From df268e3badc0ac1dc03f4d13398d6321c1a5aa0c Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:45:13 -0500 Subject: [PATCH] titania boss assets, cleanup pads, update torch, split remaining segments other than 6 (#173) * splits * torch * torch again * headers --- .vscode/c_cpp_properties.json | 1 + assets/yaml/us/ast_7_ti_1.yaml | 74 +--- assets/yaml/us/ast_7_ti_2.yaml | 72 ++++ assets/yaml/us/ast_8_ti.yaml | 67 ++++ assets/yaml/us/ast_9_ti.yaml | 69 ++++ assets/yaml/us/ast_A_ti.yaml | 86 ++--- assets/yaml/us/ast_allies.yaml | 6 +- assets/yaml/us/ast_aquas.yaml | 245 +------------ assets/yaml/us/ast_area_6.yaml | 42 --- assets/yaml/us/ast_arwing.yaml | 43 +-- assets/yaml/us/ast_bg_planet.yaml | 40 +- assets/yaml/us/ast_bg_space.yaml | 28 +- assets/yaml/us/ast_blue_marine.yaml | 6 +- assets/yaml/us/ast_enmy_space.yaml | 28 +- assets/yaml/us/ast_font.yaml | 6 +- assets/yaml/us/ast_font_3d.yaml | 231 ++++-------- assets/yaml/us/ast_landmaster.yaml | 16 - assets/yaml/us/ast_option.yaml | 14 +- assets/yaml/us/ast_sector_x.yaml | 128 +------ assets/yaml/us/ast_training.yaml | 9 - assets/yaml/us/ast_vs_player.yaml | 168 ++++----- include/assets.h | 50 +-- include/assets/ast_7_ti_2.h | 23 -- include/assets/ast_8_ti.h | 30 -- include/assets/ast_9_ti.h | 8 - include/assets/ast_enmy_planet.h | 17 + include/assets/ast_ve1_boss.h | 50 +++ include/assets/ast_versus.h | 56 +++ include/fox_enmy2_assets.h | 17 - include/fox_option_assets.h | 43 --- linker_scripts/us/symbol_addrs.txt | 4 +- linker_scripts/us/symbol_addrs_assets.txt | 43 ++- linker_scripts/us/undefined_syms.ld | 424 +++++++++++----------- src/main/fox_360.c | 1 + src/main/fox_bg.c | 2 +- src/main/fox_demo.c | 2 +- src/main/fox_edata_1C.c | 15 +- src/main/fox_edisplay.c | 10 +- src/main/fox_effect.c | 11 +- src/main/fox_enmy2.c | 12 +- src/main/fox_versus.c | 24 +- src/overlays/ovl_ending/fox_end2.c | 2 +- src/overlays/ovl_ending/fox_end2_data.c | 2 +- src/overlays/ovl_i1/fox_ve1.c | 63 +--- src/overlays/ovl_i3/fox_aq.c | 2 +- src/overlays/ovl_i3/fox_zo.c | 1 + src/overlays/ovl_i5/fox_ma.c | 3 +- src/overlays/ovl_i5/fox_ti.c | 138 ++++--- src/overlays/ovl_menu/fox_map.c | 3 +- src/overlays/ovl_menu/fox_option.c | 95 ++--- yamls/us/assets.yaml | 24 +- 51 files changed, 1030 insertions(+), 1524 deletions(-) create mode 100644 assets/yaml/us/ast_7_ti_2.yaml create mode 100644 assets/yaml/us/ast_8_ti.yaml create mode 100644 assets/yaml/us/ast_9_ti.yaml delete mode 100644 include/assets/ast_7_ti_2.h delete mode 100644 include/assets/ast_8_ti.h delete mode 100644 include/assets/ast_9_ti.h delete mode 100644 include/fox_option_assets.h diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 6bb6cc2a..d2f8dd83 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -15,6 +15,7 @@ ], "defines": [ "_LANGUAGE_C", + "__sgi", "_MIPS_SZLONG=32", "F3DEX_GBI" ], diff --git a/assets/yaml/us/ast_7_ti_1.yaml b/assets/yaml/us/ast_7_ti_1.yaml index 64f92005..b99ca779 100644 --- a/assets/yaml/us/ast_7_ti_1.yaml +++ b/assets/yaml/us/ast_7_ti_1.yaml @@ -22,7 +22,7 @@ D_TI1_7001108: { type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x07001108, symbol: D_TI1_7001108 } D_TI1_7001268: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_TI1_7001268, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_TI1_7001268 } D_TI1_7002270: { type: GFX, offset: 0x7002270, symbol: D_TI1_7002270 } @@ -43,7 +43,7 @@ D_TI1_7003488: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07003488, symbol: D_TI1_7003488, tlut: 0x07003888 } D_TI1_7003888: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_TI1_7003888, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_TI1_7003888 } D_TI1_7003A90: { type: GFX, offset: 0x7003A90, symbol: D_TI1_7003A90 } @@ -54,9 +54,6 @@ D_TI1_7003C50: D_TI1_7003E30: { type: GFX, offset: 0x7003E30, symbol: D_TI1_7003E30 } -PAD_7003FB8: - { type: BLOB, size: 8, offset: 0x7003FB8, symbol: PAD_7003FB8 } - D_TI1_7003FC0: { type: GFX, offset: 0x7003FC0, symbol: D_TI1_7003FC0 } @@ -69,9 +66,6 @@ D_TI1_7004370: D_TI1_7004560: { type: GFX, offset: 0x7004560, symbol: D_TI1_7004560 } -PAD_7004778: - { type: BLOB, size: 8, offset: 0x7004778, symbol: PAD_7004778 } - D_TI1_7004780: { type: GFX, offset: 0x7004780, symbol: D_TI1_7004780 } @@ -85,47 +79,32 @@ D_TI1_7004E78: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004E78, symbol: D_TI1_7004E78 } D_TI1_7005078: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_TI1_7005078, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_TI1_7005078 } D_TI1_7005280: { type: GFX, offset: 0x7005280, symbol: D_TI1_7005280 } -PAD_7005418: - { type: BLOB, size: 8, offset: 0x7005418, symbol: PAD_7005418 } - D_TI1_7005420: { type: GFX, offset: 0x7005420, symbol: D_TI1_7005420 } -PAD_7005648: - { type: BLOB, size: 8, offset: 0x7005648, symbol: PAD_7005648 } - D_TI1_70067C4: { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 } D_TI1_7006990: { type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990} -PAD_70069CC: - { type: BLOB, size: 4, offset: 0x70069CC, symbol: PAD_70069CC } - D_TI1_7006F74: { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 } D_TI1_7007130: { type: SF64:ANIM, offset: 0x7007130, symbol: D_TI1_7007130 } -PAD_700713C: - { type: BLOB, size: 4, offset: 0x700713C, symbol: PAD_700713C } - D_TI1_7007234: { type: SF64:ANIM, offset: 0x7007234, symbol: D_TI1_7007234 } D_TI1_700733C: { type: SF64:ANIM, offset: 0x700733C, symbol: D_TI1_700733C } -PAD_7007348: - { type: BLOB, size: 8, offset: 0x7007348, symbol: PAD_7007348 } - D_TI1_7007350: { type: GFX, offset: 0x7007350, symbol: D_TI1_7007350 } @@ -166,13 +145,13 @@ D_TI1_7009510: { type: GFX, offset: 0x7009510, symbol: D_TI1_7009510 } D_TI1_70096D8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8, pad: 8 } + { 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 } D_TI1_7009B58: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 } D_TI1_7009D60: { type: GFX, offset: 0x7009D60, symbol: D_TI1_7009D60 } @@ -187,13 +166,13 @@ D_TI1_700AAD8: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 } D_TI1_700AB58: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58, pad: 8 } + { 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 } D_TI1_700AEA8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 } D_TI1_700AF30: { type: GFX, offset: 0x700AF30, symbol: D_TI1_700AF30 } @@ -202,7 +181,7 @@ D_TI1_700B5B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B5B8, symbol: D_TI1_700B5B8 } D_TI1_700B7B8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 } D_TI1_700B9C0: { type: GFX, offset: 0x700B9C0, symbol: D_TI1_700B9C0 } @@ -210,9 +189,6 @@ D_TI1_700B9C0: D_TI1_700BB10: { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 } -PAD_700BDF8: - { type: BLOB, size: 8, offset: 0x700BDF8, symbol: PAD_700BDF8 } - D_TI1_700BE00: { type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 } @@ -225,24 +201,15 @@ D_TI1_700C3B0: D_TI1_700C4B0: { type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 } -PAD_700C888: - { type: BLOB, size: 8, offset: 0x700C888, symbol: PAD_700C888 } - D_TI1_700C8D8: { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 } D_TI1_700C964: { type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 } -PAD_700C978: - { type: BLOB, size: 8, offset: 0x700C978, symbol: PAD_700C978 } - D_TI1_700C980: { type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 } -PAD_700CA58: - { type: BLOB, size: 8, offset: 0x700CA58, symbol: PAD_700CA58 } - D_TI1_700CAF4: { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4} @@ -258,27 +225,15 @@ D_TI1_700D700: D_TI1_700D740: { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 } -PAD_700D878: - { type: BLOB, size: 0x8, offset: 0x700D878, symbol: PAD_700D878 } - D_TI1_700D880: { type: GFX, offset: 0x700D880, symbol: D_TI1_700D880 } -PAD_700D9A8: - { type: BLOB, size: 0x8, offset: 0x700D9A8, symbol: PAD_700D9A8 } - D_TI1_700D9B0: { type: GFX, offset: 0x700D9B0, symbol: D_TI1_700D9B0 } -PAD_700DAC8: - { type: BLOB, size: 0x8, offset: 0x700DAC8, symbol: PAD_700DAC8 } - D_TI1_700DAD0: { type: GFX, offset: 0x700DAD0, symbol: D_TI1_700DAD0 } -PAD_700DBA8: - { type: BLOB, size: 0x8, offset: 0x700DBA8, symbol: PAD_700DBA8 } - D_TI1_700DBB0: { type: GFX, offset: 0x700DBB0, symbol: D_TI1_700DBB0 } @@ -288,35 +243,26 @@ D_TI1_700DC50: D_TI1_700DD68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700DD68, symbol: D_TI1_700DD68 } -PAD_700DDE8: - { type: BLOB, size: 0x8, offset: 0x700DDE8, symbol: PAD_700DDE8 } - D_TI1_700DDF0: { type: GFX, offset: 0x700DDF0, symbol: D_TI1_700DDF0 } -PAD_700DEC8: - { type: BLOB, size: 0x8, offset: 0x700DEC8, symbol: PAD_700DEC8 } - D_TI1_700DED0: { type: GFX, offset: 0x700DED0, symbol: D_TI1_700DED0 } D_TI1_700DF70: { type: GFX, offset: 0x700DF70, symbol: D_TI1_700DF70 } -PAD_700E028: - { type: BLOB, size: 0x8, offset: 0x700E028, symbol: PAD_700E028 } - D_TI1_700E030: { type: GFX, offset: 0x700E030, symbol: D_TI1_700E030 } D_TI1_700E1E8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 } D_TI1_700E3F0: { type: GFX, offset: 0x700E3F0, symbol: D_TI1_700E3F0 } D_TI1_700E858: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 } D_TI1_700EA60: { type: GFX, offset: 0x700EA60, symbol: D_TI1_700EA60 } diff --git a/assets/yaml/us/ast_7_ti_2.yaml b/assets/yaml/us/ast_7_ti_2.yaml new file mode 100644 index 00000000..1ee91f1b --- /dev/null +++ b/assets/yaml/us/ast_7_ti_2.yaml @@ -0,0 +1,72 @@ +:config: + segments: + - [0x07, 0x9DD390] + header: + code: + - '#include "assets/ast_7_ti_2.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_TI2_7003EE8: + { type: SF64:ANIM, offset: 0x7003EE8, symbol: D_TI2_7003EE8 } + +D_TI2_7003F00: + { type: GFX, offset: 0x7003F00, symbol: D_TI2_7003F00 } + +D_TI2_7004270: + { type: GFX, offset: 0x7004270, symbol: D_TI2_7004270 } + +D_TI2_7004400: + { type: GFX, offset: 0x7004400, symbol: D_TI2_7004400 } + +D_TI2_70045D0: + { type: GFX, offset: 0x70045D0, symbol: D_TI2_70045D0 } + +D_TI2_70047B0: + { type: TEXTURE, ctype: u8, format: CI8, height: 16, width: 16, offset: 0x70047B0, symbol: D_TI2_70047B0 } +D_TI2_70048B0: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x70048B0, symbol: D_TI2_70048B0 } + +D_TI2_70049C0: + { type: GFX, offset: 0x70049C0, symbol: D_TI2_70049C0 } + +D_TI2_7004AB0: + { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 16, offset: 0x7004AB0, symbol: D_TI2_7004AB0 } +D_TI2_7004CB0: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 232 , offset: 0x7004CB0, symbol: D_TI2_7004CB0 } + +D_TI2_7004E80: + { type: GFX, offset: 0x7004E80, symbol: D_TI2_7004E80 } + +D_TI2_7005300: + { type: GFX, offset: 0x7005300, symbol: D_TI2_7005300 } + +D_TI2_70054C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x70054C0, symbol: D_TI2_70054C0 } + +D_TI2_70084CC: + { type: SF64:ANIM, offset: 0x70084CC, symbol: D_TI2_70084CC } + +D_TI2_70096EC: + { type: SF64:ANIM, offset: 0x70096EC, symbol: D_TI2_70096EC } + +D_TI2_7009700: + { type: GFX, offset: 0x7009700, symbol: D_TI2_7009700 } + +D_TI2_7009890: + { type: GFX, offset: 0x7009890, symbol: D_TI2_7009890 } + +D_TI2_7009A80: + { type: GFX, offset: 0x7009A80, symbol: D_TI2_7009A80 } + +D_TI2_7009B48: + { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 32, offset: 0x7009B48, symbol: D_TI2_7009B48 } +D_TI2_7009D48: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x7009D48, symbol: D_TI2_7009D48 } + +D_TI2_700E244: + { type: SF64:ANIM, offset: 0x700E244, symbol: D_TI2_700E244 } + +# size = 0xE250 \ No newline at end of file diff --git a/assets/yaml/us/ast_8_ti.yaml b/assets/yaml/us/ast_8_ti.yaml new file mode 100644 index 00000000..973cf1d5 --- /dev/null +++ b/assets/yaml/us/ast_8_ti.yaml @@ -0,0 +1,67 @@ +:config: + segments: + - [0x08, 0x9EB5E0] + header: + code: + - '#include "assets/ast_8_ti.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_TI_8000708: { type: SF64:ANIM, offset: 0x8000708, symbol: D_TI_8000708 } + +D_TI_8000D80: { type: SF64:ANIM, offset: 0x8000D80, symbol: D_TI_8000D80 } + +D_TI_8000D90: { type: GFX, offset: 0x8000D90, symbol: D_TI_8000D90 } + +D_TI_8000FC0: { type: TEXTURE, ctype: u16, format: IA16, width: 16, height: 16, offset: 0x8000FC0, symbol: D_TI_8000FC0} + +D_TI_80011C0: { type: GFX, offset: 0x80011C0, symbol: D_TI_80011C0 } + +D_TI_80012E8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x80012E8, symbol: D_TI_80012E8, tlut: 0x80013E8} +D_TI_80013E8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 88, offset: 0x80013E8, symbol: D_TI_80013E8} + +D_TI_80014A0: { type: GFX, offset: 0x80014A0, symbol: D_TI_80014A0 } + +D_TI_8001630: { type: GFX, offset: 0x8001630, symbol: D_TI_8001630 } + +D_TI_80018D0: { type: GFX, offset: 0x80018D0, symbol: D_TI_80018D0 } + +D_TI_8001A80: { type: GFX, offset: 0x8001A80, symbol: D_TI_8001A80 } + +D_TI_8001D20: { type: GFX, offset: 0x8001D20, symbol: D_TI_8001D20 } + +D_TI_8001E20: { type: GFX, offset: 0x8001E20, symbol: D_TI_8001E20 } + +D_TI_8001FB0: { type: GFX, offset: 0x8001FB0, symbol: D_TI_8001FB0 } + +D_TI_80020D0: { type: GFX, offset: 0x80020D0, symbol: D_TI_80020D0 } + +D_TI_8002360: { type: GFX, offset: 0x8002360, symbol: D_TI_8002360 } + +D_TI_8002858: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x8002858, symbol: D_TI_8002858, tlut: 0x8002C58} +D_TI_8002C58: { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x8002C58, symbol: D_TI_8002C58} + +D_TI_8002E48: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x8002E48, symbol: D_TI_8002E48, tlut: 0x8002F48} +D_TI_8002F48: { type: TEXTURE, ctype: u16, format: TLUT, colors: 216, offset: 0x8002F48, symbol: D_TI_8002F48} + +D_TI_80030F8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x80030F8, symbol: D_TI_80030F8, tlut: 0x80031F8} +D_TI_80031F8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 192, offset: 0x80031F8, symbol: D_TI_80031F8} + +D_TI_8003378: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x8003378, symbol: D_TI_8003378, tlut: 0x8003478} +D_TI_8003478: { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x8003478, symbol: D_TI_8003478} + +D_TI_80034A8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x80034A8, symbol: D_TI_80034A8, tlut: 0x80035A8} +D_TI_80035A8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 72, offset: 0x80035A8, symbol: D_TI_80035A8} + +D_TI_8003640: { type: GFX, offset: 0x8003640, symbol: D_TI_8003640 } + +D_TI_8004200: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x8004200, symbol: D_TI_8004200, tlut: 0x8004600} +D_TI_8004600: { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x8004600, symbol: D_TI_8004600} + +D_TI_8008FE8: { type: SF64:ANIM, offset: 0x8008FE8, symbol: D_TI_8008FE8 } + +D_TI_8009000: { type: GFX, offset: 0x8009000, symbol: D_TI_8009000 } + +# size: 0x92A0 \ No newline at end of file diff --git a/assets/yaml/us/ast_9_ti.yaml b/assets/yaml/us/ast_9_ti.yaml new file mode 100644 index 00000000..9c0e0710 --- /dev/null +++ b/assets/yaml/us/ast_9_ti.yaml @@ -0,0 +1,69 @@ +:config: + segments: + - [0x09, 0x9F4880] + header: + code: + - '#include "assets/ast_9_ti.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_TI_9004288: + { type: SF64:ANIM, offset: 0x9004288, symbol: D_TI_9004288 } + +D_TI_90042A0: + { type: GFX, offset: 0x90042A0, symbol: D_TI_90042A0 } + +D_TI_90043D0: + { type: GFX, offset: 0x90043D0, symbol: D_TI_90043D0 } + +D_TI_90044E0: + { type: GFX, offset: 0x90044E0, symbol: D_TI_90044E0 } + +D_TI_90045F0: + { type: GFX, offset: 0x90045F0, symbol: D_TI_90045F0 } + +D_TI_9004858: + { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x9004858, symbol: D_TI_9004858, tlut: 0x9004958 } +D_TI_9004958: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x9004958, symbol: D_TI_9004958 } + +D_TI_9004A68: + { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x9004A68, symbol: D_TI_9004A68, tlut: 0x9004E68 } +D_TI_9004E68: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x9004E68, symbol: D_TI_9004E68 } + +D_TI_9005040: + { type: GFX, offset: 0x9005040, symbol: D_TI_9005040 } + +D_TI_90051C0: + { type: GFX, offset: 0x90051C0, symbol: D_TI_90051C0 } + +D_TI_9005450: + { type: GFX, offset: 0x9005450, symbol: D_TI_9005450 } + +D_TI_9005600: + { type: GFX, offset: 0x9005600, symbol: D_TI_9005600 } + +D_TI_90058A0: + { type: GFX, offset: 0x90058A0, symbol: D_TI_90058A0 } + +D_TI_90059B8: + { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x90059B8, symbol: D_TI_90059B8, tlut: 0x9005AB8 } +D_TI_9005AB8: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x9005AB8, symbol: D_TI_9005AB8 } + +D_TI_900FC4C: + { type: SF64:ANIM, offset: 0x900FC4C, symbol: D_TI_900FC4C } + +D_TI_900FC60: + { type: GFX, offset: 0x900FC60, symbol: D_TI_900FC60 } + +D_TI_900FD70: + { type: GFX, offset: 0x900FD70, symbol: D_TI_900FD70 } + +D_TI_900FE80: + { type: GFX, offset: 0x900FE80, symbol: D_TI_900FE80 } + + # size: 0x10120 \ No newline at end of file diff --git a/assets/yaml/us/ast_A_ti.yaml b/assets/yaml/us/ast_A_ti.yaml index 4474212d..a408b65b 100644 --- a/assets/yaml/us/ast_A_ti.yaml +++ b/assets/yaml/us/ast_A_ti.yaml @@ -9,72 +9,54 @@ - '#include "sf64object.h"' - '#include "structs.h"' -D_A000000: - {type: "GFX", offset: 0xA000000, symbol: D_A000000} +D_TI_A000000: + {type: "GFX", offset: 0xA000000, symbol: D_TI_A000000} -D_A0000C8: - { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x0A0000C8, symbol: D_A0000C8, tlut: 0x0A0001C8 } +D_TI_A0000C8: + { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x0A0000C8, symbol: D_TI_A0000C8, tlut: 0x0A0001C8 } -D_A0001C8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 60, offset: 0x0A0001C8, symbol: D_A0001C8 } +D_TI_A0001C8: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 60, offset: 0x0A0001C8, symbol: D_TI_A0001C8 } -D_A0002BC: - {type: "SF64:ANIM", offset: 0xA0002BC, symbol: D_A0002BC} +D_TI_A0002BC: + {type: "SF64:ANIM", offset: 0xA0002BC, symbol: D_TI_A0002BC} -PAD_A0002C8: - { type: BLOB, size: 8, offset: 0xA0002C8, symbol: PAD_A0002C8 } +D_TI_A00047C: + {type: "SF64:ANIM", offset: 0xA00047C, symbol: D_TI_A00047C} -D_A00047C: - {type: "SF64:ANIM", offset: 0xA00047C, symbol: D_A00047C} +D_TI_A000568: + {type: "SF64:SKELETON", offset: 0xA000568, symbol: D_TI_A000568} -D_A000568: - {type: "SF64:SKELETON", offset: 0xA000568, symbol: D_A000568} +D_TI_A000858: + {type: "SF64:ANIM", offset: 0xA000858, symbol: D_TI_A000858} -PAD_A000588: - { type: BLOB, size: 8, offset: 0xA000588, symbol: PAD_A000588 } +D_TI_A000934: + {type: "SF64:ANIM", offset: 0xA000934, symbol: D_TI_A000934} -D_A000858: - {type: "SF64:ANIM", offset: 0xA000858, symbol: D_A000858} +D_TI_A000D50: + {type: "SF64:ANIM", offset: 0xA000D50, symbol: D_TI_A000D50} -PAD_A000864: - { type: BLOB, size: 12, offset: 0xA000864, symbol: PAD_A000864 } +D_TI_A000EDC: + {type: "SF64:SKELETON", offset: 0xA000EDC, symbol: D_TI_A000EDC} -D_A000934: - {type: "SF64:ANIM", offset: 0xA000934, symbol: D_A000934} +D_TI_A001A70: + {type: "SF64:SKELETON", offset: 0xA001A70, symbol: D_TI_A001A70} -D_A000D50: - {type: "SF64:ANIM", offset: 0xA000D50, symbol: D_A000D50} +D_TI_A001BE0: + {type: "GFX", offset: 0xA001BE0, symbol: D_TI_A001BE0} -D_A000EDC: - {type: "SF64:SKELETON", offset: 0xA000EDC, symbol: D_A000EDC} +D_TI_A001DB0: + {type: "GFX", offset: 0xA001DB0, symbol: D_TI_A001DB0} -D_A001A70: - {type: "SF64:SKELETON", offset: 0xA001A70, symbol: D_A001A70} +D_TI_A001EC0: + {type: "GFX", offset: 0xA001EC0, symbol: D_TI_A001EC0} -D_A001BE0: - {type: "GFX", offset: 0xA001BE0, symbol: D_A001BE0} +D_TI_A001FA0: + {type: "GFX", offset: 0xA001FA0, symbol: D_TI_A001FA0} -PAD_A001DA8: - { type: BLOB, size: 8, offset: 0xA001DA8, symbol: PAD_A001DA8 } +D_TI_A002170: + {type: "GFX", offset: 0xA002170, symbol: D_TI_A002170} -D_A001DB0: - {type: "GFX", offset: 0xA001DB0, symbol: D_A001DB0} - -D_A001EC0: - {type: "GFX", offset: 0xA001EC0, symbol: D_A001EC0} - -D_A001FA0: - {type: "GFX", offset: 0xA001FA0, symbol: D_A001FA0} - -PAD_A002168: - { type: BLOB, size: 8, offset: 0xA002168, symbol: PAD_A002168 } - -D_A002170: - {type: "GFX", offset: 0xA002170, symbol: D_A002170} - -PAD_A002378: - { type: BLOB, size: 8, offset: 0xA002378, symbol: PAD_A002378 } - -D_A009990: - {type: "SF64:ANIM", offset: 0xA009990, symbol: D_A009990} +D_TI_A009990: + {type: "SF64:ANIM", offset: 0xA009990, symbol: D_TI_A009990} diff --git a/assets/yaml/us/ast_allies.yaml b/assets/yaml/us/ast_allies.yaml index decd095a..4b68f3d9 100644 --- a/assets/yaml/us/ast_allies.yaml +++ b/assets/yaml/us/ast_allies.yaml @@ -58,7 +58,7 @@ D_D0098B0: { type: GFX, offset: 0xD0098B0, symbol: D_D0098B0 } D_D009938: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938 } D_D009A40: { type: GFX, offset: 0xD009A40, symbol: D_D009A40 } @@ -76,7 +76,7 @@ D_D00AFB8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0D00AFB8, symbol: D_D00AFB8 } D_D00B3B8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 } D_D00B5C0: { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 } @@ -86,7 +86,7 @@ D_D00B688: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 } D_D00B708: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708 } D_D00B720: { type: GFX, offset: 0xD00B720, symbol: D_D00B720 } diff --git a/assets/yaml/us/ast_aquas.yaml b/assets/yaml/us/ast_aquas.yaml index d5231664..820473f2 100644 --- a/assets/yaml/us/ast_aquas.yaml +++ b/assets/yaml/us/ast_aquas.yaml @@ -31,9 +31,7 @@ D_AQ_6002628: D_AQ_6002874: { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } -PAD_6002C08: - { type: BLOB, size: 8, offset: 0x6002C08, symbol: PAD_6002C08 } - +# D_AQ_6002C10: { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 } @@ -41,7 +39,7 @@ D_AQ_6002D58: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6002D58, symbol: D_AQ_6002D58, tlut: 0x6003158 } D_AQ_6003158: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x6003158, symbol: D_AQ_6003158, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x6003158, symbol: D_AQ_6003158 } D_AQ_6003610: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6003610, symbol: D_AQ_6003610 } @@ -58,9 +56,6 @@ D_AQ_6005954: D_AQ_6005A80: { type: SF64:SKELETON, offset: 0x6005A80, symbol: D_AQ_6005A80 } -PAD_6005AA8: - { type: BLOB, size: 8, offset: 0x6005AA8, symbol: PAD_6005AA8 } - D_AQ_6006160: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006160, symbol: D_AQ_6006160 } @@ -70,15 +65,9 @@ D_AQ_6006960: D_AQ_6007378: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007378, symbol: D_AQ_6007378 } -PAD_6007B78: - { type: BLOB, size: 8, offset: 0x6007B78, symbol: PAD_6007B78 } - D_AQ_6007B80: { type: GFX, offset: 0x6007B80, symbol: D_AQ_6007B80 } -PAD_6007D68: - { type: BLOB, size: 8, offset: 0x6007D68, symbol: PAD_6007D68 } - D_AQ_6007F68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007F68, symbol: D_AQ_6007F68 } @@ -88,9 +77,6 @@ D_AQ_6007F68: D_AQ_6008168: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 } -PAD_6008968: - { type: BLOB, size: 8, offset: 0x6008968, symbol: PAD_6008968 } - D_AQ_6008970: { type: GFX, offset: 0x6008970, symbol: D_AQ_6008970 } @@ -103,60 +89,24 @@ D_AQ_6008FC8: D_AQ_6009188: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6009188, symbol: D_AQ_6009188 } -PAD_6009988: - { type: BLOB, size: 8, offset: 0x6009988, symbol: PAD_6009988 } - D_AQ_6009C28: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6009C28, symbol: D_AQ_6009C28, tlut: 0x600A028 } D_AQ_600A028: { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x600A028, symbol: D_AQ_600A028 } -PAD_600A218: - { type: BLOB, size: 8, offset: 0x600A218, symbol: PAD_600A218 } - D_AQ_600A220: { type: GFX, offset: 0x600A220, symbol: D_AQ_600A220 } -PAD_600A478: - { type: BLOB, size: 8, offset: 0x600A478, symbol: PAD_600A478 } - -PAD_600A518: - { type: BLOB, size: 8, offset: 0x600A518, symbol: PAD_600A518 } - -PAD_600A718: - { type: BLOB, size: 8, offset: 0x600A718, symbol: PAD_600A718 } - -PAD_600A838: - { type: BLOB, size: 8, offset: 0x600A838, symbol: PAD_600A838 } - -PAD_600A8D8: - { type: BLOB, size: 8, offset: 0x600A8D8, symbol: PAD_600A8D8 } - -PAD_600A968: - { type: BLOB, size: 8, offset: 0x600A968, symbol: PAD_600A968 } - D_AQ_600AB10: { type: GFX, offset: 0x600AB10, symbol: D_AQ_600AB10 } D_AQ_600AB68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600AB68, symbol: D_AQ_600AB68 } -PAD_600B368: - { type: BLOB, size: 8, offset: 0x600B368, symbol: PAD_600B368 } - -PAD_600B3F8: - { type: BLOB, size: 8, offset: 0x600B3F8, symbol: PAD_600B3F8 } - D_AQ_600B518: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 } -PAD_600BD18: - { type: BLOB, size: 8, offset: 0x600BD18, symbol: PAD_600BD18 } - -PAD_600BF78: - { type: BLOB, size: 8, offset: 0x600BF78, symbol: PAD_600BF78 } - D_AQ_600BF80: { type: GFX, offset: 0x600BF80, symbol: D_AQ_600BF80 } @@ -172,36 +122,18 @@ D_AQ_600CB20: D_AQ_600CF20: { type: TEXTURE, ctype: u16, format: TLUT, colors: 104, offset: 0x600CF20, symbol: D_AQ_600CF20 } -PAD_600DB78: - { type: BLOB, size: 8, offset: 0x600DB78, symbol: PAD_600DB78 } - D_AQ_600DB80: { type: GFX, offset: 0x600DB80, symbol: D_AQ_600DB80 } D_AQ_600DF48: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600DF48, symbol: D_AQ_600DF48 } -PAD_600E148: - { type: BLOB, size: 8, offset: 0x600E148, symbol: PAD_600E148 } - D_AQ_600E368: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 } -PAD_600EB68: - { type: BLOB, size: 8, offset: 0x600EB68, symbol: PAD_600EB68 } - -PAD_600EBF8: - { type: BLOB, size: 8, offset: 0x600EBF8, symbol: PAD_600EBF8 } - -PAD_600EE08: - { type: BLOB, size: 8, offset: 0x600EE08, symbol: PAD_600EE08 } - D_AQ_600EE10: { type: GFX, offset: 0x600EE10, symbol: D_AQ_600EE10 } -PAD_600EEE8: - { type: BLOB, size: 8, offset: 0x600EEE8, symbol: PAD_600EEE8 } - D_AQ_600EEF0: { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 } @@ -229,9 +161,6 @@ D_AQ_6011A78: D_AQ_6011CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6011CD8, symbol: D_AQ_6011CD8 } -PAD_6011ED8: - { type: BLOB, size: 8, offset: 0x6011ED8, symbol: PAD_6011ED8 } - D_AQ_6011EE0: { type: GFX, offset: 0x6011EE0, symbol: D_AQ_6011EE0 } @@ -254,7 +183,7 @@ D_AQ_6012EA8: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6012EA8, symbol: D_AQ_6012EA8, tlut: 0x60132A8 } D_AQ_60132A8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x60132A8, symbol: D_AQ_60132A8, pad: 8 } + { 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 } @@ -289,12 +218,6 @@ D_AQ_6014520: D_AQ_60148B0: { type: GFX, offset: 0x60148B0, symbol: D_AQ_60148B0 } -PAD_6014B28: - { type: BLOB, size: 8, offset: 0x6014B28, symbol: PAD_6014B28 } - -PAD_6014CC8: - { type: BLOB, size: 8, offset: 0x6014CC8, symbol: PAD_6014CC8 } - D_AQ_6014CD0: { type: GFX, offset: 0x6014CD0, symbol: D_AQ_6014CD0 } @@ -311,43 +234,22 @@ D_AQ_60154F8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x60154F8, symbol: D_AQ_60154F8, tlut: 0x60155F8 } D_AQ_60155F8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155F8, symbol: D_AQ_60155F8, pad: 8 } + { 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 } -PAD_6015B28: - { type: BLOB, size: 8, offset: 0x6015B28, symbol: PAD_6015B28 } - -PAD_6015C78: - { type: BLOB, size: 8, offset: 0x6015C78, symbol: PAD_6015C78 } - -PAD_6015DC8: - { type: BLOB, size: 8, offset: 0x6015DC8, symbol: PAD_6015DC8 } - D_AQ_6015DD0: { type: GFX, offset: 0x6015DD0, symbol: D_AQ_6015DD0 } -PAD_6015FE8: - { type: BLOB, size: 8, offset: 0x6015FE8, symbol: PAD_6015FE8 } - D_AQ_6015FF0: { type: GFX, offset: 0x6015FF0, symbol: D_AQ_6015FF0 } -PAD_6016538: - { type: BLOB, size: 8, offset: 0x6016538, symbol: PAD_6016538 } - -PAD_6016BF8: - { type: BLOB, size: 8, offset: 0x6016BF8, symbol: PAD_6016BF8 } - -PAD_6016F38: - { type: BLOB, size: 8, offset: 0x6016F38, symbol: PAD_6016F38 } - D_AQ_6017BD8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6017BD8, symbol: D_AQ_6017BD8, tlut: 0x6017CD8 } D_AQ_6017CD8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017CD8, symbol: D_AQ_6017CD8, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017CD8, symbol: D_AQ_6017CD8 } D_AQ_6018640: { type: GFX, offset: 0x6018640, symbol: D_AQ_6018640 } @@ -365,14 +267,11 @@ D_AQ_6019238: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6019238, symbol: D_AQ_6019238, tlut: 0x6019338 } D_AQ_6019338: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 200, offset: 0x6019338, symbol: D_AQ_6019338, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 200, offset: 0x6019338, symbol: D_AQ_6019338 } D_AQ_60194D0: { type: GFX, offset: 0x60194D0, symbol: D_AQ_60194D0 } -PAD_6019878: - { type: BLOB, size: 8, offset: 0x6019878, symbol: PAD_6019878 } - D_AQ_6019880: { type: GFX, offset: 0x6019880, symbol: D_AQ_6019880 } @@ -380,7 +279,7 @@ D_AQ_6019C28: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6019C28, symbol: D_AQ_6019C28, tlut: 0x6019D28 } D_AQ_6019D28: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 168, offset: 0x6019D28, symbol: D_AQ_6019D28, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 168, offset: 0x6019D28, symbol: D_AQ_6019D28 } D_AQ_6019E80: { type: GFX, offset: 0x6019E80, symbol: D_AQ_6019E80 } @@ -389,10 +288,7 @@ D_AQ_601A308: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x601A308, symbol: D_AQ_601A308, tlut: 0x601A708 } D_AQ_601A708: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x601A708, symbol: D_AQ_601A708, pad: 8 } - -PAD_601AB28: - { type: BLOB, size: 8, offset: 0x601AB28, symbol: PAD_601AB28 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x601A708, symbol: D_AQ_601A708 } D_AQ_601AE70: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x601AE70, symbol: D_AQ_601AE70, tlut: 0x601AF70 } @@ -424,51 +320,18 @@ D_AQ_601E1F0: D_AQ_601E9F0: { type: GFX, offset: 0x601E9F0, symbol: D_AQ_601E9F0 } -PAD_601EBD8: - { type: BLOB, size: 8, offset: 0x601EBD8, symbol: PAD_601EBD8 } - D_AQ_601EC68: { type: SF64:ANIM, offset: 0x601EC68, symbol: D_AQ_601EC68 } D_AQ_601EDB4: { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 } -PAD_601F2E8: - { type: BLOB, size: 8, offset: 0x601F2E8, symbol: PAD_601F2E8 } - -PAD_601F828: - { type: BLOB, size: 8, offset: 0x601F828, symbol: PAD_601F828 } - -PAD_601FD68: - { type: BLOB, size: 8, offset: 0x601FD68, symbol: PAD_601FD68 } - -PAD_60202D8: - { type: BLOB, size: 8, offset: 0x60202D8, symbol: PAD_60202D8 } - D_AQ_6020A40: { type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 } D_AQ_6020C6C: { type: SF64:SKELETON, offset: 0x6020C6C, symbol: D_AQ_6020C6C } -PAD_6020CB4: - { type: BLOB, size: 12, offset: 0x6020CB4, symbol: PAD_6020CB4 } - -PAD_6020D48: - { type: BLOB, size: 8, offset: 0x6020D48, symbol: PAD_6020D48 } - -PAD_6020DE8: - { type: BLOB, size: 8, offset: 0x6020DE8, symbol: PAD_6020DE8 } - -PAD_6020E88: - { type: BLOB, size: 8, offset: 0x6020E88, symbol: PAD_6020E88 } - -PAD_6020F28: - { type: BLOB, size: 8, offset: 0x6020F28, symbol: PAD_6020F28 } - -PAD_6020FC8: - { type: BLOB, size: 8, offset: 0x6020FC8, symbol: PAD_6020FC8 } - D_AQ_6021058: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6021058, symbol: D_AQ_6021058 } @@ -476,7 +339,7 @@ D_AQ_6021858: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6021858, symbol: D_AQ_6021858, tlut: 0x6021C58 } D_AQ_6021C58: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x6021C58, symbol: D_AQ_6021C58, pad: 8 } + { 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 } @@ -484,9 +347,6 @@ D_AQ_602201C: D_AQ_60220E8: { type: SF64:SKELETON, offset: 0x60220E8, symbol: D_AQ_60220E8 } -PAD_6022104: - { type: BLOB, size: 12, offset: 0x6022104, symbol: PAD_6022104 } - D_AQ_6022110: { type: GFX, offset: 0x6022110, symbol: D_AQ_6022110 } @@ -505,9 +365,6 @@ D_AQ_6022888: D_AQ_60229B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60229B8, symbol: D_AQ_60229B8 } -PAD_60231B8: - { type: BLOB, size: 8, offset: 0x60231B8, symbol: PAD_60231B8 } - D_AQ_60231C0: { type: GFX, offset: 0x60231C0, symbol: D_AQ_60231C0 } @@ -517,9 +374,6 @@ D_AQ_6023780: D_AQ_602390C: { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C } -PAD_6023EA8: - { type: BLOB, size: 8, offset: 0x6023EA8, symbol: PAD_6023EA8 } - D_AQ_6023F38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6023F38, symbol: D_AQ_6023F38 } @@ -529,87 +383,24 @@ D_AQ_6024738: D_AQ_6024938: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6024938, symbol: D_AQ_6024938 } -PAD_60249B8: - { type: BLOB, size: 8, offset: 0x60249B8, symbol: PAD_60249B8 } - -PAD_6024A48: - { type: BLOB, size: 8, offset: 0x6024A48, symbol: PAD_6024A48 } - D_AQ_6024A50: { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 } -PAD_6024AD8: - { type: BLOB, size: 8, offset: 0x6024AD8, symbol: PAD_6024AD8 } - D_AQ_6024F80: { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 } D_AQ_602512C: { type: SF64:SKELETON, offset: 0x602512C, symbol: D_AQ_602512C } -PAD_6025164: - { type: BLOB, size: 12, offset: 0x6025164, symbol: PAD_6025164 } - D_AQ_60260EC: { type: SF64:ANIM, offset: 0x60260EC, symbol: D_AQ_60260EC } D_AQ_60263F8: { type: SF64:SKELETON, offset: 0x60263F8, symbol: D_AQ_60263F8 } -PAD_AQ_60266A8: - { type: BLOB, size: 8, offset: 0x60266A8, symbol: PAD_AQ_60266A8 } - -PAD_6026C78: - { type: BLOB, size: 8, offset: 0x6026C78, symbol: PAD_6026C78 } - -PAD_6026D08: - { type: BLOB, size: 8, offset: 0x6026D08, symbol: PAD_6026D08 } - -PAD_6026D98: - { type: BLOB, size: 8, offset: 0x6026D98, symbol: PAD_6026D98 } - -PAD_6026E28: - { type: BLOB, size: 8, offset: 0x6026E28, symbol: PAD_6026E28 } - -PAD_6026EB8: - { type: BLOB, size: 8, offset: 0x6026EB8, symbol: PAD_6026EB8 } - -PAD_6026F58: - { type: BLOB, size: 8, offset: 0x6026F58, symbol: PAD_6026F58 } - -PAD_60273B8: - { type: BLOB, size: 8, offset: 0x60273B8, symbol: PAD_60273B8 } - -PAD_6027458: - { type: BLOB, size: 8, offset: 0x6027458, symbol: PAD_6027458 } - -PAD_60276E8: - { type: BLOB, size: 8, offset: 0x60276E8, symbol: PAD_60276E8 } - -PAD_6027C88: - { type: BLOB, size: 8, offset: 0x6027C88, symbol: PAD_6027C88 } - -PAD_6028238: - { type: BLOB, size: 8, offset: 0x6028238, symbol: PAD_6028238 } - -PAD_60287E8: - { type: BLOB, size: 8, offset: 0x60287E8, symbol: PAD_60287E8 } - -PAD_6028F48: - { type: BLOB, size: 8, offset: 0x6028F48, symbol: PAD_6028F48 } - -PAD_6029238: - { type: BLOB, size: 8, offset: 0x6029238, symbol: PAD_6029238 } - -PAD_6029528: - { type: BLOB, size: 8, offset: 0x6029528, symbol: PAD_6029528 } - D_AQ_602AC28: { type: SF64:ANIM, offset: 0x602AC28, symbol: D_AQ_602AC28 } -PAD_602AC34: - { type: BLOB, size: 12, offset: 0x602AC34, symbol: PAD_602AC34 } - D_AQ_602AC40: { type: GFX, offset: 0x602AC40, symbol: D_AQ_602AC40 } @@ -625,18 +416,12 @@ D_AQ_602B9D4: # unused and possibly broken D_AQ_602BD60: { type: SF64:SKELETON, offset: 0x602BD60, symbol: D_AQ_602BD60 } -PAD_602BDD4: - { type: BLOB, size: 12, offset: 0x602BDD4, symbol: PAD_602BDD4 } - D_AQ_602BF88: { type: SF64:ANIM, offset: 0x602BF88, symbol: D_AQ_602BF88 } D_AQ_602C014: { type: SF64:SKELETON, offset: 0x602C014, symbol: D_AQ_602C014 } -PAD_602C028: - { type: BLOB, size: 8, offset: 0x602C028, symbol: PAD_602C028 } - D_AQ_602C030: { type: GFX, offset: 0x602C030, symbol: D_AQ_602C030 } @@ -649,9 +434,6 @@ D_AQ_602C160: D_AQ_602C960: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C960, symbol: D_AQ_602C960 } -PAD_602D2B8: - { type: BLOB, size: 8, offset: 0x602D2B8, symbol: PAD_602D2B8 } - D_AQ_602DA28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602DA28, symbol: D_AQ_602DA28 } @@ -664,12 +446,6 @@ D_AQ_602DE28: D_AQ_602E028: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602E028, symbol: D_AQ_602E028 } -PAD_602E228: - { type: BLOB, size: 8, offset: 0x602E228, symbol: PAD_602E228 } - -PAD_602E538: - { type: BLOB, size: 8, offset: 0x602E538, symbol: PAD_602E538 } - D_AQ_602E540: { type: SF64:ENV_SETTINGS, offset: 0x602E540, symbol: D_AQ_602E540 } @@ -790,9 +566,6 @@ D_AQ_6031570: D_AQ_603158C: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x603158C, symbol: D_AQ_603158C } -PAD_6031D8C: - { type: BLOB, size: 4, offset: 0x6031D8C, symbol: PAD_6031D8C } - D_AQ_6031D90: { type: VTX, count: 34, offset: 0x6031D90, symbol: D_AQ_6031D90 } diff --git a/assets/yaml/us/ast_area_6.yaml b/assets/yaml/us/ast_area_6.yaml index d0901f73..cdc4c6e1 100644 --- a/assets/yaml/us/ast_area_6.yaml +++ b/assets/yaml/us/ast_area_6.yaml @@ -36,9 +36,6 @@ D_A6_6006620: D_A6_6006A40: { type: TEXTURE, ctype: u16, format: TLUT, colors: 4, offset: 0x6006A40, symbol: D_A6_6006A40} -PAD_A6_6006A48: - { type: BLOB, size: 0x8, offset: 0x6006A48, symbol: PAD_A6_6006A48} - D_A6_6008918: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008918, symbol: D_A6_6008918 } @@ -57,15 +54,6 @@ D_A6_6009718: D_A6_6009B18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 } -PAD_A6_600A318: - { type: BLOB, size: 0x8, offset: 0x600A318, symbol: PAD_A6_600A318} - -PAD_A6_600C1E8: - { type: BLOB, size: 0x8, offset: 0x600C1E8, symbol: PAD_A6_600C1E8} - -PAD_A6_600E0B8: - { type: BLOB, size: 0x8, offset: 0x600E0B8, symbol: PAD_A6_600E0B8} - D_A6_600E0C0: { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 } @@ -75,9 +63,6 @@ D_A6_600EBE8: D_A6_600EFE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600EFE8, symbol: D_A6_600EFE8 } -PAD_A6_600F1E8: - { type: BLOB, size: 0x8, offset: 0x600F1E8, symbol: PAD_A6_600F1E8} - D_A6_600F1F0: { type: GFX, offset: 0x600F1F0, symbol: D_A6_600F1F0 } @@ -96,18 +81,12 @@ D_A6_6011688: D_A6_6011888: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06011888, symbol: D_A6_6011888 } -PAD_A6_6011908: - { type: BLOB, size: 0x8, offset: 0x6011908, symbol: PAD_A6_6011908} - D_A6_6011910: { type: GFX, offset: 0x6011910, symbol: D_A6_6011910 } D_A6_6011D48: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011D48, symbol: D_A6_6011D48 } -PAD_A6_6012548: - { type: BLOB, size: 0x8, offset: 0x6012548, symbol: PAD_A6_6012548} - D_A6_6012550: { type: GFX, offset: 0x6012550, symbol: D_A6_6012550 } @@ -132,15 +111,9 @@ D_A6_60154D8: D_A6_6015CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015CD8, symbol: D_A6_6015CD8 } -PAD_A6_6015ED8: - { type: BLOB, size: 0x8, offset: 0x6015ED8, symbol: PAD_A6_6015ED8} - D_A6_6015EE0: { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 } -PAD_A6_6016188: - { type: BLOB, size: 0x8, offset: 0x6016188, symbol: PAD_A6_6016188} - D_A6_6016190: { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 } @@ -168,18 +141,12 @@ D_A6_60187F8: D_A6_6018878: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x6018878, symbol: D_A6_6018878} -PAD_A6_6018888: - { type: BLOB, size: 0x8, offset: 0x6018888, symbol: PAD_A6_6018888} - D_A6_6018994: { type: SF64:ANIM, offset: 0x6018994, symbol: D_A6_6018994 } D_A6_6018BA0: { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 } -PAD_A6_6018BE4: - { type: BLOB, size: 0xC, offset: 0x6018BE4, symbol: PAD_A6_6018BE4} - D_A6_6018BF0: { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 } @@ -216,18 +183,12 @@ D_A6_601AA20: D_A6_601AAA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AAA8, symbol: D_A6_601AAA8 } -PAD_A6_601B2A8: - { type: BLOB, size: 0x8, offset: 0x601B2A8, symbol: PAD_A6_601B2A8} - D_A6_601B2B0: { type: GFX, offset: 0x601B2B0, symbol: D_A6_601B2B0 } D_A6_601B338: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B338, symbol: D_A6_601B338 } -PAD_A6_601BB38: - { type: BLOB, size: 0x8, offset: 0x601BB38, symbol: PAD_A6_601BB38} - D_A6_601BB40: { type: GFX, offset: 0x601BB40, symbol: D_A6_601BB40 } @@ -279,9 +240,6 @@ D_A6_6028454: D_A6_6028578: { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 } -PAD_A6_6028754: - { type: BLOB, size: 0xC, offset: 0x6028754, symbol: PAD_A6_6028754} - D_A6_6028760: { type: SF64:ENV_SETTINGS, offset: 0x6028760, symbol: D_A6_6028760} diff --git a/assets/yaml/us/ast_arwing.yaml b/assets/yaml/us/ast_arwing.yaml index 1ef3b94a..1c9a823a 100644 --- a/assets/yaml/us/ast_arwing.yaml +++ b/assets/yaml/us/ast_arwing.yaml @@ -18,9 +18,6 @@ D_arwing_3000080: D_arwing_3000090: { type: GFX, offset: 0x3000090, symbol: D_arwing_3000090 } -PAD_arwing_3001C88: - { type: BLOB, offset: 0x3001C88, size: 0x8, symbol: PAD_arwing_3001C88 } - D_arwing_3001C90: { type: GFX, offset: 0x3001C90, symbol: D_arwing_3001C90 } @@ -106,7 +103,7 @@ D_arwing_300F448: { type: TEXTURE, format: RGBA16, offset: 0x300F448, width: 64, height: 32, ctype: u16, symbol: D_arwing_300F448 } D_arwing_3010448: - { type: TEXTURE, format: RGBA16, offset: 0x3010448, width: 64, height: 32, ctype: u16, symbol: D_arwing_3010448, pad: 0x8 } + { type: TEXTURE, format: RGBA16, offset: 0x3010448, width: 64, height: 32, ctype: u16, symbol: D_arwing_3010448 } D_arwing_3011720: { type: GFX, offset: 0x3011720, symbol: D_arwing_3011720 } @@ -130,7 +127,7 @@ D_arwing_3013FE8: { type: TEXTURE, format: RGBA16, offset: 0x3013FE8, width: 32, height: 32, ctype: u16, symbol: D_arwing_3013FE8 } D_arwing_30147E8: - { type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_arwing_30147E8, pad: 8 } + { type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_arwing_30147E8 } D_arwing_3014BF0: { type: GFX, offset: 0x3014BF0, symbol: D_arwing_3014BF0 } @@ -141,62 +138,35 @@ D_arwing_3014F20: D_arwing_3015120: { type: GFX, offset: 0x3015120, symbol: D_arwing_3015120 } -PAD_arwing_30155D8: - { type: BLOB, offset: 0x30155D8, size: 0x8, symbol: PAD_arwing_30155D8 } - D_arwing_30155E0: { type: GFX, offset: 0x30155E0, symbol: D_arwing_30155E0} -PAD_arwing_3015728: - { type: BLOB, offset: 0x3015728, size: 0x8, symbol: PAD_arwing_3015728 } - -PAD_arwing_3015878: - { type: BLOB, offset: 0x3015878, size: 0x8, symbol: PAD_arwing_3015878 } - -PAD_arwing_30159C8: - { type: BLOB, offset: 0x30159C8, size: 0x8, symbol: PAD_arwing_30159C8 } - D_arwing_3015AF4: { type: SF64:ANIM, offset: 0x3015AF4, symbol: D_arwing_3015AF4 } D_arwing_3015C28: { type: SF64:ANIM, offset: 0x3015C28, symbol: D_arwing_3015C28 } -PAD_arwing_3015C34: - { type: BLOB, offset: 0x3015C34, size: 0xC, symbol: PAD_arwing_3015C34 } - D_arwing_3015D68: { type: SF64:ANIM, offset: 0x3015D68, symbol: D_arwing_3015D68 } -PAD_arwing_3015D74: - { type: BLOB, offset: 0x3015D74, size: 0xC, symbol: PAD_arwing_3015D74 } - D_arwing_3015D80: { type: GFX, offset: 0x3015D80, symbol: D_arwing_3015D80 } -PAD_arwing_3016298: - { type: BLOB, offset: 0x3016298, size: 0x8, symbol: PAD_arwing_3016298 } - D_arwing_30163C4: { type: SF64:ANIM, offset: 0x30163C4, symbol: D_arwing_30163C4 } D_arwing_3016610: { type: SF64:SKELETON, offset: 0x3016610, symbol: D_arwing_3016610 } -PAD_arwing_301665C: - { type: BLOB, offset: 0x301665C, size: 0x4, symbol: PAD_arwing_301665C } - D_arwing_3016660: { type: GFX, offset: 0x3016660, symbol: D_arwing_3016660} -PAD_arwing_3016B28: - { type: BLOB, offset: 0x3016B28, size: 0x8, symbol: PAD_arwing_3016B28 } - D_arwing_3016B30: { type: GFX, offset: 0x3016B30, symbol: D_arwing_3016B30 } D_arwing_3016BB8: - { type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_arwing_3016BB8, pad: 8 } + { type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_arwing_3016BB8 } D_arwing_3016CC0: { type: GFX, offset: 0x3016CC0, symbol: D_arwing_3016CC0 } @@ -205,7 +175,7 @@ D_arwing_30182C8: { type: TEXTURE, format: RGBA16, offset: 0x30182C8, width: 8, height: 8, ctype: u16, symbol: D_arwing_30182C8 } D_arwing_3018348: - { type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_arwing_3018348, pad: 8 } + { type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_arwing_3018348 } D_arwing_30183D0: { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 } @@ -214,13 +184,10 @@ D_arwing_30184D8: { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 } D_arwing_3018CD8: - { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8, pad: 8 } + { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 } D_arwing_30194E0: { type: GFX, offset: 0x30194E0, symbol: D_arwing_30194E0 } D_arwing_30195E8: { type: TEXTURE, format: RGBA16, offset: 0x30195E8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30195E8 } - -PAD_arwing_3019DE8: - { type: BLOB, offset: 0x3019DE8, size: 0x8, symbol: PAD_arwing_3019DE8 } \ No newline at end of file diff --git a/assets/yaml/us/ast_bg_planet.yaml b/assets/yaml/us/ast_bg_planet.yaml index 491be2b4..2f664cad 100644 --- a/assets/yaml/us/ast_bg_planet.yaml +++ b/assets/yaml/us/ast_bg_planet.yaml @@ -13,118 +13,118 @@ D_BG_PLANET_2000000: { type: GFX, offset: 0x2000000, symbol: D_BG_PLANET_2000000 } D_BG_PLANET_2000088: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_PLANET_2000088, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_PLANET_2000088 } D_BG_PLANET_2001090: { type: GFX, offset: 0x2001090, symbol: D_BG_PLANET_2001090 } D_BG_PLANET_2001118: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02001118, symbol: D_BG_PLANET_2001118, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02001118, symbol: D_BG_PLANET_2001118 } D_BG_PLANET_2002120: { type: GFX, offset: 0x2002120, symbol: D_BG_PLANET_2002120 } D_BG_PLANET_20021A8: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020021A8, symbol: D_BG_PLANET_20021A8, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020021A8, symbol: D_BG_PLANET_20021A8 } D_BG_PLANET_20031B0: { type: GFX, offset: 0x20031B0, symbol: D_BG_PLANET_20031B0 } D_BG_PLANET_2003238: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02003238, symbol: D_BG_PLANET_2003238, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02003238, symbol: D_BG_PLANET_2003238 } D_BG_PLANET_2004240: { type: GFX, offset: 0x2004240, symbol: D_BG_PLANET_2004240 } D_BG_PLANET_20042C8: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020042C8, symbol: D_BG_PLANET_20042C8, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020042C8, symbol: D_BG_PLANET_20042C8 } D_BG_PLANET_20052D0: { type: GFX, offset: 0x20052D0, symbol: D_BG_PLANET_20052D0 } D_BG_PLANET_2005358: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02005358, symbol: D_BG_PLANET_2005358, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02005358, symbol: D_BG_PLANET_2005358 } D_BG_PLANET_2006360: { type: GFX, offset: 0x2006360, symbol: D_BG_PLANET_2006360 } D_BG_PLANET_20063E8: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020063E8, symbol: D_BG_PLANET_20063E8, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020063E8, symbol: D_BG_PLANET_20063E8 } D_BG_PLANET_20073F0: { type: GFX, offset: 0x20073F0, symbol: D_BG_PLANET_20073F0 } D_BG_PLANET_2007478: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02007478, symbol: D_BG_PLANET_2007478, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02007478, symbol: D_BG_PLANET_2007478 } D_BG_PLANET_2008480: { type: GFX, offset: 0x2008480, symbol: D_BG_PLANET_2008480 } D_BG_PLANET_2008508: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02008508, symbol: D_BG_PLANET_2008508, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02008508, symbol: D_BG_PLANET_2008508 } D_BG_PLANET_2009510: { type: GFX, offset: 0x2009510, symbol: D_BG_PLANET_2009510 } D_BG_PLANET_2009598: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02009598, symbol: D_BG_PLANET_2009598, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02009598, symbol: D_BG_PLANET_2009598 } D_BG_PLANET_200A5A0: { type: GFX, offset: 0x200A5A0, symbol: D_BG_PLANET_200A5A0 } D_BG_PLANET_200A628: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200A628, symbol: D_BG_PLANET_200A628, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200A628, symbol: D_BG_PLANET_200A628 } D_BG_PLANET_200B630: { type: GFX, offset: 0x200B630, symbol: D_BG_PLANET_200B630 } D_BG_PLANET_200B6B8: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200B6B8, symbol: D_BG_PLANET_200B6B8, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200B6B8, symbol: D_BG_PLANET_200B6B8 } D_BG_PLANET_200C6C0: { type: GFX, offset: 0x200C6C0, symbol: D_BG_PLANET_200C6C0 } D_BG_PLANET_200C748: - { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200C748, symbol: D_BG_PLANET_200C748, pad: 8 } + { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200C748, symbol: D_BG_PLANET_200C748 } D_BG_PLANET_200D750: { type: GFX, offset: 0x200D750, symbol: D_BG_PLANET_200D750 } D_BG_PLANET_200D7E8: - { type: TEXTURE, ctype: u16, format: IA16, width: 64, height: 32, offset: 0x0200D7E8, symbol: D_BG_PLANET_200D7E8, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 64, height: 32, offset: 0x0200D7E8, symbol: D_BG_PLANET_200D7E8 } D_BG_PLANET_200E7F0: { type: GFX, offset: 0x200E7F0, symbol: D_BG_PLANET_200E7F0 } D_BG_PLANET_200E878: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200E878, symbol: D_BG_PLANET_200E878, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200E878, symbol: D_BG_PLANET_200E878 } D_BG_PLANET_200F080: { type: GFX, offset: 0x200F080, symbol: D_BG_PLANET_200F080 } D_BG_PLANET_200F108: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F108, symbol: D_BG_PLANET_200F108, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F108, symbol: D_BG_PLANET_200F108 } D_BG_PLANET_200F910: { type: GFX, offset: 0x200F910, symbol: D_BG_PLANET_200F910 } D_BG_PLANET_200F998: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F998, symbol: D_BG_PLANET_200F998, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F998, symbol: D_BG_PLANET_200F998 } D_BG_PLANET_20101A0: { type: GFX, offset: 0x20101A0, symbol: D_BG_PLANET_20101A0 } D_BG_PLANET_2010228: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010228, symbol: D_BG_PLANET_2010228, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010228, symbol: D_BG_PLANET_2010228 } D_BG_PLANET_2010A30: { type: GFX, offset: 0x2010A30, symbol: D_BG_PLANET_2010A30 } D_BG_PLANET_2010AB8: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010AB8, symbol: D_BG_PLANET_2010AB8, pad: 8 } + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010AB8, symbol: D_BG_PLANET_2010AB8 } D_BG_PLANET_20112C0: { type: GFX, offset: 0x20112C0, symbol: D_BG_PLANET_20112C0 } D_BG_PLANET_2011358: - { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02011358, symbol: D_BG_PLANET_2011358, pad: 8 } \ No newline at end of file + { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02011358, symbol: D_BG_PLANET_2011358 } \ No newline at end of file diff --git a/assets/yaml/us/ast_bg_space.yaml b/assets/yaml/us/ast_bg_space.yaml index 9c7fa861..430121a2 100644 --- a/assets/yaml/us/ast_bg_space.yaml +++ b/assets/yaml/us/ast_bg_space.yaml @@ -13,82 +13,82 @@ D_BG_SPACE_2000000: { type: GFX, offset: 0x2000000, symbol: D_BG_SPACE_2000000 } D_BG_SPACE_2000088: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_SPACE_2000088, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_SPACE_2000088 } D_BG_SPACE_2000890: { type: GFX, offset: 0x2000890, symbol: D_BG_SPACE_2000890 } D_BG_SPACE_2000918: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_BG_SPACE_2000918, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_BG_SPACE_2000918 } D_BG_SPACE_2001120: { type: GFX, offset: 0x2001120, symbol: D_BG_SPACE_2001120 } D_BG_SPACE_20011A8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_BG_SPACE_20011A8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_BG_SPACE_20011A8 } D_BG_SPACE_20019B0: { type: GFX, offset: 0x20019B0, symbol: D_BG_SPACE_20019B0 } D_BG_SPACE_2001A38: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_BG_SPACE_2001A38, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_BG_SPACE_2001A38 } D_BG_SPACE_2002240: { type: GFX, offset: 0x2002240, symbol: D_BG_SPACE_2002240 } D_BG_SPACE_20022C8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_BG_SPACE_20022C8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_BG_SPACE_20022C8 } D_BG_SPACE_2002AD0: { type: GFX, offset: 0x2002AD0, symbol: D_BG_SPACE_2002AD0 } D_BG_SPACE_2002B58: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_BG_SPACE_2002B58, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_BG_SPACE_2002B58 } D_BG_SPACE_2003360: { type: GFX, offset: 0x2003360, symbol: D_BG_SPACE_2003360 } D_BG_SPACE_20033E8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_BG_SPACE_20033E8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_BG_SPACE_20033E8 } D_BG_SPACE_2003BF0: { type: GFX, offset: 0x2003BF0, symbol: D_BG_SPACE_2003BF0 } D_BG_SPACE_2003C78: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_BG_SPACE_2003C78, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_BG_SPACE_2003C78 } D_BG_SPACE_2004480: { type: GFX, offset: 0x2004480, symbol: D_BG_SPACE_2004480 } D_BG_SPACE_2004508: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_BG_SPACE_2004508, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_BG_SPACE_2004508 } D_BG_SPACE_2004D10: { type: GFX, offset: 0x2004D10, symbol: D_BG_SPACE_2004D10 } D_BG_SPACE_2004D98: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_BG_SPACE_2004D98, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_BG_SPACE_2004D98 } D_BG_SPACE_20055A0: { type: GFX, offset: 0x20055A0, symbol: D_BG_SPACE_20055A0 } D_BG_SPACE_2005628: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_BG_SPACE_2005628, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_BG_SPACE_2005628 } D_BG_SPACE_2005E30: { type: GFX, offset: 0x2005E30, symbol: D_BG_SPACE_2005E30 } D_BG_SPACE_2005EB8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_BG_SPACE_2005EB8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_BG_SPACE_2005EB8 } D_BG_SPACE_20066C0: { type: GFX, offset: 0x20066C0, symbol: D_BG_SPACE_20066C0 } D_BG_SPACE_2006748: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_BG_SPACE_2006748, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_BG_SPACE_2006748 } D_BG_SPACE_2006F50: { type: GFX, offset: 0x2006F50, symbol: D_BG_SPACE_2006F50 } D_BG_SPACE_2006FD8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_BG_SPACE_2006FD8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_BG_SPACE_2006FD8 } diff --git a/assets/yaml/us/ast_blue_marine.yaml b/assets/yaml/us/ast_blue_marine.yaml index 64636ad9..8c6adb12 100644 --- a/assets/yaml/us/ast_blue_marine.yaml +++ b/assets/yaml/us/ast_blue_marine.yaml @@ -25,7 +25,7 @@ D_blue_marine_3000130: { type: GFX, offset: 0x3000130, symbol: D_blue_marine_3000130 } ast_blue_marine_seg3_vtx_00000418: - { type: VTX, count: 5, offset: 0x3000418, symbol: D_blue_marine_3000418, pad: 2 } + { type: VTX, count: 5, offset: 0x3000418, symbol: D_blue_marine_3000418 } D_blue_marine_3000470: { type: GFX, offset: 0x3000470, symbol: D_blue_marine_3000470 } @@ -43,7 +43,7 @@ D_blue_marine_3000660: { type: GFX, offset: 0x3000660, symbol: D_blue_marine_3000660 } D_blue_marine_30006E8: - { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x30006E8, symbol: D_blue_marine_30006E8, pad: 2 } + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x30006E8, symbol: D_blue_marine_30006E8 } D_blue_marine_3000AF0: { type: GFX, offset: 0x3000AF0, symbol: D_blue_marine_3000AF0 } @@ -79,7 +79,7 @@ D_blue_marine_3005980: { type: GFX, offset: 0x3005980, symbol: D_blue_marine_3005980 } D_blue_marine_30062E8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_blue_marine_30062E8, pad: 4 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_blue_marine_30062E8 } D_blue_marine_3006AF0: { type: GFX, offset: 0x3006AF0, symbol: D_blue_marine_3006AF0 } diff --git a/assets/yaml/us/ast_enmy_space.yaml b/assets/yaml/us/ast_enmy_space.yaml index f4bb146e..3ea12588 100644 --- a/assets/yaml/us/ast_enmy_space.yaml +++ b/assets/yaml/us/ast_enmy_space.yaml @@ -13,14 +13,11 @@ D_ENMY_SPACE_4000080: { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 } D_ENMY_SPACE_400014C: - { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C, pad: 8 } + { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } D_ENMY_SPACE_4000170: { type: GFX, offset: 0x4000170, symbol: D_ENMY_SPACE_4000170 } -PAD_4000648: - { type: BLOB, offset: 0x4000648, size: 0x8, symbol: PAD_4000648 } - D_ENMY_SPACE_4000650: { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 } @@ -30,9 +27,6 @@ D_ENMY_SPACE_4000EC0: D_ENMY_SPACE_4001108: { type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 } -PAD_4001308: - { type: BLOB, offset: 0x4001308, size: 0x8, symbol: PAD_4001308 } - D_ENMY_SPACE_4001310: { type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 } @@ -51,9 +45,6 @@ D_ENMY_SPACE_4002030: D_ENMY_SPACE_4002230: { type: GFX, offset: 0x4002230, symbol: D_ENMY_SPACE_4002230 } -PAD_4002658: - { type: BLOB, offset: 0x4002658, size: 0x8, symbol: PAD_4002658 } - D_ENMY_SPACE_4002C50: { type: TEXTURE, format: RGBA16, offset: 0x04002C50, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4002C50 } @@ -91,7 +82,7 @@ D_ENMY_SPACE_40067E8: { type: TEXTURE, format: RGBA16, offset: 0x40067E8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_40067E8 } D_ENMY_SPACE_40077E8: - { type: TEXTURE, format: RGBA16, offset: 0x40077E8, width: 8, height: 8, ctype: u16, symbol: D_ENMY_SPACE_40077E8, pad: 8 } + { type: TEXTURE, format: RGBA16, offset: 0x40077E8, width: 8, height: 8, ctype: u16, symbol: D_ENMY_SPACE_40077E8 } D_ENMY_SPACE_4007870: { type: GFX, offset: 0x4007870, symbol: D_ENMY_SPACE_4007870 } @@ -108,9 +99,6 @@ D_ENMY_SPACE_4008550: D_ENMY_SPACE_4008D50: { type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 } -PAD_4008F98: - { type: BLOB, offset: 0x4008F98, size: 0x8, symbol: PAD_4008F98 } - D_ENMY_SPACE_4008FA0: { type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 } @@ -123,35 +111,23 @@ D_ENMY_SPACE_40098B8: D_ENMY_SPACE_4009AB8: { type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 } -PAD_400A2B8: - { type: BLOB, offset: 0x400A2B8, size: 0x8, symbol: PAD_400A2B8 } - D_ENMY_SPACE_400A30C: { type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C } D_ENMY_SPACE_400A398: { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 } -PAD_400A3AC: - { type: BLOB, offset: 0x400A3AC, size: 0x4, symbol: PAD_400A3AC } - D_ENMY_SPACE_400A630: { type: GFX, offset: 0x400A630, symbol: D_ENMY_SPACE_400A630 } -PAD_400AAD8: - { type: BLOB, offset: 0x400AAD8, size: 0x8, symbol: PAD_400AAD8 } D_ENMY_SPACE_400AAE0: { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 } -PAD_400B388: - { type: BLOB, offset: 0x400B388, size: 0x8, symbol: PAD_400B388 } D_ENMY_SPACE_400B390: { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 } -PAD_400BD18: - { type: BLOB, offset: 0x400BD18, size: 0x8, symbol: PAD_400BD18 } D_ENMY_SPACE_400BD20: { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 } diff --git a/assets/yaml/us/ast_font.yaml b/assets/yaml/us/ast_font.yaml index d775d182..eca27483 100644 --- a/assets/yaml/us/ast_font.yaml +++ b/assets/yaml/us/ast_font.yaml @@ -75,11 +75,11 @@ D_50021F0: # ACCOM D_50022F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 23, offset: 0x50022F0, symbol: D_50022F0, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 23, offset: 0x50022F0, symbol: D_50022F0 } # PLISHED D_5002DC0: - { type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002DC0, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002DC0 } # MISSION D_5003A00: @@ -367,7 +367,7 @@ D_500A7D0: # 終 (Japanese letter meaning END) D_500A8C0: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 49, offset: 0x500A8C0, symbol: D_500A8C0, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 49, offset: 0x500A8C0, symbol: D_500A8C0 } # T (small) D_500B380: diff --git a/assets/yaml/us/ast_font_3d.yaml b/assets/yaml/us/ast_font_3d.yaml index b9c0b25d..a498f6fc 100644 --- a/assets/yaml/us/ast_font_3d.yaml +++ b/assets/yaml/us/ast_font_3d.yaml @@ -9,196 +9,121 @@ - '#include "sf64object.h"' - '#include "structs.h"' -D_9000000: - { type: GFX, offset: 0x9000000, symbol: D_9000000 } +D_FONT3D_9000000: + { type: GFX, offset: 0x9000000, symbol: D_FONT3D_9000000 } -D_90001F0: - { type: GFX, offset: 0x90001F0, symbol: D_90001F0 } +D_FONT3D_90001F0: + { type: GFX, offset: 0x90001F0, symbol: D_FONT3D_90001F0 } -D_9000528: - { type: TEXTURE, ctype: u8, format: CI4, width: 8, height: 8, offset: 0x09000528, symbol: D_9000528, tlut: 0x09000548 } +D_FONT3D_9000528: + { type: TEXTURE, ctype: u8, format: CI4, width: 8, height: 8, offset: 0x09000528, symbol: D_FONT3D_9000528, tlut: 0x09000548 } -D_9000548: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x09000548, symbol: D_9000548 } +D_FONT3D_9000548: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x09000548, symbol: D_FONT3D_9000548 } -PAD_9000568: - { type: BLOB, size: 8, offset: 0x9000568, symbol: PAD_9000568 } +D_FONT3D_9000570: + { type: GFX, offset: 0x9000570, symbol: D_FONT3D_9000570 } -D_9000570: - { type: GFX, offset: 0x9000570, symbol: D_9000570 } +D_FONT3D_9000980: + { type: GFX, offset: 0x9000980, symbol: D_FONT3D_9000980 } -PAD_9000978: - { type: BLOB, size: 8, offset: 0x9000978, symbol: PAD_9000978 } +D_FONT3D_9001120: + { type: GFX, offset: 0x9001120, symbol: D_FONT3D_9001120 } -D_9000980: - { type: GFX, offset: 0x9000980, symbol: D_9000980 } +D_FONT3D_90014E0: + { type: GFX, offset: 0x90014E0, symbol: D_FONT3D_90014E0 } -PAD_9001118: - { type: BLOB, size: 8, offset: 0x9001118, symbol: PAD_9001118 } +D_FONT3D_9001A10: + { type: GFX, offset: 0x9001A10, symbol: D_FONT3D_9001A10 } -D_9001120: - { type: GFX, offset: 0x9001120, symbol: D_9001120 } +D_FONT3D_9001E90: + { type: GFX, offset: 0x9001E90, symbol: D_FONT3D_9001E90 } -PAD_90014D8: - { type: BLOB, size: 8, offset: 0x90014D8, symbol: PAD_90014D8 } +D_FONT3D_90022A0: + { type: GFX, offset: 0x90022A0, symbol: D_FONT3D_90022A0 } -D_90014E0: - { type: GFX, offset: 0x90014E0, symbol: D_90014E0 } +D_FONT3D_9002890: + { type: GFX, offset: 0x9002890, symbol: D_FONT3D_9002890 } -PAD_9001A08: - { type: BLOB, size: 8, offset: 0x9001A08, symbol: PAD_9001A08 } +D_FONT3D_9002EA0: + { type: GFX, offset: 0x9002EA0, symbol: D_FONT3D_9002EA0 } -D_9001A10: - { type: GFX, offset: 0x9001A10, symbol: D_9001A10 } +D_FONT3D_9003230: + { type: GFX, offset: 0x9003230, symbol: D_FONT3D_9003230 } -PAD_9001E88: - { type: BLOB, size: 8, offset: 0x9001E88, symbol: PAD_9001E88 } +D_FONT3D_9003620: + { type: GFX, offset: 0x9003620, symbol: D_FONT3D_9003620 } -D_9001E90: - { type: GFX, offset: 0x9001E90, symbol: D_9001E90 } +D_FONT3D_9003A30: + { type: GFX, offset: 0x9003A30, symbol: D_FONT3D_9003A30 } -D_90022A0: - { type: GFX, offset: 0x90022A0, symbol: D_90022A0 } +D_FONT3D_9004230: + { type: GFX, offset: 0x9004230, symbol: D_FONT3D_9004230 } -D_9002890: - { type: GFX, offset: 0x9002890, symbol: D_9002890 } +D_FONT3D_9004920: + { type: GFX, offset: 0x9004920, symbol: D_FONT3D_9004920 } -PAD_9002E98: - { type: BLOB, size: 8, offset: 0x9002E98, symbol: PAD_9002E98 } +D_FONT3D_9004E10: + { type: GFX, offset: 0x9004E10, symbol: D_FONT3D_9004E10 } -D_9002EA0: - { type: GFX, offset: 0x9002EA0, symbol: D_9002EA0 } +D_FONT3D_9005380: + { type: GFX, offset: 0x9005380, symbol: D_FONT3D_9005380 } -D_9003230: - { type: GFX, offset: 0x9003230, symbol: D_9003230 } +D_FONT3D_9005980: + { type: GFX, offset: 0x9005980, symbol: D_FONT3D_9005980 } -PAD_9003618: - { type: BLOB, size: 8, offset: 0x9003618, symbol: PAD_9003618 } +D_FONT3D_9005CA0: + { type: GFX, offset: 0x9005CA0, symbol: D_FONT3D_9005CA0 } -D_9003620: - { type: GFX, offset: 0x9003620, symbol: D_9003620 } +D_FONT3D_90062D0: + { type: GFX, offset: 0x90062D0, symbol: D_FONT3D_90062D0 } -PAD_9003A28: - { type: BLOB, size: 8, offset: 0x9003A28, symbol: PAD_9003A28 } +D_FONT3D_9006500: + { type: GFX, offset: 0x9006500, symbol: D_FONT3D_9006500 } -D_9003A30: - { type: GFX, offset: 0x9003A30, symbol: D_9003A30 } +D_FONT3D_9006AE0: + { type: GFX, offset: 0x9006AE0, symbol: D_FONT3D_9006AE0 } -PAD_9004228: - { type: BLOB, size: 8, offset: 0x9004228, symbol: PAD_9004228 } +D_FONT3D_90070C0: + { type: GFX, offset: 0x90070C0, symbol: D_FONT3D_90070C0 } -D_9004230: - { type: GFX, offset: 0x9004230, symbol: D_9004230 } +D_FONT3D_90075A0: + { type: GFX, offset: 0x90075A0, symbol: D_FONT3D_90075A0 } -PAD_9004918: - { type: BLOB, size: 8, offset: 0x9004918, symbol: PAD_9004918 } +D_FONT3D_9007BB0: + { type: GFX, offset: 0x9007BB0, symbol: D_FONT3D_9007BB0 } -D_9004920: - { type: GFX, offset: 0x9004920, symbol: D_9004920 } +D_FONT3D_9007FD0: + { type: GFX, offset: 0x9007FD0, symbol: D_FONT3D_9007FD0 } -PAD_9004E08: - { type: BLOB, size: 8, offset: 0x9004E08, symbol: PAD_9004E08 } +D_FONT3D_90086F0: + { type: GFX, offset: 0x90086F0, symbol: D_FONT3D_90086F0 } -D_9004E10: - { type: GFX, offset: 0x9004E10, symbol: D_9004E10 } +D_FONT3D_9008C60: + { type: GFX, offset: 0x9008C60, symbol: D_FONT3D_9008C60 } -PAD_9005378: - { type: BLOB, size: 8, offset: 0x9005378, symbol: PAD_9005378 } +D_FONT3D_9009280: + { type: GFX, offset: 0x9009280, symbol: D_FONT3D_9009280 } -D_9005380: - { type: GFX, offset: 0x9005380, symbol: D_9005380 } +D_FONT3D_9009990: + { type: GFX, offset: 0x9009990, symbol: D_FONT3D_9009990 } -D_9005980: - { type: GFX, offset: 0x9005980, symbol: D_9005980 } +D_FONT3D_9009CB0: + { type: GFX, offset: 0x9009CB0, symbol: D_FONT3D_9009CB0 } -PAD_9005C98: - { type: BLOB, size: 8, offset: 0x9005C98, symbol: PAD_9005C98 } +D_FONT3D_900A290: + { type: GFX, offset: 0x900A290, symbol: D_FONT3D_900A290 } -D_9005CA0: - { type: GFX, offset: 0x9005CA0, symbol: D_9005CA0 } +D_FONT3D_900A870: + { type: GFX, offset: 0x900A870, symbol: D_FONT3D_900A870 } -PAD_90062C8: - { type: BLOB, size: 8, offset: 0x90062C8, symbol: PAD_90062C8 } +D_FONT3D_900AF60: + { type: GFX, offset: 0x900AF60, symbol: D_FONT3D_900AF60 } -D_90062D0: - { type: GFX, offset: 0x90062D0, symbol: D_90062D0 } +D_FONT3D_900B580: + { type: GFX, offset: 0x900B580, symbol: D_FONT3D_900B580 } -D_9006500: - { type: GFX, offset: 0x9006500, symbol: D_9006500 } - -D_9006AE0: - { type: GFX, offset: 0x9006AE0, symbol: D_9006AE0 } - -D_90070C0: - { type: GFX, offset: 0x90070C0, symbol: D_90070C0 } - -D_90075A0: - { type: GFX, offset: 0x90075A0, symbol: D_90075A0 } - -PAD_9007BA8: - { type: BLOB, size: 8, offset: 0x9007BA8, symbol: PAD_9007BA8 } - -D_9007BB0: - { type: GFX, offset: 0x9007BB0, symbol: D_9007BB0 } - -PAD_9007FC8: - { type: BLOB, size: 8, offset: 0x9007FC8, symbol: PAD_9007FC8 } - -D_9007FD0: - { type: GFX, offset: 0x9007FD0, symbol: D_9007FD0 } - -PAD_90086E8: - { type: BLOB, size: 8, offset: 0x90086E8, symbol: PAD_90086E8 } - -D_90086F0: - { type: GFX, offset: 0x90086F0, symbol: D_90086F0 } - -D_9008C60: - { type: GFX, offset: 0x9008C60, symbol: D_9008C60 } - -PAD_9009278: - { type: BLOB, size: 8, offset: 0x9009278, symbol: PAD_9009278 } - -D_9009280: - { type: GFX, offset: 0x9009280, symbol: D_9009280 } - -PAD_9009988: - { type: BLOB, size: 8, offset: 0x9009988, symbol: PAD_9009988 } - -D_9009990: - { type: GFX, offset: 0x9009990, symbol: D_9009990 } - -PAD_9009CA8: - { type: BLOB, size: 8, offset: 0x9009CA8, symbol: PAD_9009CA8 } - -D_9009CB0: - { type: GFX, offset: 0x9009CB0, symbol: D_9009CB0 } - -PAD_900A288: - { type: BLOB, size: 8, offset: 0x900A288, symbol: PAD_900A288 } - -D_900A290: - { type: GFX, offset: 0x900A290, symbol: D_900A290 } - -D_900A870: - { type: GFX, offset: 0x900A870, symbol: D_900A870 } - -PAD_900AF58: - { type: BLOB, size: 8, offset: 0x900AF58, symbol: PAD_900AF58 } - -D_900AF60: - { type: GFX, offset: 0x900AF60, symbol: D_900AF60 } - -PAD_900B578: - { type: BLOB, size: 8, offset: 0x900B578, symbol: PAD_900B578 } - -D_900B580: - { type: GFX, offset: 0x900B580, symbol: D_900B580 } - -PAD_900BB88: - { type: BLOB, size: 8, offset: 0x900BB88, symbol: PAD_900BB88 } - -D_900BB90: - { type: GFX, offset: 0x900BB90, symbol: D_900BB90 } +D_FONT3D_900BB90: + { type: GFX, offset: 0x900BB90, symbol: D_FONT3D_900BB90 } # size = 0xC1D0 diff --git a/assets/yaml/us/ast_landmaster.yaml b/assets/yaml/us/ast_landmaster.yaml index 8694ac04..7d078761 100644 --- a/assets/yaml/us/ast_landmaster.yaml +++ b/assets/yaml/us/ast_landmaster.yaml @@ -9,7 +9,6 @@ - '#include "sf64object.h"' - '#include "structs.h"' - D_landmaster_3000000: { type: TEXTURE, format: CI4, offset: 0x3000000, width: 16, height: 16, ctype: u8, tlut: 0x3000080, symbol: D_landmaster_3000000 } @@ -49,45 +48,30 @@ D_landmaster_3001E80: D_landmaster_3004680: { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 } -PAD_landmaster_30066A8: - { type: BLOB, offset: 0x30066A8, size: 0x8, symbol: PAD_landmaster_30066A8 } - D_landmaster_30066B0: { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 } D_landmaster_3006738: { type: TEXTURE, format: IA8, offset: 0x3006738, width: 16, height: 32, ctype: u8, symbol: D_landmaster_3006738 } -PAD_landmaster_3006938: - { type: BLOB, offset: 0x3006938, size: 0x8, symbol: PAD_landmaster_3006938 } - D_landmaster_3006940: { type: GFX, offset: 0x3006940, symbol: D_landmaster_3006940 } D_landmaster_30069D8: { type: TEXTURE, format: IA8, offset: 0x030069D8, width: 32, height: 32, ctype: u8, symbol: D_landmaster_30069D8 } -PAD_landmaster_3006DD8: - { type: BLOB, offset: 0x3006DD8, size: 0x8, symbol: PAD_landmaster_3006DD8 } - D_landmaster_3006DE0: { type: GFX, offset: 0x3006DE0, symbol: D_landmaster_3006DE0 } D_landmaster_3006E68: { type: TEXTURE, format: RGBA32, offset: 0x3006E68, width: 32, height: 32, ctype: u32, symbol: D_landmaster_3006E68 } -PAD_landmaster_3007E68: - { type: BLOB, offset: 0x3007E68, size: 0x8, symbol: PAD_landmaster_3007E68 } - D_landmaster_3007E70: { type: GFX, offset: 0x3007E70, symbol: D_landmaster_3007E70 } D_landmaster_3007EF8: { type: TEXTURE, format: RGBA16, offset: 0x3007EF8, width: 16, height: 16, ctype: u16, symbol: D_landmaster_3007EF8 } -PAD_landmaster_30080F8: - { type: BLOB, offset: 0x30080F8, size: 0x8, symbol: PAD_landmaster_30080F8 } - D_landmaster_3008100: { type: GFX, offset: 0x3008100, symbol: D_landmaster_3008100 } diff --git a/assets/yaml/us/ast_option.yaml b/assets/yaml/us/ast_option.yaml index 46caea6c..9369d67e 100644 --- a/assets/yaml/us/ast_option.yaml +++ b/assets/yaml/us/ast_option.yaml @@ -42,7 +42,7 @@ D_8003950: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 11, offset: 0x8003950, symbol: D_8003950, tlut: 0x80039A8 } D_80039A8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_80039A8, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_80039A8 } # D_80039D0: @@ -56,14 +56,14 @@ D_8003A70: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003A70, symbol: D_8003A70, tlut: 0x8003AB8 } D_8003AB8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_8003AB8, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_8003AB8 } # th D_8003AE0: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003AE0, symbol: D_8003AE0, tlut: 0x8003B28 } D_8003B28: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_8003B28, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_8003B28 } # Option Title Cards @@ -124,11 +124,11 @@ D_80064F0: # Voice D_80069C0: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_80069C0, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_80069C0 } # SE D_8006D10: - { type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_8006D10, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_8006D10 } # B to cancel D_8006E50: @@ -176,7 +176,7 @@ D_800B680: # Stereo D_800CD90: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_800CD90, pad: 8 } + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_800CD90 } # UNK: Triangle shape, it's mirrored to form a diamond shape D_800D070: @@ -241,7 +241,7 @@ D_8015550: { type: GFX, offset: 0x8015550, symbol: D_8015550 } D_80155E8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_80155E8, pad: 8 } + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_80155E8 } D_8015DF0: { type: GFX, offset: 0x8015DF0, symbol: D_8015DF0 } diff --git a/assets/yaml/us/ast_sector_x.yaml b/assets/yaml/us/ast_sector_x.yaml index d9fb39bd..9fb12c11 100644 --- a/assets/yaml/us/ast_sector_x.yaml +++ b/assets/yaml/us/ast_sector_x.yaml @@ -33,9 +33,6 @@ D_SX_6001950: D_SX_6001AD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 } -PAD_6001CD8: - { type: BLOB, size: 8, offset: 0x6001CD8, symbol: PAD_6001CD8 } - D_SX_6001CE0: { type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 } @@ -72,9 +69,6 @@ D_SX_6004EE8: D_SX_6005EE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 } -PAD_60066E8: - { type: BLOB, size: 8, offset: 0x60066E8, symbol: PAD_60066E8 } - D_SX_60066F0: { type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 } @@ -93,9 +87,6 @@ D_SX_6008128: D_SX_6008928: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008928, symbol: D_SX_6008928 } -PAD_6008B28: - { type: BLOB, size: 8, offset: 0x6008B28, symbol: PAD_6008B28 } - D_SX_6008B30: { type: GFX, offset: 0x6008B30, symbol: D_SX_6008B30 } @@ -105,15 +96,9 @@ D_SX_6009548: D_SX_6009748: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 } -PAD_6009948: - { type: BLOB, size: 8, offset: 0x6009948, symbol: PAD_6009948 } - D_SX_6009950: { type: GFX, offset: 0x6009950, symbol: D_SX_6009950 } -PAD_6009C28: - { type: BLOB, size: 8, offset: 0x6009C28, symbol: PAD_6009C28 } - D_SX_6009C30: { type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 } @@ -123,9 +108,6 @@ D_SX_6009CC0: D_SX_6009FF8: { type: SF64:ANIM, offset: 0x6009FF8, symbol: D_SX_6009FF8 } -PAD_600A004: - { type: BLOB, size: 0xC, offset: 0x600A004, symbol: PAD_600A004 } - D_SX_600A2D4: { type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 } @@ -141,18 +123,12 @@ D_SX_600AD70: D_SX_600AF70: { type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 } -PAD_600B2A8: - { type: BLOB, size: 8, offset: 0x600B2A8, symbol: PAD_600B2A8 } - D_SX_600B2B0: { type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 } D_SX_600B540: { type: GFX, offset: 0x600B540, symbol: D_SX_600B540 } -PAD_600B828: - { type: BLOB, size: 8, offset: 0x600B828, symbol: PAD_600B828 } - D_SX_600B830: { type: GFX, offset: 0x600B830, symbol: D_SX_600B830 } @@ -165,18 +141,12 @@ D_SX_600C5A0: D_SX_600F890: { type: SF64:ANIM, offset: 0x600F890, symbol: D_SX_600F890 } -PAD_600F89C: - { type: BLOB, size: 4, offset: 0x600F89C, symbol: PAD_600F89C } - D_SX_600F8A0: { type: GFX, offset: 0x600F8A0, symbol: D_SX_600F8A0 } D_SX_600F938: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F938, symbol: D_SX_600F938 } -PAD_6010138: - { type: BLOB, size: 8, offset: 0x6010138, symbol: PAD_6010138 } - D_SX_6010140: { type: GFX, offset: 0x6010140, symbol: D_SX_6010140 } @@ -186,11 +156,8 @@ D_SX_60105A0: D_SX_60123BC: { type: SF64:ANIM, offset: 0x60123BC, symbol: D_SX_60123BC } -PAD_60123C8: - { type: BLOB, size: 0x8, offset: 0x60123C8, symbol: PAD_60123C8 } - D_SX_6013798: - { type: SF64:ANIM, offset: 0x6013798, symbol: D_SX_6013798, pad: 0xC } + { type: SF64:ANIM, offset: 0x6013798, symbol: D_SX_6013798 } D_SX_6013820: { type: SF64:ANIM, offset: 0x6013820, symbol: D_SX_6013820 } @@ -198,51 +165,24 @@ D_SX_6013820: D_SX_601390C: { type: SF64:SKELETON, offset: 0x601390C, symbol: D_SX_601390C } -PAD_601392C: - { type: BLOB, size: 4, offset: 0x601392C, symbol: PAD_601392C } - D_SX_60158C4: { type: SF64:ANIM, offset: 0x60158C4, symbol: D_SX_60158C4 } D_SX_6016E28: { type: SF64:ANIM, offset: 0x6016E28, symbol: D_SX_6016E28 } -PAD_6016E34: - { type: BLOB, size: 0xC, offset: 0x6016E34, symbol: PAD_6016E34 } - -PAD_6017238: - { type: BLOB, size: 0x8, offset: 0x6017238, symbol: PAD_6017238 } - -PAD_60186C8: - { type: BLOB, size: 0x8, offset: 0x60186C8, symbol: PAD_60186C8 } - D_SX_601AA28: { type: SF64:ANIM, offset: 0x601AA28, symbol: D_SX_601AA28 } -PAD_601AA34: - { type: BLOB, size: 0xC, offset: 0x601AA34, symbol: PAD_601AA34 } - D_SX_601C690: { type: SF64:ANIM, offset: 0x601C690, symbol: D_SX_601C690 } -PAD_601C69C: - { type: BLOB, size: 4, offset: 0x601C69C, symbol: PAD_601C69C } - -PAD_601CA48: - { type: BLOB, size: 8, offset: 0x601CA48, symbol: PAD_601CA48 } - -PAD_601CD78: - { type: BLOB, size: 0x8, offset: 0x601CD78, symbol: PAD_601CD78 } - D_SX_60206DC: { type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC } D_SX_6020C68: { type: SF64:SKELETON, offset: 0x6020C68, symbol: D_SX_6020C68 } -PAD_6020D1C: - { type: BLOB, size: 4, offset: 0x6020D1C, symbol: PAD_6020D1C } - D_SX_6020D20: { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 } @@ -256,9 +196,6 @@ D_SX_6021ED0: D_SX_6022DF0: { type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 } -PAD_60234F8: - { type: BLOB, size: 8, offset: 0x60234F8, symbol: PAD_60234F8 } - D_SX_6023500: { type: GFX, offset: 0x6023500, symbol: D_SX_6023500 } @@ -268,69 +205,12 @@ D_SX_6023C30: D_SX_6023E30: { type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 } -PAD_60247A8: - { type: BLOB, size: 8, offset: 0x60247A8, symbol: PAD_60247A8 } - -PAD_6024B78: - { type: BLOB, size: 8, offset: 0x6024B78, symbol: PAD_6024B78 } - -PAD_60243E8: - { type: BLOB, size: 0x8, offset: 0x60243E8, symbol: PAD_60243E8 } - -PAD_6024F58: - { type: BLOB, size: 8, offset: 0x6024F58, symbol: PAD_6024F58 } - -PAD_6025348: - { type: BLOB, size: 8, offset: 0x6025348, symbol: PAD_6025348 } - -PAD_6025728: - { type: BLOB, size: 8, offset: 0x6025728, symbol: PAD_6025728 } - -PAD_6025B08: - { type: BLOB, size: 8, offset: 0x6025B08, symbol: PAD_6025B08 } - -PAD_6025EE8: - { type: BLOB, size: 8, offset: 0x6025EE8, symbol: PAD_6025EE8 } - -PAD_60262B8: - { type: BLOB, size: 8, offset: 0x60262B8, symbol: PAD_60262B8 } - -PAD_60266A8: - { type: BLOB, size: 8, offset: 0x60266A8, symbol: PAD_60266A8 } - -PAD_6026A98: - { type: BLOB, size: 8, offset: 0x6026A98, symbol: PAD_6026A98 } - -PAD_6026E88: - { type: BLOB, size: 8, offset: 0x6026E88, symbol: PAD_6026E88 } - -PAD_6027278: - { type: BLOB, size: 8, offset: 0x6027278, symbol: PAD_6027278 } - -PAD_6027658: - { type: BLOB, size: 8, offset: 0x6027658, symbol: PAD_6027658 } - -PAD_6027A08: - { type: BLOB, size: 8, offset: 0x6027A08, symbol: PAD_6027A08 } - -PAD_6027DE8: - { type: BLOB, size: 8, offset: 0x6027DE8, symbol: PAD_6027DE8 } - -PAD_60281B8: - { type: BLOB, size: 8, offset: 0x60281B8, symbol: PAD_60281B8 } - -PAD_60285E8: - { type: BLOB, size: 8, offset: 0x60285E8, symbol: PAD_60285E8 } - D_SX_60285F0: { type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 } D_SX_6029098: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 } -PAD_6029298: - { type: BLOB, size: 8, offset: 0x6029298, symbol: PAD_6029298 } - D_SX_60292A0: { type: GFX, offset: 0x60292A0, symbol: D_SX_60292A0 } @@ -340,9 +220,6 @@ D_SX_6029890: D_SX_6029918: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x029918, symbol: D_SX_6029918 } -PAD_602A118: - { type: BLOB, size: 8, offset: 0x602A118, symbol: PAD_602A118 } - D_SX_602A120: { type: SF64:ENV_SETTINGS, offset: 0x602A120, symbol: D_SX_602A120 } @@ -412,7 +289,4 @@ D_SX_6032970: D_SX_603298C: { type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C } -PAD_6032AB8: - { type: BLOB, size: 8, offset: 0x6032AB8, symbol: PAD_6032AB8 } - # size = 0x32AC0 \ No newline at end of file diff --git a/assets/yaml/us/ast_training.yaml b/assets/yaml/us/ast_training.yaml index 0207758a..654a8c55 100644 --- a/assets/yaml/us/ast_training.yaml +++ b/assets/yaml/us/ast_training.yaml @@ -46,18 +46,12 @@ D_TR_6003878: D_TR_6004878: { type: TEXTURE, format: RGBA16, offset: 0x06004878, width: 64, height: 32, ctype: u16, symbol: D_TR_6004878 } -PAD_6005878: - { type: BLOB, offset: 0x6005878, size: 0x8, symbol: PAD_6005878 } - D_TR_6005880: { type: GFX, offset: 0x6005880, symbol: D_TR_6005880 } D_TR_6005938: { type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_TR_6005938 } -PAD_6006138: - { type: BLOB, offset: 0x6006138, size: 0x8, symbol: PAD_6006138 } - gItemTrainingRingDL: { type: GFX, offset: 0x6006140, symbol: gItemTrainingRingDL } @@ -67,9 +61,6 @@ D_TR_6006958: D_TR_60069D8: { type: TEXTURE, format: RGBA16, offset: 0x060069D8, width: 8, height: 8, ctype: u16, symbol: D_TR_60069D8 } -PAD_6006A58: - { type: BLOB, offset: 0x6006A58, size: 0x8, symbol: PAD_6006A58 } - D_TR_6006A60: { type: SF64:ENV_SETTINGS, offset: 0x6006A60, symbol: D_TR_6006A60 } diff --git a/assets/yaml/us/ast_vs_player.yaml b/assets/yaml/us/ast_vs_player.yaml index 263e187e..0c352fb9 100644 --- a/assets/yaml/us/ast_vs_player.yaml +++ b/assets/yaml/us/ast_vs_player.yaml @@ -86,17 +86,17 @@ D_vs_player_3003E20: D_vs_player_3004010: { type: TEXTURE, ctype: u8, format: CI8, width: 136, height: 25, offset: 0x3004010, symbol: D_vs_player_3004010, tlut: 0x3004D58 } D_vs_player_3004D58: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3004D58, symbol: D_vs_player_3004D58, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3004D58, symbol: D_vs_player_3004D58 } D_vs_player_3004F60: { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 25, offset: 0x3004F60, symbol: D_vs_player_3004F60, tlut: 0x3005E38 } D_vs_player_3005E38: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3005E38, symbol: D_vs_player_3005E38, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3005E38, symbol: D_vs_player_3005E38 } D_vs_player_3006040: { type: TEXTURE, ctype: u8, format: CI8, width: 104, height: 25, offset: 0x3006040, symbol: D_vs_player_3006040, tlut: 0x3006A68 } D_vs_player_3006A68: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x3006A68, symbol: D_vs_player_3006A68, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x3006A68, symbol: D_vs_player_3006A68 } D_vs_player_3006C60: { type: TEXTURE, ctype: u8, format: CI8, width: 96, height: 23, offset: 0x3006C60, symbol: D_vs_player_3006C60, tlut: 0x3007500 } @@ -106,7 +106,7 @@ D_vs_player_3007500: D_vs_player_30076C0: { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 25, offset: 0x30076C0, symbol: D_vs_player_30076C0, tlut: 0x3008598 } D_vs_player_3008598: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3008598, symbol: D_vs_player_3008598, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3008598, symbol: D_vs_player_3008598 } D_vs_player_30087A0: { type: TEXTURE, ctype: u8, format: CI8, width: 40, height: 40, offset: 0x30087A0, symbol: D_vs_player_30087A0, tlut: 0x3008DE0 } @@ -126,27 +126,27 @@ D_vs_player_300A390: D_vs_player_300A470: { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 23, offset: 0x300A470, symbol: D_vs_player_300A470, tlut: 0x300B218 } D_vs_player_300B218: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x300B218, symbol: D_vs_player_300B218, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x300B218, symbol: D_vs_player_300B218 } D_vs_player_300B3F0: { type: TEXTURE, ctype: u8, format: CI8, width: 168, height: 25, offset: 0x300B3F0, symbol: D_vs_player_300B3F0, tlut: 0x300C458 } D_vs_player_300C458: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x300C458, symbol: D_vs_player_300C458, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x300C458, symbol: D_vs_player_300C458 } D_vs_player_300C660: {type: TEXTURE, ctype: u8, format: CI8, width: 112, height: 25, offset: 0x300C660, symbol: D_vs_player_300C660, tlut: 0x300D150 } D_vs_player_300D150: - {type: TEXTURE, ctype: u16, format: TLUT, colors: 251, offset: 0x300D150, symbol: D_vs_player_300D150, pad: 8} + {type: TEXTURE, ctype: u16, format: TLUT, colors: 251, offset: 0x300D150, symbol: D_vs_player_300D150 } D_vs_player_300D350: { type: TEXTURE, ctype: u8, format: CI8, width: 24, height: 3, offset: 0x300D350, symbol: D_vs_player_300D350, tlut: 0x300D398 } D_vs_player_300D398: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x300D398, symbol: D_vs_player_300D398, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x300D398, symbol: D_vs_player_300D398 } D_vs_player_300D3C0: { type: TEXTURE, ctype: u8, format: CI8, width: 24, height: 3, offset: 0x300D3C0, symbol: D_vs_player_300D3C0, tlut: 0x300D408 } D_vs_player_300D408: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x300D408, symbol: D_vs_player_300D408, pad: 8 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x300D408, symbol: D_vs_player_300D408 } D_vs_player_300D440: { type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 4, offset: 0x300D440, symbol: D_vs_player_300D440, tlut: 0x300D500 } @@ -234,13 +234,13 @@ D_vs_player_3015740: { type: GFX, offset: 0x3015740, symbol: D_vs_player_3015740} D_vs_player_3015898: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3015898, symbol: D_vs_player_3015898, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3015898, symbol: D_vs_player_3015898 } D_vs_player_30160A0: { type: GFX, offset: 0x30160A0, symbol: D_vs_player_30160A0} D_vs_player_30162F8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_vs_player_30162F8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_vs_player_30162F8 } D_vs_player_3016B00: { type: GFX, offset: 0x3016B00, symbol: D_vs_player_3016B00} @@ -288,31 +288,28 @@ D_vs_player_301AD60: { type: GFX, offset: 0x301AD60, symbol: D_vs_player_301AD60} D_vs_player_301ADE8: - {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301ADE8, symbol: D_vs_player_301ADE8, pad: 8 } + {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301ADE8, symbol: D_vs_player_301ADE8 } D_vs_player_301AEF0: { type: GFX, offset: 0x301AEF0, symbol: D_vs_player_301AEF0} D_vs_player_301AF78: - {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_vs_player_301AF78, pad: 8 } + {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_vs_player_301AF78 } D_vs_player_301B080: { type: GFX, offset: 0x301B080, symbol: D_vs_player_301B080} D_vs_player_301B438: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_vs_player_301B438, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_vs_player_301B438 } D_vs_player_301B640: { type: GFX, offset: 0x301B640, symbol: D_vs_player_301B640} -PAD_vs_player_3001B6D8: - {type: BLOB, size: 0x8, offset: 0x301B6D8, symbol: PAD_vs_player_3001B6D8 } - D_vs_player_301B6E0: { type: GFX, offset: 0x301B6E0, symbol: D_vs_player_301B6E0} D_vs_player_301B768: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x301B768, symbol: D_vs_player_301B768, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x301B768, symbol: D_vs_player_301B768 } D_vs_player_301C0A4: { type: SF64:ANIM, offset: 0x301C0A4, symbol: D_vs_player_301C0A4} @@ -321,10 +318,10 @@ D_vs_player_301C3A8: { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_vs_player_301C3A8} D_vs_player_301C614: - { type: SF64:SKELETON, offset: 0x301C614, symbol: D_vs_player_301C614, pad: 12} + { type: SF64:SKELETON, offset: 0x301C614, symbol: D_vs_player_301C614 } D_vs_player_301C79C: - { type: SF64:ANIM, offset: 0x301C79C, symbol: D_vs_player_301C79C, pad: 8} + { type: SF64:ANIM, offset: 0x301C79C, symbol: D_vs_player_301C79C } D_vs_player_301C9B0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301C9B0, symbol: D_vs_player_301C9B0 } @@ -336,22 +333,22 @@ D_vs_player_301CFEC: { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_vs_player_301CFEC} D_vs_player_301D258: - { type: SF64:SKELETON, offset: 0x301D258, symbol: D_vs_player_301D258, pad: 8} + { type: SF64:SKELETON, offset: 0x301D258, symbol: D_vs_player_301D258 } D_vs_player_301D3DC: - { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_vs_player_301D3DC, pad: 8} + { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_vs_player_301D3DC } D_vs_player_301D568: - { type: SF64:ANIM, offset: 0x301D568, symbol: D_vs_player_301D568, pad: 12} + { type: SF64:ANIM, offset: 0x301D568, symbol: D_vs_player_301D568 } D_vs_player_301D888: { type: SF64:ANIM, offset: 0x301D888, symbol: D_vs_player_301D888} D_vs_player_301DB94: - { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_vs_player_301DB94, pad: 8} + { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_vs_player_301DB94 } D_vs_player_301DD6C: - { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_vs_player_301DD6C, pad: 8} + { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_vs_player_301DD6C } D_vs_player_301DEA4: { type: SF64:ANIM, offset: 0x301DEA4, symbol: D_vs_player_301DEA4} @@ -360,7 +357,7 @@ D_vs_player_301E19C: { type: SF64:ANIM, offset: 0x301E19C, symbol: D_vs_player_301E19C} D_vs_player_301E3E8: - { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_vs_player_301E3E8, pad: 12} + { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_vs_player_301E3E8 } D_vs_player_301E560: { type: SF64:ANIM, offset: 0x301E560, symbol: D_vs_player_301E560} @@ -369,110 +366,106 @@ D_vs_player_301E570: { type: GFX, offset: 0x301E570, symbol: D_vs_player_301E570} D_vs_player_301E5F8: - {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301E5F8, symbol: D_vs_player_301E5F8, pad: 8 } + {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301E5F8, symbol: D_vs_player_301E5F8 } D_vs_player_301E700: { type: GFX, offset: 0x301E700, symbol: D_vs_player_301E700} D_vs_player_301E788: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301E788, symbol: D_vs_player_301E788, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301E788, symbol: D_vs_player_301E788 } D_vs_player_301E990: { type: GFX, offset: 0x301E990, symbol: D_vs_player_301E990} D_vs_player_301EA18: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EA18, symbol: D_vs_player_301EA18, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EA18, symbol: D_vs_player_301EA18 } D_vs_player_301EC20: { type: GFX, offset: 0x301EC20, symbol: D_vs_player_301EC20} D_vs_player_301ECA8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301ECA8, symbol: D_vs_player_301ECA8, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301ECA8, symbol: D_vs_player_301ECA8 } D_vs_player_301EEB0: { type: GFX, offset: 0x301EEB0, symbol: D_vs_player_301EEB0} D_vs_player_301EF38: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_vs_player_301EF38, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_vs_player_301EF38 } D_vs_player_301F140: { type: GFX, offset: 0x301F140, symbol: D_vs_player_301F140} -PAD_vs_player_3001F2D8: - {type: BLOB, size: 0x8, offset: 0x301F2D8, symbol: PAD_vs_player_3001F2D8 } - D_vs_player_301F2E0: { type: GFX, offset: 0x301F2E0, symbol: D_vs_player_301F2E0} D_vs_player_301F368: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F368, symbol: D_vs_player_301F368, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F368, symbol: D_vs_player_301F368 } D_vs_player_301F570: { type: GFX, offset: 0x301F570, symbol: D_vs_player_301F570} D_vs_player_301F5F8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F5F8, symbol: D_vs_player_301F5F8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F5F8, symbol: D_vs_player_301F5F8 } D_vs_player_301F800: { type: GFX, offset: 0x301F800, symbol: D_vs_player_301F800} D_vs_player_301F888: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F888, symbol: D_vs_player_301F888, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F888, symbol: D_vs_player_301F888 } D_vs_player_301FA90: { type: GFX, offset: 0x301FA90, symbol: D_vs_player_301FA90} D_vs_player_301FB18: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FB18, symbol: D_vs_player_301FB18, pad: 8 } - + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FB18, symbol: D_vs_player_301FB18 } D_vs_player_301FD20: { type: GFX, offset: 0x301FD20, symbol: D_vs_player_301FD20} D_vs_player_301FDA8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FDA8, symbol: D_vs_player_301FDA8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FDA8, symbol: D_vs_player_301FDA8 } D_vs_player_301FFB0: { type: GFX, offset: 0x301FFB0, symbol: D_vs_player_301FFB0} D_vs_player_3020048: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020048, symbol: D_vs_player_3020048, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020048, symbol: D_vs_player_3020048 } D_vs_player_3020850: { type: GFX, offset: 0x3020850, symbol: D_vs_player_3020850} D_vs_player_30208D8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30208D8, symbol: D_vs_player_30208D8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30208D8, symbol: D_vs_player_30208D8 } D_vs_player_3020AE0: { type: GFX, offset: 0x3020AE0, symbol: D_vs_player_3020AE0} D_vs_player_3020B78: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3020B78, symbol: D_vs_player_3020B78, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3020B78, symbol: D_vs_player_3020B78 } D_vs_player_3020D80: { type: GFX, offset: 0x3020D80, symbol: D_vs_player_3020D80} D_vs_player_3020E18: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020E18, symbol: D_vs_player_3020E18, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020E18, symbol: D_vs_player_3020E18 } D_vs_player_3021620: { type: GFX, offset: 0x3021620, symbol: D_vs_player_3021620} D_vs_player_30216B8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30216B8, symbol: D_vs_player_30216B8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30216B8, symbol: D_vs_player_30216B8 } D_vs_player_30218C0: { type: GFX, offset: 0x30218C0, symbol: D_vs_player_30218C0} D_vs_player_3021958: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3021958, symbol: D_vs_player_3021958, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3021958, symbol: D_vs_player_3021958 } D_vs_player_3022160: { type: GFX, offset: 0x3022160, symbol: D_vs_player_3022160} D_vs_player_30221E8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30221E8, symbol: D_vs_player_30221E8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30221E8, symbol: D_vs_player_30221E8 } D_vs_player_30223F0: { type: GFX, offset: 0x30223F0, symbol: D_vs_player_30223F0} @@ -487,34 +480,16 @@ D_vs_player_3022E60: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3022E60, symbol: D_vs_player_3022E60 } D_vs_player_3023238: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3023238, symbol: D_vs_player_3023238, pad: 8 } - -PAD_vs_player_30023AF8: - {type: BLOB, size: 0x8, offset: 0x3023AF8, symbol: PAD_vs_player_30023AF8 } - -PAD_vs_player_30023BB8: - {type: BLOB, size: 0x8, offset: 0x3023BB8, symbol: PAD_vs_player_30023BB8 } - -PAD_vs_player_30023C78: - {type: BLOB, size: 0x8, offset: 0x3023C78, symbol: PAD_vs_player_30023C78 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3023238, symbol: D_vs_player_3023238 } D_vs_player_3023F68: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3023F68, symbol: D_vs_player_3023F68, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3023F68, symbol: D_vs_player_3023F68 } D_vs_player_30242D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x30242D0, symbol: D_vs_player_30242D0 } -PAD_vs_player_30024518: - {type: BLOB, size: 0x8, offset: 0x3024518, symbol: PAD_vs_player_30024518 } - -PAD_vs_player_300245B8: - {type: BLOB, size: 0x8, offset: 0x30245B8, symbol: PAD_vs_player_300245B8 } - -PAD_vs_player_30024658: - {type: BLOB, size: 0x8, offset: 0x3024658, symbol: PAD_vs_player_30024658 } - D_vs_player_30246E8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x30246E8, symbol: D_vs_player_30246E8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x30246E8, symbol: D_vs_player_30246E8 } D_vs_player_3024C30: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3024C30, symbol: D_vs_player_3024C30 } @@ -523,13 +498,10 @@ D_vs_player_3025138: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3025138, symbol: D_vs_player_3025138 } D_vs_player_3025938: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3025938, symbol: D_vs_player_3025938, pad: 8 } - -PAD_vs_player_30025B78: - {type: BLOB, size: 0x8, offset: 0x3025B78, symbol: PAD_vs_player_30025B78 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3025938, symbol: D_vs_player_3025938 } D_vs_player_3025C68: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3025C68, symbol: D_vs_player_3025C68, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3025C68, symbol: D_vs_player_3025C68 } D_vs_player_30261A0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x30261A0, symbol: D_vs_player_30261A0 } @@ -556,13 +528,10 @@ D_vs_player_3026DB8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 8, offset: 0x3026DB8, symbol: D_vs_player_3026DB8 } D_vs_player_3026EB8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3026EB8, symbol: D_vs_player_3026EB8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3026EB8, symbol: D_vs_player_3026EB8 } D_vs_player_3027268: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3027268, symbol: D_vs_player_3027268, pad: 8 } - -PAD_vs_player_30027BD8: - {type: BLOB, size: 0x8, offset: 0x3027BD8, symbol: PAD_vs_player_30027BD8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3027268, symbol: D_vs_player_3027268 } D_vs_player_3028130: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x3028130, symbol: D_vs_player_3028130 } @@ -580,70 +549,61 @@ D_vs_player_3029160: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3029160, symbol: D_vs_player_3029160 } D_vs_player_3029388: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3029388, symbol: D_vs_player_3029388, pad: 8 } - -PAD_vs_player_30029C48: - {type: BLOB, size: 0x8, offset: 0x3029C48, symbol: PAD_vs_player_30029C48 } - -PAD_vs_player_30029D18: - {type: BLOB, size: 0x8, offset: 0x3029D18, symbol: PAD_vs_player_30029D18 } - -PAD_vs_player_30029DE8: - {type: BLOB, size: 0x8, offset: 0x3029DE8, symbol: PAD_vs_player_30029DE8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3029388, symbol: D_vs_player_3029388 } D_vs_player_302A0A0: { type: GFX, offset: 0x302A0A0, symbol: D_vs_player_302A0A0} D_vs_player_302A138: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302A138, symbol: D_vs_player_302A138, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302A138, symbol: D_vs_player_302A138 } D_vs_player_302A940: { type: GFX, offset: 0x302A940, symbol: D_vs_player_302A940} D_vs_player_302A9C8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302A9C8, symbol: D_vs_player_302A9C8, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302A9C8, symbol: D_vs_player_302A9C8 } D_vs_player_302ABD0: { type: GFX, offset: 0x302ABD0, symbol: D_vs_player_302ABD0} D_vs_player_302AC68: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302AC68, symbol: D_vs_player_302AC68, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302AC68, symbol: D_vs_player_302AC68 } D_vs_player_302B470: { type: GFX, offset: 0x302B470, symbol: D_vs_player_302B470} D_vs_player_302B4F8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302B4F8, symbol: D_vs_player_302B4F8, pad: 8} + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302B4F8, symbol: D_vs_player_302B4F8 } D_vs_player_302B700: { type: GFX, offset: 0x302B700, symbol: D_vs_player_302B700} D_vs_player_302B788: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B788, symbol: D_vs_player_302B788, pad: 8} + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B788, symbol: D_vs_player_302B788 } D_vs_player_302B890: { type: GFX, offset: 0x302B890, symbol: D_vs_player_302B890} D_vs_player_302B918: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B918, symbol: D_vs_player_302B918, pad: 8} + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B918, symbol: D_vs_player_302B918 } D_vs_player_302BA20: { type: GFX, offset: 0x302BA20, symbol: D_vs_player_302BA20} D_vs_player_302BAA8: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BAA8, symbol: D_vs_player_302BAA8, pad: 8} + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BAA8, symbol: D_vs_player_302BAA8 } D_vs_player_302BBB0: { type: GFX, offset: 0x302BBB0, symbol: D_vs_player_302BBB0} D_vs_player_302BC38: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BC38, symbol: D_vs_player_302BC38, pad: 8} + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BC38, symbol: D_vs_player_302BC38 } D_vs_player_302BD40: { type: GFX, offset: 0x302BD40, symbol: D_vs_player_302BD40} D_vs_player_302BDC8: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BDC8, symbol: D_vs_player_302BDC8, pad: 8} + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BDC8, symbol: D_vs_player_302BDC8 } D_vs_player_302BED0: { type: GFX, offset: 0x302BED0, symbol: D_vs_player_302BED0} @@ -660,7 +620,7 @@ D_vs_player_302C0D0: D_vs_player_302C188: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x302C188, symbol: D_vs_player_302C188, tlut: 0x302C288 } D_vs_player_302C288: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 94, offset: 0x302C288, symbol: D_vs_player_302C288, pad: 12 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 94, offset: 0x302C288, symbol: D_vs_player_302C288 } D_vs_player_302C350: { type: GFX, offset: 0x302C350, symbol: D_vs_player_302C350} @@ -676,7 +636,7 @@ D_vs_player_302C5A0: D_vs_player_302C658: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x302C658, symbol: D_vs_player_302C658, tlut: 0x302C758 } D_vs_player_302C758: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 101, offset: 0x302C758, symbol: D_vs_player_302C758, pad: 12 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 101, offset: 0x302C758, symbol: D_vs_player_302C758 } D_vs_player_302C830: { type: GFX, offset: 0x302C830, symbol: D_vs_player_302C830} @@ -684,7 +644,7 @@ D_vs_player_302C830: D_vs_player_302C8E8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x302C8E8, symbol: D_vs_player_302C8E8, tlut: 0x302C9E8 } D_vs_player_302C9E8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 165, offset: 0x302C9E8, symbol: D_vs_player_302C9E8, pad: 12 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 165, offset: 0x302C9E8, symbol: D_vs_player_302C9E8 } D_vs_player_302CB40: { type: GFX, offset: 0x302CB40, symbol: D_vs_player_302CB40} @@ -692,7 +652,7 @@ D_vs_player_302CB40: D_vs_player_302CBF8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x302CBF8, symbol: D_vs_player_302CBF8, tlut: 0x302CCF8 } D_vs_player_302CCF8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 158, offset: 0x302CCF8, symbol: D_vs_player_302CCF8, pad: 12 } + { type: TEXTURE, ctype: u16, format: TLUT, colors: 158, offset: 0x302CCF8, symbol: D_vs_player_302CCF8 } D_vs_player_302CE40: { type: GFX, offset: 0x302CE40, symbol: D_vs_player_302CE40} @@ -706,19 +666,19 @@ D_vs_player_302D120: { type: GFX, offset: 0x302D120, symbol: D_vs_player_302D120} D_vs_player_302D1B8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x302D1B8, symbol: D_vs_player_302D1B8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x302D1B8, symbol: D_vs_player_302D1B8 } D_vs_player_302D240: { type: GFX, offset: 0x302D240, symbol: D_vs_player_302D240} D_vs_player_302D2C8: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302D2C8, symbol: D_vs_player_302D2C8, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302D2C8, symbol: D_vs_player_302D2C8 } D_vs_player_302D4D0: { type: GFX, offset: 0x302D4D0, symbol: D_vs_player_302D4D0} D_vs_player_302D568: - {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302D568, symbol: D_vs_player_302D568, pad: 8 } + {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302D568, symbol: D_vs_player_302D568 } D_vs_player_302DD70: { type: SF64:ENV_SETTINGS, offset: 0x302DD70, symbol: D_vs_player_302DD70} diff --git a/include/assets.h b/include/assets.h index c4acd789..49d94e6a 100644 --- a/include/assets.h +++ b/include/assets.h @@ -8,13 +8,7 @@ #include "sf64player.h" // ast_enmy_planet -extern Animation D_40001A4; -extern Limb* D_4000270[]; -extern Gfx D_40018A0[]; -extern Animation D_40057AC; -extern Limb* D_40058B8[]; -extern Gfx D_40068F0[]; -extern Gfx D_4007AF0[]; + /* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z, * ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*, @@ -591,48 +585,6 @@ extern Gfx D_6019670[]; extern Gfx D_60185E0[]; extern Gfx D_6017550[]; -// ast_versus, ast_ending -extern u8 D_7000F10[]; // fox_option -extern u8 D_7001030[]; // fox_option -extern u8 D_7001270[]; // fox_option -extern u8 D_7001DF0[]; // fox_option -extern u8 D_7002110[]; // fox_option -extern u8 D_7003650[]; // fox_option -extern Gfx D_7003830[]; // fox_versus -extern u8 D_7003C70[]; // fox_versus -extern u8 D_7003E10[]; // fox_versus -extern u8 D_7003F10[]; // fox_versus -extern u8 D_7004010[]; // fox_option -extern u8 D_7004050[]; // fox_versus -extern u16 D_7004150[]; // fox_versus -extern u8 D_70041F0[]; // fox_versus -extern u16 D_70042F0[]; // fox_versus -extern u8 D_7004360[]; // fox_versus -extern u16 D_7004460[]; // fox_versus -extern u8 D_70044D0[]; // fox_versus -extern u16 D_7004990[]; // fox_versus -extern u16 D_700E9A0[]; // fox_option -extern u8 D_70118E0[]; // fox_versus, fox_option -extern u16 D_70123F8[]; // fox_versus, fox_option - -// ast_9_ti, ast_ve1_boss -extern Gfx D_9002CF0[]; -extern u16 D_9003330[]; -extern u16 D_9003890[]; -extern u16 D_9003DF0[]; -extern Gfx D_9003F50[]; -extern Gfx D_9005C80[]; -extern Gfx D_900D180[]; -extern Gfx D_900DD20[]; -extern Gfx D_900F060[]; -extern Gfx D_900F1D0[]; -extern Gfx D_9010FD0[]; -extern Gfx D_9011200[]; -extern Gfx D_901DA50[]; -extern Gfx D_9023290[]; -extern Gfx D_90234D0[]; -extern Gfx D_9023AD0[]; - // fox_map, to be ordered later extern f32 D_603E118[]; diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h deleted file mode 100644 index 6445f646..00000000 --- a/include/assets/ast_7_ti_2.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef AST_7_TI_2_H -#define AST_7_TI_2_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -extern Animation D_TI2_7003EE8; -extern Animation D_70084CC; -extern Animation D_70096EC; -extern Animation D_700E244; -extern Gfx D_7003F00[]; -extern Gfx D_7004270[]; -extern Gfx D_7004400[]; -extern Gfx D_70045D0[]; -extern Gfx D_70049C0[]; -extern Gfx D_7004E80[]; -extern Gfx D_7005300[]; -extern Gfx D_7009700[]; -extern Gfx D_7009890[]; -extern Gfx D_7009A80[]; - -#endif diff --git a/include/assets/ast_8_ti.h b/include/assets/ast_8_ti.h deleted file mode 100644 index cfdce9df..00000000 --- a/include/assets/ast_8_ti.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef AST_8_TI_H -#define AST_8_TI_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -extern Animation D_8000708; -extern Animation D_8000D80; -extern Animation D_8008FE8; -extern UNK_TYPE D_8000FC0[]; -extern Gfx D_8000D90[]; -extern Gfx D_80011C0[]; -extern Gfx D_80014A0[]; -extern Gfx D_8001630[]; -extern Gfx D_80018D0[]; -extern Gfx D_8001A80[]; -extern Gfx D_8001D20[]; -extern Gfx D_8001E20[]; -extern Gfx D_8001FB0[]; -extern Gfx D_80020D0[]; -extern Gfx D_8002360[]; -extern Gfx D_8003640[]; -extern Gfx D_8009000[]; -extern UNK_TYPE D_8008A30[]; // unused? -extern UNK_TYPE D_80098E0[]; // unused? -extern UNK_TYPE D_800B5E0[]; // unused? -extern UNK_TYPE D_800C640[]; // unused? - -#endif diff --git a/include/assets/ast_9_ti.h b/include/assets/ast_9_ti.h deleted file mode 100644 index 3e51eace..00000000 --- a/include/assets/ast_9_ti.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_9_TI_H -#define AST_9_TI_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/assets/ast_enmy_planet.h b/include/assets/ast_enmy_planet.h index be93ccaa..a860ad85 100644 --- a/include/assets/ast_enmy_planet.h +++ b/include/assets/ast_enmy_planet.h @@ -5,4 +5,21 @@ #include "sf64object.h" #include "structs.h" +extern Animation D_40001A4; +extern Limb* D_4000270[]; +extern Gfx D_4000710[]; +extern Gfx D_40018A0[]; +extern Animation D_40057AC; +extern Limb* D_40058B8[]; +extern Gfx D_40068F0[]; +extern Gfx D_4006E90[]; +extern Gfx D_40073C0[]; +extern Gfx D_4007AF0[]; +extern Gfx D_4008CE0[]; +extern Gfx D_4008CE0[]; +extern Gfx D_4008F70[]; +extern Gfx D_4008F70[]; +extern Gfx D_4009800[]; +extern Gfx D_400AAE0[]; + #endif diff --git a/include/assets/ast_ve1_boss.h b/include/assets/ast_ve1_boss.h index 4e6c91a5..2b5579f5 100644 --- a/include/assets/ast_ve1_boss.h +++ b/include/assets/ast_ve1_boss.h @@ -5,4 +5,54 @@ #include "sf64object.h" #include "structs.h" +extern Gfx D_VE1_9000000[]; +extern Gfx D_VE1_90007F0[]; +extern Gfx D_VE1_9002CF0[]; +extern u16 D_VE1_9003330[]; +extern u16 D_VE1_9003890[]; +extern u16 D_VE1_9003DF0[]; +extern Gfx D_VE1_9003F50[]; +extern Gfx D_VE1_9005C80[]; +extern Animation D_VE1_900D098; +extern Limb* D_VE1_900D164[]; +extern Gfx D_VE1_900D180[]; +extern Gfx D_VE1_900DD20[]; +extern Gfx D_VE1_900DF20[]; +extern Gfx D_VE1_900EFC0[]; +extern Gfx D_VE1_900F060[]; +extern Gfx D_VE1_900F1D0[]; +extern Animation D_VE1_9010FC4; +extern Gfx D_VE1_9010FD0[]; +extern Gfx D_VE1_9011200[]; +extern Gfx D_VE1_9012180[]; +extern Gfx D_VE1_9013880[]; +extern Gfx D_VE1_9013C20[]; +extern Gfx D_VE1_9014DF0[]; +extern Gfx D_VE1_90150A0[]; +extern Gfx D_VE1_9015480[]; +extern Gfx D_VE1_9015900[]; +extern Gfx D_VE1_9015BB0[]; +extern Animation D_VE1_9018BD0; +extern Animation D_VE1_901A4B8; +extern Animation D_VE1_901BDA8; +extern Limb* D_VE1_901C0F4[]; +extern Animation D_VE1_901DA38; +extern Gfx D_VE1_901DA50[]; +extern Gfx D_VE1_901E350[]; +extern Gfx D_VE1_901F6D0[]; +extern Gfx D_VE1_901F990[]; +extern Gfx D_VE1_901FC40[]; +extern Gfx D_VE1_9021630[]; +extern Gfx D_VE1_9021900[]; +extern Gfx D_VE1_9021B80[]; +extern Gfx D_VE1_9022A20[]; +extern Gfx D_VE1_9022D80[]; +extern Gfx D_VE1_9023290[]; +extern Gfx D_VE1_90234D0[]; +extern Gfx D_VE1_9023AD0[]; +extern Animation D_VE1_9024738; +extern Animation D_VE1_9024738; +extern Gfx D_VE1_9024750[]; + + #endif diff --git a/include/assets/ast_versus.h b/include/assets/ast_versus.h index 3540bf76..b96d7197 100644 --- a/include/assets/ast_versus.h +++ b/include/assets/ast_versus.h @@ -5,4 +5,60 @@ #include "sf64object.h" #include "structs.h" +extern u8 D_VS_7000000[]; +extern u8 D_VS_70000D0[]; +extern u8 D_VS_7000210[]; +extern u8 D_VS_7000350[]; +extern u8 D_VS_7000F10[]; // fox_option +extern u8 D_VS_7001030[]; // fox_option +extern u8 D_VS_7001270[]; // fox_option +extern u8 D_VS_70017B0[]; +extern u8 D_VS_70019E0[]; +extern u8 D_VS_7001C10[]; +extern u8 D_VS_7001DF0[]; // fox_option +extern u8 D_VS_7002110[]; // fox_option +extern u8 D_VS_70024D0[]; +extern u8 D_VS_7002730[]; +extern u8 D_VS_7002990[]; +extern u8 D_VS_7002BF0[]; +extern u8 D_VS_7002E50[]; +extern u8 D_VS_70030B0[]; +extern u8 D_VS_7003290[]; +extern u8 D_VS_7003470[]; +extern u8 D_VS_7003650[]; // fox_option +extern Gfx D_VS_7003830[]; // fox_versus +extern u8 D_VS_7003C70[]; // fox_versus +extern u8 D_VS_7003E10[]; // fox_versus +extern u8 D_VS_7003F10[]; // fox_versus +extern u8 D_VS_7004010[]; // fox_option +extern u8 D_VS_7004050[]; // fox_versus +extern u16 D_VS_7004150[]; // fox_versus +extern u8 D_VS_70041F0[]; // fox_versus +extern u16 D_VS_70042F0[]; // fox_versus +extern u8 D_VS_7004360[]; // fox_versus +extern u16 D_VS_7004460[]; // fox_versus +extern u8 D_VS_70044D0[]; // fox_versus +extern u16 D_VS_7004990[]; // fox_versus +extern u8 D_VS_70049C0[]; +extern u16 D_VS_7004B80[]; +extern u8 D_VS_7004BB0[]; +extern u16 D_VS_7004D90[]; +extern u8 D_VS_7004DC0[]; +extern u16 D_VS_7004FF0[]; +extern u8 D_VS_7005020[]; +extern u16 D_VS_70051A0[]; +extern u8 D_VS_7005600[]; +extern u16 D_VS_7005D20[]; +extern u8 D_VS_7005F10[]; +extern u16 D_VS_7006630[]; +extern u8 D_VS_7006780[]; +extern u16 D_VS_7006EA0[]; +extern u16 D_VS_70070A0[]; +extern u16 D_VS_7008EE0[]; +extern u16 D_VS_700AD20[]; +extern u16 D_VS_700CB60[]; +extern u16 D_VS_700E9A0[]; // fox_option +extern u8 D_VS_70118E0[]; // fox_versus, fox_option +extern u16 D_VS_70123F8[]; // fox_versus, fox_option + #endif diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h index 87fbb0d8..07c8c542 100644 --- a/include/fox_enmy2_assets.h +++ b/include/fox_enmy2_assets.h @@ -5,28 +5,13 @@ // Displaylists -extern Gfx D_40068F0[]; -extern Gfx D_4006E90[]; -extern Gfx D_4000170[]; -extern Gfx D_40084D0[]; -extern Gfx D_400A630[]; -extern Gfx D_4009800[]; -extern Gfx D_40073C0[]; extern Gfx D_6011F90[]; -extern Gfx D_4000710[]; -extern Gfx D_400BD20[]; -extern Gfx D_4001310[]; extern Gfx D_601F2A0[]; -extern Gfx D_400AAE0[]; -extern Gfx D_4000650[]; -extern Gfx D_4008FA0[]; extern Gfx D_60102C0[]; extern Gfx D_6017B60[]; extern Gfx D_6004D00[]; extern Gfx D_601A880[]; extern Gfx D_6015D60[]; -extern Gfx D_4000EC0[]; -extern Gfx D_4008D50[]; extern Gfx D_60102C0[]; extern Gfx D_601F3D0[]; extern Gfx D_6022B10[]; @@ -43,8 +28,6 @@ extern Gfx D_6005360[]; extern Gfx D_601B610[]; extern Gfx D_601C6A0[]; extern Gfx D_60188D0[]; -extern Gfx D_9012180[]; -extern Gfx D_900EFC0[]; extern Gfx D_601C520[]; extern Gfx D_600AF40[]; extern Gfx D_600AC70[]; diff --git a/include/fox_option_assets.h b/include/fox_option_assets.h deleted file mode 100644 index 715e6814..00000000 --- a/include/fox_option_assets.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef FOX_OPTION_ASSETS_H -#define FOX_OPTION_ASSETS_H - -#include "global.h" - -extern u8 D_70030B0[]; -extern u8 D_7003290[]; -extern u8 D_7003470[]; -extern u8 D_70049C0[]; -extern u8 D_7004BB0[]; -extern u8 D_7004DC0[]; -extern u8 D_7005020[]; -extern u8 D_7000000[]; -extern u8 D_70000D0[]; -extern u8 D_7000210[]; -extern u8 D_7000350[]; -extern u16 D_7004B80[]; -extern u16 D_7004D90[]; -extern u16 D_7004FF0[]; -extern u16 D_70051A0[]; -extern u16 D_7008EE0[]; -extern u16 D_700AD20[]; -extern u16 D_700CB60[]; -extern u16 D_70070A0[]; -extern u8 D_70017B0[]; -extern u8 D_70019E0[]; -extern u8 D_7005600[]; -extern u8 D_7005F10[]; -extern u16 D_7005D20[]; -extern u16 D_7006630[]; -extern u8 D_7001C10[]; -extern u8 D_7006780[]; -extern u8 D_70019E0[]; -extern u8 D_7005F10[]; -extern u16 D_7006EA0[]; -extern u16 D_7006630[]; -extern u8 D_70024D0[]; -extern u8 D_7002730[]; -extern u8 D_7002990[]; -extern u8 D_7002BF0[]; -extern u8 D_7002E50[]; - -#endif diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 813bbcab..24ce889b 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -30,11 +30,11 @@ D_80160000 = 0x80160000;//ignore:true D_800D0000 = 0x800D0000;//ignore:true D_7FFFFFFE = 0x7FFFFFFE;//ignore:true D_1000000 = 0x01000000;//ignore:true -D_A000000 = 0x0A000000;//ignore:true +D_TI_A000000 = 0x0A000000;//ignore:true D_4000000 = 0x04000000;//ignore:true // constant for K1 access -D_A0000000 = 0xA0000000;//ignore:true +D_TI_A0000000 = 0xA0000000;//ignore:true // hardcoded addresses in libultra D_BFF00000 = 0xBFF00000;//ignore:true diff --git a/linker_scripts/us/symbol_addrs_assets.txt b/linker_scripts/us/symbol_addrs_assets.txt index 6a3a1720..d339df6a 100644 --- a/linker_scripts/us/symbol_addrs_assets.txt +++ b/linker_scripts/us/symbol_addrs_assets.txt @@ -59,17 +59,34 @@ D_AQ_6000AE4 = 0x06000AE4; D_AQ_6002628 = 0x06002628; D_AQ_60260EC = 0x060260EC; D_AQ_60314AC = 0x060314AC; -D_TI1_70067C4 = 0x070067C4; -D_TI1_7006990 = 0x07006990; -D_TI1_7006F74 = 0x07006F74; -D_TI1_7007130 = 0x07007130; -D_TI1_7007234 = 0x07007234; -D_TI1_700733C = 0x0700733C; -D_TI2_7003EE8 = 0x07003EE8; +D_TI1_70067C4 = 0x70067C4; +D_TI1_7006990 = 0x7006990; +D_TI1_7006F74 = 0x7006F74; +D_TI1_7007130 = 0x7007130; +D_TI1_7007234 = 0x7007234; +D_TI1_700733C = 0x700733C; +D_TI2_7003EE8 = 0x7003EE8; +D_TI2_7003F00 = 0x7003F00; +D_TI2_7004270 = 0x7004270; +D_TI2_7004400 = 0x7004400; +D_TI2_70045D0 = 0x70045D0; +D_TI2_70049C0 = 0x70049C0; +D_TI2_7004E80 = 0x7004E80; +D_TI2_7005300 = 0x7005300; +D_TI2_70084CC = 0x70084CC; +D_TI2_70096EC = 0x70096EC; +D_TI2_7009700 = 0x7009700; +D_TI2_7009890 = 0x7009890; +D_TI2_7009A80 = 0x7009A80; +D_TI2_700E244 = 0x700E244; +D_TI_8008FE8 = 0x8008FE8; +D_TI_900FC4C = 0x900FC4C; +D_TI_9004288 = 0x9004288; +D_TI_A009990 = 0xA009990; -D_A6_6018994 = 0x06018994; -D_A6_6011910 = 0x06011910; -D_A6_601B2B0 = 0x0601B2B0; -D_A6_6018BA0 = 0x06018BA0; -D_A6_6028578 = 0x06028578; -D_A6_6028454 = 0x06028454; +D_A6_6018994 = 0x6018994; +D_A6_6011910 = 0x6011910; +D_A6_601B2B0 = 0x601B2B0; +D_A6_6018BA0 = 0x6018BA0; +D_A6_6028578 = 0x6028578; +D_A6_6028454 = 0x6028454; diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 74662987..121e2f77 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -542,40 +542,40 @@ D_70143C0 = 0x070143C0; D_7018708 = 0x07018708; D_70187B4 = 0x070187B4; -D_9018BD0 = 0x09018BD0; -D_901A4B8 = 0x0901A4B8; -D_901BDA8 = 0x0901BDA8; -D_901DA38 = 0x0901DA38; -D_9024738 = 0x09024738; -D_9024738 = 0x09024738; -D_9018BD0 = 0x09018BD0; -D_9010FC4 = 0x09010FC4; -D_90150A0 = 0x090150A0; -D_9015BB0 = 0x09015BB0; -D_9015900 = 0x09015900; -D_9000000 = 0x09000000; -D_9022A20 = 0x09022A20; -D_9021630 = 0x09021630; -D_9015480 = 0x09015480; -D_90007F0 = 0x090007F0; -D_9014DF0 = 0x09014DF0; -D_9022D80 = 0x09022D80; -D_901E350 = 0x0901E350; -D_901F990 = 0x0901F990; -D_9024750 = 0x09024750; -D_901F6D0 = 0x0901F6D0; -D_9021900 = 0x09021900; -D_901FC40 = 0x0901FC40; -D_9021B80 = 0x09021B80; -D_9013880 = 0x09013880; +D_VE1_9018BD0 = 0x09018BD0; +D_VE1_901A4B8 = 0x0901A4B8; +D_VE1_901BDA8 = 0x0901BDA8; +D_VE1_901DA38 = 0x0901DA38; +D_VE1_9024738 = 0x09024738; +D_VE1_9024738 = 0x09024738; +D_VE1_9018BD0 = 0x09018BD0; +D_VE1_9010FC4 = 0x09010FC4; +D_VE1_90150A0 = 0x090150A0; +D_VE1_9015BB0 = 0x09015BB0; +D_VE1_9015900 = 0x09015900; +D_VE1_9000000 = 0x09000000; +D_VE1_9022A20 = 0x09022A20; +D_VE1_9021630 = 0x09021630; +D_VE1_9015480 = 0x09015480; +D_VE1_90007F0 = 0x090007F0; +D_VE1_9014DF0 = 0x09014DF0; +D_VE1_9022D80 = 0x09022D80; +D_VE1_901E350 = 0x0901E350; +D_VE1_901F990 = 0x0901F990; +D_VE1_9024750 = 0x09024750; +D_VE1_901F6D0 = 0x0901F6D0; +D_VE1_9021900 = 0x09021900; +D_VE1_901FC40 = 0x0901FC40; +D_VE1_9021B80 = 0x09021B80; +D_VE1_9013880 = 0x09013880; -D_9003F50 = 0x09003F50; -D_9005C80 = 0x09005C80; -D_900DD20 = 0x0900DD20; -D_900F060 = 0x0900F060; -D_900F1D0 = 0x0900F1D0; -D_901DA50 = 0x0901DA50; -D_9023AD0 = 0x09023AD0; +D_VE1_9003F50 = 0x09003F50; +D_VE1_9005C80 = 0x09005C80; +D_VE1_900DD20 = 0x0900DD20; +D_VE1_900F060 = 0x0900F060; +D_VE1_900F1D0 = 0x0900F1D0; +D_VE1_901DA50 = 0x0901DA50; +D_VE1_9023AD0 = 0x09023AD0; D_C038A48 = 0x0C038A48; D_C038B40 = 0x0C038B40; @@ -666,13 +666,13 @@ D_6051D20 = 0x06051D20; D_6055F20 = 0x06055F20; D_6060610 = 0x06060610; -D_9006AE0 = 0x09006AE0; -D_9000570 = 0x09000570; -D_90086F0 = 0x090086F0; -D_9002EA0 = 0x09002EA0; -D_9005380 = 0x09005380; -D_90075A0 = 0x090075A0; -D_9004230 = 0x09004230; +D_FONT3D_9006AE0 = 0x09006AE0; +D_FONT3D_9000570 = 0x09000570; +D_FONT3D_90086F0 = 0x090086F0; +D_FONT3D_9002EA0 = 0x09002EA0; +D_FONT3D_9005380 = 0x09005380; +D_FONT3D_90075A0 = 0x090075A0; +D_FONT3D_9004230 = 0x09004230; // fox_versus @@ -1057,8 +1057,8 @@ D_6009F50 = 0x06009F50; D_600C2A0 = 0x0600C2A0; D_600BD40 = 0x0600BD40; D_60205D0 = 0x060205D0; -D_9012180 = 0x09012180; -D_900EFC0 = 0x0900EFC0; +D_VE1_9012180 = 0x09012180; +D_VE1_900EFC0 = 0x0900EFC0; D_601C520 = 0x0601C520; D_600AC70 = 0x0600AC70; D_6002500 = 0x06002500; @@ -1123,80 +1123,81 @@ D_80147B0 = 0x080147B0; D_8003A50 = 0x08003A50; D_8013990 = 0x08013990; D_80141B0 = 0x080141B0; -D_70030B0 = 0x070030B0; -D_7003290 = 0x07003290; -D_7003470 = 0x07003470; -D_70049C0 = 0x070049C0; -D_7004BB0 = 0x07004BB0; -D_7004DC0 = 0x07004DC0; -D_7005020 = 0x07005020; -D_7004B80 = 0x07004B80; -D_7004D90 = 0x07004D90; -D_7004FF0 = 0x07004FF0; -D_70051A0 = 0x070051A0; -D_7008EE0 = 0x07008EE0; -D_700AD20 = 0x0700AD20; -D_700CB60 = 0x0700CB60; -D_70070A0 = 0x070070A0; -D_7000000 = 0x07000000; -D_70000D0 = 0x070000D0; -D_7000210 = 0x07000210; -D_7000350 = 0x07000350; -D_90086F0 = 0x090086F0; -D_9007FD0 = 0x09007FD0; -D_9007BB0 = 0x09007BB0; -D_9000980 = 0x09000980; -D_90075A0 = 0x090075A0; -D_90070C0 = 0x090070C0; -D_9006AE0 = 0x09006AE0; -D_9006500 = 0x09006500; -D_90062D0 = 0x090062D0; -D_9001120 = 0x09001120; -D_9005CA0 = 0x09005CA0; -D_9005980 = 0x09005980; -D_9005380 = 0x09005380; -D_9004E10 = 0x09004E10; -D_9000570 = 0x09000570; -D_90014E0 = 0x090014E0; -D_9004920 = 0x09004920; -D_9004230 = 0x09004230; -D_9003A30 = 0x09003A30; -D_9003620 = 0x09003620; -D_9003230 = 0x09003230; -D_9002EA0 = 0x09002EA0; -D_9002890 = 0x09002890; -D_90022A0 = 0x090022A0; -D_9001E90 = 0x09001E90; -D_9001A10 = 0x09001A10; -D_900BB90 = 0x0900BB90; -D_90001F0 = 0x090001F0; -D_900B580 = 0x0900B580; -D_900AF60 = 0x0900AF60; -D_900A870 = 0x0900A870; -D_900A290 = 0x0900A290; -D_9009CB0 = 0x09009CB0; -D_9009990 = 0x09009990; -D_9009280 = 0x09009280; -D_9008C60 = 0x09008C60; -D_9000000 = 0x09000000; -D_70017B0 = 0x070017B0; -D_70019E0 = 0x070019E0; -D_7005600 = 0x07005600; -D_7005F10 = 0x07005F10; -D_7005D20 = 0x07005D20; -D_7006630 = 0x07006630; -D_7001C10 = 0x07001C10; -D_7006780 = 0x07006780; -D_70019E0 = 0x070019E0; -D_7005F10 = 0x07005F10; -D_7006EA0 = 0x07006EA0; -D_7006630 = 0x07006630; -D_70024D0 = 0x070024D0; +D_VS_70030B0 = 0x070030B0; +D_VS_7003290 = 0x07003290; +D_VS_7003470 = 0x07003470; +D_TI2_70049C0 = 0x070049C0; +D_VS_7004BB0 = 0x07004BB0; +D_VS_7004DC0 = 0x07004DC0; +D_VS_7005020 = 0x07005020; +D_VS_7004B80 = 0x07004B80; +D_VS_7004D90 = 0x07004D90; +D_VS_7004FF0 = 0x07004FF0; +D_VS_70051A0 = 0x070051A0; +D_VS_7008EE0 = 0x07008EE0; +D_VS_700AD20 = 0x0700AD20; +D_VS_700CB60 = 0x0700CB60; +D_VS_70070A0 = 0x070070A0; +D_VS_7000000 = 0x07000000; +D_END_7000000 = 0x07000000; +D_VS_70000D0 = 0x070000D0; +D_VS_7000210 = 0x07000210; +D_VS_7000350 = 0x07000350; +D_FONT3D_90086F0 = 0x090086F0; +D_FONT3D_9007FD0 = 0x09007FD0; +D_FONT3D_9007BB0 = 0x09007BB0; +D_FONT3D_9000980 = 0x09000980; +D_FONT3D_90075A0 = 0x090075A0; +D_FONT3D_90070C0 = 0x090070C0; +D_FONT3D_9006AE0 = 0x09006AE0; +D_FONT3D_9006500 = 0x09006500; +D_FONT3D_90062D0 = 0x090062D0; +D_FONT3D_9001120 = 0x09001120; +D_FONT3D_9005CA0 = 0x09005CA0; +D_FONT3D_9005980 = 0x09005980; +D_FONT3D_9005380 = 0x09005380; +D_FONT3D_9004E10 = 0x09004E10; +D_FONT3D_9000570 = 0x09000570; +D_FONT3D_90014E0 = 0x090014E0; +D_FONT3D_9004920 = 0x09004920; +D_FONT3D_9004230 = 0x09004230; +D_FONT3D_9003A30 = 0x09003A30; +D_FONT3D_9003620 = 0x09003620; +D_FONT3D_9003230 = 0x09003230; +D_FONT3D_9002EA0 = 0x09002EA0; +D_FONT3D_9002890 = 0x09002890; +D_FONT3D_90022A0 = 0x090022A0; +D_FONT3D_9001E90 = 0x09001E90; +D_FONT3D_9001A10 = 0x09001A10; +D_FONT3D_900BB90 = 0x0900BB90; +D_FONT3D_90001F0 = 0x090001F0; +D_FONT3D_900B580 = 0x0900B580; +D_FONT3D_900AF60 = 0x0900AF60; +D_FONT3D_900A870 = 0x0900A870; +D_FONT3D_900A290 = 0x0900A290; +D_FONT3D_9009CB0 = 0x09009CB0; +D_FONT3D_9009990 = 0x09009990; +D_FONT3D_9009280 = 0x09009280; +D_FONT3D_9008C60 = 0x09008C60; +D_FONT3D_9000000 = 0x09000000; +D_VS_70017B0 = 0x070017B0; +D_VS_70019E0 = 0x070019E0; +D_VS_7005600 = 0x07005600; +D_VS_7005F10 = 0x07005F10; +D_VS_7005D20 = 0x07005D20; +D_VS_7006630 = 0x07006630; +D_VS_7001C10 = 0x07001C10; +D_VS_7006780 = 0x07006780; +D_VS_70019E0 = 0x070019E0; +D_VS_7005F10 = 0x07005F10; +D_VS_7006EA0 = 0x07006EA0; +D_VS_7006630 = 0x07006630; +D_VS_70024D0 = 0x070024D0; D_TI1_7002730 = 0x07002730; -D_7002730 = 0x07002730; -D_7002990 = 0x07002990; -D_7002BF0 = 0x07002BF0; -D_7002E50 = 0x07002E50; +D_VS_7002730 = 0x07002730; +D_VS_7002990 = 0x07002990; +D_VS_7002BF0 = 0x07002BF0; +D_VS_7002E50 = 0x07002E50; // fox_ti D_TI1_700DDF0 = 0x0700DDF0; @@ -1218,43 +1219,44 @@ D_TI1_7003A90 = 0x07003A90; D_TI1_7005420 = 0x07005420; D_TI1_7003FC0 = 0x07003FC0; D_TI1_7002930 = 0x07002930; -D_7009700 = 0x07009700; -D_7004E80 = 0x07004E80; -D_70049C0 = 0x070049C0; -D_70045D0 = 0x070045D0; -D_A001FA0 = 0x0A001FA0; -D_900FE80 = 0x0900FE80; -D_80018D0 = 0x080018D0; -D_9005450 = 0x09005450; -D_8009000 = 0x08009000; -D_A002170 = 0x0A002170; -D_8001FB0 = 0x08001FB0; -D_90058A0 = 0x090058A0; -D_90042A0 = 0x090042A0; -D_90043D0 = 0x090043D0; -D_90044E0 = 0x090044E0; -D_90045F0 = 0x090045F0; -D_80020D0 = 0x080020D0; -D_7003F00 = 0x07003F00; -D_8001D20 = 0x08001D20; -D_8001E20 = 0x08001E20; -D_80011C0 = 0x080011C0; -D_8002360 = 0x08002360; -D_90051C0 = 0x090051C0; -D_8003640 = 0x08003640; -D_900FC60 = 0x0900FC60; -D_900FD70 = 0x0900FD70; -D_9005600 = 0x09005600; -D_8001630 = 0x08001630; -D_80014A0 = 0x080014A0; -D_9005040 = 0x09005040; -D_7004400 = 0x07004400; -D_7009890 = 0x07009890; -D_8001A80 = 0x08001A80; -D_A001DB0 = 0x0A001DB0; -D_A001EC0 = 0x0A001EC0; -D_A001BE0 = 0x0A001BE0; -D_7004270 = 0x07004270; +D_TI2_7009700 = 0x07009700; +D_TI2_7004E80 = 0x07004E80; +D_TI2_70049C0 = 0x070049C0; +D_TI2_70045D0 = 0x070045D0; +D_VS_70049C0 = 0x070049C0; +D_TI_A001FA0 = 0x0A001FA0; +D_TI_900FE80 = 0x0900FE80; +D_TI_80018D0 = 0x080018D0; +D_TI_9005450 = 0x09005450; +D_TI_8009000 = 0x08009000; +D_TI_A002170 = 0x0A002170; +D_TI_8001FB0 = 0x08001FB0; +D_TI_90058A0 = 0x090058A0; +D_TI_90042A0 = 0x090042A0; +D_TI_90043D0 = 0x090043D0; +D_TI_90044E0 = 0x090044E0; +D_TI_90045F0 = 0x090045F0; +D_TI_80020D0 = 0x080020D0; +D_TI2_7003F00 = 0x07003F00; +D_TI_8001D20 = 0x08001D20; +D_TI_8001E20 = 0x08001E20; +D_TI_80011C0 = 0x080011C0; +D_TI_8002360 = 0x08002360; +D_TI_90051C0 = 0x090051C0; +D_TI_8003640 = 0x08003640; +D_TI_900FC60 = 0x0900FC60; +D_TI_900FD70 = 0x0900FD70; +D_TI_9005600 = 0x09005600; +D_TI_8001630 = 0x08001630; +D_TI_80014A0 = 0x080014A0; +D_TI_9005040 = 0x09005040; +D_TI2_7004400 = 0x07004400; +D_TI2_7009890 = 0x07009890; +D_TI_8001A80 = 0x08001A80; +D_TI_A001DB0 = 0x0A001DB0; +D_TI_A001EC0 = 0x0A001EC0; +D_TI_A001BE0 = 0x0A001BE0; +D_TI2_7004270 = 0x07004270; D_arwing_3005AB0 = 0x3005AB0; D_1000000 = 0x1000000; @@ -2097,32 +2099,32 @@ D_604D680 = 0x604D680; D_605A120 = 0x605A120; D_605C230 = 0x605C230; D_TI1_7000A80 = 0x7000A80; -D_7000F10 = 0x7000F10; -D_7001030 = 0x7001030; -D_7001270 = 0x7001270; +D_VS_7000F10 = 0x7000F10; +D_VS_7001030 = 0x7001030; +D_VS_7001270 = 0x7001270; D_WZ_7001540 = 0x7001540; -D_7001DF0 = 0x7001DF0; -D_7002110 = 0x7002110; +D_VS_7001DF0 = 0x7001DF0; +D_VS_7002110 = 0x7002110; D_7002120 = 0x7002120; D_TI1_7002270 = 0x7002270; D_TI1_7002490 = 0x7002490; -D_7003650 = 0x7003650; -D_7003830 = 0x7003830; -D_7003C70 = 0x7003C70; -D_7003E10 = 0x7003E10; +D_VS_7003650 = 0x7003650; +D_VS_7003830 = 0x7003830; +D_VS_7003C70 = 0x7003C70; +D_VS_7003E10 = 0x7003E10; D_TI2_7003EE8 = 0x7003EE8; -D_7003F10 = 0x7003F10; -D_7004010 = 0x7004010; -D_7004050 = 0x7004050; -D_7004150 = 0x7004150; -D_70041F0 = 0x70041F0; +D_VS_7003F10 = 0x7003F10; +D_VS_7004010 = 0x7004010; +D_VS_7004050 = 0x7004050; +D_VS_7004150 = 0x7004150; +D_VS_70041F0 = 0x70041F0; D_7004240 = 0x7004240; -D_70042F0 = 0x70042F0; -D_7004360 = 0x7004360; -D_7004460 = 0x7004460; -D_70044D0 = 0x70044D0; -D_7004990 = 0x7004990; -D_7005300 = 0x7005300; +D_VS_70042F0 = 0x70042F0; +D_VS_7004360 = 0x7004360; +D_VS_7004460 = 0x7004460; +D_VS_70044D0 = 0x70044D0; +D_VS_7004990 = 0x7004990; +D_TI2_7005300 = 0x7005300; D_TI1_70067C4 = 0x70067C4; D_TI1_7006990 = 0x7006990; D_TI1_7006F74 = 0x7006F74; @@ -2130,12 +2132,12 @@ D_TI1_7007130 = 0x7007130; D_TI1_7007234 = 0x7007234; D_TI1_700733C = 0x700733C; D_TI1_7007350 = 0x7007350; -D_70084CC = 0x70084CC; +D_TI2_70084CC = 0x70084CC; D_TI1_7008930 = 0x7008930; D_TI1_7009510 = 0x7009510; -D_70096EC = 0x70096EC; +D_TI2_70096EC = 0x70096EC; D_TI1_70098E0 = 0x70098E0; -D_7009A80 = 0x7009A80; +D_TI2_7009A80 = 0x7009A80; D_TI1_7009D60 = 0x7009D60; D_TI1_700A990 = 0x700A990; D_TI1_700B9C0 = 0x700B9C0; @@ -2150,9 +2152,9 @@ D_TI1_700CAF4 = 0x700CAF4; D_TI1_700CB60 = 0x700CB60; D_TI1_700D534 = 0x700D534; D_TI1_700D700 = 0x700D700; -D_700E244 = 0x700E244; +D_TI2_700E244 = 0x700E244; D_TI1_700E3F0 = 0x700E3F0; -D_700E9A0 = 0x700E9A0; +D_VS_700E9A0 = 0x700E9A0; D_700E9E0 = 0x700E9E0; D_700EA38 = 0x700EA38; D_700F240 = 0x700F240; @@ -2166,17 +2168,17 @@ D_7010FF0 = 0x7010FF0; D_70110C0 = 0x70110C0; D_70110E0 = 0x70110E0; D_70111B0 = 0x70111B0; -D_70118E0 = 0x70118E0; +D_VS_70118E0 = 0x70118E0; D_70122E0 = 0x70122E0; -D_70123F8 = 0x70123F8; +D_VS_70123F8 = 0x70123F8; D_8000000 = 0x8000000; D_8000400 = 0x8000400; D_8000680 = 0x8000680; D_80006A0 = 0x80006A0; -D_8000708 = 0x8000708; -D_8000D80 = 0x8000D80; -D_8000D90 = 0x8000D90; -D_8000FC0 = 0x8000FC0; +D_TI_8000708 = 0x8000708; +D_TI_8000D80 = 0x8000D80; +D_TI_8000D90 = 0x8000D90; +D_TI_8000FC0 = 0x8000FC0; D_80016A0 = 0x80016A0; D_80017A0 = 0x80017A0; D_80017C0 = 0x80017C0; @@ -2206,7 +2208,7 @@ D_80080F0 = 0x80080F0; D_80084B0 = 0x80084B0; D_8008A30 = 0x8008A30; D_8008DA0 = 0x8008DA0; -D_8008FE8 = 0x8008FE8; +D_TI_8008FE8 = 0x8008FE8; D_80098E0 = 0x80098E0; D_8009980 = 0x8009980; D_8009B00 = 0x8009B00; @@ -2223,33 +2225,33 @@ D_800E170 = 0x800E170; D_8015550 = 0x8015550; D_8015DF0 = 0x8015DF0; D_8025080 = 0x8025080; -D_9002CF0 = 0x9002CF0; -D_9003330 = 0x9003330; -D_9003890 = 0x9003890; -D_9003DF0 = 0x9003DF0; -D_9004288 = 0x9004288; -D_900D098 = 0x900D098; -D_900D164 = 0x900D164; -D_900D180 = 0x900D180; -D_900DF20 = 0x900DF20; -D_900FC4C = 0x900FC4C; -D_9010FD0 = 0x9010FD0; -D_9011200 = 0x9011200; -D_9013C20 = 0x9013C20; -D_901C0F4 = 0x901C0F4; -D_901DA50 = 0x901DA50; -D_9023290 = 0x9023290; -D_90234D0 = 0x90234D0; -D_A000000 = 0xA000000; -D_A0002BC = 0xA0002BC; -D_A00047C = 0xA00047C; -D_A000568 = 0xA000568; -D_A000858 = 0xA000858; -D_A000934 = 0xA000934; -D_A000D50 = 0xA000D50; -D_A000EDC = 0xA000EDC; -D_A001A70 = 0xA001A70; -D_A009990 = 0xA009990; +D_VE1_9002CF0 = 0x9002CF0; +D_VE1_9003330 = 0x9003330; +D_VE1_9003890 = 0x9003890; +D_VE1_9003DF0 = 0x9003DF0; +D_TI_9004288 = 0x9004288; +D_VE1_900D098 = 0x900D098; +D_VE1_900D164 = 0x900D164; +D_VE1_900D180 = 0x900D180; +D_VE1_900DF20 = 0x900DF20; +D_TI_900FC4C = 0x900FC4C; +D_VE1_9010FD0 = 0x9010FD0; +D_VE1_9011200 = 0x9011200; +D_VE1_9013C20 = 0x9013C20; +D_VE1_901C0F4 = 0x901C0F4; +D_VE1_901DA50 = 0x901DA50; +D_VE1_9023290 = 0x9023290; +D_VE1_90234D0 = 0x90234D0; +D_TI_A000000 = 0xA000000; +D_TI_A0002BC = 0xA0002BC; +D_TI_A00047C = 0xA00047C; +D_TI_A000568 = 0xA000568; +D_TI_A000858 = 0xA000858; +D_TI_A000934 = 0xA000934; +D_TI_A000D50 = 0xA000D50; +D_TI_A000EDC = 0xA000EDC; +D_TI_A001A70 = 0xA001A70; +D_TI_A009990 = 0xA009990; D_C00208C = 0xC00208C; D_C002654 = 0xC002654; D_C002B08 = 0xC002B08; diff --git a/src/main/fox_360.c b/src/main/fox_360.c index 15d8999a..c0024a8b 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -3,6 +3,7 @@ #include "assets/ast_star_wolf.h" #include "assets/ast_allies.h" #include "assets/ast_vs_player.h" +#include "assets/ast_enmy_planet.h" /* static */ Vec3f D_800C9A90 = { 0.0f, -10.0f, 0.0f }; /* static */ Vec3f D_800C9A9C[4] = { diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index e4e0dccb..a4f23859 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -1,5 +1,5 @@ -// #include "prevent_bss_reordering.h" #include "global.h" +#include "prevent_bss_reordering.h" extern f32 D_i3_801C4188; diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index 37bf6b56..176dea2b 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -9,6 +9,7 @@ #include "assets/ast_aquas.h" #include "assets/ast_great_fox.h" #include "assets/ast_enmy_space.h" +#include "assets/ast_enmy_planet.h" extern Gfx D_60320E0[]; extern Gfx D_7010970[]; @@ -29,7 +30,6 @@ extern f32 D_80178468; extern f32 D_80178474; extern f32 D_80178478; -extern Gfx D_400AAE0[]; extern Gfx D_6000D80[]; extern Gfx D_600BAA0[]; extern Gfx D_60132A0[]; diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index aa0451cd..39c6b9fd 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -7,6 +7,7 @@ #include "assets/ast_aquas.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" +#include "assets/ast_ve1_boss.h" f32 D_800CBE70[] = { 1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f, @@ -205,10 +206,10 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_F32_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_F32_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, @@ -358,10 +359,10 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_ACTOR_277 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_i3_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, /* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_i3_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, - /* OBJ_ACTOR_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_i1_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) func_i1_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_281 */ {(void*) func_i1_80192E2C, 1, (ObjectFunc) func_i1_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_284 */ {(void*) func_i1_801934D0, 1, (ObjectFunc) func_i1_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_ACTOR_285 */ {(void*) func_i6_80193244, 1, (ObjectFunc) func_i6_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, /* OBJ_ACTOR_286 */ {(void*) func_i6_80188660, 1, (ObjectFunc) func_i6_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 8a678e21..6b321c5c 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -17,6 +17,8 @@ WingInfo D_80161630; #include "assets/ast_blue_marine.h" #include "assets/ast_vs_player.h" #include "assets/ast_enmy_space.h" +#include "assets/ast_enmy_planet.h" +#include "assets/ast_ve1_boss.h" char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; @@ -339,16 +341,16 @@ void func_8005A094(Actor* actor) { } switch (actor->iwork[0]) { case 0: - gSPDisplayList(gMasterDisp++, D_90234D0); + gSPDisplayList(gMasterDisp++, D_VE1_90234D0); break; case 1: - gSPDisplayList(gMasterDisp++, D_9023290); + gSPDisplayList(gMasterDisp++, D_VE1_9023290); break; case 2: - gSPDisplayList(gMasterDisp++, D_900D180); + gSPDisplayList(gMasterDisp++, D_VE1_900D180); break; case 3: - gSPDisplayList(gMasterDisp++, D_9010FD0); + gSPDisplayList(gMasterDisp++, D_VE1_9010FD0); break; } if (actor->iwork[1] != 0) { diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 08577b9a..6e1e3c4d 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -6,9 +6,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n"; const char D_800D7240[] = "a=<%d>\n"; const char D_800D7248[] = "a=<%d>\n"; -extern Gfx D_4008CE0[]; -extern Gfx D_4008F70[]; - extern Gfx D_6003440[]; extern Gfx D_60034E0[]; extern Gfx D_6003580[]; @@ -21,8 +18,6 @@ extern Gfx D_6016880[]; extern Gfx D_6018AF0[]; extern Gfx D_601BAD0[]; -extern Gfx D_9013C20[]; - #include "assets/ast_blue_marine.h" #include "assets/ast_arwing.h" #include "assets/ast_bg_space.h" @@ -31,6 +26,8 @@ extern Gfx D_9013C20[]; #include "assets/ast_sector_x.h" #include "assets/ast_aquas.h" #include "assets/ast_A_ti.h" +#include "assets/ast_ve1_boss.h" +#include "assets/ast_enmy_planet.h" s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) { s32 i; @@ -3195,7 +3192,7 @@ void func_80080D04(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_48); Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, effect->scale2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_A000000); + gSPDisplayList(gMasterDisp++, D_TI_A000000); RCP_SetupDL(&gMasterDisp, 0x40); break; @@ -3211,7 +3208,7 @@ void func_80080D04(Effect* effect) { case 12: Graphics_SetScaleMtx(effect->scale2); RCP_SetupDL(&gMasterDisp, 0x17); - gSPDisplayList(gMasterDisp++, D_9013C20); + gSPDisplayList(gMasterDisp++, D_VE1_9013C20); RCP_SetupDL(&gMasterDisp, 0x40); break; diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index ba0d3603..94de16ed 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -15,6 +15,8 @@ s32 D_80161690; #include "assets/ast_andross.h" #include "assets/ast_area_6.h" #include "assets/ast_enmy_space.h" +#include "assets/ast_enmy_planet.h" +#include "assets/ast_ve1_boss.h" void func_8006A7B0(u16* msg, s32 character) { PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"); @@ -945,10 +947,10 @@ UnkStruct_D003C D_800D003C[108] = { { NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_AQ_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 }, - { D_9012180, D_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_9012180, D_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { D_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, + { D_VE1_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { D_601C520, D_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, @@ -4015,15 +4017,15 @@ void func_80074FF0(Actor* actor) { case 80: Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_9011200); + gSPDisplayList(gMasterDisp++, D_VE1_9011200); break; case 81: if (actor->fwork[15] > 0.001f) { Matrix_Scale(gGfxMatrix, actor->fwork[15], actor->fwork[15], actor->fwork[15], 1); Matrix_SetGfxMtx(&gMasterDisp); - Texture_BlendRGBA16(actor->fwork[16], 16 * 11, D_9003890, D_9003DF0, D_9003330); - gSPDisplayList(gMasterDisp++, D_9002CF0); + Texture_BlendRGBA16(actor->fwork[16], 16 * 11, D_VE1_9003890, D_VE1_9003DF0, D_VE1_9003330); + gSPDisplayList(gMasterDisp++, D_VE1_9002CF0); } break; diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index 0f02fe46..4f79150e 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1,6 +1,7 @@ // #include "prevent_bss_reordering.h" #include "global.h" #include "fox_option.h" +#include "assets/ast_versus.h" s32 D_80178750; s32 D_80178754; @@ -81,7 +82,7 @@ void func_800BC760(void) { } void func_800BC88C(f32 xPos, f32 yPos, f32 scale) { - TextureRect_8bIA(&gMasterDisp, &D_7003830, 64, 17, xPos, yPos, scale, scale); + TextureRect_8bIA(&gMasterDisp, &D_VS_7003830, 64, 17, xPos, yPos, scale, scale); } void func_800BC8D8(f32 xPos, f32 yPos, f32 scale) { @@ -170,41 +171,42 @@ void func_800BD10C(f32 xPos, f32 yPos, f32 scale) { } void func_800BD164(f32 xPos, f32 yPos) { - TextureRect_8bIA(&gMasterDisp, D_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD1B0(f32 xPos, f32 yPos) { - TextureRect_8bIA(&gMasterDisp, D_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD1FC(f32 xPos, f32 yPos) { - TextureRect_8bIA(&gMasterDisp, D_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD248(f32 xPos, f32 yPos) { - TextureRect_8bCI(&gMasterDisp, D_7004050, D_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_VS_7004050, D_VS_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD2A0(f32 xPos, f32 yPos) { - TextureRect_8bCI(&gMasterDisp, D_70041F0, D_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_VS_70041F0, D_VS_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD2F8(f32 xPos, f32 yPos) { - TextureRect_8bCI(&gMasterDisp, D_7004360, D_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_VS_7004360, D_VS_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f); } void func_800BD350(f32 xPos, f32 yPos) { - TextureRect_8bCI(&gMasterDisp, D_70044D0, D_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_VS_70044D0, D_VS_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f); } void func_800BD3A8(f32 xPos, f32 yPos) { s32 i; for (i = 0; i < 8; i++) { - TextureRect_4bCI(&gMasterDisp, D_70118E0 + ((80 * 8 * i) / 2), D_70123F8, 80, 8, xPos, yPos + (i * 8), 1.0f, - 1.0f); + TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + ((80 * 8 * i) / 2), D_VS_70123F8, 80, 8, xPos, yPos + (i * 8), + 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_70118E0 + ((80 * 8 * i) / 2), D_70123F8, 80, 7, xPos, yPos + (i * 8), 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + ((80 * 8 * i) / 2), D_VS_70123F8, 80, 7, xPos, yPos + (i * 8), 1.0f, + 1.0f); } void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) { diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index 53376bf0..ace8c9c4 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -766,7 +766,7 @@ void func_ending_80190CF0(u32 arg0, AssetInfo* asset) { } Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7000000); + gSPDisplayList(gMasterDisp++, D_END_7000000); } void func_ending_80191234(s32 arg0, s32 arg1) { diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c index afbd90d8..ac85d231 100644 --- a/src/overlays/ovl_ending/fox_end2_data.c +++ b/src/overlays/ovl_ending/fox_end2_data.c @@ -95,7 +95,7 @@ extern Animation D_6031120; extern Limb* D_60313AC[]; extern Animation D_6031DB8; extern Limb* D_6032084[]; -extern Gfx D_7000000[]; +extern Gfx D_END_7000000[]; extern Gfx D_7002120[]; extern Gfx D_7004240[]; extern Gfx D_700E9E0[]; diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c index 3f80c9b4..27ebcaed 100644 --- a/src/overlays/ovl_i1/fox_ve1.c +++ b/src/overlays/ovl_i1/fox_ve1.c @@ -1,34 +1,5 @@ #include "global.h" - -extern Limb* D_900D164[]; -extern Limb* D_901C0F4[]; -extern Animation D_900D098; -extern Gfx D_900DF20[]; -extern Animation D_9018BD0; -extern Animation D_901A4B8; -extern Animation D_901BDA8; -extern Animation D_901DA38; -extern Animation D_9024738; -extern Animation D_9024738; -extern Animation D_9010FC4; -extern Gfx D_9000000[]; -extern Gfx D_90007F0[]; -extern Gfx D_9013880[]; -extern Gfx D_9014DF0[]; -extern Gfx D_90150A0[]; -extern Gfx D_9015480[]; -extern Gfx D_9015900[]; -extern Gfx D_9015BB0[]; -extern Gfx D_901E350[]; -extern Gfx D_901F6D0[]; -extern Gfx D_901F990[]; -extern Gfx D_901FC40[]; -extern Gfx D_9021630[]; -extern Gfx D_9021900[]; -extern Gfx D_9021B80[]; -extern Gfx D_9022A20[]; -extern Gfx D_9022D80[]; -extern Gfx D_9024750[]; +#include "assets/ast_ve1_boss.h" typedef struct { /* 0x00 */ s16 unk_00; @@ -520,8 +491,9 @@ void func_i1_80192AA4(Actor* actor) { } Gfx* D_i1_8019A008[17] = { - D_90150A0, D_9015BB0, D_9015900, D_9000000, D_9022A20, D_9021630, D_9015480, D_90007F0, D_9014DF0, - D_9022D80, D_901E350, D_901F990, D_901F6D0, D_9021900, D_901FC40, D_9021B80, D_9013880, + D_VE1_90150A0, D_VE1_9015BB0, D_VE1_9015900, D_VE1_9000000, D_VE1_9022A20, D_VE1_9021630, + D_VE1_9015480, D_VE1_90007F0, D_VE1_9014DF0, D_VE1_9022D80, D_VE1_901E350, D_VE1_901F990, + D_VE1_901F6D0, D_VE1_9021900, D_VE1_901FC40, D_VE1_9021B80, D_VE1_9013880, }; s16 D_i1_8019A04C[3][2] = { { -2500, 300 }, { -1000, 0 }, { -5000, 0 } }; UnkStruct_i1_8019A058 D_i1_8019A058[33] = { @@ -572,11 +544,12 @@ Vec3f D_i1_8019A544[43] = { { 134.0f, 0.0f, -24.0f }, { 104.0f, 106.0f, -24.0f }, { 104.0f, -106.0f, -24.0f }, }; UnkStruct_i1_8019A748 D_i1_8019A748[18] = { - { 1, D_90150A0, 0, 0 }, { 2, D_9015BB0, 1, 0 }, { 3, D_9015900, 2, 0 }, { 4, D_9000000, 3, 0 }, - { 5, D_9022A20, 4, 0 }, { 6, D_9021630, 5, 0 }, { 7, D_9015480, 6, 0 }, { 8, D_90007F0, 7, 0 }, - { 9, D_9014DF0, 8, 0 }, { 10, D_9022D80, 9, 0 }, { 11, D_901E350, 10, 0 }, { 12, D_901F990, 11, 0 }, - { 13, D_9024750, 15, 1 }, { 16, D_901F6D0, 12, 0 }, { 17, D_9021900, 13, 0 }, { 20, D_901FC40, 14, 0 }, - { 21, D_9021B80, 15, 0 }, { 25, D_9013880, 16, 0 }, + { 1, D_VE1_90150A0, 0, 0 }, { 2, D_VE1_9015BB0, 1, 0 }, { 3, D_VE1_9015900, 2, 0 }, + { 4, D_VE1_9000000, 3, 0 }, { 5, D_VE1_9022A20, 4, 0 }, { 6, D_VE1_9021630, 5, 0 }, + { 7, D_VE1_9015480, 6, 0 }, { 8, D_VE1_90007F0, 7, 0 }, { 9, D_VE1_9014DF0, 8, 0 }, + { 10, D_VE1_9022D80, 9, 0 }, { 11, D_VE1_901E350, 10, 0 }, { 12, D_VE1_901F990, 11, 0 }, + { 13, D_VE1_9024750, 15, 1 }, { 16, D_VE1_901F6D0, 12, 0 }, { 17, D_VE1_9021900, 13, 0 }, + { 20, D_VE1_901FC40, 14, 0 }, { 21, D_VE1_9021B80, 15, 0 }, { 25, D_VE1_9013880, 16, 0 }, }; UnkStruct_i1_8019A820 D_i1_8019A820[17] = { { 1, 50, 0, 3, 1, 2, 5, -1, -1, -1, -1, 1 }, { 2, 60, 3, 2, 0, 2, 5, 0, -1, -1, -1, 1 }, @@ -603,7 +576,8 @@ f32 D_i1_8019A9B8[199] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, }; Animation* D_i1_8019ACD4[9] = { - &D_9018BD0, &D_901A4B8, &D_901BDA8, &D_901DA38, &D_9024738, &D_9024738, &D_9018BD0, &D_9010FC4, NULL, + &D_VE1_9018BD0, &D_VE1_901A4B8, &D_VE1_901BDA8, &D_VE1_901DA38, &D_VE1_9024738, + &D_VE1_9024738, &D_VE1_9018BD0, &D_VE1_9010FC4, NULL, }; UnkStruct_i1_8019ACF8 D_i1_8019ACF8[2] = { { 0, 1 }, { -1, 0 } }; UnkStruct_i1_8019ACF8 D_i1_8019AD00[4] = { { 1, 0 }, { 2, 1 }, { 3, 0 }, { -1, 0 } }; @@ -684,7 +658,7 @@ void func_i1_80192CD4(Actor* actor) { void func_i1_80192E2C(Actor* actor) { Matrix_Scale(gGfxMatrix, 1.0f, 0.5f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_901DA50); + gSPDisplayList(gMasterDisp++, D_VE1_901DA50); } void func_i1_80192EA4(Actor* actor) { @@ -804,9 +778,9 @@ void func_i1_801933DC(Actor* actor) { if ((actor->unk_0B6 == 38) || (actor->unk_0B6 == 58)) { AUDIO_PLAY_SFX(0x1903005A, actor->sfxSource, 0); } - Animation_GetFrameData(&D_900D098, actor->unk_0B6, actor->vwork); + Animation_GetFrameData(&D_VE1_900D098, actor->unk_0B6, actor->vwork); - if (actor->unk_0B6 < (Animation_GetFrameCount(&D_900D098) - 1)) { + if (actor->unk_0B6 < (Animation_GetFrameCount(&D_VE1_900D098) - 1)) { actor->unk_0B6++; } else { actor->unk_0B6 = 0; @@ -818,7 +792,7 @@ void func_i1_801933DC(Actor* actor) { void func_i1_801934D0(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, -488.0f, 0.0f, 1); - Animation_DrawSkeleton(0, D_900D164, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE1_900D164, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); } void func_i1_80193540(Object_80* obj80) { @@ -1082,7 +1056,7 @@ void func_i1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { } Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_900DF20); + gSPDisplayList(gMasterDisp++, D_VE1_900DF20); Matrix_Pop(&gGfxMatrix); } } @@ -2381,7 +2355,8 @@ void func_i1_80198594(Boss* boss) { void func_i1_801985E4(Boss* boss) { if (boss->swork[26] == 0) { - Animation_DrawSkeleton(0, D_901C0F4, boss->vwork, func_i1_801937F4, func_i1_80193D64, boss, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE1_901C0F4, boss->vwork, func_i1_801937F4, func_i1_80193D64, boss, + &gIdentityMatrix); } boss->state = boss->swork[9]; } diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index 873357b2..19321211 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -1,4 +1,4 @@ -#include "prevent_bss_reordering.h" +// #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_blue_marine.h" #include "assets/ast_aquas.h" diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 067bd76b..385a8576 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets/ast_enmy_planet.h" // f32 temp[] = { // 13.0f, diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 4eaa8f5d..6792cd31 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1,6 +1,7 @@ // #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_landmaster.h" +#include "assets/ast_enmy_planet.h" extern u8 D_6023228[]; extern u8 D_6023388[]; @@ -98,8 +99,6 @@ extern f32 D_6035A94[]; extern ObjectInit D_6035678[]; extern ObjectInit D_60357CC[]; extern ObjectInit D_6035920[]; -extern Gfx D_4008CE0[]; -extern Gfx D_4008F70[]; extern Gfx D_600D480[]; extern Gfx D_6013060[]; extern Gfx D_6012F50[]; diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index caf77ae0..c4503cb3 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -1,11 +1,13 @@ -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_bg_planet.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_7_ti_2.h" #include "assets/ast_8_ti.h" +#include "assets/ast_9_ti.h" #include "assets/ast_A_ti.h" #include "assets/ast_landmaster.h" +#include "assets/ast_enmy_planet.h" extern Gfx D_Gfx_800D94D0[]; @@ -13,21 +15,6 @@ extern f32 D_6006924[]; extern f32 D_6006C0C[]; extern f32 D_6006C28[]; -extern Animation D_9004288; -extern Animation D_900FC4C; -extern Gfx D_90042A0[]; -extern Gfx D_90043D0[]; -extern Gfx D_90044E0[]; -extern Gfx D_90045F0[]; -extern Gfx D_9005040[]; -extern Gfx D_90051C0[]; -extern Gfx D_9005450[]; -extern Gfx D_9005600[]; -extern Gfx D_90058A0[]; -extern Gfx D_900FC60[]; -extern Gfx D_900FD70[]; -extern Gfx D_900FE80[]; - s32* D_i5_801BBEF0; f32* D_i5_801BBEF4; s32* D_i5_801BBEF8; @@ -2019,10 +2006,11 @@ void func_i5_8018F0D8(Object_80* obj80) { static Vec3f D_i5_801B7690 = { 0.0f, 460.0f, 0.0f }; Gfx* D_i5_801B769C[39] = { - D_7009700, D_7004E80, D_70049C0, D_70045D0, D_A001FA0, D_900FE80, D_80018D0, D_9005450, NULL, D_8009000, - D_A002170, D_8001FB0, D_90058A0, D_90042A0, D_90043D0, D_90044E0, D_90045F0, D_80020D0, D_7003F00, D_8001D20, - D_8001E20, NULL, D_80011C0, D_8002360, D_90051C0, D_8003640, D_900FC60, D_900FD70, D_9005600, D_8001630, - D_80014A0, D_9005040, D_7004400, D_7009890, D_8001A80, D_A001DB0, D_A001EC0, D_A001BE0, D_7004270, + D_TI2_7009700, D_TI2_7004E80, D_TI2_70049C0, D_TI2_70045D0, D_TI_A001FA0, D_TI_900FE80, D_TI_80018D0, D_TI_9005450, + NULL, D_TI_8009000, D_TI_A002170, D_TI_8001FB0, D_TI_90058A0, D_TI_90042A0, D_TI_90043D0, D_TI_90044E0, + D_TI_90045F0, D_TI_80020D0, D_TI2_7003F00, D_TI_8001D20, D_TI_8001E20, NULL, D_TI_80011C0, D_TI_8002360, + D_TI_90051C0, D_TI_8003640, D_TI_900FC60, D_TI_900FD70, D_TI_9005600, D_TI_8001630, D_TI_80014A0, D_TI_9005040, + D_TI2_7004400, D_TI2_7009890, D_TI_8001A80, D_TI_A001DB0, D_TI_A001EC0, D_TI_A001BE0, D_TI2_7004270, }; void func_i5_8018F134(Object_80* obj80) { @@ -2227,7 +2215,7 @@ void func_i5_8018FA48(Boss* boss) { *sp1C = 0.0f; } - D_i5_801BBEF8 = SEGMENTED_TO_VIRTUAL(D_8000FC0); + D_i5_801BBEF8 = SEGMENTED_TO_VIRTUAL(D_TI_8000FC0); } bool func_i5_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { @@ -3107,12 +3095,12 @@ void func_i5_80192118(Boss* boss) { boss->swork[1] = 1; break; case 1: - Animation_GetFrameData(&D_A0002BC, 0, D_i5_801BC978); - Animation_GetFrameData(&D_A0002BC, 0, D_i5_801BCDC8); - Animation_GetFrameData(&D_A0002BC, 0, D_i5_801BC9D8); - Animation_GetFrameData(&D_A0002BC, 0, D_i5_801BCE28); - Animation_GetFrameData(&D_A000934, 0, D_i5_801BCA38); - Animation_GetFrameData(&D_A000934, 0, D_i5_801BCE88); + Animation_GetFrameData(&D_TI_A0002BC, 0, D_i5_801BC978); + Animation_GetFrameData(&D_TI_A0002BC, 0, D_i5_801BCDC8); + Animation_GetFrameData(&D_TI_A0002BC, 0, D_i5_801BC9D8); + Animation_GetFrameData(&D_TI_A0002BC, 0, D_i5_801BCE28); + Animation_GetFrameData(&D_TI_A000934, 0, D_i5_801BCA38); + Animation_GetFrameData(&D_TI_A000934, 0, D_i5_801BCE88); if ((gPlayer[0].unk_138 - boss->obj.pos.z) <= 450.0f) { gPlayer[0].unk_19C = -1; gPlayer[0].unk_000 = 0.0f; @@ -3249,23 +3237,23 @@ void func_i5_80192118(Boss* boss) { Math_SmoothStepToF(&boss->vel.z, gPlayer[0].vel.z, 0.7f, 1.0f, 0.01f); Math_SmoothStepToF(&boss->obj.pos.x, gPlayer[0].pos.x, 0.1f, 6.0f, 0.01f); Math_SmoothStepToF(&boss->obj.pos.z, gPlayer[0].unk_138 - 450.0f, 0.1f, 1.0f, 0.01f); - Animation_GetFrameData(&D_A000D50, D_i5_801BBEF0[24] >> 1, D_i5_801BCA38); + Animation_GetFrameData(&D_TI_A000D50, D_i5_801BBEF0[24] >> 1, D_i5_801BCA38); switch (D_i5_801BBEF0[39]) { case 0: - Animation_GetFrameData(&D_A000858, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_A000858, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); break; case 1: - Animation_GetFrameData(&D_A00047C, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_A00047C, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); break; } switch (D_i5_801BBEF0[40]) { case 0: - Animation_GetFrameData(&D_A000858, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); + Animation_GetFrameData(&D_TI_A000858, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); break; case 1: - Animation_GetFrameData(&D_A00047C, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); + Animation_GetFrameData(&D_TI_A00047C, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); break; } Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 8, 0.5f, 360.0f, 0.01f); @@ -3275,20 +3263,20 @@ void func_i5_80192118(Boss* boss) { D_i5_801BBEF0[22]++; D_i5_801BBEF0[23]++; - if (D_i5_801BBEF0[24] >= (Animation_GetFrameCount(&D_A000D50) * 2)) { + if (D_i5_801BBEF0[24] >= (Animation_GetFrameCount(&D_TI_A000D50) * 2)) { D_i5_801BBEF0[24] = 0; } switch (D_i5_801BBEF0[39]) { case 0: - if (D_i5_801BBEF0[22] >= (Animation_GetFrameCount(&D_A000858) * 2)) { + if (D_i5_801BBEF0[22] >= (Animation_GetFrameCount(&D_TI_A000858) * 2)) { D_i5_801BBEF0[22] = 0; } break; case 1: - if (D_i5_801BBEF0[22] >= (Animation_GetFrameCount(&D_A00047C) * 2)) { + if (D_i5_801BBEF0[22] >= (Animation_GetFrameCount(&D_TI_A00047C) * 2)) { D_i5_801BBEF0[22] = 0; } break; @@ -3296,12 +3284,12 @@ void func_i5_80192118(Boss* boss) { switch (D_i5_801BBEF0[40]) { case 0: - if (D_i5_801BBEF0[23] >= (Animation_GetFrameCount(&D_A000858) * 2)) { + if (D_i5_801BBEF0[23] >= (Animation_GetFrameCount(&D_TI_A000858) * 2)) { D_i5_801BBEF0[23] = 0; } break; case 1: - if (D_i5_801BBEF0[23] >= (Animation_GetFrameCount(&D_A00047C) * 2)) { + if (D_i5_801BBEF0[23] >= (Animation_GetFrameCount(&D_TI_A00047C) * 2)) { D_i5_801BBEF0[23] = 0; } break; @@ -3379,25 +3367,25 @@ void func_i5_80192118(Boss* boss) { break; case 4: boss->vel.z = gPlayer[0].vel.z; - Animation_GetFrameData(&D_8000D80, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); - Animation_GetFrameData(&D_8000D80, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); - Animation_GetFrameData(&D_8000708, D_i5_801BBEF0[24] >> 1, D_i5_801BCA38); + Animation_GetFrameData(&D_TI_8000D80, D_i5_801BBEF0[22] >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_8000D80, D_i5_801BBEF0[23] >> 1, D_i5_801BC9D8); + Animation_GetFrameData(&D_TI_8000708, D_i5_801BBEF0[24] >> 1, D_i5_801BCA38); Math_SmoothStepToF(&boss->fwork[0], 0.5f, 0.05f, 0.05f, 0.01f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 8, boss->fwork[0], 360.0f, 0.01f); Math_SmoothStepToVec3fArray(D_i5_801BC9D8, D_i5_801BCE28, 1, 8, boss->fwork[0], 360.0f, 0.01f); Math_SmoothStepToVec3fArray(D_i5_801BCA38, D_i5_801BCE88, 1, 13, boss->fwork[0], 360.0f, 0.01f); if (boss->timer_050 <= 120) { - if (D_i5_801BBEF0[22] < ((Animation_GetFrameCount(&D_8000D80) * 2) - 1)) { + if (D_i5_801BBEF0[22] < ((Animation_GetFrameCount(&D_TI_8000D80) * 2) - 1)) { D_i5_801BBEF0[22]++; } } if (boss->timer_050 < 108) { - if (D_i5_801BBEF0[23] < ((Animation_GetFrameCount(&D_8000D80) * 2) - 1)) { + if (D_i5_801BBEF0[23] < ((Animation_GetFrameCount(&D_TI_8000D80) * 2) - 1)) { D_i5_801BBEF0[23]++; } } if (boss->timer_050 <= 120) { - if (D_i5_801BBEF0[24] < ((Animation_GetFrameCount(&D_8000708) * 2) - 1)) { + if (D_i5_801BBEF0[24] < ((Animation_GetFrameCount(&D_TI_8000708) * 2) - 1)) { D_i5_801BBEF0[24]++; } } @@ -4105,23 +4093,23 @@ void func_i5_80193DF0(Boss* boss) { switch (boss->state) { case 7: - Animation_GetFrameData(&D_70084CC, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI2_70084CC, boss->unk_04C >> 1, D_i5_801BC978); break; case 8: Animation_GetFrameData(&D_TI2_7003EE8, boss->unk_04C >> 1, D_i5_801BC978); break; case 9: - Animation_GetFrameData(&D_8008FE8, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_8008FE8, boss->unk_04C >> 1, D_i5_801BC978); break; case 10: - Animation_GetFrameData(&D_700E244, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI2_700E244, boss->unk_04C >> 1, D_i5_801BC978); break; case 11: case 13: - Animation_GetFrameData(&D_9004288, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_9004288, boss->unk_04C >> 1, D_i5_801BC978); break; case 12: - Animation_GetFrameData(&D_A009990, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_A009990, boss->unk_04C >> 1, D_i5_801BC978); break; } @@ -4129,7 +4117,7 @@ void func_i5_80193DF0(Boss* boss) { case 0: break; case 1: - Animation_GetFrameData(&D_70096EC, (s32) boss->fwork[48] >> 1, D_i5_801BD218); + Animation_GetFrameData(&D_TI2_70096EC, (s32) boss->fwork[48] >> 1, D_i5_801BD218); // might need to copy individual values for (i = 0; i < 19; i++) { D_i5_801BC978[D_i5_801BAA50[i]] = D_i5_801BD218[D_i5_801BAA50[i]]; @@ -4137,7 +4125,7 @@ void func_i5_80193DF0(Boss* boss) { break; case 2: - Animation_GetFrameData(&D_A009990, (s32) boss->fwork[48] >> 1, D_i5_801BD218); + Animation_GetFrameData(&D_TI_A009990, (s32) boss->fwork[48] >> 1, D_i5_801BD218); for (i = 0; i < 19; i++) { D_i5_801BC978[D_i5_801BAA50[i]] = D_i5_801BD218[D_i5_801BAA50[i]]; } @@ -4163,7 +4151,7 @@ void func_i5_80193DF0(Boss* boss) { boss->obj.pos.x = gPlayer[0].pos.x; boss->obj.pos.z = gPlayer[0].unk_138 - 1070.0f; boss->vel.z = 0.0f; - Animation_GetFrameData(&D_900FC4C, 0, D_i5_801BCDC8); + Animation_GetFrameData(&D_TI_900FC4C, 0, D_i5_801BCDC8); D_i5_801BBEF4[8] = 48.0f; D_i5_801BBEF4[9] = 48.0f; boss->fwork[35] = 1.0f; @@ -4181,7 +4169,7 @@ void func_i5_80193DF0(Boss* boss) { } break; case 6: - boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_900FC4C) * 2); + boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_TI_900FC4C) * 2); if ((boss->unk_04C == 0) || (boss->unk_04C == 68) || (boss->unk_04C == 96) || (boss->unk_04C == 149)) { AUDIO_PLAY_SFX(0x2900502A, boss->sfxSource, 4); } @@ -4210,16 +4198,16 @@ void func_i5_80193DF0(Boss* boss) { D_i5_801BBF00[i].unk_26 = 1; } } - Animation_GetFrameData(&D_900FC4C, boss->unk_04C >> 1, D_i5_801BC978); + Animation_GetFrameData(&D_TI_900FC4C, boss->unk_04C >> 1, D_i5_801BC978); Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_900FC4C) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_900FC4C) * 2)) { AUDIO_PLAY_SFX(0x2940702B, boss->sfxSource, 4); gPlayer[0].unk_19C = 0; boss->unk_04C = 0; boss->fwork[48] = 0; - Animation_GetFrameData(&D_70084CC, 0, D_i5_801BC978); + Animation_GetFrameData(&D_TI2_70084CC, 0, D_i5_801BC978); boss->swork[31] = 0; boss->swork[30]++; boss->vel.z = -15.0f; @@ -4276,7 +4264,7 @@ void func_i5_80193DF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_70084CC) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI2_70084CC) * 2)) { boss->fwork[36] = 0.0f; boss->fwork[37] = 0.0f; spB8 = 1; @@ -4338,7 +4326,7 @@ void func_i5_80193DF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_8008FE8) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_8008FE8) * 2)) { spB8 = 1; } break; @@ -4346,7 +4334,7 @@ void func_i5_80193DF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_700E244) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI2_700E244) * 2)) { spB8 = 1; } break; @@ -4489,7 +4477,7 @@ void func_i5_80193DF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_9004288) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_9004288) * 2)) { boss->swork[24] = 0; boss->fwork[43] = 0.0f; boss->swork[25] = 0; @@ -4505,7 +4493,7 @@ void func_i5_80193DF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); boss->unk_04C++; - if (boss->unk_04C >= (Animation_GetFrameCount(&D_A009990) * 2)) { + if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_A009990) * 2)) { boss->swork[33] = 0; boss->fwork[48] = 0; spB8 = 1; @@ -4551,15 +4539,15 @@ void func_i5_80193DF0(Boss* boss) { break; case 1: boss->fwork[48] += boss->fwork[2]; - if (Animation_GetFrameCount(&D_70096EC) * 2 <= boss->fwork[48]) { - boss->fwork[48] -= Animation_GetFrameCount(&D_70096EC) * 2; + if (Animation_GetFrameCount(&D_TI2_70096EC) * 2 <= boss->fwork[48]) { + boss->fwork[48] -= Animation_GetFrameCount(&D_TI2_70096EC) * 2; } else if (boss->fwork[48] < 0.0f) { - boss->fwork[48] += Animation_GetFrameCount(&D_70096EC) * 2 - 1.0f; + boss->fwork[48] += Animation_GetFrameCount(&D_TI2_70096EC) * 2 - 1.0f; } break; case 2: boss->fwork[48] += 1.0f; - if (Animation_GetFrameCount(&D_A009990) * 2 <= boss->fwork[48]) { + if (Animation_GetFrameCount(&D_TI_A009990) * 2 <= boss->fwork[48]) { if (boss->state == 13) { boss->fwork[0] = 0.0f; boss->swork[34] = 1; @@ -4665,7 +4653,7 @@ void func_i5_80193DF0(Boss* boss) { effect->unk_44 = 53; effect->info.unk_10 = 400.0f; effect->info.unk_14 = -1; - effect->unk_74 = D_7009A80; + effect->unk_74 = D_TI2_7009A80; } } if ((boss->fwork[12] <= 0.0f) && (boss->fwork[6] > 0.0f)) { @@ -4682,7 +4670,7 @@ void func_i5_80193DF0(Boss* boss) { effect->unk_44 = 53; effect->info.unk_10 = 400.0f; effect->info.unk_14 = -1; - effect->unk_74 = D_7009A80; + effect->unk_74 = D_TI2_7009A80; } } } @@ -4956,23 +4944,23 @@ void func_i5_801982A8(Boss* boss) { case 4: Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 0; - Animation_DrawSkeleton(0, D_A000EDC, D_i5_801BCE88, func_i5_8018FC70, func_i5_8019002C, boss, + Animation_DrawSkeleton(0, D_TI_A000EDC, D_i5_801BCE88, func_i5_8018FC70, func_i5_8019002C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); D_i5_801B83A8[0] = 22.0f; Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 1; - Animation_DrawSkeleton(0, D_A000568, D_i5_801BCDC8, func_i5_801903A0, func_i5_8019081C, boss, + Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCDC8, func_i5_801903A0, func_i5_8019081C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 2; - Animation_DrawSkeleton(0, D_A000568, D_i5_801BCE28, func_i5_801903A0, func_i5_8019081C, boss, + Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCE28, func_i5_801903A0, func_i5_8019081C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); break; case 6: - Animation_DrawSkeleton(0, D_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, + Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, &gIdentityMatrix); break; case 7: @@ -4982,7 +4970,7 @@ void func_i5_801982A8(Boss* boss) { case 11: case 12: case 13: - Animation_DrawSkeleton(0, D_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, + Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, &gIdentityMatrix); break; case 0: @@ -5077,7 +5065,7 @@ void func_i5_801982A8(Boss* boss) { RCP_SetupDL(&gMasterDisp, 0x31); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 178); gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0); - gSPDisplayList(gMasterDisp++, D_7005300); + gSPDisplayList(gMasterDisp++, D_TI2_7005300); Matrix_Pop(&gGfxMatrix); } if (D_i5_801BBEF0[17] > 0) { @@ -5091,7 +5079,7 @@ void func_i5_801982A8(Boss* boss) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) ((f32) (D_i5_801BBEF0[17] * 89.0f) / 3.0f)); gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0); - gSPDisplayList(gMasterDisp++, D_7005300); + gSPDisplayList(gMasterDisp++, D_TI2_7005300); Matrix_Pop(&gGfxMatrix); } @@ -5107,14 +5095,14 @@ void func_i5_801982A8(Boss* boss) { RCP_SetupDL(&gMasterDisp, 0x48); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 178); gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0); - gSPDisplayList(gMasterDisp++, D_8000D90); + gSPDisplayList(gMasterDisp++, D_TI_8000D90); Matrix_Pop(&gGfxMatrix); Matrix_Scale(gGfxMatrix, sp120, sp120, temp_fs2, 1); Matrix_SetGfxMtx(&gMasterDisp); gDPPipeSync(gMasterDisp++); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64); gDPSetEnvColor(gMasterDisp++, 0, 128, 110, 0); - gSPDisplayList(gMasterDisp++, D_8000D90); + gSPDisplayList(gMasterDisp++, D_TI_8000D90); Matrix_RotateY(gCalcMatrix, (boss->fwork[21] - 90.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, (boss->fwork[22] - 180.0f) * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, (boss->fwork[20] + boss->fwork[42]) * M_DTOR, 1); diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index a9e9c163..d84fc3ad 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -3430,7 +3430,8 @@ void func_menu_801A4394(void) { void func_menu_801A4650(void) { s32 i; static Gfx* D_menu_801B6A4C[] = { - D_9006AE0, D_90086F0, D_9005380, D_90075A0, D_9000570, D_9002EA0, D_90075A0, D_9004230, + D_FONT3D_9006AE0, D_FONT3D_90086F0, D_FONT3D_9005380, D_FONT3D_90075A0, + D_FONT3D_9000570, D_FONT3D_9002EA0, D_FONT3D_90075A0, D_FONT3D_9004230, }; Lights_SetOneLight(&gMasterDisp, 0, 0, 127, 28, 58, 105, 65, 70, 48); diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 4b98badd..50db3327 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -21,10 +21,10 @@ extern Gfx D_menu_801B50D8[]; extern Gfx D_menu_801B5E78[]; extern Gfx D_menu_801B57A8[]; -#include "fox_option_assets.h" #include "assets/ast_font.h" #include "assets/ast_font_3d.h" #include "assets/ast_option.h" +#include "assets/ast_versus.h" extern f32 D_menu_801CD818[]; @@ -2142,7 +2142,7 @@ void Option_RankingMenuDraw(void) { func_menu_8019C824(&D_menu_801B93F0); temp_t0 = D_menu_801B93F0; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_t0, temp_t0, 255); - TextureRect_8bIA(&gMasterDisp, D_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f); } RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); @@ -2746,33 +2746,33 @@ void func_menu_80199820(s32 arg0) { s32 colorGB; s32 i; static u8* D_menu_801AF1E0[3] = { - D_70030B0, - D_7003290, - D_7003470, + D_VS_70030B0, + D_VS_7003290, + D_VS_7003470, }; static u8* D_menu_801AF1EC[4] = { - D_70049C0, - D_7004BB0, - D_7004DC0, - D_7005020, + D_VS_70049C0, + D_VS_7004BB0, + D_VS_7004DC0, + D_VS_7005020, }; static u16* D_menu_801AF1FC[4] = { - D_7004B80, - D_7004D90, - D_7004FF0, - D_70051A0, + D_VS_7004B80, + D_VS_7004D90, + D_VS_7004FF0, + D_VS_70051A0, }; static u16* D_menu_801AF20C[4] = { - D_7008EE0, - D_700AD20, - D_700CB60, - D_70070A0, + D_VS_7008EE0, + D_VS_700AD20, + D_VS_700CB60, + D_VS_70070A0, }; static u8* D_menu_801AF21C[4] = { - D_7000000, - D_70000D0, - D_7000210, - D_7000350, + D_VS_7000000, + D_VS_70000D0, + D_VS_7000210, + D_VS_7000350, }; static s32 D_menu_801AF22C[4] = { 177, 255, 0, 30 }; static s32 D_menu_801AF23C[4] = { 242, 30, 255, 30 }; @@ -2783,11 +2783,11 @@ void func_menu_80199820(s32 arg0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 4; i++) { - TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * i) / 2, D_70123F8, 80, 16, D_menu_801AF148[arg0], + TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + (80 * 16 * i) / 2, D_VS_70123F8, 80, 16, D_menu_801AF148[arg0], D_menu_801AF158[arg0] + (16.0f * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * 4) / 2, D_70123F8, 80, 7, D_menu_801AF148[arg0], + TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + (80 * 16 * 4) / 2, D_VS_70123F8, 80, 7, D_menu_801AF148[arg0], D_menu_801AF158[arg0] + (16.0f * 4), 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF22C[arg0], D_menu_801AF23C[arg0], D_menu_801AF24C[arg0], 255); @@ -2809,7 +2809,7 @@ void func_menu_80199820(s32 arg0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7001030, 64, 9, D_menu_801AF148[arg0] + D_menu_801AF1BC, + TextureRect_8bIA(&gMasterDisp, D_VS_7001030, 64, 9, D_menu_801AF148[arg0] + D_menu_801AF1BC, D_menu_801AF158[arg0] + D_menu_801AF1C0, 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); @@ -2826,7 +2826,7 @@ void func_menu_80199820(s32 arg0) { TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D8, D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC, + TextureRect_8bIA(&gMasterDisp, D_VS_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC, D_menu_801AF158[arg0] + D_menu_801AF1D0, 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -2859,7 +2859,7 @@ void func_menu_80199EA8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 3; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_VS_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f, 1.0f); } } @@ -3211,7 +3211,7 @@ void func_menu_8019AB30(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f); } } @@ -3225,7 +3225,7 @@ void func_menu_8019AD84(void) { s32 colorGB; s32 var_v0; - static u8* sTimeTrialMinuteTextures[] = { D_70024D0, D_7002730, D_7002990, D_7002BF0, D_7002E50 }; + static u8* sTimeTrialMinuteTextures[] = { D_VS_70024D0, D_VS_7002730, D_VS_7002990, D_VS_7002BF0, D_VS_7002E50 }; RCP_SetupDL(&gMasterDisp, 0x53); @@ -3266,7 +3266,7 @@ void func_menu_8019AD84(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f); } } @@ -3309,7 +3309,7 @@ void func_menu_8019AFFC(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f); } if (D_menu_801B93D0 == 30) { @@ -3328,9 +3328,9 @@ void func_menu_8019B1F8(void) { s32 i; s32 width; s32 sp8C[2]; - static u8* D_menu_801AF2BC[] = { D_7001C10, D_70019E0 }; - static u8* D_menu_801AF2C4[] = { D_7006780, D_7005F10 }; - static u16* D_menu_801AF2CC[] = { D_7006EA0, D_7006630 }; + static u8* D_menu_801AF2BC[] = { D_VS_7001C10, D_VS_70019E0 }; + static u8* D_menu_801AF2C4[] = { D_VS_7006780, D_VS_7005F10 }; + static u16* D_menu_801AF2CC[] = { D_VS_7006EA0, D_VS_7006630 }; for (xPos = D_menu_801AF2A8, i = 0; i < 2; i++, xPos += D_menu_801AF2B0) { if (i == D_80161A28) { @@ -3366,16 +3366,16 @@ void func_menu_8019B3DC(void) { s32 i; s32 sp8C[3]; static u8* D_menu_801AF2E8[] = { - D_70017B0, - D_70019E0, + D_VS_70017B0, + D_VS_70019E0, }; static u8* D_menu_801AF2F0[] = { - D_7005600, - D_7005F10, + D_VS_7005600, + D_VS_7005F10, }; static u16* D_menu_801AF2F8[] = { - D_7005D20, - D_7006630, + D_VS_7005D20, + D_VS_7006630, }; for (xPos = D_menu_801AF2D4, i = 0; i < 2; i++, xPos += D_menu_801AF2DC) { @@ -3423,15 +3423,15 @@ void func_menu_8019B5AC(void) { if (gGameFrameCount & var_v0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f); } } void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255); - TextureRect_8bIA_MirX(&gMasterDisp, D_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f); + TextureRect_8bIA_MirX(&gMasterDisp, D_VS_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_VS_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f); } void func_menu_8019B7D4(void) { @@ -4227,10 +4227,13 @@ void func_menu_8019D624(void) { void func_menu_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle, f32 yAngle, f32 zAngle) { static Gfx* D_menu_801AF33C[37] = { - D_90086F0, D_9007FD0, D_9007BB0, D_9000980, D_90075A0, D_90070C0, D_9006AE0, D_9006500, D_90062D0, D_9001120, - D_9005CA0, D_9005980, D_9005380, D_9004E10, D_9000570, D_90014E0, D_9004920, D_9004230, D_9003A30, D_9003620, - D_9003230, D_9002EA0, D_9002890, D_90022A0, D_9001E90, D_9001A10, D_900BB90, D_90001F0, D_900B580, D_900AF60, - D_900A870, D_900A290, D_9009CB0, D_9009990, D_9009280, D_9008C60, D_9000000, + D_FONT3D_90086F0, D_FONT3D_9007FD0, D_FONT3D_9007BB0, D_FONT3D_9000980, D_FONT3D_90075A0, D_FONT3D_90070C0, + D_FONT3D_9006AE0, D_FONT3D_9006500, D_FONT3D_90062D0, D_FONT3D_9001120, D_FONT3D_9005CA0, D_FONT3D_9005980, + D_FONT3D_9005380, D_FONT3D_9004E10, D_FONT3D_9000570, D_FONT3D_90014E0, D_FONT3D_9004920, D_FONT3D_9004230, + D_FONT3D_9003A30, D_FONT3D_9003620, D_FONT3D_9003230, D_FONT3D_9002EA0, D_FONT3D_9002890, D_FONT3D_90022A0, + D_FONT3D_9001E90, D_FONT3D_9001A10, D_FONT3D_900BB90, D_FONT3D_90001F0, D_FONT3D_900B580, D_FONT3D_900AF60, + D_FONT3D_900A870, D_FONT3D_900A290, D_FONT3D_9009CB0, D_FONT3D_9009990, D_FONT3D_9009280, D_FONT3D_9008C60, + D_FONT3D_9000000, }; s32 i; diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index fc3c2e8d..2105a917 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -119,23 +119,39 @@ - name: ast_7_ti_2 exclusive_ram_id: segment_07 - type: bin + type: code + dir: assets + vram: 0x07000000 start: 0x9DD390 + subsegments: + - [0x9DD390, .data, ast_7_ti_2/ast_7_ti_2] - name: ast_8_ti exclusive_ram_id: segment_08 - type: bin + type: code + dir: assets start: 0x9EB5E0 + vram: 0x08000000 + subsegments: + - [0x9EB5E0, .data, ast_8_ti/ast_8_ti] - name: ast_9_ti exclusive_ram_id: segment_09 - type: bin + type: code + dir: assets start: 0x9F4880 + vram: 0x09000000 + subsegments: + - [0x9F4880, .data, ast_9_ti/ast_9_ti] - name: ast_A_ti + type: code + dir: assets exclusive_ram_id: segment_0A - type: bin start: 0xA049A0 + vram: 0x0A000000 + subsegments: + - [0xA049A0, .data, ast_A_ti/ast_A_ti] - name: ast_7_ti_1 exclusive_ram_id: segment_07