diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-08-12 11:58:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-12 11:58:54 -0300 |
| commit | 0251769d1699b7f4bc7a6f05de6f52cf2ca4f29a (patch) | |
| tree | b4a8984774446718076fcaa8feb5c5366e741480 /assets | |
| parent | 83c54429159331ced13e2a97c3fbb17549a72b4e (diff) | |
General docs (#269)
* fox_display.c DOCS
* PRINTF
* actor->destroy boolean
* corneria docs
* Boss->unk_04C to Boss->animFrame
* aCoGrangaWalkingAnim
* more corneria docs
* Spawner
* Spawner code refined
* Spawner description
* Actor Spawn guard
* Molar Rock (name by @inspectredc)
* more docs
* actor docs
* initial disassembly config for lodgenet
* correct vram addresses for lodgenet
* Actor Docs
* More actor docs
* more actor docs
* correction
* correction
* more actor docs
* Preliminary work for Effect documentation
* Change Init for Setup
* fox_play cleanup and defake
* fox_zo function names
* fox_so function renaming
* more object docs
* venom 1 actors
* actor docs
* some fox_bo docs
* some fox_fo corrections
* fox_ma obj->this
* fox_ma renamings
* fox_ma docs
* fox_ti Actors
* revert permuter settings to ido
* some renames on fox_andross.c
* fox_sy actors
* object names
* corrections
* some effect comments
* fix AudioTable struct and data to avoid UB
* uintptr_t in audio
* audio load changes
* event id enum usage in fox_sy
* clear padding in sPlaylists
* HUD_FoBase_ExplodeCs
* HUD
Diffstat (limited to 'assets')
48 files changed, 1236 insertions, 1236 deletions
diff --git a/assets/yaml/jp/rev0/ast_7_ti_1.yaml b/assets/yaml/jp/rev0/ast_7_ti_1.yaml index e1f11466..3d70040b 100644 --- a/assets/yaml/jp/rev0/ast_7_ti_1.yaml +++ b/assets/yaml/jp/rev0/ast_7_ti_1.yaml @@ -89,8 +89,8 @@ D_TI1_7005420: D_TI1_70067C4: { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 } -D_TI1_7006990: - { type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990} +aTi1DesertCrawlerSkel: + { type: SF64:SKELETON, offset: 0x7006990, symbol: aTi1DesertCrawlerSkel} D_TI1_7006F74: { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 } @@ -146,8 +146,8 @@ D_TI1_7009510: D_TI1_70096D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8 } -D_TI1_70098E0: - { type: GFX, offset: 0x70098E0, symbol: D_TI1_70098E0 } +aTiDelphorDL: + { type: GFX, offset: 0x70098E0, symbol: aTiDelphorDL } D_TI1_7009B58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 } @@ -158,8 +158,8 @@ D_TI1_7009D60: D_TI1_700A190: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 } -D_TI1_700A990: - { type: GFX, offset: 0x700A990, symbol: D_TI1_700A990 } +aTi1BombDL: + { type: GFX, offset: 0x700A990, symbol: aTi1BombDL } D_TI1_700AAD8: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 } @@ -167,8 +167,8 @@ D_TI1_700AAD8: D_TI1_700AB58: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58 } -D_TI1_700AB70: - { type: GFX, offset: 0x700AB70, symbol: D_TI1_700AB70 } +aTi1LandmineDL: + { type: GFX, offset: 0x700AB70, symbol: aTi1LandmineDL } D_TI1_700AEA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 } @@ -188,8 +188,8 @@ D_TI1_700B9C0: D_TI1_700BB10: { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 } -D_TI1_700BE00: - { type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 } +aTiBridgeDL: + { type: GFX, offset: 0x700BE00, symbol: aTiBridgeDL } D_TI1_700BFB0: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 } @@ -200,11 +200,11 @@ D_TI1_700C3B0: D_TI1_700C4B0: { type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 } -D_TI1_700C8D8: - { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 } +aTi1DesertRoverAnim: + { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim } -D_TI1_700C964: - { type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 } +aTi1DesertRoverSkel: + { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel } D_TI1_700C980: { type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 } @@ -218,8 +218,8 @@ D_TI1_700CB60: D_TI1_700D534: { type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 } -D_TI1_700D700: - {type: SF64:SKELETON, offset: 0x700D700, symbol: D_TI1_700D700} +aTiRascoSkel: + {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel} D_TI1_700D740: { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 } diff --git a/assets/yaml/jp/rev0/ast_allies.yaml b/assets/yaml/jp/rev0/ast_allies.yaml index 0574dedf..57a24582 100644 --- a/assets/yaml/jp/rev0/ast_allies.yaml +++ b/assets/yaml/jp/rev0/ast_allies.yaml @@ -8,8 +8,8 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_D000000: - { type: GFX, offset: 0xD000000, symbol: D_D000000 } +aKattMarkDL: + { type: GFX, offset: 0xD000000, symbol: aKattMarkDL } ast_allies_seg13_vtx_00000098: { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 } @@ -17,11 +17,11 @@ ast_allies_seg13_vtx_00000098: D_D0000C8: { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 } -D_D0000E0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: D_D0000E0, tlut: 0x0D000160 } +aKattMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: aKattMarkTex, tlut: 0x0D000160 } -D_D000160: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: D_D000160 } +aKattMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: aKattMarkTLUT } D_D000170: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 } @@ -77,25 +77,25 @@ D_D00AFB8: D_D00B3B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 } -D_D00B5C0: - { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 } +aBillMarkDL: + { type: GFX, offset: 0xD00B5C0, symbol: aBillMarkDL } # Letter B -D_D00B688: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 } +aBillMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: aBillMarkTex, tlut: 0xD00B708 } -D_D00B708: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708 } +aBillMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: aBillMarkTLUT } -D_D00B720: - { type: GFX, offset: 0xD00B720, symbol: D_D00B720 } +aJamesMarkDL: + { type: GFX, offset: 0xD00B720, symbol: aJamesMarkDL } # Letter J ? -D_D00B7F0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: D_D00B7F0, tlut: 0xD00B870 } +aJamesMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: aJamesMarkTex, tlut: 0xD00B870 } -D_D00B870: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: D_D00B870 } +aJamesMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT } D_D00B880: { type: GFX, offset: 0xD00B880, symbol: D_D00B880 } diff --git a/assets/yaml/jp/rev0/ast_andross.yaml b/assets/yaml/jp/rev0/ast_andross.yaml index 00111e67..c296a5a1 100644 --- a/assets/yaml/jp/rev0/ast_andross.yaml +++ b/assets/yaml/jp/rev0/ast_andross.yaml @@ -232,8 +232,8 @@ D_ANDROSS_C038860: D_ANDROSS_C038954: {type: SF64:HITBOX, offset: 0xC038954, symbol: D_ANDROSS_C038954} -D_ANDROSS_C038A48: - {type: SF64:HITBOX, offset: 0xC038A48, symbol: D_ANDROSS_C038A48} +aAndDoorHitbox: + {type: SF64:HITBOX, offset: 0xC038A48, symbol: aAndDoorHitbox} D_ANDROSS_C038AC4: {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4} @@ -241,20 +241,20 @@ D_ANDROSS_C038AC4: D_ANDROSS_C038B40: {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40} -D_ANDROSS_C038BA4: - {type: SF64:HITBOX, offset: 0xC038BA4, symbol: D_ANDROSS_C038BA4} +aAndPathIntersectionHitbox: + {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox} -D_ANDROSS_C038BD8: - {type: SF64:HITBOX, offset: 0xC038BD8, symbol: D_ANDROSS_C038BD8} +aAndPassageHitbox: + {type: SF64:HITBOX, offset: 0xC038BD8, symbol: aAndPassageHitbox} D_ANDROSS_C038CCC: {type: SF64:HITBOX, offset: 0xC038CCC, symbol: D_ANDROSS_C038CCC} -D_ANDROSS_C038DC0: - {type: SF64:HITBOX, offset: 0xC038DC0, symbol: D_ANDROSS_C038DC0} +aAndAndrossHitbox: + {type: SF64:HITBOX, offset: 0xC038DC0, symbol: aAndAndrossHitbox} -D_ANDROSS_C038F24: - {type: SF64:HITBOX, offset: 0xC038F24, symbol: D_ANDROSS_C038F24} +aAndBrainHitbox: + {type: SF64:HITBOX, offset: 0xC038F24, symbol: aAndBrainHitbox} D_ANDROSS_C038FE8: {type: VTX, count: 34, offset: 0xC038FE8, symbol: D_ANDROSS_C038FE8} diff --git a/assets/yaml/jp/rev0/ast_aquas.yaml b/assets/yaml/jp/rev0/ast_aquas.yaml index b83eba47..d56b32e7 100644 --- a/assets/yaml/jp/rev0/ast_aquas.yaml +++ b/assets/yaml/jp/rev0/ast_aquas.yaml @@ -35,8 +35,8 @@ D_AQ_6002874: { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } # -D_AQ_6002C10: - { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 } +aAqOysterDL: + { type: GFX, offset: 0x6002C10, symbol: aAqOysterDL } D_AQ_6002D58: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6002D58, symbol: D_AQ_6002D58, tlut: 0x6003158 } @@ -152,8 +152,8 @@ D_AQ_600BD20: D_AQ_600B518: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 } -D_AQ_600BF80: - { type: GFX, offset: 0x600BF80, symbol: D_AQ_600BF80 } +aAqTunnel2DL: + { type: GFX, offset: 0x600BF80, symbol: aAqTunnel2DL } D_AQ_600C530: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x600C530, symbol: D_AQ_600C530, tlut: 0x600C930 } @@ -197,11 +197,11 @@ D_AQ_600E150: D_AQ_600E368: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 } -D_AQ_600EE10: - { type: GFX, offset: 0x600EE10, symbol: D_AQ_600EE10 } +aAqWall1DL: + { type: GFX, offset: 0x600EE10, symbol: aAqWall1DL } -D_AQ_600EEF0: - { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 } +aAqBump2DL: + { type: GFX, offset: 0x600EEF0, symbol: aAqBump2DL } D_AQ_600F030: { type: GFX, offset: 0x600F030, symbol: D_AQ_600F030 } @@ -230,11 +230,11 @@ D_AQ_6011A78: D_AQ_6011CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6011CD8, symbol: D_AQ_6011CD8 } -D_AQ_6011EE0: - { type: GFX, offset: 0x6011EE0, symbol: D_AQ_6011EE0 } +aAqTunnel1DL: + { type: GFX, offset: 0x6011EE0, symbol: aAqTunnel1DL } -D_AQ_60120F0: - { type: GFX, offset: 0x60120F0, symbol: D_AQ_60120F0 } +aAqRoofDL: + { type: GFX, offset: 0x60120F0, symbol: aAqRoofDL } D_AQ_60126A8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 64, offset: 0x60126A8, symbol: D_AQ_60126A8, tlut: 0x6012AA8 } @@ -254,14 +254,14 @@ D_AQ_6012EA8: D_AQ_60132A8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x60132A8, symbol: D_AQ_60132A8 } -D_AQ_60135E0: - { type: SF64:ANIM, offset: 0x60135E0, symbol: D_AQ_60135E0 } +aAqFishGroupAnim: + { type: SF64:ANIM, offset: 0x60135E0, symbol: aAqFishGroupAnim } -D_AQ_60136CC: - { type: SF64:SKELETON, offset: 0x60136CC, symbol: D_AQ_60136CC } +aAqFishGroupSkel1: + { type: SF64:SKELETON, offset: 0x60136CC, symbol: aAqFishGroupSkel1 } -D_AQ_60137CC: - { type: SF64:SKELETON, offset: 0x60137CC, symbol: D_AQ_60137CC } +aAqFishGroupSkel2: + { type: SF64:SKELETON, offset: 0x60137CC, symbol: aAqFishGroupSkel2 } D_AQ_60137F0: { type: GFX, offset: 0x60137F0, symbol: D_AQ_60137F0 } @@ -275,11 +275,11 @@ D_AQ_6013EC0: D_AQ_6014030: { type: GFX, offset: 0x6014030, symbol: D_AQ_6014030 } -D_AQ_6014438: - { type: SF64:ANIM, offset: 0x6014438, symbol: D_AQ_6014438 } +aAqStoneColumnAnim: + { type: SF64:ANIM, offset: 0x6014438, symbol: aAqStoneColumnAnim } -D_AQ_6014504: - { type: SF64:SKELETON, offset: 0x6014504, symbol: D_AQ_6014504 } +aAqStoneColumnSkel: + { type: SF64:SKELETON, offset: 0x6014504, symbol: aAqStoneColumnSkel } D_AQ_6014520: { type: GFX, offset: 0x6014520, symbol: D_AQ_6014520 } @@ -293,8 +293,8 @@ D_AQ_6014CD0: D_AQ_6014E50: { type: GFX, offset: 0x6014E50, symbol: D_AQ_6014E50 } -D_AQ_6014FD0: - { type: GFX, offset: 0x6014FD0, symbol: D_AQ_6014FD0 } +aAqBoulderDL: + { type: GFX, offset: 0x6014FD0, symbol: aAqBoulderDL } D_AQ_6015430: { type: GFX, offset: 0x6015430, symbol: D_AQ_6015430 } @@ -305,8 +305,8 @@ D_AQ_60154F8: D_AQ_60155F8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155F8, symbol: D_AQ_60155F8 } -D_AQ_6015730: - { type: GFX, offset: 0x6015730, symbol: D_AQ_6015730 } +aAqArchDL: + { type: GFX, offset: 0x6015730, symbol: aAqArchDL } D_AQ_6015DD0: { type: GFX, offset: 0x6015DD0, symbol: D_AQ_6015DD0 } @@ -383,8 +383,8 @@ D_AQ_601D110: D_AQ_601DE50: { type: SF64:ANIM, offset: 0x601DE50, symbol: D_AQ_601DE50 } -D_AQ_601DE60: - { type: GFX, offset: 0x601DE60, symbol: D_AQ_601DE60 } +aAqCoralReef2DL: + { type: GFX, offset: 0x601DE60, symbol: aAqCoralReef2DL } D_AQ_601E1F0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601E1F0, symbol: D_AQ_601E1F0 } @@ -392,11 +392,11 @@ D_AQ_601E1F0: D_AQ_601E9F0: { type: GFX, offset: 0x601E9F0, symbol: D_AQ_601E9F0 } -D_AQ_601EC68: - { type: SF64:ANIM, offset: 0x601EC68, symbol: D_AQ_601EC68 } +aAqCoralAnim: + { type: SF64:ANIM, offset: 0x601EC68, symbol: aAqCoralAnim } -D_AQ_601EDB4: - { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 } +aAqCoralSkel: + { type: SF64:SKELETON, offset: 0x601EDB4, symbol: aAqCoralSkel } D_AQ_601EDE0: { type: GFX, offset: 0x601EDE0, symbol: D_AQ_601EDE0 } @@ -425,11 +425,11 @@ D_AQ_6021858: D_AQ_6021C58: { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x6021C58, symbol: D_AQ_6021C58 } -D_AQ_602201C: - { type: SF64:ANIM, offset: 0x602201C, symbol: D_AQ_602201C } +aAqOysterAnim: + { type: SF64:ANIM, offset: 0x602201C, symbol: aAqOysterAnim } -D_AQ_60220E8: - { type: SF64:SKELETON, offset: 0x60220E8, symbol: D_AQ_60220E8 } +aAqOysterSkel: + { type: SF64:SKELETON, offset: 0x60220E8, symbol: aAqOysterSkel } D_AQ_6022110: { type: GFX, offset: 0x6022110, symbol: D_AQ_6022110 } @@ -449,14 +449,14 @@ D_AQ_6022888: D_AQ_60229B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60229B8, symbol: D_AQ_60229B8 } -D_AQ_60231C0: - { type: GFX, offset: 0x60231C0, symbol: D_AQ_60231C0 } +aAqCoralReef1DL: + { type: GFX, offset: 0x60231C0, symbol: aAqCoralReef1DL } -D_AQ_6023780: - { type: SF64:ANIM, offset: 0x6023780, symbol: D_AQ_6023780 } +aAqJellyfishAnim: + { type: SF64:ANIM, offset: 0x6023780, symbol: aAqJellyfishAnim } -D_AQ_602390C: - { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C } +aAqJellyfishSkel: + { type: SF64:SKELETON, offset: 0x602390C, symbol: aAqJellyfishSkel } D_AQ_6023940: { type: GFX, offset: 0x6023940, symbol: D_AQ_6023940 } @@ -482,8 +482,8 @@ D_AQ_6024938: D_AQ_60249C0: { type: GFX, offset: 0x60249C0, symbol: D_AQ_60249C0 } -D_AQ_6024A50: - { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 } +aAqPearlDL: + { type: GFX, offset: 0x6024A50, symbol: aAqPearlDL } D_AQ_6024F80: { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 } @@ -605,8 +605,8 @@ D_AQ_602AC40: D_AQ_602ACC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602ACC0, symbol: D_AQ_602ACC0 } -D_AQ_602B4C0: - { type: GFX, offset: 0x602B4C0, symbol: D_AQ_602B4C0 } +aAqRockDL: + { type: GFX, offset: 0x602B4C0, symbol: aAqRockDL } D_AQ_602B9D4: # unused and possibly broken { type: SF64:ANIM, offset: 0x602B9D4, symbol: D_AQ_602B9D4 } @@ -656,8 +656,8 @@ D_AQ_602E5C8: D_AQ_60308B8: { type: SF64:SCRIPT, offset: 0x60308B8, symbol: D_AQ_60308B8 } -D_AQ_6030B10: - { type: SF64:HITBOX, offset: 0x6030B10, symbol: D_AQ_6030B10 } +aBoss301Hitbox: + { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox } D_AQ_6030B14_f32: { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 } @@ -674,8 +674,8 @@ D_AQ_6030B68: D_AQ_6030BAC: { type: SF64:HITBOX, offset: 0x6030BAC, symbol: D_AQ_6030BAC } -D_AQ_6030BE0: - { type: SF64:HITBOX, offset: 0x6030BE0, symbol: D_AQ_6030BE0 } +aAqActor188Hitbox: + { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox } D_AQ_6030BFC: { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC } @@ -686,14 +686,14 @@ D_AQ_6030C18: D_AQ_6030C44: { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 } -D_AQ_6030C60: - { type: SF64:HITBOX, offset: 0x6030C60, symbol: D_AQ_6030C60 } +aAqCoralReef1Hitbox: + { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox } -D_AQ_6030C7C: - { type: SF64:HITBOX, offset: 0x6030C7C, symbol: D_AQ_6030C7C } +aAqTunnel1Hitbox: + { type: SF64:HITBOX, offset: 0x6030C7C, symbol: aAqTunnel1Hitbox } -D_AQ_6030D20: - { type: SF64:HITBOX, offset: 0x6030D20, symbol: D_AQ_6030D20 } +aAqStoneColumnHitbox: + { type: SF64:HITBOX, offset: 0x6030D20, symbol: aAqStoneColumnHitbox } D_AQ_6030D3C: { type: SF64:HITBOX, offset: 0x6030D3C, symbol: D_AQ_6030D3C } @@ -701,65 +701,65 @@ D_AQ_6030D3C: D_AQ_6030D58: { type: SF64:HITBOX, offset: 0x6030D58, symbol: D_AQ_6030D58 } -D_AQ_6030D74: - { type: SF64:HITBOX, offset: 0x6030D74, symbol: D_AQ_6030D74 } +aAqArchHitbox: + { type: SF64:HITBOX, offset: 0x6030D74, symbol: aAqArchHitbox } -D_AQ_6030DF8: - { type: SF64:HITBOX, offset: 0x6030DF8, symbol: D_AQ_6030DF8 } +aAqCoralReef2Hitbox: + { type: SF64:HITBOX, offset: 0x6030DF8, symbol: aAqCoralReef2Hitbox } -D_AQ_6030E14: - { type: SF64:HITBOX, offset: 0x6030E14, symbol: D_AQ_6030E14 } +aAqRockHitbox: + { type: SF64:HITBOX, offset: 0x6030E14, symbol: aAqRockHitbox } -D_AQ_6030E30_Hitbox: - { type: SF64:HITBOX, offset: 0x6030E30, symbol: D_AQ_6030E30_Hitbox } +aAqWall1Hitbox: + { type: SF64:HITBOX, offset: 0x6030E30, symbol: aAqWall1Hitbox } -D_AQ_6030E4C: - { type: SF64:HITBOX, offset: 0x6030E4C, symbol: D_AQ_6030E4C } +aAqRoofHitbox: + { type: SF64:HITBOX, offset: 0x6030E4C, symbol: aAqRoofHitbox } -D_AQ_6030E68: - { type: SF64:HITBOX, offset: 0x6030E68, symbol: D_AQ_6030E68 } +aAqTunnel2Hitbox: + { type: SF64:HITBOX, offset: 0x6030E68, symbol: aAqTunnel2Hitbox } -D_AQ_6030F74: - { type: SF64:HITBOX, offset: 0x6030F74, symbol: D_AQ_6030F74 } +aAqBacoonHitbox: + { type: SF64:HITBOX, offset: 0x6030F74, symbol: aAqBacoonHitbox } -D_AQ_6031398: - { type: SF64:HITBOX, offset: 0x6031398, symbol: D_AQ_6031398 } +aAqAnglerFishHitbox: + { type: SF64:HITBOX, offset: 0x6031398, symbol: aAqAnglerFishHitbox } -D_AQ_60313CC: - { type: SF64:HITBOX, offset: 0x60313CC, symbol: D_AQ_60313CC } +aAqGaroaHitbox: + { type: SF64:HITBOX, offset: 0x60313CC, symbol: aAqGaroaHitbox } -D_AQ_6031400: - { type: SF64:HITBOX, offset: 0x6031400, symbol: D_AQ_6031400 } +aAqSculpinHitbox: + { type: SF64:HITBOX, offset: 0x6031400, symbol: aAqSculpinHitbox } -D_AQ_603144C: - { type: SF64:HITBOX, offset: 0x603144C, symbol: D_AQ_603144C } +aAqSpindlyFishHitbox: + { type: SF64:HITBOX, offset: 0x603144C, symbol: aAqSpindlyFishHitbox } -D_AQ_6031480: - { type: SF64:HITBOX, offset: 0x6031480, symbol: D_AQ_6031480 } +aAqSquidHitbox: + { type: SF64:HITBOX, offset: 0x6031480, symbol: aAqSquidHitbox } D_AQ_60314AC: { type: SF64:HITBOX, offset: 0x60314AC, symbol: D_AQ_60314AC } -D_AQ_60314C8: - { type: SF64:HITBOX, offset: 0x60314C8, symbol: D_AQ_60314C8 } +aAqOysterHitbox: + { type: SF64:HITBOX, offset: 0x60314C8, symbol: aAqOysterHitbox } D_AQ_60314E4: { type: SF64:HITBOX, offset: 0x60314E4, symbol: D_AQ_60314E4 } -D_AQ_6031500: - { type: SF64:HITBOX, offset: 0x6031500, symbol: D_AQ_6031500 } +aAqBoulderHitbox: + { type: SF64:HITBOX, offset: 0x6031500, symbol: aAqBoulderHitbox } D_AQ_603151C: { type: SF64:HITBOX, offset: 0x603151C, symbol: D_AQ_603151C } -D_AQ_6031538: - { type: SF64:HITBOX, offset: 0x6031538, symbol: D_AQ_6031538 } +aAqCoralHitbox: + { type: SF64:HITBOX, offset: 0x6031538, symbol: aAqCoralHitbox } -D_AQ_6031554: - { type: SF64:HITBOX, offset: 0x6031554, symbol: D_AQ_6031554 } +aAqJellyfishHitbox: + { type: SF64:HITBOX, offset: 0x6031554, symbol: aAqJellyfishHitbox } -D_AQ_6031570: - { type: SF64:HITBOX, offset: 0x6031570, symbol: D_AQ_6031570 } +aAqFishGroupHitbox: + { type: SF64:HITBOX, offset: 0x6031570, symbol: aAqFishGroupHitbox } D_AQ_603158C: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x603158C, symbol: D_AQ_603158C } diff --git a/assets/yaml/jp/rev0/ast_area_6.yaml b/assets/yaml/jp/rev0/ast_area_6.yaml index 6584145f..fe99d8e0 100644 --- a/assets/yaml/jp/rev0/ast_area_6.yaml +++ b/assets/yaml/jp/rev0/ast_area_6.yaml @@ -237,8 +237,8 @@ D_A6_6028254: D_A6_60282A0: { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 } -D_A6_6028454: - { type: SF64:HITBOX, offset: 0x6028454, symbol: D_A6_6028454 } +aA6GorgonHitbox: + { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox } D_A6_6028578: { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 } diff --git a/assets/yaml/jp/rev0/ast_arwing.yaml b/assets/yaml/jp/rev0/ast_arwing.yaml index 89515c40..7354410b 100644 --- a/assets/yaml/jp/rev0/ast_arwing.yaml +++ b/assets/yaml/jp/rev0/ast_arwing.yaml @@ -179,8 +179,8 @@ D_arwing_3018348: D_arwing_30183D0: { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 } -D_arwing_30184D8: - { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 } +aWindshieldClouldReflextionTex: + { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: aWindshieldClouldReflextionTex } D_arwing_3018CD8: { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 } diff --git a/assets/yaml/jp/rev0/ast_bolse.yaml b/assets/yaml/jp/rev0/ast_bolse.yaml index 64f49f89..8f033e51 100644 --- a/assets/yaml/jp/rev0/ast_bolse.yaml +++ b/assets/yaml/jp/rev0/ast_bolse.yaml @@ -115,8 +115,8 @@ D_BO_600AB90: D_BO_600AD80: { type: TEXTURE, format: RGBA16, offset: 0x0600AD80, width: 32, height: 32, ctype: u16, symbol: D_BO_600AD80 } -D_BO_600B8B0: - { type: GFX, offset: 0x600B8B0, symbol: D_BO_600B8B0 } +aBoBuildingDL: + { type: GFX, offset: 0x600B8B0, symbol: aBoBuildingDL } D_BO_600BAA0: { type: GFX, offset: 0x600BAA0, symbol: D_BO_600BAA0 } @@ -133,11 +133,11 @@ D_BO_600C0B8: D_BO_600C2D8: { type: TEXTURE, format: IA8, offset: 0x0600C2D8, width: 32, height: 16, ctype: u8, symbol: D_BO_600C2D8 } -D_BO_600C4E0: - { type: GFX, offset: 0x600C4E0, symbol: D_BO_600C4E0 } +aBoBaseShieldDL: + { type: GFX, offset: 0x600C4E0, symbol: aBoBaseShieldDL } -D_BO_600CF88: - { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: D_BO_600CF88 } +aBoBaseShieldTex: + { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: aBoBaseShieldTex } D_BO_600D190: { type: GFX, offset: 0x600D190, symbol: D_BO_600D190 } @@ -148,20 +148,20 @@ D_BO_600D2A0: D_BO_600E2A0: { type: TEXTURE, format: RGBA16, offset: 0x0600E2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600E2A0 } -D_BO_600F2E0: - { type: SF64:ANIM, offset: 0x600F2E0, symbol: D_BO_600F2E0 } +aBoLaserCannonAnim: + { type: SF64:ANIM, offset: 0x600F2E0, symbol: aBoLaserCannonAnim } -D_BO_600F36C: - { type: SF64:SKELETON, offset: 0x600F36C, symbol: D_BO_600F36C } +aBoLaserCannonSkel: + { type: SF64:SKELETON, offset: 0x600F36C, symbol: aBoLaserCannonSkel } -D_BO_600F3D8: - { type: SF64:ANIM, offset: 0x600F3D8, symbol: D_BO_600F3D8 } +aBoShieldReactorAnim: + { type: SF64:ANIM, offset: 0x600F3D8, symbol: aBoShieldReactorAnim } -D_BO_600F4A4: - { type: SF64:SKELETON, offset: 0x600F4A4, symbol: D_BO_600F4A4 } +aBoShieldReactorSkel: + { type: SF64:SKELETON, offset: 0x600F4A4, symbol: aBoShieldReactorSkel } -D_BO_600F4C0: - { type: GFX, offset: 0x600F4C0, symbol: D_BO_600F4C0 } +aBoPoleDL: + { type: GFX, offset: 0x600F4C0, symbol: aBoPoleDL } D_BO_600F728: { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 } @@ -178,23 +178,23 @@ D_BO_6010294: PAD_BO_6011B20: { type: BLOB, size: 0x4, offset: 0x6011B20, symbol: PAD_BO_6011B20, mesh_symbol: D_BO_OFFSET } -D_BO_6011B24: - { type: SF64:HITBOX, offset: 0x6011B24, symbol: D_BO_6011B24 } +aBoShieldReactorHitbox: + { type: SF64:HITBOX, offset: 0x6011B24, symbol: aBoShieldReactorHitbox } D_BO_6011BA4: { type: SF64:HITBOX, offset: 0x6011BA4, symbol: D_BO_6011BA4 } -D_BO_6011BF4: - { type: SF64:HITBOX, offset: 0x6011BF4, symbol: D_BO_6011BF4 } +aBoLaserCannonHitbox: + { type: SF64:HITBOX, offset: 0x6011BF4, symbol: aBoLaserCannonHitbox } -D_BO_6011C10: - { type: SF64:HITBOX, offset: 0x6011C10, symbol: D_BO_6011C10 } +aBoPoleHitbox: + { type: SF64:HITBOX, offset: 0x6011C10, symbol: aBoPoleHitbox } -D_BO_6011C48: - { type: SF64:HITBOX, offset: 0x6011C48, symbol: D_BO_6011C48 } +aBoBuildingHitbox: + { type: SF64:HITBOX, offset: 0x6011C48, symbol: aBoBuildingHitbox } -D_BO_6011C80: - { type: SF64:HITBOX, offset: 0x6011C80, symbol: D_BO_6011C80 } +aBoBaseCoreHitbox: + { type: SF64:HITBOX, offset: 0x6011C80, symbol: aBoBaseCoreHitbox } D_BO_6011E28: { type: VTX, count: 34, offset: 0x6011E28, symbol: D_BO_6011E28 } diff --git a/assets/yaml/jp/rev0/ast_common.yaml b/assets/yaml/jp/rev0/ast_common.yaml index 00250513..66c29972 100644 --- a/assets/yaml/jp/rev0/ast_common.yaml +++ b/assets/yaml/jp/rev0/ast_common.yaml @@ -695,11 +695,11 @@ D_101CBC0: D_101CCC0: { type: TEXTURE, format: TLUT, colors: 88, offset: 0x101CCC0, ctype: u16, symbol: D_101CCC0 } -D_101CD70: - { type: GFX, offset: 0x101CD70, symbol: D_101CD70 } +aUnusedShieldDL: + { type: GFX, offset: 0x101CD70, symbol: aUnusedShieldDL } -D_101D070: - { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: D_101D070 } +aUnusedShieldTex: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: aUnusedShieldTex } D_101D870: { type: GFX, offset: 0x101D870, symbol: D_101D870 } @@ -710,8 +710,8 @@ ast_common_seg1_vtx_1D9C8: D_101DE20: { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101DE20, symbol: D_101DE20 } -D_101DC10: - { type: GFX, offset: 0x101DC10, symbol: D_101DC10 } +aBarrelRollTex: + { type: GFX, offset: 0x101DC10, symbol: aBarrelRollTex } D_101EE20: { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101EE20, symbol: D_101EE20 } @@ -806,32 +806,32 @@ D_1024230: D_1024290: { type: GFX, offset: 0x1024290, symbol: D_1024290 } -D_1024410: - { type: GFX, offset: 0x1024410, symbol: D_1024410 } +aPeppyMarkDL: + { type: GFX, offset: 0x1024410, symbol: aPeppyMarkDL } -D_10244D8: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: D_10244D8 } +aPeppyMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: aPeppyMarkTex } -D_1024558: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: D_1024558 } +aPeppyMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: aPeppyMarkTLUT } -D_1024570: - { type: GFX, offset: 0x1024570, symbol: D_1024570 } +aFalcoMarkDL: + { type: GFX, offset: 0x1024570, symbol: aFalcoMarkDL } -D_1024638: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: D_1024638 } +aFalcoMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: aFalcoMarkTex } -D_10246B8: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: D_10246B8 } +aFalcoMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: aFalcoMarkTLUT } -D_10246D0: - { type: GFX, offset: 0x10246D0, symbol: D_10246D0 } +aSlippyMarkDL: + { type: GFX, offset: 0x10246D0, symbol: aSlippyMarkDL } -D_1024798: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: D_1024798 } +aSlippyMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: aSlippyMarkTex } -D_1024818: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: D_1024818 } +aSlippyMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: aSlippyMarkTLUT } D_1024830: { type: GFX, offset: 0x1024830, symbol: D_1024830 } diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml index 953521ce..7c50e853 100644 --- a/assets/yaml/jp/rev0/ast_corneria.yaml +++ b/assets/yaml/jp/rev0/ast_corneria.yaml @@ -303,20 +303,20 @@ D_CO_602AA7C: aCoDoorsSkel: { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel } -D_CO_602BC18: - { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 } +aCoGrangaWalkingAnim: + { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim } D_CO_602BE64: { type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 } -D_CO_602C0D0: - { type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 } +aCoGrangaStationaryAnim: + { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim } D_CO_602D31C: { type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C } -D_CO_602D400: - { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 } +aCoCarrierAnim: + { type: SF64:ANIM, offset: 0x602D400, symbol: aCoCarrierAnim } aCoCarrierSkel: { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel } @@ -522,14 +522,14 @@ aCoBuilding10Hitbox: aCoIBeamHitbox: { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox } -D_CO_603E54C: - { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C } +aCoActorSkibotHitbox: + { type: SF64:HITBOX, offset: 0x603E54C, symbol: aCoActorSkibotHitbox } -D_CO_603E598: - { type: SF64:HITBOX, offset: 0x603E598, symbol: D_CO_603E598 } +aCoActorRadarHitbox: + { type: SF64:HITBOX, offset: 0x603E598, symbol: aCoActorRadarHitbox } -D_CO_603E5B4: - { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 } +aCoMoleMissileHitbox: + { type: SF64:HITBOX, offset: 0x603E5B4, symbol: aCoMoleMissileHitbox } CoGarudaHitbox: { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox } @@ -540,14 +540,14 @@ aCoGarudaDestroyHitbox: D_CO_603E620: { type: SF64:HITBOX, offset: 0x603E620, symbol: D_CO_603E620 } -D_CO_603E714: - { type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 } +aCoCarrierLeftHitbox: + { type: SF64:HITBOX, offset: 0x603E714, symbol: aCoCarrierLeftHitbox } -D_CO_603E748: - { type: SF64:HITBOX, offset: 0x603E748, symbol: D_CO_603E748 } +aCoCarrierUpperHitbox: + { type: SF64:HITBOX, offset: 0x603E748, symbol: aCoCarrierUpperHitbox } -D_CO_603E7C4: - { type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 } +aCoCarrierBottomHitbox: + { type: SF64:HITBOX, offset: 0x603E7C4, symbol: aCoCarrierBottomHitbox } D_CO_603E840: { type: SF64:HITBOX, offset: 0x603E840, symbol: D_CO_603E840 } diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml index 7815eeeb..bf24079b 100644 --- a/assets/yaml/jp/rev0/ast_fortuna.yaml +++ b/assets/yaml/jp/rev0/ast_fortuna.yaml @@ -62,11 +62,11 @@ D_FO_6006120: D_FO_6006220: { type: TEXTURE, format: TLUT, colors: 120, offset: 0x6006220, ctype: u16, symbol: D_FO_6006220 } -D_FO_6006310: - { type: GFX, offset: 0x6006310, symbol: D_FO_6006310 } +aFoMountain3DL: + { type: GFX, offset: 0x6006310, symbol: aFoMountain3DL } -D_FO_60066E0: - { type: GFX, offset: 0x60066E0, symbol: D_FO_60066E0 } +aFoTowerDL: + { type: GFX, offset: 0x60066E0, symbol: aFoTowerDL } ast_fortuna_seg6_vtx_6898: { type: VTX, count: 52, offset: 0x6006898, symbol: ast_fortuna_seg6_vtx_6898 } @@ -92,17 +92,17 @@ D_FO_6007590: D_FO_6007730: { type: GFX, offset: 0x6007730, symbol: D_FO_6007730 } -D_FO_6007854: - { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 } +aFoRadarAnim: + { type: SF64:ANIM, offset: 0x6007854, symbol: aFoRadarAnim } -D_FO_6007980: - { type: SF64:SKELETON, offset: 0x6007980, symbol: D_FO_6007980 } +aFoRadarSkel: + { type: SF64:SKELETON, offset: 0x6007980, symbol: aFoRadarSkel } -D_FO_60079B0: - { type: GFX, offset: 0x60079B0, symbol: D_FO_60079B0 } +aFoMountain1DL: + { type: GFX, offset: 0x60079B0, symbol: aFoMountain1DL } -D_FO_6007D80: - { type: GFX, offset: 0x6007D80, symbol: D_FO_6007D80 } +aFoMountain2DL: + { type: GFX, offset: 0x6007D80, symbol: aFoMountain2DL } D_FO_6008150: { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6008150, ctype: u16, symbol: D_FO_6008150 } @@ -161,8 +161,8 @@ D_FO_600F60C: aFoPoleHitbox: { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox } -D_FO_600FEB8: - { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 } +aFoTowerHitbox: + { type: SF64:HITBOX, offset: 0x600FEB8, symbol: aFoTowerHitbox } aFoRadarHitbox: { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox } @@ -170,14 +170,14 @@ aFoRadarHitbox: D_FO_600FF64: { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 } -D_FO_600FF80: - { type: SF64:HITBOX, offset: 0x600FF80, symbol: D_FO_600FF80 } +aFoMountain1Hitbox: + { type: SF64:HITBOX, offset: 0x600FF80, symbol: aFoMountain1Hitbox } -D_FO_600FFA0: - { type: SF64:HITBOX, offset: 0x600FFA0, symbol: D_FO_600FFA0 } +aFoMountain2Hitbox: + { type: SF64:HITBOX, offset: 0x600FFA0, symbol: aFoMountain2Hitbox } -D_FO_600FFC0: - { type: SF64:HITBOX, offset: 0x600FFC0, symbol: D_FO_600FFC0 } +aFoMountain3Hitbox: + { type: SF64:HITBOX, offset: 0x600FFC0, symbol: aFoMountain3Hitbox } -D_FO_600FFE0: - { type: SF64:HITBOX, offset: 0x600FFE0, symbol: D_FO_600FFE0 }
\ No newline at end of file +aFoBaseHitbox: + { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_katina.yaml b/assets/yaml/jp/rev0/ast_katina.yaml index 30d5e698..6ec0a0a3 100644 --- a/assets/yaml/jp/rev0/ast_katina.yaml +++ b/assets/yaml/jp/rev0/ast_katina.yaml @@ -57,8 +57,8 @@ D_KA_60062F8: D_KA_6006AF8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006AF8, ctype: u16, symbol: D_KA_6006AF8 } -aKaDestroyedSaucererDL: - { type: GFX, offset: 0x6007300, symbol: aKaDestroyedSaucererDL } +aKaDestroyedKaSaucererDL: + { type: GFX, offset: 0x6007300, symbol: aKaDestroyedKaSaucererDL } D_KA_6009250: { type: GFX, offset: 0x6009250, symbol: D_KA_6009250 } @@ -169,11 +169,11 @@ D_KA_6011000: D_KA_6011044: { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 } -D_KA_6011058: - { type: SF64:HITBOX, offset: 0x6011058, symbol: D_KA_6011058 } +aKaSaucererHitbox: + { type: SF64:HITBOX, offset: 0x6011058, symbol: aKaSaucererHitbox } -D_KA_601115C: - { type: SF64:HITBOX, offset: 0x601115C, symbol: D_KA_601115C } +aKaFrontlineBaseHitbox: + { type: SF64:HITBOX, offset: 0x601115C, symbol: aKaFrontlineBaseHitbox } D_KA_60111D8: { type: SF64:HITBOX, offset: 0x60111D8, symbol: D_KA_60111D8 }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_landmaster.yaml b/assets/yaml/jp/rev0/ast_landmaster.yaml index 2d126597..42b43cf1 100644 --- a/assets/yaml/jp/rev0/ast_landmaster.yaml +++ b/assets/yaml/jp/rev0/ast_landmaster.yaml @@ -14,8 +14,8 @@ D_landmaster_3000000: D_landmaster_3000080: { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_landmaster_3000080 } -D_landmaster_3000090: - { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 } +aLandmasterModelDL: + { type: GFX, offset: 0x3000090, symbol: aLandmasterModelDL } D_landmaster_3004CA8: { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3004CA8 } @@ -44,8 +44,8 @@ D_landmaster_3001680: D_landmaster_3001E80: { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001E80 } -D_landmaster_3004680: - { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 } +aLandmasterCanonDL: + { type: GFX, offset: 0x3004680, symbol: aLandmasterCanonDL } D_landmaster_30066B0: { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 } diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml index 289d4ccd..04859b16 100644 --- a/assets/yaml/jp/rev0/ast_macbeth.yaml +++ b/assets/yaml/jp/rev0/ast_macbeth.yaml @@ -163,8 +163,8 @@ D_MA_6007430: D_MA_6007500: {type: GFX, offset: 0x6007500, symbol: D_MA_6007500} -D_MA_60075D0: - {type: GFX, offset: 0x60075D0, symbol: D_MA_60075D0} +aMaWeaponsFactoryDL: + {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL} D_MA_60092E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x60092E0, symbol: D_MA_60092E0} @@ -238,8 +238,8 @@ D_MA_600AE18: D_MA_600AE98: { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98} -D_MA_600AF40: - {type: GFX, offset: 0x600AF40, symbol: D_MA_600AF40} +aMaGuillotineDL: + {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL} D_MA_600B2E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0} @@ -265,8 +265,8 @@ D_MA_600D1E4: D_MA_600D280: { type: TEXTURE, format: IA16, ctype: u16, width: 16, height: 16, offset: 0x600D280, symbol: D_MA_600D280} -D_MA_600D480: - {type: GFX, offset: 0x600D480, symbol: D_MA_600D480} +aMaSpearDL: + {type: GFX, offset: 0x600D480, symbol: aMaSpearDL} D_MA_600D878: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600D878, symbol: D_MA_600D878, tlut: 0x600D978} @@ -361,8 +361,8 @@ D_MA_6012C00: D_MA_6012C98: { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 8, offset: 0x6012C98, symbol: D_MA_6012C98} -D_MA_6012F50: - {type: GFX, offset: 0x6012F50, symbol: D_MA_6012F50} +aMaShockBoxLightDL: + {type: GFX, offset: 0x6012F50, symbol: aMaShockBoxLightDL} D_MA_6012FE0: { type: TEXTURE, format: IA8, ctype: u8, width: 16, height: 8, offset: 0x6012FE0, symbol: D_MA_6012FE0} @@ -391,8 +391,8 @@ D_MA_6015494: D_MA_6015500: {type: SF64:SKELETON, offset: 0x6015500, symbol: D_MA_6015500} -D_MA_6015510: - {type: GFX, offset: 0x6015510, symbol: D_MA_6015510} +aMaShockBoxDL: + {type: GFX, offset: 0x6015510, symbol: aMaShockBoxDL} D_MA_6015C24: {type: SF64:ANIM, offset: 0x6015C24, symbol: D_MA_6015C24} @@ -451,11 +451,11 @@ D_MA_601A840: D_MA_601A8C8: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x601A8C8, symbol: D_MA_601A8C8} -D_MA_601B0D0: - {type: GFX, offset: 0x601B0D0, symbol: D_MA_601B0D0} +aMaFloor6DL: + {type: GFX, offset: 0x601B0D0, symbol: aMaFloor6DL} -D_MA_601B7C0: - {type: GFX, offset: 0x601B7C0, symbol: D_MA_601B7C0} +aMaWall4DL: + {type: GFX, offset: 0x601B7C0, symbol: aMaWall4DL} D_MA_601BB78: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BB78, symbol: D_MA_601BB78, tlut: 0x601BC78} @@ -493,8 +493,8 @@ D_MA_601EAB0: D_MA_601EBBC: {type: SF64:SKELETON, offset: 0x601EBBC, symbol: D_MA_601EBBC} -D_MA_601F1D0: - {type: GFX, offset: 0x601F1D0, symbol: D_MA_601F1D0} +aMaWall2DL: + {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL} D_MA_601F270: {type: GFX, offset: 0x601F270, symbol: D_MA_601F270} @@ -550,14 +550,14 @@ D_MA_6023388: D_MA_6023788: { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6023788, symbol: D_MA_6023788} -D_MA_60238F0: - {type: GFX, offset: 0x60238F0, symbol: D_MA_60238F0} +aMaWall3DL: + {type: GFX, offset: 0x60238F0, symbol: aMaWall3DL} D_MA_60239D0: {type: GFX, offset: 0x60239D0, symbol: D_MA_60239D0} -D_MA_6024010: - {type: GFX, offset: 0x6024010, symbol: D_MA_6024010} +aMaBuilding1DL: + {type: GFX, offset: 0x6024010, symbol: aMaBuilding1DL} D_MA_6024230: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6024230, symbol: D_MA_6024230, tlut: 0x6024630} @@ -568,17 +568,17 @@ D_MA_6024630: D_MA_6024670: {type: GFX, offset: 0x6024670, symbol: D_MA_6024670} -D_MA_60251A0: - {type: GFX, offset: 0x60251A0, symbol: D_MA_60251A0} +aMaHorizontalLockBarDL: + {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL} D_MA_60253E0: {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0} -D_MA_60257B0: - {type: GFX, offset: 0x60257B0, symbol: D_MA_60257B0} +aMaBarrierDL: + {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL} -D_MA_6025850: - {type: GFX, offset: 0x6025850, symbol: D_MA_6025850} +aMaVerticalLockBarDL: + {type: GFX, offset: 0x6025850, symbol: aMaVerticalLockBarDL} D_MA_6025A70: {type: GFX, offset: 0x6025A70, symbol: D_MA_6025A70} @@ -604,11 +604,11 @@ D_MA_6026C00: D_MA_6027000: { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6027000, symbol: D_MA_6027000} -D_MA_60270E0: - {type: GFX, offset: 0x60270E0, symbol: D_MA_60270E0} +aMaWall1DL: + {type: GFX, offset: 0x60270E0, symbol: aMaWall1DL} -D_MA_6027180: - { type: GFX, offset: 0x6027180, symbol: D_MA_6027180} +aMaBuilding2DL: + { type: GFX, offset: 0x6027180, symbol: aMaBuilding2DL} D_MA_6027320: {type: SF64:ANIM, offset: 0x6027320, symbol: D_MA_6027320} @@ -616,8 +616,8 @@ D_MA_6027320: D_MA_602742C: {type: SF64:SKELETON, offset: 0x602742C, symbol: D_MA_602742C} -D_MA_6027900: - {type: GFX, offset: 0x6027900, symbol: D_MA_6027900} +aMaFloor2DL: + {type: GFX, offset: 0x6027900, symbol: aMaFloor2DL} D_MA_6027A04: {type: SF64:ANIM, offset: 0x6027A04, symbol: D_MA_6027A04} @@ -658,14 +658,14 @@ D_MA_602CB80: D_MA_602D380: {type: GFX, offset: 0x602D380, symbol: D_MA_602D380} -D_MA_602DAE0: - {type: GFX, offset: 0x602DAE0, symbol: D_MA_602DAE0} +aMaFloor1DL: + {type: GFX, offset: 0x602DAE0, symbol: aMaFloor1DL} -D_MA_602DB80: - {type: GFX, offset: 0x602DB80, symbol: D_MA_602DB80} +aMaFloor3DL: + {type: GFX, offset: 0x602DB80, symbol: aMaFloor3DL} -D_MA_602DC20: - {type: GFX, offset: 0x602DC20, symbol: D_MA_602DC20} +aMaFloor5DL: + {type: GFX, offset: 0x602DC20, symbol: aMaFloor5DL} D_MA_602DCB8: {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602DCB8, symbol: D_MA_602DCB8} @@ -703,11 +703,11 @@ D_MA_602FFA0: D_MA_602FFC0: {type: GFX, offset: 0x602FFC0, symbol: D_MA_602FFC0} -D_MA_6030500: - {type: GFX, offset: 0x6030500, symbol: D_MA_6030500} +aMaTerrainBumpDL: + {type: GFX, offset: 0x6030500, symbol: aMaTerrainBumpDL} -D_MA_6030630: - {type: GFX, offset: 0x6030630, symbol: D_MA_6030630} +aMaFloor4DL: + {type: GFX, offset: 0x6030630, symbol: aMaFloor4DL} D_MA_60306D0: {type: GFX, offset: 0x60306D0, symbol: D_MA_60306D0} @@ -757,20 +757,20 @@ D_MA_6035920: D_MA_60359AC: {type: SF64:HITBOX, offset: 0x60359AC, symbol: D_MA_60359AC} -D_MA_60359C8: - {type: SF64:HITBOX, offset: 0x60359C8, symbol: D_MA_60359C8} +aMaLocomotiveHitbox: + {type: SF64:HITBOX, offset: 0x60359C8, symbol: aMaLocomotiveHitbox} -D_MA_6035A14: - {type: SF64:HITBOX, offset: 0x6035A14, symbol: D_MA_6035A14} +aMaTrainCar2Hitbox: + {type: SF64:HITBOX, offset: 0x6035A14, symbol: aMaTrainCar2Hitbox} -D_MA_6035A48: - {type: SF64:HITBOX, offset: 0x6035A48, symbol: D_MA_6035A48} +aMaTrainCar1Hitbox: + {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTrainCar1Hitbox} D_MA_6035A94: {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94} -D_MA_6035AE0: - {type: SF64:HITBOX, offset: 0x6035AE0, symbol: D_MA_6035AE0} +aMaTrainCar3Hitbox: + {type: SF64:HITBOX, offset: 0x6035AE0, symbol: aMaTrainCar3Hitbox} D_MA_6035B44: {type: SF64:HITBOX, offset: 0x6035B44, symbol: D_MA_6035B44} @@ -790,14 +790,14 @@ D_MA_6035CD4: D_MA_6035D38: {type: SF64:HITBOX, offset: 0x6035D38, symbol: D_MA_6035D38} -D_MA_6035D9C: - {type: SF64:HITBOX, offset: 0x6035D9C, symbol: D_MA_6035D9C} +aMaTrainCar4Hitbox: + {type: SF64:HITBOX, offset: 0x6035D9C, symbol: aMaTrainCar4Hitbox} D_MA_6035DD0: {type: SF64:HITBOX, offset: 0x6035DD0, symbol: D_MA_6035DD0} -D_MA_6035E04: - {type: SF64:HITBOX, offset: 0x6035E04, symbol: D_MA_6035E04} +aMaTrainCar5Hitbox: + {type: SF64:HITBOX, offset: 0x6035E04, symbol: aMaTrainCar5Hitbox} D_MA_6035E68: {type: SF64:HITBOX, offset: 0x6035E68, symbol: D_MA_6035E68} @@ -817,101 +817,101 @@ D_MA_6035FF8: D_MA_603605C: {type: SF64:HITBOX, offset: 0x603605C, symbol: D_MA_603605C} -D_MA_60360C0: - {type: SF64:HITBOX, offset: 0x60360C0, symbol: D_MA_60360C0} +aMaTrainCar6Hitbox: + {type: SF64:HITBOX, offset: 0x60360C0, symbol: aMaTrainCar6Hitbox} -D_MA_6036154: - {type: SF64:HITBOX, offset: 0x6036154, symbol: D_MA_6036154} +aMaTrainCar7Hitbox: + {type: SF64:HITBOX, offset: 0x6036154, symbol: aMaTrainCar7Hitbox} D_MA_6036188: {type: SF64:HITBOX, offset: 0x6036188, symbol: D_MA_6036188} -D_MA_6036204: - {type: SF64:HITBOX, offset: 0x6036204, symbol: D_MA_6036204} +aMaTrainTrack13Hitbox: + {type: SF64:HITBOX, offset: 0x6036204, symbol: aMaTrainTrack13Hitbox} D_MA_6036250: {type: SF64:HITBOX, offset: 0x6036250, symbol: D_MA_6036250} -D_MA_603626C: - {type: SF64:HITBOX, offset: 0x603626C, symbol: D_MA_603626C} +aMaBuilding1Hitbox: + {type: SF64:HITBOX, offset: 0x603626C, symbol: aMaBuilding1Hitbox} -D_MA_6036288: - {type: SF64:HITBOX, offset: 0x6036288, symbol: D_MA_6036288} +aMaBuilding2Hitbox: + {type: SF64:HITBOX, offset: 0x6036288, symbol: aMaBuilding2Hitbox} -D_MA_60362A4: - {type: SF64:HITBOX, offset: 0x60362A4, symbol: D_MA_60362A4} +aMaTowerHitbox: + {type: SF64:HITBOX, offset: 0x60362A4, symbol: aMaTowerHitbox} -D_MA_60362D8: - {type: SF64:HITBOX, offset: 0x60362D8, symbol: D_MA_60362D8} +aMaWall2Hitbox: + {type: SF64:HITBOX, offset: 0x60362D8, symbol: aMaWall2Hitbox} -D_MA_60362F4: - {type: SF64:HITBOX, offset: 0x60362F4, symbol: D_MA_60362F4} +aMaWall4Hitbox: + {type: SF64:HITBOX, offset: 0x60362F4, symbol: aMaWall4Hitbox} -D_MA_6036328: - {type: SF64:HITBOX, offset: 0x6036328, symbol: D_MA_6036328} +aMaWall3Hitbox: + {type: SF64:HITBOX, offset: 0x6036328, symbol: aMaWall3Hitbox} -D_MA_6036344: - {type: SF64:HITBOX, offset: 0x6036344, symbol: D_MA_6036344} +aMaIndicatorSignHitbox: + {type: SF64:HITBOX, offset: 0x6036344, symbol: aMaIndicatorSignHitbox} -D_MA_6036370: - {type: SF64:HITBOX, offset: 0x6036370, symbol: D_MA_6036370} +aMaTerrainBumpHitbox: + {type: SF64:HITBOX, offset: 0x6036370, symbol: aMaTerrainBumpHitbox} -D_MA_603638C: - {type: SF64:HITBOX, offset: 0x603638C, symbol: D_MA_603638C} +aMaFloor1Hitbox: + {type: SF64:HITBOX, offset: 0x603638C, symbol: aMaFloor1Hitbox} -D_MA_60363B8: - {type: SF64:HITBOX, offset: 0x60363B8, symbol: D_MA_60363B8} +aMaFloor2Hitbox: + {type: SF64:HITBOX, offset: 0x60363B8, symbol: aMaFloor2Hitbox} -D_MA_60363E4: - {type: SF64:HITBOX, offset: 0x60363E4, symbol: D_MA_60363E4} +aMaFloor3Hitbox: + {type: SF64:HITBOX, offset: 0x60363E4, symbol: aMaFloor3Hitbox} -D_MA_6036410: - {type: SF64:HITBOX, offset: 0x6036410, symbol: D_MA_6036410} +aMaFloor4Hitbox: + {type: SF64:HITBOX, offset: 0x6036410, symbol: aMaFloor4Hitbox} -D_MA_603643C: - {type: SF64:HITBOX, offset: 0x603643C, symbol: D_MA_603643C} +aMaFloor5Hitbox: + {type: SF64:HITBOX, offset: 0x603643C, symbol: aMaFloor5Hitbox} -D_MA_6036458: - {type: SF64:HITBOX, offset: 0x6036458, symbol: D_MA_6036458} +aMaMaRailroadSwitchHitbox: + {type: SF64:HITBOX, offset: 0x6036458, symbol: aMaMaRailroadSwitchHitbox} D_MA_603648C: {type: SF64:HITBOX, offset: 0x603648C, symbol: D_MA_603648C} -D_MA_60364C0: - {type: SF64:HITBOX, offset: 0x60364C0, symbol: D_MA_60364C0} +aMaBoulderHitbox: + {type: SF64:HITBOX, offset: 0x60364C0, symbol: aMaBoulderHitbox} -D_MA_60364DC: - {type: SF64:HITBOX, offset: 0x60364DC, symbol: D_MA_60364DC} +aMaRailwaySignalHitbox: + {type: SF64:HITBOX, offset: 0x60364DC, symbol: aMaRailwaySignalHitbox} D_MA_6036520: {type: SF64:HITBOX, offset: 0x6036520, symbol: D_MA_6036520} -D_MA_6036594: - {type: SF64:HITBOX, offset: 0x6036594, symbol: D_MA_6036594} +aMaSwitchTrackHitbox: + {type: SF64:HITBOX, offset: 0x6036594, symbol: aMaSwitchTrackHitbox} D_MA_6036668: {type: SF64:HITBOX, offset: 0x6036668, symbol: D_MA_6036668} -D_MA_60366EC: - {type: SF64:HITBOX, offset: 0x60366EC, symbol: D_MA_60366EC} +aMaHorizontalLockBarHitbox: + {type: SF64:HITBOX, offset: 0x60366EC, symbol: aMaHorizontalLockBarHitbox} -D_MA_6036708: - {type: SF64:HITBOX, offset: 0x6036708, symbol: D_MA_6036708} +aMaVerticalLockBarHitbox: + {type: SF64:HITBOX, offset: 0x6036708, symbol: aMaVerticalLockBarHitbox} -D_MA_6036724: - {type: SF64:HITBOX, offset: 0x6036724, symbol: D_MA_6036724} +aMaProximityLightHitbox: + {type: SF64:HITBOX, offset: 0x6036724, symbol: aMaProximityLightHitbox} -D_MA_6036728: - {type: SF64:HITBOX, offset: 0x6036728, symbol: D_MA_6036728} +aMaBarrierHitbox: + {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox} -D_MA_6036744: - {type: SF64:HITBOX, offset: 0x6036744, symbol: D_MA_6036744} +aMaActor219Hitbox: + {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox} -D_MA_6036760: - {type: SF64:HITBOX, offset: 0x6036760, symbol: D_MA_6036760} +aMaFloor6Hitbox: + {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox} -D_MA_603677C: - {type: SF64:HITBOX, offset: 0x603677C, symbol: D_MA_603677C} +aMaActor207Hitbox: + {type: SF64:HITBOX, offset: 0x603677C, symbol: aMaActor207Hitbox} D_MA_6036818: {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818} @@ -919,20 +919,20 @@ D_MA_6036818: D_MA_6036894: {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894} -D_MA_60368E0: - {type: SF64:HITBOX, offset: 0x60368E0, symbol: D_MA_60368E0} +aMaGuillotineHitbox: + {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} D_MA_60368FC: {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC} -D_MA_6036930: - {type: SF64:HITBOX, offset: 0x6036930, symbol: D_MA_6036930} +aMaBombDropHitbox: + {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox} -D_MA_603694C: - {type: SF64:HITBOX, offset: 0x603694C, symbol: D_MA_603694C} +aMaSpearHitbox: + {type: SF64:HITBOX, offset: 0x603694C, symbol: aMaSpearHitbox} -D_MA_6036968: - {type: SF64:HITBOX, offset: 0x6036968, symbol: D_MA_6036968} +aMaShockBoxHitbox: + {type: SF64:HITBOX, offset: 0x6036968, symbol: aMaShockBoxHitbox} D_MA_60381D8: {type: SF64:SCRIPT, offset: 0x60381D8, symbol: D_MA_60381D8} diff --git a/assets/yaml/jp/rev0/ast_meteo.yaml b/assets/yaml/jp/rev0/ast_meteo.yaml index 242222db..f97e017e 100644 --- a/assets/yaml/jp/rev0/ast_meteo.yaml +++ b/assets/yaml/jp/rev0/ast_meteo.yaml @@ -104,8 +104,8 @@ D_ME_600C740: D_ME_600CAA0: { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 } -D_ME_600CD60: - { type: GFX, offset: 0x600CD60, symbol: D_ME_600CD60 } +aMeMeteorShower3DL: + { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL } D_ME_600CDE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CDE8, symbol: D_ME_600CDE8 } @@ -137,8 +137,8 @@ D_ME_6014238: D_ME_6015238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06015238, symbol: D_ME_6015238 } -D_ME_6016240: - { type: GFX, offset: 0x6016240, symbol: D_ME_6016240 } +aMeMeteorShower2DL: + { type: GFX, offset: 0x6016240, symbol: aMeMeteorShower2DL } D_ME_60162C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x060162C8, symbol: D_ME_60162C8 } @@ -146,20 +146,20 @@ D_ME_60162C8: D_ME_60172C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060172C8, symbol: D_ME_60172C8 } -D_ME_6017AD0: - { type: GFX, offset: 0x06017AD0, symbol: D_ME_6017AD0 } +aMeMeteorShower1DL: + { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL } D_ME_6017B60: { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 } -D_ME_6018450: - { type: GFX, offset: 0x06018450, symbol: D_ME_6018450 } +aMeLaserCannon2DL: + { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL } D_ME_6018960: { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 } -D_ME_6018C00: - { type: GFX, offset: 0x06018C00, symbol: D_ME_6018C00 } +aMeMeteor1DL: + { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL } D_ME_6019430: { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 } @@ -286,29 +286,29 @@ D_ME_602F604: D_ME_602F638: { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 } -D_ME_602F684: - { type: SF64:HITBOX, offset: 0x602F684, symbol: D_ME_602F684 } +aMeMeteoBallHitbox: + { type: SF64:HITBOX, offset: 0x602F684, symbol: aMeMeteoBallHitbox } -D_ME_602F6A0: - { type: SF64:HITBOX, offset: 0x602F6A0, symbol: D_ME_602F6A0 } +aMeHopBotHitbox: + { type: SF64:HITBOX, offset: 0x602F6A0, symbol: aMeHopBotHitbox } -D_ME_602F6EC: - { type: SF64:HITBOX, offset: 0x602F6EC, symbol: D_ME_602F6EC } +aMeMeteor1Hitbox: + { type: SF64:HITBOX, offset: 0x602F6EC, symbol: aMeMeteor1Hitbox } -D_ME_602F708: - { type: SF64:HITBOX, offset: 0x602F708, symbol: D_ME_602F708 } +aMeMeteor2Hitbox: + { type: SF64:HITBOX, offset: 0x602F708, symbol: aMeMeteor2Hitbox } -D_ME_602F724: - { type: SF64:HITBOX, offset: 0x602F724, symbol: D_ME_602F724 } +aMeLaserCannon1Hitbox: + { type: SF64:HITBOX, offset: 0x602F724, symbol: aMeLaserCannon1Hitbox } -D_ME_602F740: - { type: SF64:HITBOX, offset: 0x602F740, symbol: D_ME_602F740 } +aMeLaserCannon2Hitbox: + { type: SF64:HITBOX, offset: 0x602F740, symbol: aMeLaserCannon2Hitbox } -D_ME_602F75C: - { type: SF64:HITBOX, offset: 0x602F75C, symbol: D_ME_602F75C } +aMeCrusherHitbox: + { type: SF64:HITBOX, offset: 0x602F75C, symbol: aMeCrusherHitbox } -D_ME_602FA50: - { type: SF64:HITBOX, offset: 0x602FA50, symbol: D_ME_602FA50 } +aMeCrusherShieldHitbox: + { type: SF64:HITBOX, offset: 0x602FA50, symbol: aMeCrusherShieldHitbox } D_ME_602FA9C: {type: SF64:COLPOLY, count: 79, offset: 0x602FA9C, symbol: D_ME_602FA9C, mesh_symbol: D_ME_OFFSET } diff --git a/assets/yaml/jp/rev0/ast_sector_x.yaml b/assets/yaml/jp/rev0/ast_sector_x.yaml index 44423c6f..77373c91 100644 --- a/assets/yaml/jp/rev0/ast_sector_x.yaml +++ b/assets/yaml/jp/rev0/ast_sector_x.yaml @@ -247,14 +247,14 @@ D_SX_603238C: D_SX_6032408: { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 } -D_SX_6032488: - { type: SF64:HITBOX, offset: 0x6032488, symbol: D_SX_6032488 } +aSxSpyborgLeftArmHitbox: + { type: SF64:HITBOX, offset: 0x6032488, symbol: aSxSpyborgLeftArmHitbox } -D_SX_60324EC: - { type: SF64:HITBOX, offset: 0x60324EC, symbol: D_SX_60324EC } +aSxSpyborgRightArmHitbox: + { type: SF64:HITBOX, offset: 0x60324EC, symbol: aSxSpyborgRightArmHitbox } -D_SX_6032550: - { type: SF64:HITBOX, offset: 0x6032550, symbol: D_SX_6032550 } +aSxSpyborgHitbox: + { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox } D_SX_603285C: { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C } diff --git a/assets/yaml/jp/rev0/ast_sector_y.yaml b/assets/yaml/jp/rev0/ast_sector_y.yaml index 8384bd9b..4e0ef4dd 100644 --- a/assets/yaml/jp/rev0/ast_sector_y.yaml +++ b/assets/yaml/jp/rev0/ast_sector_y.yaml @@ -35,11 +35,11 @@ D_SY_6003348: D_SY_60034C4: { type: SF64:ANIM, offset: 0x60034C4, symbol: D_SY_60034C4 } -D_SY_60034D0: - { type: GFX, offset: 0x60034D0, symbol: D_SY_60034D0 } +aSyShipWindowsDL: + { type: GFX, offset: 0x60034D0, symbol: aSyShipWindowsDL } -D_SY_60036A0: - { type: GFX, offset: 0x60036A0, symbol: D_SY_60036A0 } +aSyShip3DestroyedDL: + { type: GFX, offset: 0x60036A0, symbol: aSyShip3DestroyedDL } D_SY_6004958: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06004958, symbol: D_SY_6004958 } @@ -47,8 +47,8 @@ D_SY_6004958: D_SY_6005158: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06005158, symbol: D_SY_6005158 } -D_SY_6005360: - { type: GFX, offset: 0x6005360, symbol: D_SY_6005360 } +aSyShip4DL: + { type: GFX, offset: 0x6005360, symbol: aSyShip4DL } D_SY_6005BE0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06005BE0, symbol: D_SY_6005BE0 } @@ -74,8 +74,8 @@ D_SY_6008BE0: D_SY_6008FE0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008FE0, symbol: D_SY_6008FE0 } -D_SY_60097E0: - { type: GFX, offset: 0x060097E0, symbol: D_SY_60097E0 } +aSyShip1DL: + { type: GFX, offset: 0x060097E0, symbol: aSyShip1DL } D_SY_600AAC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600AAC0, symbol: D_SY_600AAC0 } @@ -98,11 +98,11 @@ D_SY_600EAC0: D_SY_600F2C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x0600F2C0, symbol: D_SY_600F2C0 } -D_SY_600F6C0: - { type: GFX, offset: 0x600F6C0, symbol: D_SY_600F6C0 } +aSyShip4DestroyedDL: + { type: GFX, offset: 0x600F6C0, symbol: aSyShip4DestroyedDL } -D_SY_60102C0: - { type: GFX, offset: 0x60102C0, symbol: D_SY_60102C0 } +aSyShip3DL: + { type: GFX, offset: 0x60102C0, symbol: aSyShip3DL } D_SY_6011758: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06011758, symbol: D_SY_6011758 } @@ -158,8 +158,8 @@ D_SY_6015960: D_SY_6015B60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 } -D_SY_60188D0: - { type: GFX, offset: 0x60188D0, symbol: D_SY_60188D0 } +aSyShipProjectileDL: + { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL } D_SY_60183B0: { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 } @@ -176,20 +176,20 @@ D_SY_601AD70: D_SY_601AE08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 } -D_SY_601B610: - { type: GFX, offset: 0x601B610, symbol: D_SY_601B610 } +aSyShip2SpriteDL: + { type: GFX, offset: 0x601B610, symbol: aSyShip2SpriteDL } D_SY_601B6A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601B6A0, symbol: D_SY_601B6A0 } -D_SY_601C6A0: - { type: GFX, offset: 0x601C6A0, symbol: D_SY_601C6A0 } +aSyShip3SpriteDL: + { type: GFX, offset: 0x601C6A0, symbol: aSyShip3SpriteDL } D_SY_601C730: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601C730, symbol: D_SY_601C730 } -D_SY_601D730: - { type: GFX, offset: 0x601D730, symbol: D_SY_601D730 } +aSyShip2DL: + { type: GFX, offset: 0x601D730, symbol: aSyShip2DL } D_SY_601F3B8: { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 } @@ -308,8 +308,8 @@ D_SY_6032E18: D_SY_6033070: {type: SF64:COLPOLY, count: 174, offset: 0x6033070, symbol: D_SY_6033070, mesh_symbol: D_SY_6033E08 } -D_SY_603405C: - { type: SF64:HITBOX, offset: 0x603405C, symbol: D_SY_603405C } +aSyRobotHitbox: + { type: SF64:HITBOX, offset: 0x603405C, symbol: aSyRobotHitbox } D_SY_60340C0: { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 } @@ -329,34 +329,34 @@ D_SY_60342A0: D_SY_6034304: { type: SF64:HITBOX, offset: 0x6034304, symbol: D_SY_6034304 } -D_SY_6034368: - { type: SF64:HITBOX, offset: 0x6034368, symbol: D_SY_6034368 } +aSyScenery156Hitbox: + { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox } D_SY_603445C: { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C } -D_SY_6034478: - { type: SF64:HITBOX, offset: 0x6034478, symbol: D_SY_6034478 } +aSyShip1Hitbox: + { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox } -D_SY_603450C: - { type: SF64:HITBOX, offset: 0x603450C, symbol: D_SY_603450C } +aSyShip2Hitbox: + { type: SF64:HITBOX, offset: 0x603450C, symbol: aSyShip2Hitbox } -D_SY_6034588: - { type: SF64:HITBOX, offset: 0x6034588, symbol: D_SY_6034588 } +aSyShip3Hitbox: + { type: SF64:HITBOX, offset: 0x6034588, symbol: aSyShip3Hitbox } -D_SY_6034664: - { type: SF64:HITBOX, offset: 0x6034664, symbol: D_SY_6034664 } +aSyShip3DestroyedHitbox: + { type: SF64:HITBOX, offset: 0x6034664, symbol: aSyShip3DestroyedHitbox } -D_SY_6034770: - { type: SF64:HITBOX, offset: 0x6034770, symbol: D_SY_6034770 } +aSyShip4Hitbox: + { type: SF64:HITBOX, offset: 0x6034770, symbol: aSyShip4Hitbox } -D_SY_60347D4: - { type: SF64:HITBOX, offset: 0x60347D4, symbol: D_SY_60347D4 } +aSyShipWindowsHitbox: + { type: SF64:HITBOX, offset: 0x60347D4, symbol: aSyShipWindowsHitbox } -D_SY_60347F0: - { type: SF64:HITBOX, offset: 0x60347F0, symbol: D_SY_60347F0 } +aSyShip4DestroyedHitbox: + { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox } -D_SY_603486C: - { type: SF64:HITBOX, offset: 0x603486C, symbol: D_SY_603486C } +aSyShipProjectileHitbox: + { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox } # size = 0x34890
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_sector_z.yaml b/assets/yaml/jp/rev0/ast_sector_z.yaml index 96233307..7357255e 100644 --- a/assets/yaml/jp/rev0/ast_sector_z.yaml +++ b/assets/yaml/jp/rev0/ast_sector_z.yaml @@ -85,8 +85,8 @@ D_SZ_60041F8: D_SZ_60042F8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x060042F8, symbol: D_SZ_60042F8 } -D_SZ_6004330: - { type: GFX, offset: 0x6004330, symbol: D_SZ_6004330 } +aSzMissileMark: + { type: GFX, offset: 0x6004330, symbol: aSzMissileMark } D_SZ_6004458: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 8, offset: 0x06004458, symbol: D_SZ_6004458, tlut: 0x06004558 } @@ -160,13 +160,13 @@ D_SZ_6007558: D_SZ_6009230: { type: SF64:HITBOX, offset: 0x6009230, symbol: D_SZ_6009230 } -D_SZ_600924C: - { type: SF64:HITBOX, offset: 0x600924C, symbol: D_SZ_600924C } +aSzSpaceJunk3Hitbox: + { type: SF64:HITBOX, offset: 0x600924C, symbol: aSzSpaceJunk3Hitbox } -D_SZ_60092E8: - { type: SF64:HITBOX, offset: 0x60092E8, symbol: D_SZ_60092E8 } +aSzSpaceJunk1Hitbox: + { type: SF64:HITBOX, offset: 0x60092E8, symbol: aSzSpaceJunk1Hitbox } -D_SZ_6009388: - { type: SF64:HITBOX, offset: 0x6009388, symbol: D_SZ_6009388 } +aSzGreatFoxHitbox: + { type: SF64:HITBOX, offset: 0x6009388, symbol: aSzGreatFoxHitbox } # size = 0x93B0
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_titania.yaml b/assets/yaml/jp/rev0/ast_titania.yaml index d782b058..b4bf560a 100644 --- a/assets/yaml/jp/rev0/ast_titania.yaml +++ b/assets/yaml/jp/rev0/ast_titania.yaml @@ -76,11 +76,11 @@ D_TI_6005000: D_TI_600631C: {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C} -D_TI_60064AC: - {type: SF64:HITBOX, offset: 0x60064AC, symbol: D_TI_60064AC} +aTi1LandmineHitbox: + {type: SF64:HITBOX, offset: 0x60064AC, symbol: aTi1LandmineHitbox} -D_TI_60064C8: - {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8} +aTiDesertRoverHitbox: + {type: SF64:HITBOX, offset: 0x60064C8, symbol: aTiDesertRoverHitbox} aTiSkullHitbox: {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox} @@ -112,32 +112,32 @@ aTiRib7Hitbox: aTiRib8Hitbox: {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox} -D_TI_60067C4: - {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4} +aTiDelphorHitbox: + {type: SF64:HITBOX, offset: 0x60067C4, symbol: aTiDelphorHitbox} -D_TI_6006808: - {type: SF64:HITBOX, offset: 0x6006808, symbol: D_TI_6006808} +aTiDelphorHeadHitbox: + {type: SF64:HITBOX, offset: 0x6006808, symbol: aTiDelphorHeadHitbox} -D_TI_6006A3C: - {type: SF64:HITBOX, offset: 0x6006A3C, symbol: D_TI_6006A3C} +aTiDesertCrawlerHitbox: + {type: SF64:HITBOX, offset: 0x6006A3C, symbol: aTiDesertCrawlerHitbox} -D_TI_600683C: - {type: SF64:HITBOX, offset: 0x600683C, symbol: D_TI_600683C} +aTiBoulderHitbox: + {type: SF64:HITBOX, offset: 0x600683C, symbol: aTiBoulderHitbox} -D_TI_6006858: - {type: SF64:HITBOX, offset: 0x6006858, symbol: D_TI_6006858} +aTiBombHitbox: + {type: SF64:HITBOX, offset: 0x6006858, symbol: aTiBombHitbox} D_TI_6006874: {type: SF64:HITBOX, offset: 0x6006874, symbol: D_TI_6006874} -D_TI_6006890: - {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890} +aTiRascoHitbox: + {type: SF64:HITBOX, offset: 0x6006890, symbol: aTiRascoHitbox} aTiCactusHitbox: {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox} -D_TI_60068F0: - {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0} +aTiFekudaHitbox: + {type: SF64:HITBOX, offset: 0x60068F0, symbol: aTiFekudaHitbox} D_TI_6006940: {type: SF64:HITBOX, offset: 0x6006940, symbol: D_TI_6006940} @@ -166,8 +166,8 @@ D_TI_6006A04: D_TI_6006A20: {type: SF64:HITBOX, offset: 0x6006A20, symbol: D_TI_6006A20} -D_TI_6006BF0: - {type: SF64:HITBOX, offset: 0x6006BF0, symbol: D_TI_6006BF0} +aTiPillarHitbox: + {type: SF64:HITBOX, offset: 0x6006BF0, symbol: aTiPillarHitbox} D_TI_6006924: {type: SF64:HITBOX, offset: 0x6006924, symbol: D_TI_6006924} @@ -178,8 +178,8 @@ D_TI_6006C0C: D_TI_6006C28: {type: SF64:HITBOX, offset: 0x6006C28, symbol: D_TI_6006C28} -D_TI_6006C44: - {type: SF64:HITBOX, offset: 0x6006C44, symbol: D_TI_6006C44} +aTiBridgeHitbox: + {type: SF64:HITBOX, offset: 0x6006C44, symbol: aTiBridgeHitbox} D_TI_6006C60: {type: SF64:OBJECT_INIT, offset: 0x6006C60, symbol: D_TI_6006C60} diff --git a/assets/yaml/jp/rev0/ast_training.yaml b/assets/yaml/jp/rev0/ast_training.yaml index 8b141c42..ca3aee22 100644 --- a/assets/yaml/jp/rev0/ast_training.yaml +++ b/assets/yaml/jp/rev0/ast_training.yaml @@ -31,8 +31,8 @@ D_TR_6002740: D_TR_60028F0: { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 } -D_TR_60030F0: - { type: GFX, offset: 0x60030F0, symbol: D_TR_60030F0 } +aTrBuildingDL: + { type: GFX, offset: 0x60030F0, symbol: aTrBuildingDL } D_TR_6003360: { type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_TR_6003360 } @@ -76,8 +76,8 @@ D_TR_6008EF8: D_TR_6009B34: { type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_TR_6009B34 } -D_TR_6009CC4: - { type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_TR_6009CC4 } +aTrBuildingHitbox: + { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox } D_TR_6009CFC: { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC } diff --git a/assets/yaml/jp/rev0/ast_ve1_boss.yaml b/assets/yaml/jp/rev0/ast_ve1_boss.yaml index 4fd6bcc5..a5d6a967 100644 --- a/assets/yaml/jp/rev0/ast_ve1_boss.yaml +++ b/assets/yaml/jp/rev0/ast_ve1_boss.yaml @@ -50,8 +50,8 @@ D_VE1_90039F0: D_VE1_9003DF0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x9003DF0, symbol: D_VE1_9003DF0} -D_VE1_9003F50: - {type: GFX, offset: 0x9003F50, symbol: D_VE1_9003F50} +aVe1TempleInterior1DL: + {type: GFX, offset: 0x9003F50, symbol: aVe1TempleInterior1DL} D_VE1_9004478: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x9004478, symbol: D_VE1_9004478} @@ -65,8 +65,8 @@ D_VE1_9005078: D_VE1_9005478: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9005478, symbol: D_VE1_9005478} -D_VE1_9005C80: - {type: GFX, offset: 0x9005C80, symbol: D_VE1_9005C80} +aVe1TempleEntranceDL: + {type: GFX, offset: 0x9005C80, symbol: aVe1TempleEntranceDL} D_VE1_9009700: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9009700, symbol: D_VE1_9009700} @@ -92,8 +92,8 @@ D_VE1_900BF00: D_VE1_900C700: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900C700, symbol: D_VE1_900C700} -D_VE1_900D098: - {type: SF64:ANIM, offset: 0x900D098, symbol: D_VE1_900D098} +aVe1MonkeyStatueAnim: + {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim} D_VE1_900D164: {type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164} @@ -104,8 +104,8 @@ D_VE1_900D180: D_VE1_900D520: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900D520, symbol: D_VE1_900D520} -D_VE1_900DD20: - {type: GFX, offset: 0x900DD20, symbol: D_VE1_900DD20} +aVe1Pillar1DL: + {type: GFX, offset: 0x900DD20, symbol: aVe1Pillar1DL} D_VE1_900DF20: {type: GFX, offset: 0x900DF20, symbol: D_VE1_900DF20} @@ -116,11 +116,11 @@ D_VE1_900DFB8: D_VE1_900EFC0: {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0} -D_VE1_900F060: - {type: GFX, offset: 0x900F060, symbol: D_VE1_900F060} +aVe1TempleInterior2DL: + {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL} -D_VE1_900F1D0: - {type: GFX, offset: 0x900F1D0, symbol: D_VE1_900F1D0} +aVe1TempleInterior3DL: + {type: GFX, offset: 0x900F1D0, symbol: aVe1TempleInterior3DL} D_VE1_9010FC4: {type: SF64:ANIM, offset: 0x9010FC4, symbol: D_VE1_9010FC4} @@ -179,8 +179,8 @@ D_VE1_901C0F4: D_VE1_901DA38: {type: SF64:ANIM, offset: 0x901DA38, symbol: D_VE1_901DA38} -D_VE1_901DA50: - {type: GFX, offset: 0x901DA50, symbol: D_VE1_901DA50} +aVe1Pillar3DL: + {type: GFX, offset: 0x901DA50, symbol: aVe1Pillar3DL} D_VE1_901DC90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x901DC90, symbol: D_VE1_901DC90} @@ -230,8 +230,8 @@ D_VE1_90234D0: D_VE1_9023880: {type: GFX, offset: 0x9023880, symbol: D_VE1_9023880} -D_VE1_9023AD0: - {type: GFX, offset: 0x9023AD0, symbol: D_VE1_9023AD0} +aVe1Pillar4DL: + {type: GFX, offset: 0x9023AD0, symbol: aVe1Pillar4DL} D_VE1_9024738: {type: SF64:ANIM, offset: 0x9024738, symbol: D_VE1_9024738} diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml index a533e8fb..b012c997 100644 --- a/assets/yaml/jp/rev0/ast_venom_1.yaml +++ b/assets/yaml/jp/rev0/ast_venom_1.yaml @@ -46,8 +46,8 @@ D_VE1_6003078: D_VE1_6003478: { type: TEXTURE, format: TLUT, colors: 204, offset: 0x6003478, ctype: u16, symbol: D_VE1_6003478 } -D_VE1_6003610: - { type: GFX, offset: 0x6003610, symbol: D_VE1_6003610 } +aVe1WatchPostDL: + { type: GFX, offset: 0x6003610, symbol: aVe1WatchPostDL } D_VE1_6003B10: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 } @@ -70,8 +70,8 @@ D_VE1_60046F0: D_VE1_6004780: { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 } -D_VE1_6005780: - { type: GFX, offset: 0x6005780, symbol: D_VE1_6005780 } +aVe1GeneratorDL: + { type: GFX, offset: 0x6005780, symbol: aVe1GeneratorDL } D_VE1_6005E50: { type: TEXTURE, format: TLUT, colors: 160, offset: 0x6005E50, ctype: u16, symbol: D_VE1_6005E50 } @@ -97,11 +97,11 @@ D_VE1_60066D0: D_VE1_6006750: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006750, ctype: u16, symbol: D_VE1_6006750 } -D_VE1_6006F50: - { type: GFX, offset: 0x6006F50, symbol: D_VE1_6006F50 } +aVe1HallwayObstacleDL: + { type: GFX, offset: 0x6006F50, symbol: aVe1HallwayObstacleDL } -D_VE1_6007410: - { type: GFX, offset: 0x6007410, symbol: D_VE1_6007410 } +aVe1SceneryWall3DL: + { type: GFX, offset: 0x6007410, symbol: aVe1SceneryWall3DL } D_VE1_60074E8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 } @@ -133,50 +133,50 @@ D_VE1_601B474: D_VE1_601B4C4: { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 } -D_VE1_601B4E0: - { type: SF64:HITBOX, offset: 0x601B4E0, symbol: D_VE1_601B4E0 } +aVe1SceneryWall1Hitbox: + { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox } -D_VE1_601B4FC: - { type: SF64:HITBOX, offset: 0x601B4FC, symbol: D_VE1_601B4FC } +aVe1SceneryWall2Hitbox: + { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox } -D_VE1_601B518: - { type: SF64:HITBOX, offset: 0x601B518, symbol: D_VE1_601B518 } +aVe1SceneryWall3Hitbox: + { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox } -D_VE1_601B584: - { type: SF64:HITBOX, offset: 0x601B584, symbol: D_VE1_601B584 } +aVe1HallwayObstacleHitbox: + { type: SF64:HITBOX, offset: 0x601B584, symbol: aVe1HallwayObstacleHitbox } -D_VE1_601B5F4: - { type: SF64:HITBOX, offset: 0x601B5F4, symbol: D_VE1_601B5F4 } +aVe1GeneratorHitbox: + { type: SF64:HITBOX, offset: 0x601B5F4, symbol: aVe1GeneratorHitbox } -D_VE1_601B644: - { type: SF64:HITBOX, offset: 0x601B644, symbol: D_VE1_601B644 } +aVe1WatchPostHitbox: + { type: SF64:HITBOX, offset: 0x601B644, symbol: aVe1WatchPostHitbox } -D_VE1_601B678: - { type: SF64:HITBOX, offset: 0x601B678, symbol: D_VE1_601B678 } +aVe1TempleEntranceHitbox: + { type: SF64:HITBOX, offset: 0x601B678, symbol: aVe1TempleEntranceHitbox } -D_VE1_601B6C4: - { type: SF64:HITBOX, offset: 0x601B6C4, symbol: D_VE1_601B6C4 } +aVe1TempleInterior1Hitbox: + { type: SF64:HITBOX, offset: 0x601B6C4, symbol: aVe1TempleInterior1Hitbox } -D_VE1_601B710: - { type: SF64:HITBOX, offset: 0x601B710, symbol: D_VE1_601B710 } +aVe1TempleInterior2Hitbox: + { type: SF64:HITBOX, offset: 0x601B710, symbol: aVe1TempleInterior2Hitbox } -D_VE1_601B75C: - { type: SF64:HITBOX, offset: 0x601B75C, symbol: D_VE1_601B75C } +aVe1TempleInterior3Hitbox: + { type: SF64:HITBOX, offset: 0x601B75C, symbol: aVe1TempleInterior3Hitbox } -D_VE1_601B7F8: - { type: SF64:HITBOX, offset: 0x601B7F8, symbol: D_VE1_601B7F8 } +aVe1Pillar1Hitbox: + { type: SF64:HITBOX, offset: 0x601B7F8, symbol: aVe1Pillar1Hitbox } -D_VE1_601B830: - { type: SF64:HITBOX, offset: 0x601B830, symbol: D_VE1_601B830 } +aVe1Pillar2Hitbox: + { type: SF64:HITBOX, offset: 0x601B830, symbol: aVe1Pillar2Hitbox } -D_VE1_601B868: - { type: SF64:HITBOX, offset: 0x601B868, symbol: D_VE1_601B868 } +aVe1Pillar3Hitbox: + { type: SF64:HITBOX, offset: 0x601B868, symbol: aVe1Pillar3Hitbox } -D_VE1_601B8A0: - { type: SF64:HITBOX, offset: 0x601B8A0, symbol: D_VE1_601B8A0 } +aVe1Pillar4Hitbox: + { type: SF64:HITBOX, offset: 0x601B8A0, symbol: aVe1Pillar4Hitbox } -D_VE1_601B8D8: - { type: SF64:HITBOX, offset: 0x601B8D8, symbol: D_VE1_601B8D8 } +aVe1MonkeyStatueHitbox: + { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox } D_VE1_601B944: { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_venom_2.yaml b/assets/yaml/jp/rev0/ast_venom_2.yaml index fd597c94..8f644d57 100644 --- a/assets/yaml/jp/rev0/ast_venom_2.yaml +++ b/assets/yaml/jp/rev0/ast_venom_2.yaml @@ -27,11 +27,11 @@ D_VE2_60020D0: D_VE2_6002890: { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6002890, ctype: u8, symbol: D_VE2_6002890 } -D_VE2_6002990: - { type: GFX, offset: 0x6002990, symbol: D_VE2_6002990 } +aAndPathExitDL: + { type: GFX, offset: 0x6002990, symbol: aAndPathExitDL } -D_VE2_6003000: - { type: GFX, offset: 0x6003000, symbol: D_VE2_6003000 } +aAndPathIntersectionDL: + { type: GFX, offset: 0x6003000, symbol: aAndPathIntersectionDL } D_VE2_60038E0: { type: GFX, offset: 0x60038E0, symbol: D_VE2_60038E0 } @@ -39,8 +39,8 @@ D_VE2_60038E0: D_VE2_6003970: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003970, ctype: u16, symbol: D_VE2_6003970 } -D_VE2_6004170: - { type: GFX, offset: 0x6004170, symbol: D_VE2_6004170 } +aAndPathEntranceDL: + { type: GFX, offset: 0x6004170, symbol: aAndPathEntranceDL } D_VE2_6004888: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6004888, ctype: u16, symbol: D_VE2_6004888 } @@ -57,8 +57,8 @@ D_VE2_6006088: D_VE2_60030D8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60030D8, ctype: u16, symbol: D_VE2_60030D8 } -D_VE2_6006890: - { type: GFX, offset: 0x6006890, symbol: D_VE2_6006890 } +aAndPathWallsDL: + { type: GFX, offset: 0x6006890, symbol: aAndPathWallsDL } D_VE2_6006E20: { type: GFX, offset: 0x6006E20, symbol: D_VE2_6006E20 } @@ -72,8 +72,8 @@ D_VE2_6007E20: D_VE2_6008170: { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 } -D_VE2_6008370: - { type: GFX, offset: 0x6008370, symbol: D_VE2_6008370 } +aVe2TowerDL: + { type: GFX, offset: 0x6008370, symbol: aVe2TowerDL } D_VE2_6008AF8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 } @@ -162,8 +162,8 @@ D_VE2_600F700: D_VE2_6010700: { type: GFX, offset: 0x6010700, symbol: D_VE2_6010700 } -D_VE2_6010960: - { type: GFX, offset: 0x6010960, symbol: D_VE2_6010960 } +aVe2MountainDL: + { type: GFX, offset: 0x6010960, symbol: aVe2MountainDL } D_VE2_6010CA0: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6010CA0, ctype: u16, symbol: D_VE2_6010CA0 } @@ -195,11 +195,11 @@ D_VE2_6014D94: D_VE2_6014FEC: { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC, mesh_symbol: D_VE2_OFFSET } -D_VE2_601668C: - { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C } +aVe2TowerHitbox: + { type: SF64:HITBOX, offset: 0x601668C, symbol: aVe2TowerHitbox } -D_VE2_60166F4: - { type: SF64:HITBOX, offset: 0x60166F4, symbol: D_VE2_60166F4 } +aVe2BaseHitbox: + { type: SF64:HITBOX, offset: 0x60166F4, symbol: aVe2BaseHitbox } -D_VE2_6016714: - { type: SF64:HITBOX, offset: 0x6016714, symbol: D_VE2_6016714 }
\ No newline at end of file +aVe2MountainHitbox: + { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_versus.yaml b/assets/yaml/jp/rev0/ast_versus.yaml index 1e778a7f..75b6f5e2 100644 --- a/assets/yaml/jp/rev0/ast_versus.yaml +++ b/assets/yaml/jp/rev0/ast_versus.yaml @@ -182,8 +182,8 @@ D_versus_300EC80: D_versus_300EE80: { type: GFX, offset: 0x300EE80, symbol: D_versus_300EE80} -D_versus_300FB80: - { type: GFX, offset: 0x300FB80, symbol: D_versus_300FB80} +aVsLandmasterModelDL: + { type: GFX, offset: 0x300FB80, symbol: aVsLandmasterModelDL} D_versus_3010690: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010690, symbol: D_versus_3010690 } @@ -203,14 +203,14 @@ D_versus_3011E40: D_versus_3011ED0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3011ED0, symbol: D_versus_3011ED0 } -D_versus_3012ED0: - { type: GFX, offset: 0x3012ED0, symbol: D_versus_3012ED0} +aVsSpaceJunk3DL: + { type: GFX, offset: 0x3012ED0, symbol: aVsSpaceJunk3DL} -D_versus_3013580: - { type: GFX, offset: 0x3013580, symbol: D_versus_3013580} +aVsSpaceJunk2DL: + { type: GFX, offset: 0x3013580, symbol: aVsSpaceJunk2DL} -D_versus_3013780: - { type: GFX, offset: 0x3013780, symbol: D_versus_3013780} +aVsSpaceJunk1DL: + { type: GFX, offset: 0x3013780, symbol: aVsSpaceJunk1DL} D_versus_3013F50: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x3013F50, symbol: D_versus_3013F50, tlut: 0x3014350 } @@ -245,8 +245,8 @@ D_versus_30160A0: D_versus_30162F8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_versus_30162F8 } -D_versus_3016B00: - { type: GFX, offset: 0x3016B00, symbol: D_versus_3016B00} +aVsKaFlBaseDL: + { type: GFX, offset: 0x3016B00, symbol: aVsKaFlBaseDL} D_versus_3016DC0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016DC0, symbol: D_versus_3016DC0 } @@ -257,14 +257,14 @@ D_versus_3016FC0: D_versus_30171C0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30171C0, symbol: D_versus_30171C0 } -D_versus_30173C0: - { type: GFX, offset: 0x30173C0, symbol: D_versus_30173C0} +aVsPyramid1DL: + { type: GFX, offset: 0x30173C0, symbol: aVsPyramid1DL} -D_versus_30174E0: - { type: GFX, offset: 0x30174E0, symbol: D_versus_30174E0} +aVsPyramid2DL: + { type: GFX, offset: 0x30174E0, symbol: aVsPyramid2DL} -D_versus_3017600: - { type: GFX, offset: 0x3017600, symbol: D_versus_3017600} +aVsBuildingDL: + { type: GFX, offset: 0x3017600, symbol: aVsBuildingDL} D_versus_3017800: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3017800, symbol: D_versus_3017800 } @@ -299,8 +299,8 @@ D_versus_301AEF0: D_versus_301AF78: {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_versus_301AF78 } -D_versus_301B080: - { type: GFX, offset: 0x301B080, symbol: D_versus_301B080} +aVsArchDL: + { type: GFX, offset: 0x301B080, symbol: aVsArchDL} D_versus_301B438: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_versus_301B438 } @@ -320,8 +320,8 @@ D_versus_301C0A4: D_versus_301C3A8: { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_versus_301C3A8} -D_versus_301C614: - { type: SF64:SKELETON, offset: 0x301C614, symbol: D_versus_301C614 } +aVsOnFootFalcoSkel: + { type: SF64:SKELETON, offset: 0x301C614, symbol: aVsOnFootFalcoSkel } D_versus_301C79C: { type: SF64:ANIM, offset: 0x301C79C, symbol: D_versus_301C79C } @@ -335,8 +335,8 @@ D_versus_301CCE4: D_versus_301CFEC: { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_versus_301CFEC} -D_versus_301D258: - { type: SF64:SKELETON, offset: 0x301D258, symbol: D_versus_301D258 } +aVsOnFootFoxSkel: + { type: SF64:SKELETON, offset: 0x301D258, symbol: aVsOnFootFoxSkel } D_versus_301D3DC: { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_versus_301D3DC } @@ -347,8 +347,8 @@ D_versus_301D568: D_versus_301D888: { type: SF64:ANIM, offset: 0x301D888, symbol: D_versus_301D888} -D_versus_301DB94: - { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_versus_301DB94 } +aVsOnFootPeppySkel: + { type: SF64:SKELETON, offset: 0x301DB94, symbol: aVsOnFootPeppySkel } D_versus_301DD6C: { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_versus_301DD6C } @@ -359,8 +359,8 @@ D_versus_301DEA4: D_versus_301E19C: { type: SF64:ANIM, offset: 0x301E19C, symbol: D_versus_301E19C} -D_versus_301E3E8: - { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_versus_301E3E8 } +aVsOnFootSlippySkel: + { type: SF64:SKELETON, offset: 0x301E3E8, symbol: aVsOnFootSlippySkel } D_versus_301E560: { type: SF64:ANIM, offset: 0x301E560, symbol: D_versus_301E560} @@ -395,8 +395,8 @@ D_versus_301EEB0: D_versus_301EF38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_versus_301EF38 } -D_versus_301F140: - { type: GFX, offset: 0x301F140, symbol: D_versus_301F140} +aVsLandmasterCanonDL: + { type: GFX, offset: 0x301F140, symbol: aVsLandmasterCanonDL} D_versus_301F2E0: { type: GFX, offset: 0x301F2E0, symbol: D_versus_301F2E0} @@ -704,26 +704,26 @@ D_versus_302E170: D_versus_302E378: { type: SF64:OBJECT_INIT, offset: 0x302E378, symbol: D_versus_302E378} -D_versus_302ED4C: - { type: SF64:HITBOX, offset: 0x302ED4C, symbol: D_versus_302ED4C} +aVsSpaceJunk1Hitbox: + { type: SF64:HITBOX, offset: 0x302ED4C, symbol: aVsSpaceJunk1Hitbox} -D_versus_302ED98: - { type: SF64:HITBOX, offset: 0x302ED98, symbol: D_versus_302ED98} +aVsSpaceJunk2Hitbox: + { type: SF64:HITBOX, offset: 0x302ED98, symbol: aVsSpaceJunk2Hitbox} -D_versus_302EDB4: - { type: SF64:HITBOX, offset: 0x302EDB4, symbol: D_versus_302EDB4} +aVsSpaceJunk3Hitbox: + { type: SF64:HITBOX, offset: 0x302EDB4, symbol: aVsSpaceJunk3Hitbox} -D_versus_302EE00: - { type: SF64:HITBOX, offset: 0x302EE00, symbol: D_versus_302EE00} +aVsKaFlBaseHitbox: + { type: SF64:HITBOX, offset: 0x302EE00, symbol: aVsKaFlBaseHitbox} -D_versus_302EE64: - { type: SF64:HITBOX, offset: 0x302EE64, symbol: D_versus_302EE64} +aVsBuilding1Hibox: + { type: SF64:HITBOX, offset: 0x302EE64, symbol: aVsBuilding1Hibox} -D_versus_302EE80: - { type: SF64:HITBOX, offset: 0x302EE80, symbol: D_versus_302EE80} +aVsBuilding2Hibox: + { type: SF64:HITBOX, offset: 0x302EE80, symbol: aVsBuilding2Hibox} -D_versus_302EE9C: - { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_versus_302EE9C} +aVsArchHitbox: + { type: SF64:HITBOX, offset: 0x302EE9C, symbol: aVsArchHitbox} D_versus_302EEE8: { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_versus_302EEE8, mesh_symbol: D_versus_OFFSET} diff --git a/assets/yaml/jp/rev0/ast_zoness.yaml b/assets/yaml/jp/rev0/ast_zoness.yaml index 8f634226..1dd6ae6a 100644 --- a/assets/yaml/jp/rev0/ast_zoness.yaml +++ b/assets/yaml/jp/rev0/ast_zoness.yaml @@ -141,14 +141,14 @@ D_ZO_600E5EC: D_ZO_600E7D8: { type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8} -D_ZO_600E820: - { type: GFX, offset: 0x600E820, symbol: D_ZO_600E820} +aZoOilRig3DL: + { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL} -D_ZO_600EC90: - { type: GFX, offset: 0x600EC90, symbol: D_ZO_600EC90} +aZoOilRig2DL: + { type: GFX, offset: 0x600EC90, symbol: aZoOilRig2DL} -D_ZO_600F560: - { type: GFX, offset: 0x600F560, symbol: D_ZO_600F560} +aZoOilRig1DL: + { type: GFX, offset: 0x600F560, symbol: aZoOilRig1DL} D_ZO_600FE58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600FE58, symbol: D_ZO_600FE58} @@ -225,8 +225,8 @@ D_ZO_6017810: D_ZO_60178B0: { type: GFX, offset: 0x60178B0, symbol: D_ZO_60178B0} -D_ZO_6017950: - { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950} +aZoBallDL: + { type: GFX, offset: 0x6017950, symbol: aZoBallDL} D_ZO_60179D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60179D8, symbol: D_ZO_60179D8} @@ -366,8 +366,8 @@ D_ZO_601FBC4: D_ZO_601FC90: { type: SF64:SKELETON, offset: 0x601FC90, symbol: D_ZO_601FC90} -D_ZO_601FCB0: - { type: GFX, offset: 0x601FCB0, symbol: D_ZO_601FCB0} +aZoIslandDL: + { type: GFX, offset: 0x601FCB0, symbol: aZoIslandDL} D_ZO_60201B0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0} @@ -471,8 +471,8 @@ D_ZO_6024220: D_ZO_60242B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60242B8, symbol: D_ZO_60242B8} -aZoRock1DL: - { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL} +aZoRockDL: + { type: GFX, offset: 0x6024AC0, symbol: aZoRockDL} D_ZO_6024D60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60} @@ -502,59 +502,59 @@ D_ZO_602AC50: D_ZO_602AE94: { type: ARRAY, count: 242, array_type: Vec3f, offset: 0x602AE94, symbol: D_ZO_602AE94} -aZoRock1Hitbox: - { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox} +aZoRockHitbox: + { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRockHitbox} -D_ZO_602BA20: - { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20} +aZoOilRig1Hitbox: + { type: SF64:HITBOX, offset: 0x602BA20, symbol: aZoOilRig1Hitbox} -D_ZO_602BAE4: - { type: SF64:HITBOX, offset: 0x602BAE4, symbol: D_ZO_602BAE4} +aZoOilRig2Hitbox: + { type: SF64:HITBOX, offset: 0x602BAE4, symbol: aZoOilRig2Hitbox} -D_ZO_602BBD8: - { type: SF64:HITBOX, offset: 0x602BBD8, symbol: D_ZO_602BBD8} +aZoOilRig3Hitbox: + { type: SF64:HITBOX, offset: 0x602BBD8, symbol: aZoOilRig3Hitbox} -D_ZO_602BC54: - { type: SF64:HITBOX, offset: 0x602BC54, symbol: D_ZO_602BC54} +aZoIslandHitbox: + { type: SF64:HITBOX, offset: 0x602BC54, symbol: aZoIslandHitbox} -D_ZO_602BC58: - { type: SF64:HITBOX, offset: 0x602BC58, symbol: D_ZO_602BC58} +aZoDodoraHitbox: + { type: SF64:HITBOX, offset: 0x602BC58, symbol: aZoDodoraHitbox} -D_ZO_602BE3C: - { type: SF64:HITBOX, offset: 0x602BE3C, symbol: D_ZO_602BE3C} +aZoTroikaHitbox: + { type: SF64:HITBOX, offset: 0x602BE3C, symbol: aZoTroikaHitbox} -D_ZO_602BE58: - { type: SF64:HITBOX, offset: 0x602BE58, symbol: D_ZO_602BE58} +aZoObnemaHitbox: + { type: SF64:HITBOX, offset: 0x602BE58, symbol: aZoObnemaHitbox} -D_ZO_602BFC4: - { type: SF64:HITBOX, offset: 0x602BFC4, symbol: D_ZO_602BFC4} +aZoBarrierHitbox: + { type: SF64:HITBOX, offset: 0x602BFC4, symbol: aZoBarrierHitbox} D_ZO_602C028: { type: SF64:HITBOX, offset: 0x602C028, symbol: D_ZO_602C028} -D_ZO_602C044: - { type: SF64:HITBOX, offset: 0x602C044, symbol: D_ZO_602C044} +aZoSarumarineHitbox: + { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox} D_ZO_602C1A0: { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0} -D_ZO_602C1D4: - { type: SF64:HITBOX, offset: 0x602C1D4, symbol: D_ZO_602C1D4} +aZoCargoShipHitbox: + { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox} -D_ZO_602C218: - { type: SF64:HITBOX, offset: 0x602C218, symbol: D_ZO_602C218} +aZoContainerHitbox: + { type: SF64:HITBOX, offset: 0x602C218, symbol: aZoContainerHitbox} -D_ZO_602C234: - { type: SF64:HITBOX, offset: 0x602C234, symbol: D_ZO_602C234} +aZoRadarBuoyHitbox: + { type: SF64:HITBOX, offset: 0x602C234, symbol: aZoRadarBuoyHitbox} -D_ZO_602C250: - { type: SF64:HITBOX, offset: 0x602C250, symbol: D_ZO_602C250} +aZoSupplyCraneHitbox: + { type: SF64:HITBOX, offset: 0x602C250, symbol: aZoSupplyCraneHitbox} -D_ZO_602C294: - { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294} +aZoBirdHitbox: + { type: SF64:HITBOX, offset: 0x602C294, symbol: aZoBirdHitbox} -D_ZO_602C2B0: - { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0} +aZoSearchLightHitbox: + { type: SF64:HITBOX, offset: 0x602C2B0, symbol: aZoSearchLightHitbox} D_ZO_602C2CC: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C2CC, symbol: D_ZO_602C2CC} diff --git a/assets/yaml/us/rev1/ast_7_ti_1.yaml b/assets/yaml/us/rev1/ast_7_ti_1.yaml index 3e49b4c9..53dd2d2c 100644 --- a/assets/yaml/us/rev1/ast_7_ti_1.yaml +++ b/assets/yaml/us/rev1/ast_7_ti_1.yaml @@ -89,8 +89,8 @@ D_TI1_7005420: D_TI1_70067C4: { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 } -D_TI1_7006990: - { type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990} +aTi1DesertCrawlerSkel: + { type: SF64:SKELETON, offset: 0x7006990, symbol: aTi1DesertCrawlerSkel} D_TI1_7006F74: { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 } @@ -146,8 +146,8 @@ D_TI1_7009510: D_TI1_70096D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8 } -D_TI1_70098E0: - { type: GFX, offset: 0x70098E0, symbol: D_TI1_70098E0 } +aTiDelphorDL: + { type: GFX, offset: 0x70098E0, symbol: aTiDelphorDL } D_TI1_7009B58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 } @@ -158,8 +158,8 @@ D_TI1_7009D60: D_TI1_700A190: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 } -D_TI1_700A990: - { type: GFX, offset: 0x700A990, symbol: D_TI1_700A990 } +aTi1BombDL: + { type: GFX, offset: 0x700A990, symbol: aTi1BombDL } D_TI1_700AAD8: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 } @@ -167,8 +167,8 @@ D_TI1_700AAD8: D_TI1_700AB58: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58 } -D_TI1_700AB70: - { type: GFX, offset: 0x700AB70, symbol: D_TI1_700AB70 } +aTi1LandmineDL: + { type: GFX, offset: 0x700AB70, symbol: aTi1LandmineDL } D_TI1_700AEA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 } @@ -188,8 +188,8 @@ D_TI1_700B9C0: D_TI1_700BB10: { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 } -D_TI1_700BE00: - { type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 } +aTiBridgeDL: + { type: GFX, offset: 0x700BE00, symbol: aTiBridgeDL } D_TI1_700BFB0: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 } @@ -200,11 +200,11 @@ D_TI1_700C3B0: D_TI1_700C4B0: { type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 } -D_TI1_700C8D8: - { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 } +aTi1DesertRoverAnim: + { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim } -D_TI1_700C964: - { type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 } +aTi1DesertRoverSkel: + { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel } D_TI1_700C980: { type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 } @@ -218,8 +218,8 @@ D_TI1_700CB60: D_TI1_700D534: { type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 } -D_TI1_700D700: - {type: SF64:SKELETON, offset: 0x700D700, symbol: D_TI1_700D700} +aTiRascoSkel: + {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel} D_TI1_700D740: { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 } diff --git a/assets/yaml/us/rev1/ast_allies.yaml b/assets/yaml/us/rev1/ast_allies.yaml index 3f9594f5..d4997d4b 100644 --- a/assets/yaml/us/rev1/ast_allies.yaml +++ b/assets/yaml/us/rev1/ast_allies.yaml @@ -8,8 +8,8 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_D000000: - { type: GFX, offset: 0xD000000, symbol: D_D000000 } +aKattMarkDL: + { type: GFX, offset: 0xD000000, symbol: aKattMarkDL } ast_allies_seg13_vtx_00000098: { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 } @@ -17,11 +17,11 @@ ast_allies_seg13_vtx_00000098: D_D0000C8: { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 } -D_D0000E0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: D_D0000E0, tlut: 0x0D000160 } +aKattMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: aKattMarkTex, tlut: 0x0D000160 } -D_D000160: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: D_D000160 } +aKattMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: aKattMarkTLUT } D_D000170: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 } @@ -77,25 +77,25 @@ D_D00AFB8: D_D00B3B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 } -D_D00B5C0: - { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 } +aBillMarkDL: + { type: GFX, offset: 0xD00B5C0, symbol: aBillMarkDL } # Letter B -D_D00B688: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 } +aBillMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: aBillMarkTex, tlut: 0xD00B708 } -D_D00B708: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708 } +aBillMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: aBillMarkTLUT } -D_D00B720: - { type: GFX, offset: 0xD00B720, symbol: D_D00B720 } +aJamesMarkDL: + { type: GFX, offset: 0xD00B720, symbol: aJamesMarkDL } # Letter J ? -D_D00B7F0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: D_D00B7F0, tlut: 0xD00B870 } +aJamesMarkTex: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: aJamesMarkTex, tlut: 0xD00B870 } -D_D00B870: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: D_D00B870 } +aJamesMarkTLUT: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT } D_D00B880: { type: GFX, offset: 0xD00B880, symbol: D_D00B880 } diff --git a/assets/yaml/us/rev1/ast_andross.yaml b/assets/yaml/us/rev1/ast_andross.yaml index 673b0167..a2954394 100644 --- a/assets/yaml/us/rev1/ast_andross.yaml +++ b/assets/yaml/us/rev1/ast_andross.yaml @@ -232,8 +232,8 @@ D_ANDROSS_C038860: D_ANDROSS_C038954: {type: SF64:HITBOX, offset: 0xC038954, symbol: D_ANDROSS_C038954} -D_ANDROSS_C038A48: - {type: SF64:HITBOX, offset: 0xC038A48, symbol: D_ANDROSS_C038A48} +aAndDoorHitbox: + {type: SF64:HITBOX, offset: 0xC038A48, symbol: aAndDoorHitbox} D_ANDROSS_C038AC4: {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4} @@ -241,20 +241,20 @@ D_ANDROSS_C038AC4: D_ANDROSS_C038B40: {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40} -D_ANDROSS_C038BA4: - {type: SF64:HITBOX, offset: 0xC038BA4, symbol: D_ANDROSS_C038BA4} +aAndPathIntersectionHitbox: + {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox} -D_ANDROSS_C038BD8: - {type: SF64:HITBOX, offset: 0xC038BD8, symbol: D_ANDROSS_C038BD8} +aAndPassageHitbox: + {type: SF64:HITBOX, offset: 0xC038BD8, symbol: aAndPassageHitbox} D_ANDROSS_C038CCC: {type: SF64:HITBOX, offset: 0xC038CCC, symbol: D_ANDROSS_C038CCC} -D_ANDROSS_C038DC0: - {type: SF64:HITBOX, offset: 0xC038DC0, symbol: D_ANDROSS_C038DC0} +aAndAndrossHitbox: + {type: SF64:HITBOX, offset: 0xC038DC0, symbol: aAndAndrossHitbox} -D_ANDROSS_C038F24: - {type: SF64:HITBOX, offset: 0xC038F24, symbol: D_ANDROSS_C038F24} +aAndBrainHitbox: + {type: SF64:HITBOX, offset: 0xC038F24, symbol: aAndBrainHitbox} D_ANDROSS_C038FE8: {type: VTX, count: 34, offset: 0xC038FE8, symbol: D_ANDROSS_C038FE8} diff --git a/assets/yaml/us/rev1/ast_aquas.yaml b/assets/yaml/us/rev1/ast_aquas.yaml index d78d5c3b..654d670d 100644 --- a/assets/yaml/us/rev1/ast_aquas.yaml +++ b/assets/yaml/us/rev1/ast_aquas.yaml @@ -35,8 +35,8 @@ D_AQ_6002874: { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } # -D_AQ_6002C10: - { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 } +aAqOysterDL: + { type: GFX, offset: 0x6002C10, symbol: aAqOysterDL } D_AQ_6002D58: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6002D58, symbol: D_AQ_6002D58, tlut: 0x6003158 } @@ -152,8 +152,8 @@ D_AQ_600BD20: D_AQ_600B518: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 } -D_AQ_600BF80: - { type: GFX, offset: 0x600BF80, symbol: D_AQ_600BF80 } +aAqTunnel2DL: + { type: GFX, offset: 0x600BF80, symbol: aAqTunnel2DL } D_AQ_600C530: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x600C530, symbol: D_AQ_600C530, tlut: 0x600C930 } @@ -197,11 +197,11 @@ D_AQ_600E150: D_AQ_600E368: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 } -D_AQ_600EE10: - { type: GFX, offset: 0x600EE10, symbol: D_AQ_600EE10 } +aAqWall1DL: + { type: GFX, offset: 0x600EE10, symbol: aAqWall1DL } -D_AQ_600EEF0: - { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 } +aAqBump2DL: + { type: GFX, offset: 0x600EEF0, symbol: aAqBump2DL } D_AQ_600F030: { type: GFX, offset: 0x600F030, symbol: D_AQ_600F030 } @@ -230,11 +230,11 @@ D_AQ_6011A78: D_AQ_6011CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6011CD8, symbol: D_AQ_6011CD8 } -D_AQ_6011EE0: - { type: GFX, offset: 0x6011EE0, symbol: D_AQ_6011EE0 } +aAqTunnel1DL: + { type: GFX, offset: 0x6011EE0, symbol: aAqTunnel1DL } -D_AQ_60120F0: - { type: GFX, offset: 0x60120F0, symbol: D_AQ_60120F0 } +aAqRoofDL: + { type: GFX, offset: 0x60120F0, symbol: aAqRoofDL } D_AQ_60126A8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 64, offset: 0x60126A8, symbol: D_AQ_60126A8, tlut: 0x6012AA8 } @@ -254,14 +254,14 @@ D_AQ_6012EA8: D_AQ_60132A8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x60132A8, symbol: D_AQ_60132A8 } -D_AQ_60135E0: - { type: SF64:ANIM, offset: 0x60135E0, symbol: D_AQ_60135E0 } +aAqFishGroupAnim: + { type: SF64:ANIM, offset: 0x60135E0, symbol: aAqFishGroupAnim } -D_AQ_60136CC: - { type: SF64:SKELETON, offset: 0x60136CC, symbol: D_AQ_60136CC } +aAqFishGroupSkel1: + { type: SF64:SKELETON, offset: 0x60136CC, symbol: aAqFishGroupSkel1 } -D_AQ_60137CC: - { type: SF64:SKELETON, offset: 0x60137CC, symbol: D_AQ_60137CC } +aAqFishGroupSkel2: + { type: SF64:SKELETON, offset: 0x60137CC, symbol: aAqFishGroupSkel2 } D_AQ_60137F0: { type: GFX, offset: 0x60137F0, symbol: D_AQ_60137F0 } @@ -275,11 +275,11 @@ D_AQ_6013EC0: D_AQ_6014030: { type: GFX, offset: 0x6014030, symbol: D_AQ_6014030 } -D_AQ_6014438: - { type: SF64:ANIM, offset: 0x6014438, symbol: D_AQ_6014438 } +aAqStoneColumnAnim: + { type: SF64:ANIM, offset: 0x6014438, symbol: aAqStoneColumnAnim } -D_AQ_6014504: - { type: SF64:SKELETON, offset: 0x6014504, symbol: D_AQ_6014504 } +aAqStoneColumnSkel: + { type: SF64:SKELETON, offset: 0x6014504, symbol: aAqStoneColumnSkel } D_AQ_6014520: { type: GFX, offset: 0x6014520, symbol: D_AQ_6014520 } @@ -293,8 +293,8 @@ D_AQ_6014CD0: D_AQ_6014E50: { type: GFX, offset: 0x6014E50, symbol: D_AQ_6014E50 } -D_AQ_6014FD0: - { type: GFX, offset: 0x6014FD0, symbol: D_AQ_6014FD0 } +aAqBoulderDL: + { type: GFX, offset: 0x6014FD0, symbol: aAqBoulderDL } D_AQ_6015430: { type: GFX, offset: 0x6015430, symbol: D_AQ_6015430 } @@ -305,8 +305,8 @@ D_AQ_60154F8: D_AQ_60155F8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155F8, symbol: D_AQ_60155F8 } -D_AQ_6015730: - { type: GFX, offset: 0x6015730, symbol: D_AQ_6015730 } +aAqArchDL: + { type: GFX, offset: 0x6015730, symbol: aAqArchDL } D_AQ_6015DD0: { type: GFX, offset: 0x6015DD0, symbol: D_AQ_6015DD0 } @@ -383,8 +383,8 @@ D_AQ_601D110: D_AQ_601DE50: { type: SF64:ANIM, offset: 0x601DE50, symbol: D_AQ_601DE50 } -D_AQ_601DE60: - { type: GFX, offset: 0x601DE60, symbol: D_AQ_601DE60 } +aAqCoralReef2DL: + { type: GFX, offset: 0x601DE60, symbol: aAqCoralReef2DL } D_AQ_601E1F0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601E1F0, symbol: D_AQ_601E1F0 } @@ -392,11 +392,11 @@ D_AQ_601E1F0: D_AQ_601E9F0: { type: GFX, offset: 0x601E9F0, symbol: D_AQ_601E9F0 } -D_AQ_601EC68: - { type: SF64:ANIM, offset: 0x601EC68, symbol: D_AQ_601EC68 } +aAqCoralAnim: + { type: SF64:ANIM, offset: 0x601EC68, symbol: aAqCoralAnim } -D_AQ_601EDB4: - { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 } +aAqCoralSkel: + { type: SF64:SKELETON, offset: 0x601EDB4, symbol: aAqCoralSkel } D_AQ_601EDE0: { type: GFX, offset: 0x601EDE0, symbol: D_AQ_601EDE0 } @@ -425,11 +425,11 @@ D_AQ_6021858: D_AQ_6021C58: { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x6021C58, symbol: D_AQ_6021C58 } -D_AQ_602201C: - { type: SF64:ANIM, offset: 0x602201C, symbol: D_AQ_602201C } +aAqOysterAnim: + { type: SF64:ANIM, offset: 0x602201C, symbol: aAqOysterAnim } -D_AQ_60220E8: - { type: SF64:SKELETON, offset: 0x60220E8, symbol: D_AQ_60220E8 } +aAqOysterSkel: + { type: SF64:SKELETON, offset: 0x60220E8, symbol: aAqOysterSkel } D_AQ_6022110: { type: GFX, offset: 0x6022110, symbol: D_AQ_6022110 } @@ -449,14 +449,14 @@ D_AQ_6022888: D_AQ_60229B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60229B8, symbol: D_AQ_60229B8 } -D_AQ_60231C0: - { type: GFX, offset: 0x60231C0, symbol: D_AQ_60231C0 } +aAqCoralReef1DL: + { type: GFX, offset: 0x60231C0, symbol: aAqCoralReef1DL } -D_AQ_6023780: - { type: SF64:ANIM, offset: 0x6023780, symbol: D_AQ_6023780 } +aAqJellyfishAnim: + { type: SF64:ANIM, offset: 0x6023780, symbol: aAqJellyfishAnim } -D_AQ_602390C: - { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C } +aAqJellyfishSkel: + { type: SF64:SKELETON, offset: 0x602390C, symbol: aAqJellyfishSkel } D_AQ_6023940: { type: GFX, offset: 0x6023940, symbol: D_AQ_6023940 } @@ -482,8 +482,8 @@ D_AQ_6024938: D_AQ_60249C0: { type: GFX, offset: 0x60249C0, symbol: D_AQ_60249C0 } -D_AQ_6024A50: - { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 } +aAqPearlDL: + { type: GFX, offset: 0x6024A50, symbol: aAqPearlDL } D_AQ_6024F80: { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 } @@ -605,8 +605,8 @@ D_AQ_602AC40: D_AQ_602ACC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602ACC0, symbol: D_AQ_602ACC0 } -D_AQ_602B4C0: - { type: GFX, offset: 0x602B4C0, symbol: D_AQ_602B4C0 } +aAqRockDL: + { type: GFX, offset: 0x602B4C0, symbol: aAqRockDL } D_AQ_602B9D4: # unused and possibly broken { type: SF64:ANIM, offset: 0x602B9D4, symbol: D_AQ_602B9D4 } @@ -656,8 +656,8 @@ D_AQ_602E5C8: D_AQ_60308B8: { type: SF64:SCRIPT, offset: 0x60308B8, symbol: D_AQ_60308B8 } -D_AQ_6030B10: - { type: SF64:HITBOX, offset: 0x6030B10, symbol: D_AQ_6030B10 } +aBoss301Hitbox: + { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox } D_AQ_6030B14_f32: { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 } @@ -674,8 +674,8 @@ D_AQ_6030B68: D_AQ_6030BAC: { type: SF64:HITBOX, offset: 0x6030BAC, symbol: D_AQ_6030BAC } -D_AQ_6030BE0: - { type: SF64:HITBOX, offset: 0x6030BE0, symbol: D_AQ_6030BE0 } +aAqActor188Hitbox: + { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox } D_AQ_6030BFC: { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC } @@ -686,14 +686,14 @@ D_AQ_6030C18: D_AQ_6030C44: { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 } -D_AQ_6030C60: - { type: SF64:HITBOX, offset: 0x6030C60, symbol: D_AQ_6030C60 } +aAqCoralReef1Hitbox: + { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox } -D_AQ_6030C7C: - { type: SF64:HITBOX, offset: 0x6030C7C, symbol: D_AQ_6030C7C } +aAqTunnel1Hitbox: + { type: SF64:HITBOX, offset: 0x6030C7C, symbol: aAqTunnel1Hitbox } -D_AQ_6030D20: - { type: SF64:HITBOX, offset: 0x6030D20, symbol: D_AQ_6030D20 } +aAqStoneColumnHitbox: + { type: SF64:HITBOX, offset: 0x6030D20, symbol: aAqStoneColumnHitbox } D_AQ_6030D3C: { type: SF64:HITBOX, offset: 0x6030D3C, symbol: D_AQ_6030D3C } @@ -701,65 +701,65 @@ D_AQ_6030D3C: D_AQ_6030D58: { type: SF64:HITBOX, offset: 0x6030D58, symbol: D_AQ_6030D58 } -D_AQ_6030D74: - { type: SF64:HITBOX, offset: 0x6030D74, symbol: D_AQ_6030D74 } +aAqArchHitbox: + { type: SF64:HITBOX, offset: 0x6030D74, symbol: aAqArchHitbox } -D_AQ_6030DF8: - { type: SF64:HITBOX, offset: 0x6030DF8, symbol: D_AQ_6030DF8 } +aAqCoralReef2Hitbox: + { type: SF64:HITBOX, offset: 0x6030DF8, symbol: aAqCoralReef2Hitbox } -D_AQ_6030E14: - { type: SF64:HITBOX, offset: 0x6030E14, symbol: D_AQ_6030E14 } +aAqRockHitbox: + { type: SF64:HITBOX, offset: 0x6030E14, symbol: aAqRockHitbox } -D_AQ_6030E30_Hitbox: - { type: SF64:HITBOX, offset: 0x6030E30, symbol: D_AQ_6030E30_Hitbox } +aAqWall1Hitbox: + { type: SF64:HITBOX, offset: 0x6030E30, symbol: aAqWall1Hitbox } -D_AQ_6030E4C: - { type: SF64:HITBOX, offset: 0x6030E4C, symbol: D_AQ_6030E4C } +aAqRoofHitbox: + { type: SF64:HITBOX, offset: 0x6030E4C, symbol: aAqRoofHitbox } -D_AQ_6030E68: - { type: SF64:HITBOX, offset: 0x6030E68, symbol: D_AQ_6030E68 } +aAqTunnel2Hitbox: + { type: SF64:HITBOX, offset: 0x6030E68, symbol: aAqTunnel2Hitbox } -D_AQ_6030F74: - { type: SF64:HITBOX, offset: 0x6030F74, symbol: D_AQ_6030F74 } +aAqBacoonHitbox: + { type: SF64:HITBOX, offset: 0x6030F74, symbol: aAqBacoonHitbox } -D_AQ_6031398: - { type: SF64:HITBOX, offset: 0x6031398, symbol: D_AQ_6031398 } +aAqAnglerFishHitbox: + { type: SF64:HITBOX, offset: 0x6031398, symbol: aAqAnglerFishHitbox } -D_AQ_60313CC: - { type: SF64:HITBOX, offset: 0x60313CC, symbol: D_AQ_60313CC } +aAqGaroaHitbox: + { type: SF64:HITBOX, offset: 0x60313CC, symbol: aAqGaroaHitbox } -D_AQ_6031400: - { type: SF64:HITBOX, offset: 0x6031400, symbol: D_AQ_6031400 } +aAqSculpinHitbox: + { type: SF64:HITBOX, offset: 0x6031400, symbol: aAqSculpinHitbox } -D_AQ_603144C: - { type: SF64:HITBOX, offset: 0x603144C, symbol: D_AQ_603144C } +aAqSpindlyFishHitbox: + { type: SF64:HITBOX, offset: 0x603144C, symbol: aAqSpindlyFishHitbox } -D_AQ_6031480: - { type: SF64:HITBOX, offset: 0x6031480, symbol: D_AQ_6031480 } +aAqSquidHitbox: + { type: SF64:HITBOX, offset: 0x6031480, symbol: aAqSquidHitbox } D_AQ_60314AC: { type: SF64:HITBOX, offset: 0x60314AC, symbol: D_AQ_60314AC } -D_AQ_60314C8: - { type: SF64:HITBOX, offset: 0x60314C8, symbol: D_AQ_60314C8 } +aAqOysterHitbox: + { type: SF64:HITBOX, offset: 0x60314C8, symbol: aAqOysterHitbox } D_AQ_60314E4: { type: SF64:HITBOX, offset: 0x60314E4, symbol: D_AQ_60314E4 } -D_AQ_6031500: - { type: SF64:HITBOX, offset: 0x6031500, symbol: D_AQ_6031500 } +aAqBoulderHitbox: + { type: SF64:HITBOX, offset: 0x6031500, symbol: aAqBoulderHitbox } D_AQ_603151C: { type: SF64:HITBOX, offset: 0x603151C, symbol: D_AQ_603151C } -D_AQ_6031538: - { type: SF64:HITBOX, offset: 0x6031538, symbol: D_AQ_6031538 } +aAqCoralHitbox: + { type: SF64:HITBOX, offset: 0x6031538, symbol: aAqCoralHitbox } -D_AQ_6031554: - { type: SF64:HITBOX, offset: 0x6031554, symbol: D_AQ_6031554 } +aAqJellyfishHitbox: + { type: SF64:HITBOX, offset: 0x6031554, symbol: aAqJellyfishHitbox } -D_AQ_6031570: - { type: SF64:HITBOX, offset: 0x6031570, symbol: D_AQ_6031570 } +aAqFishGroupHitbox: + { type: SF64:HITBOX, offset: 0x6031570, symbol: aAqFishGroupHitbox } D_AQ_603158C: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x603158C, symbol: D_AQ_603158C } diff --git a/assets/yaml/us/rev1/ast_area_6.yaml b/assets/yaml/us/rev1/ast_area_6.yaml index 100e6e03..e673f924 100644 --- a/assets/yaml/us/rev1/ast_area_6.yaml +++ b/assets/yaml/us/rev1/ast_area_6.yaml @@ -237,8 +237,8 @@ D_A6_6028254: D_A6_60282A0: { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 } -D_A6_6028454: - { type: SF64:HITBOX, offset: 0x6028454, symbol: D_A6_6028454 } +aA6GorgonHitbox: + { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox } D_A6_6028578: { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 } diff --git a/assets/yaml/us/rev1/ast_arwing.yaml b/assets/yaml/us/rev1/ast_arwing.yaml index dcd135ab..06cc46b3 100644 --- a/assets/yaml/us/rev1/ast_arwing.yaml +++ b/assets/yaml/us/rev1/ast_arwing.yaml @@ -179,8 +179,8 @@ D_arwing_3018348: D_arwing_30183D0: { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 } -D_arwing_30184D8: - { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 } +aWindshieldClouldReflextionTex: + { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: aWindshieldClouldReflextionTex } D_arwing_3018CD8: { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 } diff --git a/assets/yaml/us/rev1/ast_bolse.yaml b/assets/yaml/us/rev1/ast_bolse.yaml index 3dc404f8..ff8e45e5 100644 --- a/assets/yaml/us/rev1/ast_bolse.yaml +++ b/assets/yaml/us/rev1/ast_bolse.yaml @@ -115,8 +115,8 @@ D_BO_600AB90: D_BO_600AD80: { type: TEXTURE, format: RGBA16, offset: 0x0600AD80, width: 32, height: 32, ctype: u16, symbol: D_BO_600AD80 } -D_BO_600B8B0: - { type: GFX, offset: 0x600B8B0, symbol: D_BO_600B8B0 } +aBoBuildingDL: + { type: GFX, offset: 0x600B8B0, symbol: aBoBuildingDL } D_BO_600BAA0: { type: GFX, offset: 0x600BAA0, symbol: D_BO_600BAA0 } @@ -133,11 +133,11 @@ D_BO_600C0B8: D_BO_600C2D8: { type: TEXTURE, format: IA8, offset: 0x0600C2D8, width: 32, height: 16, ctype: u8, symbol: D_BO_600C2D8 } -D_BO_600C4E0: - { type: GFX, offset: 0x600C4E0, symbol: D_BO_600C4E0 } +aBoBaseShieldDL: + { type: GFX, offset: 0x600C4E0, symbol: aBoBaseShieldDL } -D_BO_600CF88: - { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: D_BO_600CF88 } +aBoBaseShieldTex: + { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: aBoBaseShieldTex } D_BO_600D190: { type: GFX, offset: 0x600D190, symbol: D_BO_600D190 } @@ -148,20 +148,20 @@ D_BO_600D2A0: D_BO_600E2A0: { type: TEXTURE, format: RGBA16, offset: 0x0600E2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600E2A0 } -D_BO_600F2E0: - { type: SF64:ANIM, offset: 0x600F2E0, symbol: D_BO_600F2E0 } +aBoLaserCannonAnim: + { type: SF64:ANIM, offset: 0x600F2E0, symbol: aBoLaserCannonAnim } -D_BO_600F36C: - { type: SF64:SKELETON, offset: 0x600F36C, symbol: D_BO_600F36C } +aBoLaserCannonSkel: + { type: SF64:SKELETON, offset: 0x600F36C, symbol: aBoLaserCannonSkel } -D_BO_600F3D8: - { type: SF64:ANIM, offset: 0x600F3D8, symbol: D_BO_600F3D8 } +aBoShieldReactorAnim: + { type: SF64:ANIM, offset: 0x600F3D8, symbol: aBoShieldReactorAnim } -D_BO_600F4A4: - { type: SF64:SKELETON, offset: 0x600F4A4, symbol: D_BO_600F4A4 } +aBoShieldReactorSkel: + { type: SF64:SKELETON, offset: 0x600F4A4, symbol: aBoShieldReactorSkel } -D_BO_600F4C0: - { type: GFX, offset: 0x600F4C0, symbol: D_BO_600F4C0 } +aBoPoleDL: + { type: GFX, offset: 0x600F4C0, symbol: aBoPoleDL } D_BO_600F728: { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 } @@ -178,23 +178,23 @@ D_BO_6010294: D_BO_6011B20: { type: SF64:HITBOX, offset: 0x6011B20, symbol: D_BO_6011B20 } -D_BO_6011B24: - { type: SF64:HITBOX, offset: 0x6011B24, symbol: D_BO_6011B24 } +aBoShieldReactorHitbox: + { type: SF64:HITBOX, offset: 0x6011B24, symbol: aBoShieldReactorHitbox } D_BO_6011BA4: { type: SF64:HITBOX, offset: 0x6011BA4, symbol: D_BO_6011BA4 } -D_BO_6011BF4: - { type: SF64:HITBOX, offset: 0x6011BF4, symbol: D_BO_6011BF4 } +aBoLaserCannonHitbox: + { type: SF64:HITBOX, offset: 0x6011BF4, symbol: aBoLaserCannonHitbox } -D_BO_6011C10: - { type: SF64:HITBOX, offset: 0x6011C10, symbol: D_BO_6011C10 } +aBoPoleHitbox: + { type: SF64:HITBOX, offset: 0x6011C10, symbol: aBoPoleHitbox } -D_BO_6011C48: - { type: SF64:HITBOX, offset: 0x6011C48, symbol: D_BO_6011C48 } +aBoBuildingHitbox: + { type: SF64:HITBOX, offset: 0x6011C48, symbol: aBoBuildingHitbox } -D_BO_6011C80: - { type: SF64:HITBOX, offset: 0x6011C80, symbol: D_BO_6011C80 } +aBoBaseCoreHitbox: + { type: SF64:HITBOX, offset: 0x6011C80, symbol: aBoBaseCoreHitbox } D_BO_6011E28: { type: VTX, count: 34, offset: 0x6011E28, symbol: D_BO_6011E28 } diff --git a/assets/yaml/us/rev1/ast_common.yaml b/assets/yaml/us/rev1/ast_common.yaml index 5717aba9..dbd1724d 100644 --- a/assets/yaml/us/rev1/ast_common.yaml +++ b/assets/yaml/us/rev1/ast_common.yaml @@ -695,11 +695,11 @@ D_101CBC0: D_101CCC0: { type: TEXTURE, format: TLUT, colors: 88, offset: 0x101CCC0, ctype: u16, symbol: D_101CCC0 } -D_101CD70: - { type: GFX, offset: 0x101CD70, symbol: D_101CD70 } +aUnusedShieldDL: + { type: GFX, offset: 0x101CD70, symbol: aUnusedShieldDL } -D_101D070: - { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: D_101D070 } +aUnusedShieldTex: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: aUnusedShieldTex } D_101D870: { type: GFX, offset: 0x101D870, symbol: D_101D870 } @@ -710,8 +710,8 @@ ast_common_seg1_vtx_1D9C8: D_101DE20: { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101DE20, symbol: D_101DE20 } -D_101DC10: - { type: GFX, offset: 0x101DC10, symbol: D_101DC10 } +aBarrelRollTex: + { type: GFX, offset: 0x101DC10, symbol: aBarrelRollTex } D_101EE20: { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101EE20, symbol: D_101EE20 } @@ -806,32 +806,32 @@ D_1024230: D_1024290: { type: GFX, offset: 0x1024290, symbol: D_1024290 } -D_1024410: - { type: GFX, offset: 0x1024410, symbol: D_1024410 } +aPeppyMarkDL: + { type: GFX, offset: 0x1024410, symbol: aPeppyMarkDL } -D_10244D8: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: D_10244D8 } +aPeppyMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: aPeppyMarkTex } -D_1024558: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: D_1024558 } +aPeppyMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: aPeppyMarkTLUT } -D_1024570: - { type: GFX, offset: 0x1024570, symbol: D_1024570 } +aFalcoMarkDL: + { type: GFX, offset: 0x1024570, symbol: aFalcoMarkDL } -D_1024638: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: D_1024638 } +aFalcoMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: aFalcoMarkTex } -D_10246B8: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: D_10246B8 } +aFalcoMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: aFalcoMarkTLUT } -D_10246D0: - { type: GFX, offset: 0x10246D0, symbol: D_10246D0 } +aSlippyMarkDL: + { type: GFX, offset: 0x10246D0, symbol: aSlippyMarkDL } -D_1024798: - { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: D_1024798 } +aSlippyMarkTex: + { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: aSlippyMarkTex } -D_1024818: - { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: D_1024818 } +aSlippyMarkTLUT: + { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: aSlippyMarkTLUT } D_1024830: { type: GFX, offset: 0x1024830, symbol: D_1024830 } diff --git a/assets/yaml/us/rev1/ast_corneria.yaml b/assets/yaml/us/rev1/ast_corneria.yaml index 15f83392..96933be6 100644 --- a/assets/yaml/us/rev1/ast_corneria.yaml +++ b/assets/yaml/us/rev1/ast_corneria.yaml @@ -303,20 +303,20 @@ D_CO_602AA7C: aCoDoorsSkel: { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel } -D_CO_602BC18: - { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 } +aCoGrangaWalkingAnim: + { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim } D_CO_602BE64: { type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 } -D_CO_602C0D0: - { type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 } +aCoGrangaStationaryAnim: + { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim } D_CO_602D31C: { type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C } -D_CO_602D400: - { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 } +aCoCarrierAnim: + { type: SF64:ANIM, offset: 0x602D400, symbol: aCoCarrierAnim } aCoCarrierSkel: { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel } @@ -522,14 +522,14 @@ aCoBuilding10Hitbox: aCoIBeamHitbox: { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox } -D_CO_603E54C: - { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C } +aCoActorSkibotHitbox: + { type: SF64:HITBOX, offset: 0x603E54C, symbol: aCoActorSkibotHitbox } -D_CO_603E598: - { type: SF64:HITBOX, offset: 0x603E598, symbol: D_CO_603E598 } +aCoActorRadarHitbox: + { type: SF64:HITBOX, offset: 0x603E598, symbol: aCoActorRadarHitbox } -D_CO_603E5B4: - { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 } +aCoMoleMissileHitbox: + { type: SF64:HITBOX, offset: 0x603E5B4, symbol: aCoMoleMissileHitbox } CoGarudaHitbox: { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox } @@ -540,14 +540,14 @@ aCoGarudaDestroyHitbox: aCoGrangaHitbox: { type: SF64:HITBOX, offset: 0x603E620, symbol: aCoGrangaHitbox } -D_CO_603E714: - { type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 } +aCoCarrierLeftHitbox: + { type: SF64:HITBOX, offset: 0x603E714, symbol: aCoCarrierLeftHitbox } -D_CO_603E748: - { type: SF64:HITBOX, offset: 0x603E748, symbol: D_CO_603E748 } +aCoCarrierUpperHitbox: + { type: SF64:HITBOX, offset: 0x603E748, symbol: aCoCarrierUpperHitbox } -D_CO_603E7C4: - { type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 } +aCoCarrierBottomHitbox: + { type: SF64:HITBOX, offset: 0x603E7C4, symbol: aCoCarrierBottomHitbox } aCoCarrierHitbox: { type: SF64:HITBOX, offset: 0x603E840, symbol: aCoCarrierHitbox } diff --git a/assets/yaml/us/rev1/ast_fortuna.yaml b/assets/yaml/us/rev1/ast_fortuna.yaml index 4fafae5e..46466a80 100644 --- a/assets/yaml/us/rev1/ast_fortuna.yaml +++ b/assets/yaml/us/rev1/ast_fortuna.yaml @@ -62,11 +62,11 @@ D_FO_6006120: D_FO_6006220: { type: TEXTURE, format: TLUT, colors: 120, offset: 0x6006220, ctype: u16, symbol: D_FO_6006220 } -D_FO_6006310: - { type: GFX, offset: 0x6006310, symbol: D_FO_6006310 } +aFoMountain3DL: + { type: GFX, offset: 0x6006310, symbol: aFoMountain3DL } -D_FO_60066E0: - { type: GFX, offset: 0x60066E0, symbol: D_FO_60066E0 } +aFoTowerDL: + { type: GFX, offset: 0x60066E0, symbol: aFoTowerDL } ast_fortuna_seg6_vtx_6898: { type: VTX, count: 52, offset: 0x6006898, symbol: ast_fortuna_seg6_vtx_6898 } @@ -92,17 +92,17 @@ D_FO_6007590: D_FO_6007730: { type: GFX, offset: 0x6007730, symbol: D_FO_6007730 } -D_FO_6007854: - { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 } +aFoRadarAnim: + { type: SF64:ANIM, offset: 0x6007854, symbol: aFoRadarAnim } -D_FO_6007980: - { type: SF64:SKELETON, offset: 0x6007980, symbol: D_FO_6007980 } +aFoRadarSkel: + { type: SF64:SKELETON, offset: 0x6007980, symbol: aFoRadarSkel } -D_FO_60079B0: - { type: GFX, offset: 0x60079B0, symbol: D_FO_60079B0 } +aFoMountain1DL: + { type: GFX, offset: 0x60079B0, symbol: aFoMountain1DL } -D_FO_6007D80: - { type: GFX, offset: 0x6007D80, symbol: D_FO_6007D80 } +aFoMountain2DL: + { type: GFX, offset: 0x6007D80, symbol: aFoMountain2DL } D_FO_6008150: { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6008150, ctype: u16, symbol: D_FO_6008150 } @@ -161,8 +161,8 @@ D_FO_600F60C: aFoPoleHitbox: { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox } -D_FO_600FEB8: - { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 } +aFoTowerHitbox: + { type: SF64:HITBOX, offset: 0x600FEB8, symbol: aFoTowerHitbox } aFoRadarHitbox: { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox } @@ -170,14 +170,14 @@ aFoRadarHitbox: D_FO_600FF64: { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 } -D_FO_600FF80: - { type: SF64:HITBOX, offset: 0x600FF80, symbol: D_FO_600FF80 } +aFoMountain1Hitbox: + { type: SF64:HITBOX, offset: 0x600FF80, symbol: aFoMountain1Hitbox } -D_FO_600FFA0: - { type: SF64:HITBOX, offset: 0x600FFA0, symbol: D_FO_600FFA0 } +aFoMountain2Hitbox: + { type: SF64:HITBOX, offset: 0x600FFA0, symbol: aFoMountain2Hitbox } -D_FO_600FFC0: - { type: SF64:HITBOX, offset: 0x600FFC0, symbol: D_FO_600FFC0 } +aFoMountain3Hitbox: + { type: SF64:HITBOX, offset: 0x600FFC0, symbol: aFoMountain3Hitbox } -D_FO_600FFE0: - { type: SF64:HITBOX, offset: 0x600FFE0, symbol: D_FO_600FFE0 }
\ No newline at end of file +aFoBaseHitbox: + { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox }
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_katina.yaml b/assets/yaml/us/rev1/ast_katina.yaml index 09fe56ed..6198381e 100644 --- a/assets/yaml/us/rev1/ast_katina.yaml +++ b/assets/yaml/us/rev1/ast_katina.yaml @@ -57,8 +57,8 @@ D_KA_60062F8: D_KA_6006AF8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006AF8, ctype: u16, symbol: D_KA_6006AF8 } -aKaDestroyedSaucererDL: - { type: GFX, offset: 0x6007300, symbol: aKaDestroyedSaucererDL } +aKaDestroyedKaSaucererDL: + { type: GFX, offset: 0x6007300, symbol: aKaDestroyedKaSaucererDL } D_KA_6009250: { type: GFX, offset: 0x6009250, symbol: D_KA_6009250 } @@ -169,11 +169,11 @@ D_KA_6011000: D_KA_6011044: { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 } -D_KA_6011058: - { type: SF64:HITBOX, offset: 0x6011058, symbol: D_KA_6011058 } +aKaSaucererHitbox: + { type: SF64:HITBOX, offset: 0x6011058, symbol: aKaSaucererHitbox } -D_KA_601115C: - { type: SF64:HITBOX, offset: 0x601115C, symbol: D_KA_601115C } +aKaFrontlineBaseHitbox: + { type: SF64:HITBOX, offset: 0x601115C, symbol: aKaFrontlineBaseHitbox } D_KA_60111D8: { type: SF64:HITBOX, offset: 0x60111D8, symbol: D_KA_60111D8 }
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_landmaster.yaml b/assets/yaml/us/rev1/ast_landmaster.yaml index ff5ebaa7..3269c031 100644 --- a/assets/yaml/us/rev1/ast_landmaster.yaml +++ b/assets/yaml/us/rev1/ast_landmaster.yaml @@ -14,8 +14,8 @@ D_landmaster_3000000: D_landmaster_3000080: { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_landmaster_3000080 } -D_landmaster_3000090: - { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 } +aLandmasterModelDL: + { type: GFX, offset: 0x3000090, symbol: aLandmasterModelDL } D_landmaster_3004CA8: { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3004CA8 } @@ -44,8 +44,8 @@ D_landmaster_3001680: D_landmaster_3001E80: { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001E80 } -D_landmaster_3004680: - { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 } +aLandmasterCanonDL: + { type: GFX, offset: 0x3004680, symbol: aLandmasterCanonDL } D_landmaster_30066B0: { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 } diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml index 20650095..fe1c9de1 100644 --- a/assets/yaml/us/rev1/ast_macbeth.yaml +++ b/assets/yaml/us/rev1/ast_macbeth.yaml @@ -163,8 +163,8 @@ D_MA_6007430: D_MA_6007500: {type: GFX, offset: 0x6007500, symbol: D_MA_6007500} -D_MA_60075D0: - {type: GFX, offset: 0x60075D0, symbol: D_MA_60075D0} +aMaWeaponsFactoryDL: + {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL} D_MA_60092E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x60092E0, symbol: D_MA_60092E0} @@ -238,8 +238,8 @@ D_MA_600AE18: D_MA_600AE98: { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98} -D_MA_600AF40: - {type: GFX, offset: 0x600AF40, symbol: D_MA_600AF40} +aMaGuillotineDL: + {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL} D_MA_600B2E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0} @@ -265,8 +265,8 @@ D_MA_600D1E4: D_MA_600D280: { type: TEXTURE, format: IA16, ctype: u16, width: 16, height: 16, offset: 0x600D280, symbol: D_MA_600D280} -D_MA_600D480: - {type: GFX, offset: 0x600D480, symbol: D_MA_600D480} +aMaSpearDL: + {type: GFX, offset: 0x600D480, symbol: aMaSpearDL} D_MA_600D878: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600D878, symbol: D_MA_600D878, tlut: 0x600D978} @@ -361,8 +361,8 @@ D_MA_6012C00: D_MA_6012C98: { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 8, offset: 0x6012C98, symbol: D_MA_6012C98} -D_MA_6012F50: - {type: GFX, offset: 0x6012F50, symbol: D_MA_6012F50} +aMaShockBoxLightDL: + {type: GFX, offset: 0x6012F50, symbol: aMaShockBoxLightDL} D_MA_6012FE0: { type: TEXTURE, format: IA8, ctype: u8, width: 16, height: 8, offset: 0x6012FE0, symbol: D_MA_6012FE0} @@ -391,8 +391,8 @@ D_MA_6015494: D_MA_6015500: {type: SF64:SKELETON, offset: 0x6015500, symbol: D_MA_6015500} -D_MA_6015510: - {type: GFX, offset: 0x6015510, symbol: D_MA_6015510} +aMaShockBoxDL: + {type: GFX, offset: 0x6015510, symbol: aMaShockBoxDL} D_MA_6015C24: {type: SF64:ANIM, offset: 0x6015C24, symbol: D_MA_6015C24} @@ -451,11 +451,11 @@ D_MA_601A840: D_MA_601A8C8: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x601A8C8, symbol: D_MA_601A8C8} -D_MA_601B0D0: - {type: GFX, offset: 0x601B0D0, symbol: D_MA_601B0D0} +aMaFloor6DL: + {type: GFX, offset: 0x601B0D0, symbol: aMaFloor6DL} -D_MA_601B7C0: - {type: GFX, offset: 0x601B7C0, symbol: D_MA_601B7C0} +aMaWall4DL: + {type: GFX, offset: 0x601B7C0, symbol: aMaWall4DL} D_MA_601BB78: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BB78, symbol: D_MA_601BB78, tlut: 0x601BC78} @@ -493,8 +493,8 @@ D_MA_601EAB0: D_MA_601EBBC: {type: SF64:SKELETON, offset: 0x601EBBC, symbol: D_MA_601EBBC} -D_MA_601F1D0: - {type: GFX, offset: 0x601F1D0, symbol: D_MA_601F1D0} +aMaWall2DL: + {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL} D_MA_601F270: {type: GFX, offset: 0x601F270, symbol: D_MA_601F270} @@ -550,14 +550,14 @@ D_MA_6023388: D_MA_6023788: { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6023788, symbol: D_MA_6023788} -D_MA_60238F0: - {type: GFX, offset: 0x60238F0, symbol: D_MA_60238F0} +aMaWall3DL: + {type: GFX, offset: 0x60238F0, symbol: aMaWall3DL} D_MA_60239D0: {type: GFX, offset: 0x60239D0, symbol: D_MA_60239D0} -D_MA_6024010: - {type: GFX, offset: 0x6024010, symbol: D_MA_6024010} +aMaBuilding1DL: + {type: GFX, offset: 0x6024010, symbol: aMaBuilding1DL} D_MA_6024230: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6024230, symbol: D_MA_6024230, tlut: 0x6024630} @@ -568,17 +568,17 @@ D_MA_6024630: D_MA_6024670: {type: GFX, offset: 0x6024670, symbol: D_MA_6024670} -D_MA_60251A0: - {type: GFX, offset: 0x60251A0, symbol: D_MA_60251A0} +aMaHorizontalLockBarDL: + {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL} D_MA_60253E0: {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0} -D_MA_60257B0: - {type: GFX, offset: 0x60257B0, symbol: D_MA_60257B0} +aMaBarrierDL: + {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL} -D_MA_6025850: - {type: GFX, offset: 0x6025850, symbol: D_MA_6025850} +aMaVerticalLockBarDL: + {type: GFX, offset: 0x6025850, symbol: aMaVerticalLockBarDL} D_MA_6025A70: {type: GFX, offset: 0x6025A70, symbol: D_MA_6025A70} @@ -604,11 +604,11 @@ D_MA_6026C00: D_MA_6027000: { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6027000, symbol: D_MA_6027000} -D_MA_60270E0: - {type: GFX, offset: 0x60270E0, symbol: D_MA_60270E0} +aMaWall1DL: + {type: GFX, offset: 0x60270E0, symbol: aMaWall1DL} -D_MA_6027180: - { type: GFX, offset: 0x6027180, symbol: D_MA_6027180} +aMaBuilding2DL: + { type: GFX, offset: 0x6027180, symbol: aMaBuilding2DL} D_MA_6027320: {type: SF64:ANIM, offset: 0x6027320, symbol: D_MA_6027320} @@ -616,8 +616,8 @@ D_MA_6027320: D_MA_602742C: {type: SF64:SKELETON, offset: 0x602742C, symbol: D_MA_602742C} -D_MA_6027900: - {type: GFX, offset: 0x6027900, symbol: D_MA_6027900} +aMaFloor2DL: + {type: GFX, offset: 0x6027900, symbol: aMaFloor2DL} D_MA_6027A04: {type: SF64:ANIM, offset: 0x6027A04, symbol: D_MA_6027A04} @@ -658,14 +658,14 @@ D_MA_602CB80: D_MA_602D380: {type: GFX, offset: 0x602D380, symbol: D_MA_602D380} -D_MA_602DAE0: - {type: GFX, offset: 0x602DAE0, symbol: D_MA_602DAE0} +aMaFloor1DL: + {type: GFX, offset: 0x602DAE0, symbol: aMaFloor1DL} -D_MA_602DB80: - {type: GFX, offset: 0x602DB80, symbol: D_MA_602DB80} +aMaFloor3DL: + {type: GFX, offset: 0x602DB80, symbol: aMaFloor3DL} -D_MA_602DC20: - {type: GFX, offset: 0x602DC20, symbol: D_MA_602DC20} +aMaFloor5DL: + {type: GFX, offset: 0x602DC20, symbol: aMaFloor5DL} D_MA_602DCB8: {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602DCB8, symbol: D_MA_602DCB8} @@ -703,11 +703,11 @@ D_MA_602FFA0: D_MA_602FFC0: {type: GFX, offset: 0x602FFC0, symbol: D_MA_602FFC0} -D_MA_6030500: - {type: GFX, offset: 0x6030500, symbol: D_MA_6030500} +aMaTerrainBumpDL: + {type: GFX, offset: 0x6030500, symbol: aMaTerrainBumpDL} -D_MA_6030630: - {type: GFX, offset: 0x6030630, symbol: D_MA_6030630} +aMaFloor4DL: + {type: GFX, offset: 0x6030630, symbol: aMaFloor4DL} D_MA_60306D0: {type: GFX, offset: 0x60306D0, symbol: D_MA_60306D0} @@ -757,20 +757,20 @@ D_MA_6035920: D_MA_60359AC: {type: SF64:HITBOX, offset: 0x60359AC, symbol: D_MA_60359AC} -D_MA_60359C8: - {type: SF64:HITBOX, offset: 0x60359C8, symbol: D_MA_60359C8} +aMaLocomotiveHitbox: + {type: SF64:HITBOX, offset: 0x60359C8, symbol: aMaLocomotiveHitbox} -D_MA_6035A14: - {type: SF64:HITBOX, offset: 0x6035A14, symbol: D_MA_6035A14} +aMaTrainCar2Hitbox: + {type: SF64:HITBOX, offset: 0x6035A14, symbol: aMaTrainCar2Hitbox} -D_MA_6035A48: - {type: SF64:HITBOX, offset: 0x6035A48, symbol: D_MA_6035A48} +aMaTrainCar1Hitbox: + {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTrainCar1Hitbox} D_MA_6035A94: {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94} -D_MA_6035AE0: - {type: SF64:HITBOX, offset: 0x6035AE0, symbol: D_MA_6035AE0} +aMaTrainCar3Hitbox: + {type: SF64:HITBOX, offset: 0x6035AE0, symbol: aMaTrainCar3Hitbox} D_MA_6035B44: {type: SF64:HITBOX, offset: 0x6035B44, symbol: D_MA_6035B44} @@ -790,14 +790,14 @@ D_MA_6035CD4: D_MA_6035D38: {type: SF64:HITBOX, offset: 0x6035D38, symbol: D_MA_6035D38} -D_MA_6035D9C: - {type: SF64:HITBOX, offset: 0x6035D9C, symbol: D_MA_6035D9C} +aMaTrainCar4Hitbox: + {type: SF64:HITBOX, offset: 0x6035D9C, symbol: aMaTrainCar4Hitbox} D_MA_6035DD0: {type: SF64:HITBOX, offset: 0x6035DD0, symbol: D_MA_6035DD0} -D_MA_6035E04: - {type: SF64:HITBOX, offset: 0x6035E04, symbol: D_MA_6035E04} +aMaTrainCar5Hitbox: + {type: SF64:HITBOX, offset: 0x6035E04, symbol: aMaTrainCar5Hitbox} D_MA_6035E68: {type: SF64:HITBOX, offset: 0x6035E68, symbol: D_MA_6035E68} @@ -817,101 +817,101 @@ D_MA_6035FF8: D_MA_603605C: {type: SF64:HITBOX, offset: 0x603605C, symbol: D_MA_603605C} -D_MA_60360C0: - {type: SF64:HITBOX, offset: 0x60360C0, symbol: D_MA_60360C0} +aMaTrainCar6Hitbox: + {type: SF64:HITBOX, offset: 0x60360C0, symbol: aMaTrainCar6Hitbox} -D_MA_6036154: - {type: SF64:HITBOX, offset: 0x6036154, symbol: D_MA_6036154} +aMaTrainCar7Hitbox: + {type: SF64:HITBOX, offset: 0x6036154, symbol: aMaTrainCar7Hitbox} D_MA_6036188: {type: SF64:HITBOX, offset: 0x6036188, symbol: D_MA_6036188} -D_MA_6036204: - {type: SF64:HITBOX, offset: 0x6036204, symbol: D_MA_6036204} +aMaTrainTrack13Hitbox: + {type: SF64:HITBOX, offset: 0x6036204, symbol: aMaTrainTrack13Hitbox} D_MA_6036250: {type: SF64:HITBOX, offset: 0x6036250, symbol: D_MA_6036250} -D_MA_603626C: - {type: SF64:HITBOX, offset: 0x603626C, symbol: D_MA_603626C} +aMaBuilding1Hitbox: + {type: SF64:HITBOX, offset: 0x603626C, symbol: aMaBuilding1Hitbox} -D_MA_6036288: - {type: SF64:HITBOX, offset: 0x6036288, symbol: D_MA_6036288} +aMaBuilding2Hitbox: + {type: SF64:HITBOX, offset: 0x6036288, symbol: aMaBuilding2Hitbox} -D_MA_60362A4: - {type: SF64:HITBOX, offset: 0x60362A4, symbol: D_MA_60362A4} +aMaTowerHitbox: + {type: SF64:HITBOX, offset: 0x60362A4, symbol: aMaTowerHitbox} -D_MA_60362D8: - {type: SF64:HITBOX, offset: 0x60362D8, symbol: D_MA_60362D8} +aMaWall2Hitbox: + {type: SF64:HITBOX, offset: 0x60362D8, symbol: aMaWall2Hitbox} -D_MA_60362F4: - {type: SF64:HITBOX, offset: 0x60362F4, symbol: D_MA_60362F4} +aMaWall4Hitbox: + {type: SF64:HITBOX, offset: 0x60362F4, symbol: aMaWall4Hitbox} -D_MA_6036328: - {type: SF64:HITBOX, offset: 0x6036328, symbol: D_MA_6036328} +aMaWall3Hitbox: + {type: SF64:HITBOX, offset: 0x6036328, symbol: aMaWall3Hitbox} -D_MA_6036344: - {type: SF64:HITBOX, offset: 0x6036344, symbol: D_MA_6036344} +aMaIndicatorSignHitbox: + {type: SF64:HITBOX, offset: 0x6036344, symbol: aMaIndicatorSignHitbox} -D_MA_6036370: - {type: SF64:HITBOX, offset: 0x6036370, symbol: D_MA_6036370} +aMaTerrainBumpHitbox: + {type: SF64:HITBOX, offset: 0x6036370, symbol: aMaTerrainBumpHitbox} -D_MA_603638C: - {type: SF64:HITBOX, offset: 0x603638C, symbol: D_MA_603638C} +aMaFloor1Hitbox: + {type: SF64:HITBOX, offset: 0x603638C, symbol: aMaFloor1Hitbox} -D_MA_60363B8: - {type: SF64:HITBOX, offset: 0x60363B8, symbol: D_MA_60363B8} +aMaFloor2Hitbox: + {type: SF64:HITBOX, offset: 0x60363B8, symbol: aMaFloor2Hitbox} -D_MA_60363E4: - {type: SF64:HITBOX, offset: 0x60363E4, symbol: D_MA_60363E4} +aMaFloor3Hitbox: + {type: SF64:HITBOX, offset: 0x60363E4, symbol: aMaFloor3Hitbox} -D_MA_6036410: - {type: SF64:HITBOX, offset: 0x6036410, symbol: D_MA_6036410} +aMaFloor4Hitbox: + {type: SF64:HITBOX, offset: 0x6036410, symbol: aMaFloor4Hitbox} -D_MA_603643C: - {type: SF64:HITBOX, offset: 0x603643C, symbol: D_MA_603643C} +aMaFloor5Hitbox: + {type: SF64:HITBOX, offset: 0x603643C, symbol: aMaFloor5Hitbox} -D_MA_6036458: - {type: SF64:HITBOX, offset: 0x6036458, symbol: D_MA_6036458} +aMaMaRailroadSwitchHitbox: + {type: SF64:HITBOX, offset: 0x6036458, symbol: aMaMaRailroadSwitchHitbox} D_MA_603648C: {type: SF64:HITBOX, offset: 0x603648C, symbol: D_MA_603648C} -D_MA_60364C0: - {type: SF64:HITBOX, offset: 0x60364C0, symbol: D_MA_60364C0} +aMaBoulderHitbox: + {type: SF64:HITBOX, offset: 0x60364C0, symbol: aMaBoulderHitbox} -D_MA_60364DC: - {type: SF64:HITBOX, offset: 0x60364DC, symbol: D_MA_60364DC} +aMaRailwaySignalHitbox: + {type: SF64:HITBOX, offset: 0x60364DC, symbol: aMaRailwaySignalHitbox} D_MA_6036520: {type: SF64:HITBOX, offset: 0x6036520, symbol: D_MA_6036520} -D_MA_6036594: - {type: SF64:HITBOX, offset: 0x6036594, symbol: D_MA_6036594} +aMaSwitchTrackHitbox: + {type: SF64:HITBOX, offset: 0x6036594, symbol: aMaSwitchTrackHitbox} D_MA_6036668: {type: SF64:HITBOX, offset: 0x6036668, symbol: D_MA_6036668} -D_MA_60366EC: - {type: SF64:HITBOX, offset: 0x60366EC, symbol: D_MA_60366EC} +aMaHorizontalLockBarHitbox: + {type: SF64:HITBOX, offset: 0x60366EC, symbol: aMaHorizontalLockBarHitbox} -D_MA_6036708: - {type: SF64:HITBOX, offset: 0x6036708, symbol: D_MA_6036708} +aMaVerticalLockBarHitbox: + {type: SF64:HITBOX, offset: 0x6036708, symbol: aMaVerticalLockBarHitbox} -D_MA_6036724: - {type: SF64:HITBOX, offset: 0x6036724, symbol: D_MA_6036724} +aMaProximityLightHitbox: + {type: SF64:HITBOX, offset: 0x6036724, symbol: aMaProximityLightHitbox} -D_MA_6036728: - {type: SF64:HITBOX, offset: 0x6036728, symbol: D_MA_6036728} +aMaBarrierHitbox: + {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox} -D_MA_6036744: - {type: SF64:HITBOX, offset: 0x6036744, symbol: D_MA_6036744} +aMaActor219Hitbox: + {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox} -D_MA_6036760: - {type: SF64:HITBOX, offset: 0x6036760, symbol: D_MA_6036760} +aMaFloor6Hitbox: + {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox} -D_MA_603677C: - {type: SF64:HITBOX, offset: 0x603677C, symbol: D_MA_603677C} +aMaActor207Hitbox: + {type: SF64:HITBOX, offset: 0x603677C, symbol: aMaActor207Hitbox} D_MA_6036818: {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818} @@ -919,20 +919,20 @@ D_MA_6036818: D_MA_6036894: {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894} -D_MA_60368E0: - {type: SF64:HITBOX, offset: 0x60368E0, symbol: D_MA_60368E0} +aMaGuillotineHitbox: + {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} D_MA_60368FC: {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC} -D_MA_6036930: - {type: SF64:HITBOX, offset: 0x6036930, symbol: D_MA_6036930} +aMaBombDropHitbox: + {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox} -D_MA_603694C: - {type: SF64:HITBOX, offset: 0x603694C, symbol: D_MA_603694C} +aMaSpearHitbox: + {type: SF64:HITBOX, offset: 0x603694C, symbol: aMaSpearHitbox} -D_MA_6036968: - {type: SF64:HITBOX, offset: 0x6036968, symbol: D_MA_6036968} +aMaShockBoxHitbox: + {type: SF64:HITBOX, offset: 0x6036968, symbol: aMaShockBoxHitbox} D_MA_60381D8: {type: SF64:SCRIPT, offset: 0x60381D8, symbol: D_MA_60381D8} diff --git a/assets/yaml/us/rev1/ast_meteo.yaml b/assets/yaml/us/rev1/ast_meteo.yaml index 16a3ac8b..26757edd 100644 --- a/assets/yaml/us/rev1/ast_meteo.yaml +++ b/assets/yaml/us/rev1/ast_meteo.yaml @@ -104,8 +104,8 @@ D_ME_600C740: D_ME_600CAA0: { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 } -D_ME_600CD60: - { type: GFX, offset: 0x600CD60, symbol: D_ME_600CD60 } +aMeMeteorShower3DL: + { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL } D_ME_600CDE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CDE8, symbol: D_ME_600CDE8 } @@ -137,8 +137,8 @@ D_ME_6014238: D_ME_6015238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06015238, symbol: D_ME_6015238 } -D_ME_6016240: - { type: GFX, offset: 0x6016240, symbol: D_ME_6016240 } +aMeMeteorShower2DL: + { type: GFX, offset: 0x6016240, symbol: aMeMeteorShower2DL } D_ME_60162C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x060162C8, symbol: D_ME_60162C8 } @@ -146,20 +146,20 @@ D_ME_60162C8: D_ME_60172C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060172C8, symbol: D_ME_60172C8 } -D_ME_6017AD0: - { type: GFX, offset: 0x06017AD0, symbol: D_ME_6017AD0 } +aMeMeteorShower1DL: + { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL } D_ME_6017B60: { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 } -D_ME_6018450: - { type: GFX, offset: 0x06018450, symbol: D_ME_6018450 } +aMeLaserCannon2DL: + { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL } D_ME_6018960: { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 } -D_ME_6018C00: - { type: GFX, offset: 0x06018C00, symbol: D_ME_6018C00 } +aMeMeteor1DL: + { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL } D_ME_6019430: { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 } @@ -286,29 +286,29 @@ D_ME_602F604: D_ME_602F638: { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 } -D_ME_602F684: - { type: SF64:HITBOX, offset: 0x602F684, symbol: D_ME_602F684 } +aMeMeteoBallHitbox: + { type: SF64:HITBOX, offset: 0x602F684, symbol: aMeMeteoBallHitbox } -D_ME_602F6A0: - { type: SF64:HITBOX, offset: 0x602F6A0, symbol: D_ME_602F6A0 } +aMeHopBotHitbox: + { type: SF64:HITBOX, offset: 0x602F6A0, symbol: aMeHopBotHitbox } -D_ME_602F6EC: - { type: SF64:HITBOX, offset: 0x602F6EC, symbol: D_ME_602F6EC } +aMeMeteor1Hitbox: + { type: SF64:HITBOX, offset: 0x602F6EC, symbol: aMeMeteor1Hitbox } -D_ME_602F708: - { type: SF64:HITBOX, offset: 0x602F708, symbol: D_ME_602F708 } +aMeMeteor2Hitbox: + { type: SF64:HITBOX, offset: 0x602F708, symbol: aMeMeteor2Hitbox } -D_ME_602F724: - { type: SF64:HITBOX, offset: 0x602F724, symbol: D_ME_602F724 } +aMeLaserCannon1Hitbox: + { type: SF64:HITBOX, offset: 0x602F724, symbol: aMeLaserCannon1Hitbox } -D_ME_602F740: - { type: SF64:HITBOX, offset: 0x602F740, symbol: D_ME_602F740 } +aMeLaserCannon2Hitbox: + { type: SF64:HITBOX, offset: 0x602F740, symbol: aMeLaserCannon2Hitbox } -D_ME_602F75C: - { type: SF64:HITBOX, offset: 0x602F75C, symbol: D_ME_602F75C } +aMeCrusherHitbox: + { type: SF64:HITBOX, offset: 0x602F75C, symbol: aMeCrusherHitbox } -D_ME_602FA50: - { type: SF64:HITBOX, offset: 0x602FA50, symbol: D_ME_602FA50 } +aMeCrusherShieldHitbox: + { type: SF64:HITBOX, offset: 0x602FA50, symbol: aMeCrusherShieldHitbox } D_ME_602FA9C: {type: SF64:COLPOLY, count: 79, offset: 0x602FA9C, symbol: D_ME_602FA9C, mesh_symbol: D_ME_OFFSET } diff --git a/assets/yaml/us/rev1/ast_sector_x.yaml b/assets/yaml/us/rev1/ast_sector_x.yaml index 2f2d2754..7dfa09e5 100644 --- a/assets/yaml/us/rev1/ast_sector_x.yaml +++ b/assets/yaml/us/rev1/ast_sector_x.yaml @@ -247,14 +247,14 @@ D_SX_603238C: D_SX_6032408: { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 } -D_SX_6032488: - { type: SF64:HITBOX, offset: 0x6032488, symbol: D_SX_6032488 } +aSxSpyborgLeftArmHitbox: + { type: SF64:HITBOX, offset: 0x6032488, symbol: aSxSpyborgLeftArmHitbox } -D_SX_60324EC: - { type: SF64:HITBOX, offset: 0x60324EC, symbol: D_SX_60324EC } +aSxSpyborgRightArmHitbox: + { type: SF64:HITBOX, offset: 0x60324EC, symbol: aSxSpyborgRightArmHitbox } -D_SX_6032550: - { type: SF64:HITBOX, offset: 0x6032550, symbol: D_SX_6032550 } +aSxSpyborgHitbox: + { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox } D_SX_603285C: { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C } diff --git a/assets/yaml/us/rev1/ast_sector_y.yaml b/assets/yaml/us/rev1/ast_sector_y.yaml index 8ca9f1ef..3e107fe7 100644 --- a/assets/yaml/us/rev1/ast_sector_y.yaml +++ b/assets/yaml/us/rev1/ast_sector_y.yaml @@ -35,11 +35,11 @@ D_SY_6003348: D_SY_60034C4: { type: SF64:ANIM, offset: 0x60034C4, symbol: D_SY_60034C4 } -D_SY_60034D0: - { type: GFX, offset: 0x60034D0, symbol: D_SY_60034D0 } +aSyShipWindowsDL: + { type: GFX, offset: 0x60034D0, symbol: aSyShipWindowsDL } -D_SY_60036A0: - { type: GFX, offset: 0x60036A0, symbol: D_SY_60036A0 } +aSyShip3DestroyedDL: + { type: GFX, offset: 0x60036A0, symbol: aSyShip3DestroyedDL } D_SY_6004958: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06004958, symbol: D_SY_6004958 } @@ -47,8 +47,8 @@ D_SY_6004958: D_SY_6005158: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06005158, symbol: D_SY_6005158 } -D_SY_6005360: - { type: GFX, offset: 0x6005360, symbol: D_SY_6005360 } +aSyShip4DL: + { type: GFX, offset: 0x6005360, symbol: aSyShip4DL } D_SY_6005BE0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06005BE0, symbol: D_SY_6005BE0 } @@ -74,8 +74,8 @@ D_SY_6008BE0: D_SY_6008FE0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008FE0, symbol: D_SY_6008FE0 } -D_SY_60097E0: - { type: GFX, offset: 0x060097E0, symbol: D_SY_60097E0 } +aSyShip1DL: + { type: GFX, offset: 0x060097E0, symbol: aSyShip1DL } D_SY_600AAC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600AAC0, symbol: D_SY_600AAC0 } @@ -98,11 +98,11 @@ D_SY_600EAC0: D_SY_600F2C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x0600F2C0, symbol: D_SY_600F2C0 } -D_SY_600F6C0: - { type: GFX, offset: 0x600F6C0, symbol: D_SY_600F6C0 } +aSyShip4DestroyedDL: + { type: GFX, offset: 0x600F6C0, symbol: aSyShip4DestroyedDL } -D_SY_60102C0: - { type: GFX, offset: 0x60102C0, symbol: D_SY_60102C0 } +aSyShip3DL: + { type: GFX, offset: 0x60102C0, symbol: aSyShip3DL } D_SY_6011758: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06011758, symbol: D_SY_6011758 } @@ -158,8 +158,8 @@ D_SY_6015960: D_SY_6015B60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 } -D_SY_60188D0: - { type: GFX, offset: 0x60188D0, symbol: D_SY_60188D0 } +aSyShipProjectileDL: + { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL } D_SY_60183B0: { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 } @@ -176,20 +176,20 @@ D_SY_601AD70: D_SY_601AE08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 } -D_SY_601B610: - { type: GFX, offset: 0x601B610, symbol: D_SY_601B610 } +aSyShip2SpriteDL: + { type: GFX, offset: 0x601B610, symbol: aSyShip2SpriteDL } D_SY_601B6A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601B6A0, symbol: D_SY_601B6A0 } -D_SY_601C6A0: - { type: GFX, offset: 0x601C6A0, symbol: D_SY_601C6A0 } +aSyShip3SpriteDL: + { type: GFX, offset: 0x601C6A0, symbol: aSyShip3SpriteDL } D_SY_601C730: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601C730, symbol: D_SY_601C730 } -D_SY_601D730: - { type: GFX, offset: 0x601D730, symbol: D_SY_601D730 } +aSyShip2DL: + { type: GFX, offset: 0x601D730, symbol: aSyShip2DL } D_SY_601F3B8: { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 } @@ -308,8 +308,8 @@ D_SY_6032E18: D_SY_6033070: {type: SF64:COLPOLY, count: 174, offset: 0x6033070, symbol: D_SY_6033070, mesh_symbol: D_SY_6033E08 } -D_SY_603405C: - { type: SF64:HITBOX, offset: 0x603405C, symbol: D_SY_603405C } +aSyRobotHitbox: + { type: SF64:HITBOX, offset: 0x603405C, symbol: aSyRobotHitbox } D_SY_60340C0: { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 } @@ -329,34 +329,34 @@ D_SY_60342A0: D_SY_6034304: { type: SF64:HITBOX, offset: 0x6034304, symbol: D_SY_6034304 } -D_SY_6034368: - { type: SF64:HITBOX, offset: 0x6034368, symbol: D_SY_6034368 } +aSyScenery156Hitbox: + { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox } D_SY_603445C: { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C } -D_SY_6034478: - { type: SF64:HITBOX, offset: 0x6034478, symbol: D_SY_6034478 } +aSyShip1Hitbox: + { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox } -D_SY_603450C: - { type: SF64:HITBOX, offset: 0x603450C, symbol: D_SY_603450C } +aSyShip2Hitbox: + { type: SF64:HITBOX, offset: 0x603450C, symbol: aSyShip2Hitbox } -D_SY_6034588: - { type: SF64:HITBOX, offset: 0x6034588, symbol: D_SY_6034588 } +aSyShip3Hitbox: + { type: SF64:HITBOX, offset: 0x6034588, symbol: aSyShip3Hitbox } -D_SY_6034664: - { type: SF64:HITBOX, offset: 0x6034664, symbol: D_SY_6034664 } +aSyShip3DestroyedHitbox: + { type: SF64:HITBOX, offset: 0x6034664, symbol: aSyShip3DestroyedHitbox } -D_SY_6034770: - { type: SF64:HITBOX, offset: 0x6034770, symbol: D_SY_6034770 } +aSyShip4Hitbox: + { type: SF64:HITBOX, offset: 0x6034770, symbol: aSyShip4Hitbox } -D_SY_60347D4: - { type: SF64:HITBOX, offset: 0x60347D4, symbol: D_SY_60347D4 } +aSyShipWindowsHitbox: + { type: SF64:HITBOX, offset: 0x60347D4, symbol: aSyShipWindowsHitbox } -D_SY_60347F0: - { type: SF64:HITBOX, offset: 0x60347F0, symbol: D_SY_60347F0 } +aSyShip4DestroyedHitbox: + { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox } -D_SY_603486C: - { type: SF64:HITBOX, offset: 0x603486C, symbol: D_SY_603486C } +aSyShipProjectileHitbox: + { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox } # size = 0x34890
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_sector_z.yaml b/assets/yaml/us/rev1/ast_sector_z.yaml index 5213b9d2..f6e4284a 100644 --- a/assets/yaml/us/rev1/ast_sector_z.yaml +++ b/assets/yaml/us/rev1/ast_sector_z.yaml @@ -85,8 +85,8 @@ D_SZ_60041F8: D_SZ_60042F8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x060042F8, symbol: D_SZ_60042F8 } -D_SZ_6004330: - { type: GFX, offset: 0x6004330, symbol: D_SZ_6004330 } +aSzMissileMark: + { type: GFX, offset: 0x6004330, symbol: aSzMissileMark } D_SZ_6004458: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 8, offset: 0x06004458, symbol: D_SZ_6004458, tlut: 0x06004558 } @@ -160,13 +160,13 @@ D_SZ_6007558: aSZMissileHitbox: { type: SF64:HITBOX, offset: 0x6009230, symbol: aSZMissileHitbox } -D_SZ_600924C: - { type: SF64:HITBOX, offset: 0x600924C, symbol: D_SZ_600924C } +aSzSpaceJunk3Hitbox: + { type: SF64:HITBOX, offset: 0x600924C, symbol: aSzSpaceJunk3Hitbox } -D_SZ_60092E8: - { type: SF64:HITBOX, offset: 0x60092E8, symbol: D_SZ_60092E8 } +aSzSpaceJunk1Hitbox: + { type: SF64:HITBOX, offset: 0x60092E8, symbol: aSzSpaceJunk1Hitbox } -D_SZ_6009388: - { type: SF64:HITBOX, offset: 0x6009388, symbol: D_SZ_6009388 } +aSzGreatFoxHitbox: + { type: SF64:HITBOX, offset: 0x6009388, symbol: aSzGreatFoxHitbox } # size = 0x93B0
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_titania.yaml b/assets/yaml/us/rev1/ast_titania.yaml index 829c10bd..a0cc8a19 100644 --- a/assets/yaml/us/rev1/ast_titania.yaml +++ b/assets/yaml/us/rev1/ast_titania.yaml @@ -76,11 +76,11 @@ D_TI_6005000: D_TI_600631C: {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C} -D_TI_60064AC: - {type: SF64:HITBOX, offset: 0x60064AC, symbol: D_TI_60064AC} +aTi1LandmineHitbox: + {type: SF64:HITBOX, offset: 0x60064AC, symbol: aTi1LandmineHitbox} -D_TI_60064C8: - {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8} +aTiDesertRoverHitbox: + {type: SF64:HITBOX, offset: 0x60064C8, symbol: aTiDesertRoverHitbox} aTiSkullHitbox: {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox} @@ -112,32 +112,32 @@ aTiRib7Hitbox: aTiRib8Hitbox: {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox} -D_TI_60067C4: - {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4} +aTiDelphorHitbox: + {type: SF64:HITBOX, offset: 0x60067C4, symbol: aTiDelphorHitbox} -D_TI_6006808: - {type: SF64:HITBOX, offset: 0x6006808, symbol: D_TI_6006808} +aTiDelphorHeadHitbox: + {type: SF64:HITBOX, offset: 0x6006808, symbol: aTiDelphorHeadHitbox} -D_TI_6006A3C: - {type: SF64:HITBOX, offset: 0x6006A3C, symbol: D_TI_6006A3C} +aTiDesertCrawlerHitbox: + {type: SF64:HITBOX, offset: 0x6006A3C, symbol: aTiDesertCrawlerHitbox} -D_TI_600683C: - {type: SF64:HITBOX, offset: 0x600683C, symbol: D_TI_600683C} +aTiBoulderHitbox: + {type: SF64:HITBOX, offset: 0x600683C, symbol: aTiBoulderHitbox} -D_TI_6006858: - {type: SF64:HITBOX, offset: 0x6006858, symbol: D_TI_6006858} +aTiBombHitbox: + {type: SF64:HITBOX, offset: 0x6006858, symbol: aTiBombHitbox} D_TI_6006874: {type: SF64:HITBOX, offset: 0x6006874, symbol: D_TI_6006874} -D_TI_6006890: - {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890} +aTiRascoHitbox: + {type: SF64:HITBOX, offset: 0x6006890, symbol: aTiRascoHitbox} aTiCactusHitbox: {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox} -D_TI_60068F0: - {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0} +aTiFekudaHitbox: + {type: SF64:HITBOX, offset: 0x60068F0, symbol: aTiFekudaHitbox} D_TI_6006940: {type: SF64:HITBOX, offset: 0x6006940, symbol: D_TI_6006940} @@ -166,8 +166,8 @@ D_TI_6006A04: D_TI_6006A20: {type: SF64:HITBOX, offset: 0x6006A20, symbol: D_TI_6006A20} -D_TI_6006BF0: - {type: SF64:HITBOX, offset: 0x6006BF0, symbol: D_TI_6006BF0} +aTiPillarHitbox: + {type: SF64:HITBOX, offset: 0x6006BF0, symbol: aTiPillarHitbox} D_TI_6006924: {type: SF64:HITBOX, offset: 0x6006924, symbol: D_TI_6006924} @@ -178,8 +178,8 @@ D_TI_6006C0C: D_TI_6006C28: {type: SF64:HITBOX, offset: 0x6006C28, symbol: D_TI_6006C28} -D_TI_6006C44: - {type: SF64:HITBOX, offset: 0x6006C44, symbol: D_TI_6006C44} +aTiBridgeHitbox: + {type: SF64:HITBOX, offset: 0x6006C44, symbol: aTiBridgeHitbox} D_TI_6006C60: {type: SF64:OBJECT_INIT, offset: 0x6006C60, symbol: D_TI_6006C60} diff --git a/assets/yaml/us/rev1/ast_training.yaml b/assets/yaml/us/rev1/ast_training.yaml index 3a064e81..6ac1d8e2 100644 --- a/assets/yaml/us/rev1/ast_training.yaml +++ b/assets/yaml/us/rev1/ast_training.yaml @@ -31,8 +31,8 @@ D_TR_6002740: D_TR_60028F0: { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 } -D_TR_60030F0: - { type: GFX, offset: 0x60030F0, symbol: D_TR_60030F0 } +aTrBuildingDL: + { type: GFX, offset: 0x60030F0, symbol: aTrBuildingDL } D_TR_6003360: { type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_TR_6003360 } @@ -76,8 +76,8 @@ D_TR_6008EF8: D_TR_6009B34: { type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_TR_6009B34 } -D_TR_6009CC4: - { type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_TR_6009CC4 } +aTrBuildingHitbox: + { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox } D_TR_6009CFC: { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC } diff --git a/assets/yaml/us/rev1/ast_ve1_boss.yaml b/assets/yaml/us/rev1/ast_ve1_boss.yaml index 14a29c08..a87b71cc 100644 --- a/assets/yaml/us/rev1/ast_ve1_boss.yaml +++ b/assets/yaml/us/rev1/ast_ve1_boss.yaml @@ -50,8 +50,8 @@ D_VE1_90039F0: D_VE1_9003DF0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x9003DF0, symbol: D_VE1_9003DF0} -D_VE1_9003F50: - {type: GFX, offset: 0x9003F50, symbol: D_VE1_9003F50} +aVe1TempleInterior1DL: + {type: GFX, offset: 0x9003F50, symbol: aVe1TempleInterior1DL} D_VE1_9004478: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x9004478, symbol: D_VE1_9004478} @@ -65,8 +65,8 @@ D_VE1_9005078: D_VE1_9005478: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9005478, symbol: D_VE1_9005478} -D_VE1_9005C80: - {type: GFX, offset: 0x9005C80, symbol: D_VE1_9005C80} +aVe1TempleEntranceDL: + {type: GFX, offset: 0x9005C80, symbol: aVe1TempleEntranceDL} D_VE1_9009700: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9009700, symbol: D_VE1_9009700} @@ -92,8 +92,8 @@ D_VE1_900BF00: D_VE1_900C700: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900C700, symbol: D_VE1_900C700} -D_VE1_900D098: - {type: SF64:ANIM, offset: 0x900D098, symbol: D_VE1_900D098} +aVe1MonkeyStatueAnim: + {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim} D_VE1_900D164: {type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164} @@ -104,8 +104,8 @@ D_VE1_900D180: D_VE1_900D520: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900D520, symbol: D_VE1_900D520} -D_VE1_900DD20: - {type: GFX, offset: 0x900DD20, symbol: D_VE1_900DD20} +aVe1Pillar1DL: + {type: GFX, offset: 0x900DD20, symbol: aVe1Pillar1DL} D_VE1_900DF20: {type: GFX, offset: 0x900DF20, symbol: D_VE1_900DF20} @@ -116,11 +116,11 @@ D_VE1_900DFB8: D_VE1_900EFC0: {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0} -D_VE1_900F060: - {type: GFX, offset: 0x900F060, symbol: D_VE1_900F060} +aVe1TempleInterior2DL: + {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL} -D_VE1_900F1D0: - {type: GFX, offset: 0x900F1D0, symbol: D_VE1_900F1D0} +aVe1TempleInterior3DL: + {type: GFX, offset: 0x900F1D0, symbol: aVe1TempleInterior3DL} D_VE1_9010FC4: {type: SF64:ANIM, offset: 0x9010FC4, symbol: D_VE1_9010FC4} @@ -179,8 +179,8 @@ D_VE1_901C0F4: D_VE1_901DA38: {type: SF64:ANIM, offset: 0x901DA38, symbol: D_VE1_901DA38} -D_VE1_901DA50: - {type: GFX, offset: 0x901DA50, symbol: D_VE1_901DA50} +aVe1Pillar3DL: + {type: GFX, offset: 0x901DA50, symbol: aVe1Pillar3DL} D_VE1_901DC90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x901DC90, symbol: D_VE1_901DC90} @@ -230,8 +230,8 @@ D_VE1_90234D0: D_VE1_9023880: {type: GFX, offset: 0x9023880, symbol: D_VE1_9023880} -D_VE1_9023AD0: - {type: GFX, offset: 0x9023AD0, symbol: D_VE1_9023AD0} +aVe1Pillar4DL: + {type: GFX, offset: 0x9023AD0, symbol: aVe1Pillar4DL} D_VE1_9024738: {type: SF64:ANIM, offset: 0x9024738, symbol: D_VE1_9024738} diff --git a/assets/yaml/us/rev1/ast_venom_1.yaml b/assets/yaml/us/rev1/ast_venom_1.yaml index 96722e97..a8bbfaf9 100644 --- a/assets/yaml/us/rev1/ast_venom_1.yaml +++ b/assets/yaml/us/rev1/ast_venom_1.yaml @@ -46,8 +46,8 @@ D_VE1_6003078: D_VE1_6003478: { type: TEXTURE, format: TLUT, colors: 204, offset: 0x6003478, ctype: u16, symbol: D_VE1_6003478 } -D_VE1_6003610: - { type: GFX, offset: 0x6003610, symbol: D_VE1_6003610 } +aVe1WatchPostDL: + { type: GFX, offset: 0x6003610, symbol: aVe1WatchPostDL } D_VE1_6003B10: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 } @@ -70,8 +70,8 @@ D_VE1_60046F0: D_VE1_6004780: { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 } -D_VE1_6005780: - { type: GFX, offset: 0x6005780, symbol: D_VE1_6005780 } +aVe1GeneratorDL: + { type: GFX, offset: 0x6005780, symbol: aVe1GeneratorDL } D_VE1_6005E50: { type: TEXTURE, format: TLUT, colors: 160, offset: 0x6005E50, ctype: u16, symbol: D_VE1_6005E50 } @@ -97,11 +97,11 @@ D_VE1_60066D0: D_VE1_6006750: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006750, ctype: u16, symbol: D_VE1_6006750 } -D_VE1_6006F50: - { type: GFX, offset: 0x6006F50, symbol: D_VE1_6006F50 } +aVe1HallwayObstacleDL: + { type: GFX, offset: 0x6006F50, symbol: aVe1HallwayObstacleDL } -D_VE1_6007410: - { type: GFX, offset: 0x6007410, symbol: D_VE1_6007410 } +aVe1SceneryWall3DL: + { type: GFX, offset: 0x6007410, symbol: aVe1SceneryWall3DL } D_VE1_60074E8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 } @@ -133,50 +133,50 @@ D_VE1_601B474: D_VE1_601B4C4: { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 } -D_VE1_601B4E0: - { type: SF64:HITBOX, offset: 0x601B4E0, symbol: D_VE1_601B4E0 } +aVe1SceneryWall1Hitbox: + { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox } -D_VE1_601B4FC: - { type: SF64:HITBOX, offset: 0x601B4FC, symbol: D_VE1_601B4FC } +aVe1SceneryWall2Hitbox: + { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox } -D_VE1_601B518: - { type: SF64:HITBOX, offset: 0x601B518, symbol: D_VE1_601B518 } +aVe1SceneryWall3Hitbox: + { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox } -D_VE1_601B584: - { type: SF64:HITBOX, offset: 0x601B584, symbol: D_VE1_601B584 } +aVe1HallwayObstacleHitbox: + { type: SF64:HITBOX, offset: 0x601B584, symbol: aVe1HallwayObstacleHitbox } -D_VE1_601B5F4: - { type: SF64:HITBOX, offset: 0x601B5F4, symbol: D_VE1_601B5F4 } +aVe1GeneratorHitbox: + { type: SF64:HITBOX, offset: 0x601B5F4, symbol: aVe1GeneratorHitbox } -D_VE1_601B644: - { type: SF64:HITBOX, offset: 0x601B644, symbol: D_VE1_601B644 } +aVe1WatchPostHitbox: + { type: SF64:HITBOX, offset: 0x601B644, symbol: aVe1WatchPostHitbox } -D_VE1_601B678: - { type: SF64:HITBOX, offset: 0x601B678, symbol: D_VE1_601B678 } +aVe1TempleEntranceHitbox: + { type: SF64:HITBOX, offset: 0x601B678, symbol: aVe1TempleEntranceHitbox } -D_VE1_601B6C4: - { type: SF64:HITBOX, offset: 0x601B6C4, symbol: D_VE1_601B6C4 } +aVe1TempleInterior1Hitbox: + { type: SF64:HITBOX, offset: 0x601B6C4, symbol: aVe1TempleInterior1Hitbox } -D_VE1_601B710: - { type: SF64:HITBOX, offset: 0x601B710, symbol: D_VE1_601B710 } +aVe1TempleInterior2Hitbox: + { type: SF64:HITBOX, offset: 0x601B710, symbol: aVe1TempleInterior2Hitbox } -D_VE1_601B75C: - { type: SF64:HITBOX, offset: 0x601B75C, symbol: D_VE1_601B75C } +aVe1TempleInterior3Hitbox: + { type: SF64:HITBOX, offset: 0x601B75C, symbol: aVe1TempleInterior3Hitbox } -D_VE1_601B7F8: - { type: SF64:HITBOX, offset: 0x601B7F8, symbol: D_VE1_601B7F8 } +aVe1Pillar1Hitbox: + { type: SF64:HITBOX, offset: 0x601B7F8, symbol: aVe1Pillar1Hitbox } -D_VE1_601B830: - { type: SF64:HITBOX, offset: 0x601B830, symbol: D_VE1_601B830 } +aVe1Pillar2Hitbox: + { type: SF64:HITBOX, offset: 0x601B830, symbol: aVe1Pillar2Hitbox } -D_VE1_601B868: - { type: SF64:HITBOX, offset: 0x601B868, symbol: D_VE1_601B868 } +aVe1Pillar3Hitbox: + { type: SF64:HITBOX, offset: 0x601B868, symbol: aVe1Pillar3Hitbox } -D_VE1_601B8A0: - { type: SF64:HITBOX, offset: 0x601B8A0, symbol: D_VE1_601B8A0 } +aVe1Pillar4Hitbox: + { type: SF64:HITBOX, offset: 0x601B8A0, symbol: aVe1Pillar4Hitbox } -D_VE1_601B8D8: - { type: SF64:HITBOX, offset: 0x601B8D8, symbol: D_VE1_601B8D8 } +aVe1MonkeyStatueHitbox: + { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox } D_VE1_601B944: { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_venom_2.yaml b/assets/yaml/us/rev1/ast_venom_2.yaml index 26d37d60..ae6f652e 100644 --- a/assets/yaml/us/rev1/ast_venom_2.yaml +++ b/assets/yaml/us/rev1/ast_venom_2.yaml @@ -27,11 +27,11 @@ D_VE2_60020D0: D_VE2_6002890: { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6002890, ctype: u8, symbol: D_VE2_6002890 } -D_VE2_6002990: - { type: GFX, offset: 0x6002990, symbol: D_VE2_6002990 } +aAndPathExitDL: + { type: GFX, offset: 0x6002990, symbol: aAndPathExitDL } -D_VE2_6003000: - { type: GFX, offset: 0x6003000, symbol: D_VE2_6003000 } +aAndPathIntersectionDL: + { type: GFX, offset: 0x6003000, symbol: aAndPathIntersectionDL } D_VE2_60038E0: { type: GFX, offset: 0x60038E0, symbol: D_VE2_60038E0 } @@ -39,8 +39,8 @@ D_VE2_60038E0: D_VE2_6003970: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003970, ctype: u16, symbol: D_VE2_6003970 } -D_VE2_6004170: - { type: GFX, offset: 0x6004170, symbol: D_VE2_6004170 } +aAndPathEntranceDL: + { type: GFX, offset: 0x6004170, symbol: aAndPathEntranceDL } D_VE2_6004888: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6004888, ctype: u16, symbol: D_VE2_6004888 } @@ -57,8 +57,8 @@ D_VE2_6006088: D_VE2_60030D8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60030D8, ctype: u16, symbol: D_VE2_60030D8 } -D_VE2_6006890: - { type: GFX, offset: 0x6006890, symbol: D_VE2_6006890 } +aAndPathWallsDL: + { type: GFX, offset: 0x6006890, symbol: aAndPathWallsDL } D_VE2_6006E20: { type: GFX, offset: 0x6006E20, symbol: D_VE2_6006E20 } @@ -72,8 +72,8 @@ D_VE2_6007E20: D_VE2_6008170: { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 } -D_VE2_6008370: - { type: GFX, offset: 0x6008370, symbol: D_VE2_6008370 } +aVe2TowerDL: + { type: GFX, offset: 0x6008370, symbol: aVe2TowerDL } D_VE2_6008AF8: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 } @@ -162,8 +162,8 @@ D_VE2_600F700: D_VE2_6010700: { type: GFX, offset: 0x6010700, symbol: D_VE2_6010700 } -D_VE2_6010960: - { type: GFX, offset: 0x6010960, symbol: D_VE2_6010960 } +aVe2MountainDL: + { type: GFX, offset: 0x6010960, symbol: aVe2MountainDL } D_VE2_6010CA0: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6010CA0, ctype: u16, symbol: D_VE2_6010CA0 } @@ -195,11 +195,11 @@ D_VE2_6014D94: D_VE2_6014FEC: { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC, mesh_symbol: D_VE2_OFFSET } -D_VE2_601668C: - { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C } +aVe2TowerHitbox: + { type: SF64:HITBOX, offset: 0x601668C, symbol: aVe2TowerHitbox } -D_VE2_60166F4: - { type: SF64:HITBOX, offset: 0x60166F4, symbol: D_VE2_60166F4 } +aVe2BaseHitbox: + { type: SF64:HITBOX, offset: 0x60166F4, symbol: aVe2BaseHitbox } -D_VE2_6016714: - { type: SF64:HITBOX, offset: 0x6016714, symbol: D_VE2_6016714 }
\ No newline at end of file +aVe2MountainHitbox: + { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox }
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_versus.yaml b/assets/yaml/us/rev1/ast_versus.yaml index f5961866..d0b75a41 100644 --- a/assets/yaml/us/rev1/ast_versus.yaml +++ b/assets/yaml/us/rev1/ast_versus.yaml @@ -182,8 +182,8 @@ D_versus_300EC80: D_versus_300EE80: { type: GFX, offset: 0x300EE80, symbol: D_versus_300EE80} -D_versus_300FB80: - { type: GFX, offset: 0x300FB80, symbol: D_versus_300FB80} +aVsLandmasterModelDL: + { type: GFX, offset: 0x300FB80, symbol: aVsLandmasterModelDL} D_versus_3010690: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010690, symbol: D_versus_3010690 } @@ -203,14 +203,14 @@ D_versus_3011E40: D_versus_3011ED0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3011ED0, symbol: D_versus_3011ED0 } -D_versus_3012ED0: - { type: GFX, offset: 0x3012ED0, symbol: D_versus_3012ED0} +aVsSpaceJunk3DL: + { type: GFX, offset: 0x3012ED0, symbol: aVsSpaceJunk3DL} -D_versus_3013580: - { type: GFX, offset: 0x3013580, symbol: D_versus_3013580} +aVsSpaceJunk2DL: + { type: GFX, offset: 0x3013580, symbol: aVsSpaceJunk2DL} -D_versus_3013780: - { type: GFX, offset: 0x3013780, symbol: D_versus_3013780} +aVsSpaceJunk1DL: + { type: GFX, offset: 0x3013780, symbol: aVsSpaceJunk1DL} D_versus_3013F50: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x3013F50, symbol: D_versus_3013F50, tlut: 0x3014350 } @@ -245,8 +245,8 @@ D_versus_30160A0: D_versus_30162F8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_versus_30162F8 } -D_versus_3016B00: - { type: GFX, offset: 0x3016B00, symbol: D_versus_3016B00} +aVsKaFlBaseDL: + { type: GFX, offset: 0x3016B00, symbol: aVsKaFlBaseDL} D_versus_3016DC0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016DC0, symbol: D_versus_3016DC0 } @@ -257,14 +257,14 @@ D_versus_3016FC0: D_versus_30171C0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30171C0, symbol: D_versus_30171C0 } -D_versus_30173C0: - { type: GFX, offset: 0x30173C0, symbol: D_versus_30173C0} +aVsPyramid1DL: + { type: GFX, offset: 0x30173C0, symbol: aVsPyramid1DL} -D_versus_30174E0: - { type: GFX, offset: 0x30174E0, symbol: D_versus_30174E0} +aVsPyramid2DL: + { type: GFX, offset: 0x30174E0, symbol: aVsPyramid2DL} -D_versus_3017600: - { type: GFX, offset: 0x3017600, symbol: D_versus_3017600} +aVsBuildingDL: + { type: GFX, offset: 0x3017600, symbol: aVsBuildingDL} D_versus_3017800: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3017800, symbol: D_versus_3017800 } @@ -299,8 +299,8 @@ D_versus_301AEF0: D_versus_301AF78: {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_versus_301AF78 } -D_versus_301B080: - { type: GFX, offset: 0x301B080, symbol: D_versus_301B080} +aVsArchDL: + { type: GFX, offset: 0x301B080, symbol: aVsArchDL} D_versus_301B438: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_versus_301B438 } @@ -320,8 +320,8 @@ D_versus_301C0A4: D_versus_301C3A8: { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_versus_301C3A8} -D_versus_301C614: - { type: SF64:SKELETON, offset: 0x301C614, symbol: D_versus_301C614 } +aVsOnFootFalcoSkel: + { type: SF64:SKELETON, offset: 0x301C614, symbol: aVsOnFootFalcoSkel } D_versus_301C79C: { type: SF64:ANIM, offset: 0x301C79C, symbol: D_versus_301C79C } @@ -335,8 +335,8 @@ D_versus_301CCE4: D_versus_301CFEC: { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_versus_301CFEC} -D_versus_301D258: - { type: SF64:SKELETON, offset: 0x301D258, symbol: D_versus_301D258 } +aVsOnFootFoxSkel: + { type: SF64:SKELETON, offset: 0x301D258, symbol: aVsOnFootFoxSkel } D_versus_301D3DC: { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_versus_301D3DC } @@ -347,8 +347,8 @@ D_versus_301D568: D_versus_301D888: { type: SF64:ANIM, offset: 0x301D888, symbol: D_versus_301D888} -D_versus_301DB94: - { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_versus_301DB94 } +aVsOnFootPeppySkel: + { type: SF64:SKELETON, offset: 0x301DB94, symbol: aVsOnFootPeppySkel } D_versus_301DD6C: { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_versus_301DD6C } @@ -359,8 +359,8 @@ D_versus_301DEA4: D_versus_301E19C: { type: SF64:ANIM, offset: 0x301E19C, symbol: D_versus_301E19C} -D_versus_301E3E8: - { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_versus_301E3E8 } +aVsOnFootSlippySkel: + { type: SF64:SKELETON, offset: 0x301E3E8, symbol: aVsOnFootSlippySkel } D_versus_301E560: { type: SF64:ANIM, offset: 0x301E560, symbol: D_versus_301E560} @@ -395,8 +395,8 @@ D_versus_301EEB0: D_versus_301EF38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_versus_301EF38 } -D_versus_301F140: - { type: GFX, offset: 0x301F140, symbol: D_versus_301F140} +aVsLandmasterCanonDL: + { type: GFX, offset: 0x301F140, symbol: aVsLandmasterCanonDL} D_versus_301F2E0: { type: GFX, offset: 0x301F2E0, symbol: D_versus_301F2E0} @@ -704,26 +704,26 @@ D_versus_302E170: D_versus_302E378: { type: SF64:OBJECT_INIT, offset: 0x302E378, symbol: D_versus_302E378} -D_versus_302ED4C: - { type: SF64:HITBOX, offset: 0x302ED4C, symbol: D_versus_302ED4C} +aVsSpaceJunk1Hitbox: + { type: SF64:HITBOX, offset: 0x302ED4C, symbol: aVsSpaceJunk1Hitbox} -D_versus_302ED98: - { type: SF64:HITBOX, offset: 0x302ED98, symbol: D_versus_302ED98} +aVsSpaceJunk2Hitbox: + { type: SF64:HITBOX, offset: 0x302ED98, symbol: aVsSpaceJunk2Hitbox} -D_versus_302EDB4: - { type: SF64:HITBOX, offset: 0x302EDB4, symbol: D_versus_302EDB4} +aVsSpaceJunk3Hitbox: + { type: SF64:HITBOX, offset: 0x302EDB4, symbol: aVsSpaceJunk3Hitbox} -D_versus_302EE00: - { type: SF64:HITBOX, offset: 0x302EE00, symbol: D_versus_302EE00} +aVsKaFlBaseHitbox: + { type: SF64:HITBOX, offset: 0x302EE00, symbol: aVsKaFlBaseHitbox} -D_versus_302EE64: - { type: SF64:HITBOX, offset: 0x302EE64, symbol: D_versus_302EE64} +aVsBuilding1Hibox: + { type: SF64:HITBOX, offset: 0x302EE64, symbol: aVsBuilding1Hibox} -D_versus_302EE80: - { type: SF64:HITBOX, offset: 0x302EE80, symbol: D_versus_302EE80} +aVsBuilding2Hibox: + { type: SF64:HITBOX, offset: 0x302EE80, symbol: aVsBuilding2Hibox} -D_versus_302EE9C: - { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_versus_302EE9C} +aVsArchHitbox: + { type: SF64:HITBOX, offset: 0x302EE9C, symbol: aVsArchHitbox} D_versus_302EEE8: { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_versus_302EEE8, mesh_symbol: D_versus_OFFSET} diff --git a/assets/yaml/us/rev1/ast_zoness.yaml b/assets/yaml/us/rev1/ast_zoness.yaml index 406db142..69f313f7 100644 --- a/assets/yaml/us/rev1/ast_zoness.yaml +++ b/assets/yaml/us/rev1/ast_zoness.yaml @@ -141,14 +141,14 @@ D_ZO_600E5EC: D_ZO_600E7D8: { type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8} -D_ZO_600E820: - { type: GFX, offset: 0x600E820, symbol: D_ZO_600E820} +aZoOilRig3DL: + { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL} -D_ZO_600EC90: - { type: GFX, offset: 0x600EC90, symbol: D_ZO_600EC90} +aZoOilRig2DL: + { type: GFX, offset: 0x600EC90, symbol: aZoOilRig2DL} -D_ZO_600F560: - { type: GFX, offset: 0x600F560, symbol: D_ZO_600F560} +aZoOilRig1DL: + { type: GFX, offset: 0x600F560, symbol: aZoOilRig1DL} D_ZO_600FE58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600FE58, symbol: D_ZO_600FE58} @@ -225,8 +225,8 @@ D_ZO_6017810: D_ZO_60178B0: { type: GFX, offset: 0x60178B0, symbol: D_ZO_60178B0} -D_ZO_6017950: - { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950} +aZoBallDL: + { type: GFX, offset: 0x6017950, symbol: aZoBallDL} D_ZO_60179D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60179D8, symbol: D_ZO_60179D8} @@ -366,8 +366,8 @@ D_ZO_601FBC4: D_ZO_601FC90: { type: SF64:SKELETON, offset: 0x601FC90, symbol: D_ZO_601FC90} -D_ZO_601FCB0: - { type: GFX, offset: 0x601FCB0, symbol: D_ZO_601FCB0} +aZoIslandDL: + { type: GFX, offset: 0x601FCB0, symbol: aZoIslandDL} D_ZO_60201B0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0} @@ -471,8 +471,8 @@ D_ZO_6024220: D_ZO_60242B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60242B8, symbol: D_ZO_60242B8} -aZoRock1DL: - { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL} +aZoRockDL: + { type: GFX, offset: 0x6024AC0, symbol: aZoRockDL} D_ZO_6024D60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60} @@ -502,59 +502,59 @@ D_ZO_602AC50: D_ZO_602AE94: { type: ARRAY, count: 242, array_type: Vec3f, offset: 0x602AE94, symbol: D_ZO_602AE94} -aZoRock1Hitbox: - { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox} +aZoRockHitbox: + { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRockHitbox} -D_ZO_602BA20: - { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20} +aZoOilRig1Hitbox: + { type: SF64:HITBOX, offset: 0x602BA20, symbol: aZoOilRig1Hitbox} -D_ZO_602BAE4: - { type: SF64:HITBOX, offset: 0x602BAE4, symbol: D_ZO_602BAE4} +aZoOilRig2Hitbox: + { type: SF64:HITBOX, offset: 0x602BAE4, symbol: aZoOilRig2Hitbox} -D_ZO_602BBD8: - { type: SF64:HITBOX, offset: 0x602BBD8, symbol: D_ZO_602BBD8} +aZoOilRig3Hitbox: + { type: SF64:HITBOX, offset: 0x602BBD8, symbol: aZoOilRig3Hitbox} -D_ZO_602BC54: - { type: SF64:HITBOX, offset: 0x602BC54, symbol: D_ZO_602BC54} +aZoIslandHitbox: + { type: SF64:HITBOX, offset: 0x602BC54, symbol: aZoIslandHitbox} -D_ZO_602BC58: - { type: SF64:HITBOX, offset: 0x602BC58, symbol: D_ZO_602BC58} +aZoDodoraHitbox: + { type: SF64:HITBOX, offset: 0x602BC58, symbol: aZoDodoraHitbox} -D_ZO_602BE3C: - { type: SF64:HITBOX, offset: 0x602BE3C, symbol: D_ZO_602BE3C} +aZoTroikaHitbox: + { type: SF64:HITBOX, offset: 0x602BE3C, symbol: aZoTroikaHitbox} -D_ZO_602BE58: - { type: SF64:HITBOX, offset: 0x602BE58, symbol: D_ZO_602BE58} +aZoObnemaHitbox: + { type: SF64:HITBOX, offset: 0x602BE58, symbol: aZoObnemaHitbox} -D_ZO_602BFC4: - { type: SF64:HITBOX, offset: 0x602BFC4, symbol: D_ZO_602BFC4} +aZoBarrierHitbox: + { type: SF64:HITBOX, offset: 0x602BFC4, symbol: aZoBarrierHitbox} D_ZO_602C028: { type: SF64:HITBOX, offset: 0x602C028, symbol: D_ZO_602C028} -D_ZO_602C044: - { type: SF64:HITBOX, offset: 0x602C044, symbol: D_ZO_602C044} +aZoSarumarineHitbox: + { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox} D_ZO_602C1A0: { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0} -D_ZO_602C1D4: - { type: SF64:HITBOX, offset: 0x602C1D4, symbol: D_ZO_602C1D4} +aZoCargoShipHitbox: + { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox} -D_ZO_602C218: - { type: SF64:HITBOX, offset: 0x602C218, symbol: D_ZO_602C218} +aZoContainerHitbox: + { type: SF64:HITBOX, offset: 0x602C218, symbol: aZoContainerHitbox} -D_ZO_602C234: - { type: SF64:HITBOX, offset: 0x602C234, symbol: D_ZO_602C234} +aZoRadarBuoyHitbox: + { type: SF64:HITBOX, offset: 0x602C234, symbol: aZoRadarBuoyHitbox} -D_ZO_602C250: - { type: SF64:HITBOX, offset: 0x602C250, symbol: D_ZO_602C250} +aZoSupplyCraneHitbox: + { type: SF64:HITBOX, offset: 0x602C250, symbol: aZoSupplyCraneHitbox} -D_ZO_602C294: - { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294} +aZoBirdHitbox: + { type: SF64:HITBOX, offset: 0x602C294, symbol: aZoBirdHitbox} -D_ZO_602C2B0: - { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0} +aZoSearchLightHitbox: + { type: SF64:HITBOX, offset: 0x602C2B0, symbol: aZoSearchLightHitbox} D_ZO_602C2CC: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C2CC, symbol: D_ZO_602C2CC} |