diff --git a/assets/yaml/us/ast_option.yaml b/assets/yaml/us/ast_option.yaml index 9369d67e..1f142000 100644 --- a/assets/yaml/us/ast_option.yaml +++ b/assets/yaml/us/ast_option.yaml @@ -10,241 +10,241 @@ - '#include "structs.h"' # Invoice -D_8000000: - { type: TEXTURE, ctype: u8, format: CI4, width: 128, height: 26, offset: 0x8000000, symbol: D_8000000, tlut: 0x8000680 } +D_OPT_8000000: + { type: TEXTURE, ctype: u8, format: CI4, width: 128, height: 26, offset: 0x8000000, symbol: D_OPT_8000000, tlut: 0x8000680 } -D_8000680: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8000680, symbol: D_8000680 } +D_OPT_8000680: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8000680, symbol: D_OPT_8000680 } # Cornerian army attn: -D_80006A0: - { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 34, offset: 0x80006A0, symbol: D_80006A0, tlut: 0x80017A0 } +D_OPT_80006A0: + { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 34, offset: 0x80006A0, symbol: D_OPT_80006A0, tlut: 0x80017A0 } -D_80017A0: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80017A0, symbol: D_80017A0 } +D_OPT_80017A0: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80017A0, symbol: D_OPT_80017A0 } # Venomian units destroyed -D_80017C0: - { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 66, offset: 0x80017C0, symbol: D_80017C0, tlut: 0x80038C0 } +D_OPT_80017C0: + { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 66, offset: 0x80017C0, symbol: D_OPT_80017C0, tlut: 0x80038C0 } -D_80038C0: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80038C0, symbol: D_80038C0 } +D_OPT_80038C0: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80038C0, symbol: D_OPT_80038C0 } # nd -D_80038E0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 10, offset: 0x80038E0, symbol: D_80038E0, tlut: 0x8003930 } +D_OPT_80038E0: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 10, offset: 0x80038E0, symbol: D_OPT_80038E0, tlut: 0x8003930 } -D_8003930: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003930, symbol: D_8003930 } +D_OPT_8003930: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003930, symbol: D_OPT_8003930 } # rd -D_8003950: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 11, offset: 0x8003950, symbol: D_8003950, tlut: 0x80039A8 } +D_OPT_8003950: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 11, offset: 0x8003950, symbol: D_OPT_8003950, tlut: 0x80039A8 } -D_80039A8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_80039A8 } +D_OPT_80039A8: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_OPT_80039A8 } # -D_80039D0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80039D0 , symbol: D_80039D0, tlut: 0x8003A50 } +D_OPT_80039D0: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80039D0 , symbol: D_OPT_80039D0, tlut: 0x8003A50 } -D_8003A50: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003A50, symbol: D_8003A50 } +D_OPT_8003A50: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003A50, symbol: D_OPT_8003A50 } # st -D_8003A70: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003A70, symbol: D_8003A70, tlut: 0x8003AB8 } +D_OPT_8003A70: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003A70, symbol: D_OPT_8003A70, tlut: 0x8003AB8 } -D_8003AB8: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_8003AB8 } +D_OPT_8003AB8: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_OPT_8003AB8 } # th -D_8003AE0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003AE0, symbol: D_8003AE0, tlut: 0x8003B28 } +D_OPT_8003AE0: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003AE0, symbol: D_OPT_8003AE0, tlut: 0x8003B28 } -D_8003B28: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_8003B28 } +D_OPT_8003B28: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_OPT_8003B28 } # Option Title Cards # Main Game -D_8003B50: - { type: TEXTURE, ctype: u8, format: IA8, width: 72, height: 12, offset: 0x8003B50, symbol: D_8003B50 } +D_OPT_8003B50: + { type: TEXTURE, ctype: u8, format: IA8, width: 72, height: 12, offset: 0x8003B50, symbol: D_OPT_8003B50 } # Training -D_8003EB0: - { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8003EB0, symbol: D_8003EB0 } +D_OPT_8003EB0: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8003EB0, symbol: D_OPT_8003EB0 } # Vs. -D_8004270: - { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 10, offset: 0x8004270, symbol: D_8004270 } +D_OPT_8004270: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 10, offset: 0x8004270, symbol: D_OPT_8004270 } # Ranking -D_80043B0: - { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 12, offset: 0x80043B0, symbol: D_80043B0 } +D_OPT_80043B0: + { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 12, offset: 0x80043B0, symbol: D_OPT_80043B0 } # Sound -D_80046B0: - { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 10, offset: 0x80046B0, symbol: D_80046B0 } +D_OPT_80046B0: + { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 10, offset: 0x80046B0, symbol: D_OPT_80046B0 } # Data -D_8004930: - { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 10, offset: 0x8004930, symbol: D_8004930 } +D_OPT_8004930: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 10, offset: 0x8004930, symbol: D_OPT_8004930 } -D_8004C50: - { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8004C50, symbol: D_8004C50 } +D_OPT_8004C50: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8004C50, symbol: D_OPT_8004C50 } # Option VS Cards # Point Match -D_8005010: - { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x8005010, symbol: D_8005010 } +D_OPT_8005010: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x8005010, symbol: D_OPT_8005010 } # Battle Royal -D_80054F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 11, offset: 0x80054F0, symbol: D_80054F0 } +D_OPT_80054F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 11, offset: 0x80054F0, symbol: D_OPT_80054F0 } # Time Trial -D_8005910: - { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8005910, symbol: D_8005910 } +D_OPT_8005910: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8005910, symbol: D_OPT_8005910 } # Sound Options # Press R to test -D_8005CD0: - { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 13, offset: 0x8005CD0, symbol: D_8005CD0 } +D_OPT_8005CD0: + { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 13, offset: 0x8005CD0, symbol: D_OPT_8005CD0 } # Mode -D_8006280: - { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 13, offset: 0x8006280, symbol: D_8006280 } +D_OPT_8006280: + { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 13, offset: 0x8006280, symbol: D_OPT_8006280 } # Music -D_80064F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x80064F0, symbol: D_80064F0 } +D_OPT_80064F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x80064F0, symbol: D_OPT_80064F0 } # Voice -D_80069C0: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_80069C0 } +D_OPT_80069C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_OPT_80069C0 } # SE -D_8006D10: - { type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_8006D10 } +D_OPT_8006D10: + { type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_OPT_8006D10 } # B to cancel -D_8006E50: - { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8006E50, symbol: D_8006E50 } +D_OPT_8006E50: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8006E50, symbol: D_OPT_8006E50 } # Headphone -D_8007210: - { type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x8007210, symbol: D_8007210 } +D_OPT_8007210: + { type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x8007210, symbol: D_OPT_8007210 } # Mono -D_80076E0: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 14, offset: 0x80076E0, symbol: D_80076E0 } +D_OPT_80076E0: + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 14, offset: 0x80076E0, symbol: D_OPT_80076E0 } # Soundtrack -D_80079F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 14, offset: 0x80079F0, symbol: D_80079F0 } +D_OPT_80079F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 14, offset: 0x80079F0, symbol: D_OPT_80079F0 } # A to confirm -D_80080F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x80080F0, symbol: D_80080F0 } +D_OPT_80080F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x80080F0, symbol: D_OPT_80080F0 } # Clear Saved Data -D_80084B0: - { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x80084B0, symbol: D_80084B0 } +D_OPT_80084B0: + { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x80084B0, symbol: D_OPT_80084B0 } # Are you sure? -D_8008DA0: - { type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 19, offset: 0x8008DA0, symbol: D_8008DA0 } +D_OPT_8008DA0: + { type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 19, offset: 0x8008DA0, symbol: D_OPT_8008DA0 } # Yes -D_8009980: - { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 12, offset: 0x8009980, symbol: D_8009980 } +D_OPT_8009980: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 12, offset: 0x8009980, symbol: D_OPT_8009980 } # No -D_8009B00: - { type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x8009B00, symbol: D_8009B00 } +D_OPT_8009B00: + { type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x8009B00, symbol: D_OPT_8009B00 } # Are you REALLY sure? -D_8009CE0: - { type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 41, offset: 0x8009CE0, symbol: D_8009CE0 } +D_OPT_8009CE0: + { type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 41, offset: 0x8009CE0, symbol: D_OPT_8009CE0 } # Data erased -D_800B680: - { type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 41, offset: 0x800B680, symbol: D_800B680 } +D_OPT_800B680: + { type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 41, offset: 0x800B680, symbol: D_OPT_800B680 } # Stereo -D_800CD90: - { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_800CD90 } +D_OPT_800CD90: + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_OPT_800CD90 } # UNK: Triangle shape, it's mirrored to form a diamond shape -D_800D070: - { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x800D070, symbol: D_800D070 } +D_OPT_800D070: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x800D070, symbol: D_OPT_800D070 } # UNK: -D_800D170: - { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 16, offset: 0x800D170, symbol: D_800D170 } +D_OPT_800D170: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 16, offset: 0x800D170, symbol: D_OPT_800D170 } # Seal -D_800D1F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 48, offset: 0x800D1F0, symbol: D_800D1F0 } +D_OPT_800D1F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 48, offset: 0x800D1F0, symbol: D_OPT_800D1F0 } # UNK: -D_800E0F0: - { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E0F0, symbol: D_800E0F0 } +D_OPT_800E0F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E0F0, symbol: D_OPT_800E0F0 } -D_800E130: - { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E130, symbol: D_800E130 } +D_OPT_800E130: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E130, symbol: D_OPT_800E130 } # Mercenary Unit STARFOX Fox Mccloud -D_800E170: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 188, height: 60, offset: 0x800E170, symbol: D_800E170 } +D_OPT_800E170: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 188, height: 60, offset: 0x800E170, symbol: D_OPT_800E170 } # ScrollBar -D_8013990: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 104, height: 10, offset: 0x8013990, symbol: D_8013990 } +D_OPT_8013990: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 104, height: 10, offset: 0x8013990, symbol: D_OPT_8013990 } # ScrollBar Indicator -D_80141B0: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x80141B0, symbol: D_80141B0 } +D_OPT_80141B0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x80141B0, symbol: D_OPT_80141B0 } # Speaker -D_80143B0: - { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x80143B0, symbol: D_80143B0, tlut: D_80147B0 } +D_OPT_80143B0: + { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x80143B0, symbol: D_OPT_80143B0, tlut: D_OPT_80147B0 } -D_80147B0: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x80147B0, symbol: D_80147B0 } +D_OPT_80147B0: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x80147B0, symbol: D_OPT_80147B0 } -D_80147F0: - { type: GFX, offset: 0x80147F0, symbol: D_80147F0 } +D_OPT_80147F0: + { type: GFX, offset: 0x80147F0, symbol: D_OPT_80147F0 } ast_option_seg8_vtx_00014B50: { type: VTX, count: 124, offset: 0x8014B50, symbol: ast_option_seg8_vtx_00014B50 } -D_8015310: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x8015310, symbol: D_8015310, tlut: 0x08015390 } +D_OPT_8015310: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x8015310, symbol: D_OPT_8015310, tlut: 0x08015390 } -D_8015390: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015390, symbol: D_8015390 } +D_OPT_8015390: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015390, symbol: D_OPT_8015390 } -D_80153B0: - { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80153B0, symbol: D_80153B0, tlut: 0x08015430 } +D_OPT_80153B0: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80153B0, symbol: D_OPT_80153B0, tlut: 0x08015430 } -D_8015430: - { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015430, symbol: D_8015430 } +D_OPT_8015430: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015430, symbol: D_OPT_8015430 } -D_8015450: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x08015450, symbol: D_8015450 } +D_OPT_8015450: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x08015450, symbol: D_OPT_8015450 } -D_8015550: - { type: GFX, offset: 0x8015550, symbol: D_8015550 } +D_OPT_8015550: + { type: GFX, offset: 0x8015550, symbol: D_OPT_8015550 } -D_80155E8: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_80155E8 } +D_OPT_80155E8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_OPT_80155E8 } -D_8015DF0: - { type: GFX, offset: 0x8015DF0, symbol: D_8015DF0 } +D_OPT_8015DF0: + { type: GFX, offset: 0x8015DF0, symbol: D_OPT_8015DF0 } -D_8015E88: - { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x08015E88, symbol: D_8015E88 } +D_OPT_8015E88: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x08015E88, symbol: D_OPT_8015E88 } diff --git a/include/assets.h b/include/assets.h index 49d94e6a..aea7bbdc 100644 --- a/include/assets.h +++ b/include/assets.h @@ -17,55 +17,42 @@ */ extern Gfx D_60005B0[]; // fox_bg extern Gfx D_6000A80[]; // fox_bg, fox_effect -extern u16 D_A6_6000B60[]; // fox_radio extern Gfx D_6000E00[]; // fox_edata_1C extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka extern Gfx D_6001840[]; // fox_bg extern Gfx D_6001A60[]; // fox_effect -extern u16 D_A6_6001A80[]; // fox_radio extern u8 D_6001B80[]; // fox_hud extern Vtx D_6001C50[]; // fox_play -extern u8 D_6001C80[]; // fox_map extern Gfx D_6001DA0[]; // fox_demo, fox_edata_1C extern u8 D_60020D0[]; // fox_hud -extern u8 D_6002160[]; // fox_map extern Gfx D_60023B0[]; // fox_edata_1C extern Gfx D_6002990[]; // fox_edata_1C -extern u16 D_A6_60029A0[]; // fox_radio extern Gfx D_6002E60[]; // fox_bg extern Gfx D_6002F80[]; // fox_bg extern Gfx D_6003000[]; // fox_edata_1C -extern u8 D_60030D0[]; // fox_map extern Gfx D_60030F0[]; // fox_edata_1C extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2 extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2 extern Gfx D_6003760[]; -extern u16 D_A6_60038C0[]; extern Gfx D_60038E0[]; extern u16 D_60038F8[]; -extern u8 D_6003B50[]; extern Gfx D_6004170[]; extern Gfx D_6004330[]; extern Vtx D_6004500[]; extern Gfx D_6004570[]; extern Gfx D_60046F0[]; -extern u16 D_A6_60047E0[]; extern Gfx D_6004900[]; -extern u8 D_6004AC0[]; extern Gfx D_6004FE0[]; extern EnvSettings D_6005000; extern Gfx D_6005360[]; -extern u16 D_A6_6005700[]; extern u16 D_6005710[]; -extern u8 D_6005740[]; extern Gfx D_6005780[]; extern Gfx D_6005880[]; extern Gfx D_60059F0[]; extern Gfx D_6006140[]; extern Gfx D_6006310[]; extern u16* D_600631C[]; -extern u8 D_6006320[]; extern Animation D_600636C; extern f32 D_60064AC[]; extern f32 D_60064C8[]; @@ -109,7 +96,6 @@ extern f32 D_6006C44[]; extern Animation D_6006D64; extern Limb* D_6006E50[]; extern EnvSettings D_6006E70; -extern u8 D_6006E80[]; extern u16 D_6006EA0[]; extern Gfx D_6006F50[]; extern Gfx D_6007410[]; @@ -117,7 +103,6 @@ extern CollisionPoly D_6007558[]; extern Gfx D_60075D0[]; extern Gfx D_6007650[]; extern Gfx D_60079B0[]; -extern u8 D_6007B90[]; extern Gfx D_6007CF0[]; extern Gfx D_6007D80[]; extern Gfx D_6007D90[]; @@ -125,7 +110,6 @@ extern EnvSettings D_6007E30; extern Gfx D_6008370[]; extern Gfx D_6008770[]; extern Gfx D_6008830[]; -extern u8 D_6008990[]; extern Gfx D_6008AA0[]; extern Vec3s D_6008E08[]; extern f32 D_600924C[]; @@ -133,7 +117,6 @@ extern Gfx D_6009250[]; extern f32 D_60092E8[]; extern f32 D_6009388[]; extern Gfx D_60097E0[]; -extern u8 D_6009AD0[]; extern u16* D_6009B34[]; extern u16 D_6009BB8[]; extern f32 D_6009CC4[]; @@ -144,13 +127,11 @@ extern Vtx D_6009ED0[]; extern Gfx D_6009F90[]; extern Gfx D_600A420[]; extern Gfx D_600A810[]; -extern u8 D_600AD30[]; extern Gfx D_600AF40[]; extern Gfx D_600B0E0[]; extern Animation D_600B1B4; extern Gfx D_600B4B0[]; extern Gfx D_600B8B0[]; -extern u8 D_600B9B0[]; extern Gfx D_600BAF0[]; extern u16 D_600BEA0[]; extern Gfx D_600C130[]; @@ -162,7 +143,6 @@ extern Gfx D_600C740[]; extern Vtx D_600C780[]; extern Gfx D_600CAA0[]; extern u16 D_600CBD8[]; -extern u8 D_600CC10[]; extern Gfx D_600D190[]; extern Animation D_600D3DC; extern u16 D_600D5C0[]; @@ -174,8 +154,6 @@ extern Gfx D_600DBC0[]; extern u8 D_600DDC0[]; extern Gfx D_600DDF0[]; extern Gfx D_600E050[]; -extern Gfx D_A6_600E0C0[]; -extern u8 D_600E210[]; extern Animation D_600E2C4; extern u8 D_600E360[]; extern Limb* D_600E470[]; @@ -188,9 +166,7 @@ extern Gfx D_600EFF0[]; extern Gfx D_600F160[]; extern Gfx D_600F1D0[]; extern CollisionPoly D_600F1DC[]; -extern Gfx D_A6_600F1F0[]; extern Gfx D_600F2F0[]; -extern u8 D_600F390[]; extern Vec3s D_600F394[]; extern Gfx D_600F3D0[]; extern CollisionPoly D_600F3F4[]; @@ -213,13 +189,11 @@ extern f32 D_600FF80[]; extern f32 D_600FFA0[]; extern f32 D_600FFC0[]; extern f32 D_600FFE0[]; -extern u8 D_6010010[]; extern ObjectInit* D_6010088[]; extern u8 D_6010090[]; extern u16 D_6010198[]; extern CollisionPoly D_6010294[]; extern Gfx D_60102C0[]; -extern u8 D_60105C0[]; extern u8 D_60106B0[]; extern Gfx D_6010700[]; extern Gfx D_6010960[]; @@ -230,32 +204,26 @@ extern u8 D_6010FA0[]; extern EnvSettings D_6011000; extern f32 D_6011058[]; extern f32 D_601115C[]; -extern u8 D_TEX_6011660[]; extern Vec3s D_601170C[]; extern u8 D_6011890[]; -extern Gfx D_A6_6011910[]; extern f32 D_6011B24[]; extern u16 D_6011B40[]; extern f32 D_6011BF4[]; extern f32 D_6011C10[]; extern f32 D_6011C48[]; extern f32 D_6011C80[]; -extern u8 D_6011EA0[]; extern u8 D_6012310[]; extern u8 D_60123F0[]; extern Gfx D_6012C00_Gfx[]; extern Animation D_6012C00_Anim; -extern u8 D_60131A0[]; extern Gfx D_60132B0[]; extern u8 D_6013470[]; extern Gfx D_6013480[]; extern Gfx D_60137B0[]; extern Animation D_601388C; extern Gfx D_6013960[]; -extern u8 D_60139E0[]; extern Gfx D_6013B50[]; extern u8 D_6014140[]; -extern u8 D_6014360[]; extern Gfx D_60143E0[]; extern Gfx D_6014500[]; extern u16 D_6014510[]; @@ -267,13 +235,10 @@ extern u8 D_60148B0[]; extern Gfx D_60148D0[]; extern Gfx D_6014A20[]; extern Gfx D_6014B50[]; -extern u8 D_6014BA0[]; extern EnvSettings D_6014D50; extern CollisionPoly D_6014FEC[]; extern Gfx D_60153B0[]; extern u16 D_6015430[]; -extern u8 D_6015CE0[]; -extern Gfx D_A6_6015EE0[]; extern Gfx D_6015F00[]; extern Gfx D_6016270[]; extern Vec3s D_6016374[]; @@ -282,34 +247,23 @@ extern Gfx D_6016580[]; extern f32 D_601668C[]; extern f32 D_60166F4[]; extern f32 D_6016714[]; -extern u8 D_6016760[]; extern Gfx D_6016CF0[]; extern Gfx D_6017090[]; extern Gfx D_6017370[]; -extern u8 D_6017640[]; -extern u8 D_6018280[]; extern Gfx D_6018450[]; extern Gfx D_60188D0[]; -extern Animation D_A6_6018994; -extern Limb* D_A6_6018BA0[]; -extern Gfx D_A6_6018BF0[]; extern Gfx D_6018C00[]; // possible collision extern Gfx D_6018D40[]; extern Gfx D_6018E80[]; extern u16 D_6018F30[]; -extern u8 D_60190B0[]; extern Gfx D_6019220[]; -extern Gfx D_A6_6019730[]; extern u16 D_6019E50[]; -extern Gfx D_A6_601A120[]; extern Gfx D_601A7A0[]; extern Gfx D_601A7D0[]; extern Gfx D_601AD70[]; extern Gfx D_601AE40[]; extern Gfx D_601B0D0[]; extern u16* D_601B1E4[]; -extern Gfx D_A6_601B2B0[]; -extern u16 D_601B4B0[]; extern f32 D_601B4C4[]; extern f32 D_601B4E0[]; extern f32 D_601B4FC[]; @@ -331,21 +285,16 @@ extern f32 D_601B830[]; extern f32 D_601B868[]; extern f32 D_601B8A0[]; extern f32 D_601B8D8[]; -extern Gfx D_A6_601BB40[]; extern Gfx D_601BEC0[]; -extern Gfx D_601C0D0[]; extern Gfx D_601C6A0[]; extern Gfx D_601C7C0[]; extern Gfx D_601C820[]; extern u16 D_601C8E0[]; -extern Gfx D_601C960[]; extern Gfx D_601C9B0[]; -extern Gfx D_601D1F0[]; extern Gfx D_601D730[]; extern u8 D_601D750[]; extern u16 D_601D800[]; extern u16 D_601DB50[]; -extern Gfx D_601DE80[]; extern Gfx D_601E150[]; extern u16 D_601E1E8[]; extern Animation D_601E8C4; @@ -355,11 +304,9 @@ extern Gfx D_601F1D0[]; extern EnvSettings D_601F1F0; extern Gfx D_601F500[]; extern Gfx D_601F5A0[]; -extern Gfx D_601F6B0[]; extern Animation D_601F874; extern Limb* D_601F920[]; extern Gfx D_601FCB0[]; -extern u8 D_601FF40[]; extern Gfx D_601FF80[]; extern Gfx D_60200E0[]; extern Gfx D_6020760[]; @@ -368,9 +315,7 @@ extern Gfx D_6020B40[]; extern u16* D_6020DD0[]; extern Gfx D_6020E60[]; extern u16 D_6020F60[]; -extern u16 D_6022340[]; extern Gfx D_60223C0[]; -extern u8 D_60223E0[]; extern Gfx D_6022450[]; extern Gfx D_6022530[]; extern u16 D_6022760[]; @@ -379,13 +324,10 @@ extern u16 D_60229A4[]; extern f32 D_60231A4[]; extern Gfx D_60238F0[]; extern Gfx D_6023AC0[]; -extern EnvSettings D_A6_6023F20; extern Gfx D_6024010[]; extern Gfx D_6024220[]; extern Gfx D_60244A0[]; extern u16 D_60245E0[]; -extern u16 D_60247E0[]; -extern u8 D_6024890[]; extern Gfx D_6024AC0[]; extern Gfx D_6024B60[]; extern u16 D_6025500[]; @@ -393,23 +335,14 @@ extern Gfx D_6025B50[]; extern u16 D_6026420[]; extern EnvSettings D_60266D0; extern EnvSettings D_ENV_6026C80; -extern u16 D_6026C90[]; -extern u8 D_6026D70[]; extern Gfx D_60270E0[]; extern Gfx D_6027180[]; extern Animation D_6027320; extern u16 D_6027340[]; extern Limb* D_602742C[]; extern Gfx D_6027900[]; -extern u16* D_A6_6027F50[]; extern u16 D_6028260[]; -extern f32 D_A6_6028454[]; -extern f32 D_A6_6028578[]; -extern EnvSettings D_A6_6028760; -extern u16* D_A6_60289FC[]; extern u16 D_6028A60[]; -extern u16 D_6029170[]; -extern u8 D_6029220[]; extern Animation D_6029528; extern Limb* D_6029674[]; extern Gfx D_6029890[]; @@ -417,8 +350,6 @@ extern Gfx D_602A720[]; extern u16* D_602AAC0[]; extern u16 D_602AC50[]; extern ObjectInit* D_602B148[]; -extern u16 D_602B620[]; -extern u8 D_602B6D0[]; extern f32 D_602B9EC[]; extern f32 D_602BA20[]; extern f32 D_602BAE4[]; @@ -440,9 +371,7 @@ extern Triangle D_602CACC[]; extern Vec3f D_602CB80[]; extern Gfx D_602D5F0[]; extern Gfx D_602DA20[]; -extern u16 D_602DAD0[]; extern Gfx D_602DAE0[]; -extern u8 D_602DB60[]; extern Gfx D_602DB80[]; extern Gfx D_602DC20[]; extern Gfx D_602DCA0[]; @@ -465,8 +394,6 @@ extern f32 D_602F75C[]; extern Gfx D_602F7C0[]; extern f32 D_602FA50[]; extern CollisionPoly D_602FA9C[]; -extern u16 D_602FF60[]; -extern u8 D_602FFD0[]; extern Vec3s D_60300C8[]; extern CollisionPoly D_6030208[]; extern Gfx D_6030500[]; @@ -489,15 +416,11 @@ extern Vec3f D_6030F7C[]; extern Triangle D_6030FC4[]; extern Vec3s D_603184C[]; extern Gfx D_60320E0[]; -extern u16 D_60323D0[]; -extern u16 D_6032440[]; extern Gfx D_6032580[]; -extern u16 D_6032A60[]; extern Gfx D_6032BC0[]; extern u16* D_6032E18[]; extern Gfx D_6033000[]; extern CollisionPoly D_6033070[]; -extern u16 D_6033080[]; extern Vec3s D_6033E08[]; extern f32 D_603405C[]; extern f32 D_6034368[]; @@ -510,7 +433,6 @@ extern f32 D_60347D4[]; extern f32 D_60347F0[]; extern f32 D_603486C[]; extern Gfx D_6034B90[]; -extern u16 D_6035780[]; extern f32 D_60359C8[]; extern f32 D_6035A14[]; extern f32 D_6035A48[]; @@ -557,12 +479,8 @@ extern f32 D_6036968[]; extern Gfx D_6036CD0[]; extern EnvSettings D_6037160; extern Gfx D_6037CF0[]; -extern u16 D_6037E80[]; extern u16* D_60381D8[]; -extern u16 D_603A580[]; -extern u16 D_603A580[]; extern ObjectInit D_603B074[]; -extern u16 D_603CC80[]; extern u16* D_603D9E8[]; extern f32 D_603DCA4[]; extern f32 D_603DD40[]; @@ -585,8 +503,6 @@ extern Gfx D_6019670[]; extern Gfx D_60185E0[]; extern Gfx D_6017550[]; -// fox_map, to be ordered later - extern f32 D_603E118[]; extern f32 D_603E14C[]; extern f32 D_603E1B4[]; @@ -618,25 +534,9 @@ extern f32 D_603EAE0[]; extern f32 D_603EB0C[]; extern u16 D_603EB38[]; extern Triangle D_603F338[]; -extern u16 D_603F380[]; extern Vec3f D_603F388[]; extern Triangle D_603F40C[]; extern Vec3f D_603F4E4[]; extern Gfx D_6041070[]; -extern u16 D_6041A80[]; -extern u16 D_6044180[]; -extern u16 D_60447A0[]; -extern u16 D_6047550[]; -extern Gfx D_6049F80[]; -extern Gfx D_604A190[]; -extern Gfx D_604A400[]; -extern Gfx D_604A710[]; -extern Gfx D_604A9F0[]; -extern Gfx D_604B750[]; -extern Gfx D_604DB10[]; -extern Gfx D_6051D20[]; -extern Gfx D_6055F20[]; -extern Gfx D_605C230[]; -extern Gfx D_6060610[]; #endif // ASSETS_H diff --git a/include/assets/ast_ending.h b/include/assets/ast_ending.h index 22c1e0fe..5ab3bee2 100644 --- a/include/assets/ast_ending.h +++ b/include/assets/ast_ending.h @@ -5,4 +5,30 @@ #include "sf64object.h" #include "structs.h" +extern Gfx D_END_7010970[]; +extern Animation D_END_70111D0; +extern Animation D_END_70143C0; +extern Animation D_END_7018708; +extern Limb* D_END_70187B4[]; +extern Gfx D_END_700C620[]; +extern Gfx D_END_700C8B0[]; +extern Gfx D_END_700F240[]; +extern Gfx D_END_700F320[]; +extern Gfx D_END_7010970[]; +extern u8 D_END_7010E10[]; +extern u16 D_END_7010EE0[]; +extern u8 D_END_7010F00[]; +extern u16 D_END_7010FD0[]; +extern u8 D_END_7010FF0[]; +extern u16 D_END_70110C0[]; +extern u8 D_END_70110E0[]; +extern u16 D_END_70111B0[]; +extern Gfx D_END_7000000[]; +extern Gfx D_END_7002120[]; +extern Gfx D_END_7004240[]; +extern Gfx D_END_700E9E0[]; +extern u16 D_END_700EA38[]; +extern Gfx D_END_7010970[]; +extern Gfx D_END_7016540[]; + #endif diff --git a/include/assets/ast_enmy_planet.h b/include/assets/ast_enmy_planet.h index a860ad85..830d54bb 100644 --- a/include/assets/ast_enmy_planet.h +++ b/include/assets/ast_enmy_planet.h @@ -5,21 +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[]; +extern Animation D_ENMY_PLANET_40001A4; +extern Limb* D_ENMY_PLANET_4000270[]; +extern Gfx D_ENMY_PLANET_4000710[]; +extern Gfx D_ENMY_PLANET_40018A0[]; +extern Animation D_ENMY_PLANET_40057AC; +extern Limb* D_ENMY_PLANET_40058B8[]; +extern Gfx D_ENMY_PLANET_40068F0[]; +extern Gfx D_ENMY_PLANET_4006E90[]; +extern Gfx D_ENMY_PLANET_40073C0[]; +extern Gfx D_ENMY_PLANET_4007AF0[]; +extern Gfx D_ENMY_PLANET_4008CE0[]; +extern Gfx D_ENMY_PLANET_4008CE0[]; +extern Gfx D_ENMY_PLANET_4008F70[]; +extern Gfx D_ENMY_PLANET_4008F70[]; +extern Gfx D_ENMY_PLANET_4009800[]; +extern Gfx D_ENMY_PLANET_400AAE0[]; #endif diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h index efb42d4c..baea58dd 100644 --- a/include/fox_edisplay_assets.h +++ b/include/fox_edisplay_assets.h @@ -1,7 +1,7 @@ #ifndef FOX_EDISPLAY_ASSETS_H #define FOX_EDISPLAY_ASSETS_H -#include "global.h" +#include "sys.h" extern Gfx D_6027960[]; extern Gfx D_60273A0[]; diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h index 07c8c542..15d13d4f 100644 --- a/include/fox_enmy2_assets.h +++ b/include/fox_enmy2_assets.h @@ -1,7 +1,7 @@ #ifndef FOX_ENMY2_ASSETS_H #define FOX_ENMY2_ASSETS_H -#include "global.h" +#include "sys.h" // Displaylists diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h index 9dee9b4e..5972e9e9 100644 --- a/include/fox_enmy_assets.h +++ b/include/fox_enmy_assets.h @@ -1,7 +1,7 @@ #ifndef FOX_ENMY_ASSETS_H #define FOX_ENMY_ASSETS_H -#include "global.h" +#include "sf64object.h" extern ObjectInit D_60371A4[]; extern ObjectInit D_6026CC4[]; diff --git a/include/global.h b/include/global.h index 1a4923ba..f001ef09 100644 --- a/include/global.h +++ b/include/global.h @@ -20,6 +20,5 @@ #include "i5.h" #include "i6.h" #include "assets/ast_common.h" -#include "assets.h" #endif // GLOBAL_H diff --git a/include/hud.h b/include/hud.h deleted file mode 100644 index 68615254..00000000 --- a/include/hud.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef HUD_H -#define HUD_H - -#include "global.h" - -typedef struct { - /* 0x00 */ u8* unk_00; - /* 0x04 */ s32 width; - /* 0x08 */ s32 height; - /* 0x0C */ u8* unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; -} UnkStruct_D_800D1AEC; - -void func_80084930(f32, f32, s32); -void func_80086444(void); -void func_80087788(void); -void func_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, - f32 arg9, f32 argA); -void func_80085944(void); -void func_80086CC8(void); -void func_80086DCC(void); -void func_80087B5C(void); -void func_80089994(s32); -s32 func_8008A4DC(void); -void func_8008B044(void); -void func_8008B1B0(void); -void func_8008B2F0(void); -void func_8008B734(void); -void func_8008B9E8(void); -void func_8008BAE4(void); -void func_8008CBE4(void); -void func_8008D250(void); -void func_8008D31C(void); -void func_8008D4F0(f32, f32); -void func_8008D7F4(void); -void func_8008D984(void); -void func_8008DC34(void); -void func_8008E5E8(void); -s32 func_80090E8C(Actor*); -s32 func_800910C0(Actor*); - -#endif diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 24ce889b..f382003b 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -31,7 +31,7 @@ D_800D0000 = 0x800D0000;//ignore:true D_7FFFFFFE = 0x7FFFFFFE;//ignore:true D_1000000 = 0x01000000;//ignore:true D_TI_A000000 = 0x0A000000;//ignore:true -D_4000000 = 0x04000000;//ignore:true +D_ENMY_PLANET_4000000 = 0x04000000;//ignore:true // constant for K1 access D_TI_A0000000 = 0xA0000000;//ignore:true diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 121e2f77..8ccfdacc 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -537,10 +537,10 @@ D_6017550 = 0x06017550; D_TI1_700AB70 = 0x0700AB70; D_TI1_700BE00 = 0x0700BE00; -D_70111D0 = 0x070111D0; -D_70143C0 = 0x070143C0; -D_7018708 = 0x07018708; -D_70187B4 = 0x070187B4; +D_END_70111D0 = 0x070111D0; +D_END_70143C0 = 0x070143C0; +D_END_7018708 = 0x07018708; +D_END_70187B4 = 0x070187B4; D_VE1_9018BD0 = 0x09018BD0; D_VE1_901A4B8 = 0x0901A4B8; @@ -728,7 +728,7 @@ D_C038954 = 0x0C038954; // fox_end2 D_arwing_3016CC0 = 0x03016CC0; D_50054B0 = 0x050054B0; -D_7016540 = 0x07016540; +D_END_7016540 = 0x07016540; // fox_edisplay D_6027960 = 0x06027960; @@ -1030,7 +1030,7 @@ D_6014D94 = 0x006014D94; // fox_enmy2 D_6011F90 = 0x06011F90; -D_4000710 = 0x04000710; +D_ENMY_PLANET_4000710 = 0x04000710; D_601F2A0 = 0x0601F2A0; D_A6_6016190 = 0x06016190; D_SX_6023500 = 0x06023500; @@ -1064,9 +1064,9 @@ D_600AC70 = 0x0600AC70; D_6002500 = 0x06002500; D_60043F0 = 0x060043F0; D_6004310 = 0x06004310; -D_4006E90 = 0x04006E90; -D_4009800 = 0x04009800; -D_40073C0 = 0x040073C0; +D_ENMY_PLANET_4006E90 = 0x04006E90; +D_ENMY_PLANET_4009800 = 0x04009800; +D_ENMY_PLANET_40073C0 = 0x040073C0; D_A6_60282A0 = 0x060282A0; D_SX_603298C = 0x0603298C; @@ -1108,21 +1108,21 @@ D_60368E0 = 0x060368E0; // fox_option -D_8003B50 = 0x08003B50; -D_8003EB0 = 0x08003EB0; -D_8004270 = 0x08004270; -D_80043B0 = 0x080043B0; -D_80046B0 = 0x080046B0; -D_8004930 = 0x08004930; -D_8005010 = 0x08005010; -D_80054F0 = 0x080054F0; -D_8005910 = 0x08005910; -D_80143B0 = 0x080143B0; -D_80039D0 = 0x080039D0; -D_80147B0 = 0x080147B0; -D_8003A50 = 0x08003A50; -D_8013990 = 0x08013990; -D_80141B0 = 0x080141B0; +D_OPT_8003B50 = 0x08003B50; +D_OPT_8003EB0 = 0x08003EB0; +D_OPT_8004270 = 0x08004270; +D_OPT_80043B0 = 0x080043B0; +D_OPT_80046B0 = 0x080046B0; +D_OPT_8004930 = 0x08004930; +D_OPT_8005010 = 0x08005010; +D_OPT_80054F0 = 0x080054F0; +D_OPT_8005910 = 0x08005910; +D_OPT_80143B0 = 0x080143B0; +D_OPT_80039D0 = 0x080039D0; +D_OPT_80147B0 = 0x080147B0; +D_OPT_8003A50 = 0x08003A50; +D_OPT_8013990 = 0x08013990; +D_OPT_80141B0 = 0x080141B0; D_VS_70030B0 = 0x070030B0; D_VS_7003290 = 0x07003290; D_VS_7003470 = 0x07003470; @@ -1453,17 +1453,17 @@ D_vs_player_302E95C = 0x302E95C; D_vs_player_302EA4C = 0x302EA4C; D_vs_player_302EB3C = 0x302EB3C; D_vs_player_302EC20 = 0x302EC20; -D_4000080 = 0x4000080; -D_400014C = 0x400014C; -D_40001A4 = 0x40001A4; -D_4000270 = 0x4000270; -D_40018A0 = 0x40018A0; -D_40057AC = 0x40057AC; -D_40058B8 = 0x40058B8; -D_40068F0 = 0x40068F0; -D_4007AF0 = 0x4007AF0; -D_4008CE0 = 0x4008CE0; -D_4008F70 = 0x4008F70; +D_ENMY_PLANET_4000080 = 0x4000080; +D_ENMY_PLANET_400014C = 0x400014C; +D_ENMY_PLANET_40001A4 = 0x40001A4; +D_ENMY_PLANET_4000270 = 0x4000270; +D_ENMY_PLANET_40018A0 = 0x40018A0; +D_ENMY_PLANET_40057AC = 0x40057AC; +D_ENMY_PLANET_40058B8 = 0x40058B8; +D_ENMY_PLANET_40068F0 = 0x40068F0; +D_ENMY_PLANET_4007AF0 = 0x4007AF0; +D_ENMY_PLANET_4008CE0 = 0x4008CE0; +D_ENMY_PLANET_4008F70 = 0x4008F70; D_5000200 = 0x5000200; D_5000300 = 0x5000300; D_5000500 = 0x5000500; @@ -2105,7 +2105,7 @@ D_VS_7001270 = 0x7001270; D_WZ_7001540 = 0x7001540; D_VS_7001DF0 = 0x7001DF0; D_VS_7002110 = 0x7002110; -D_7002120 = 0x7002120; +D_END_7002120 = 0x7002120; D_TI1_7002270 = 0x7002270; D_TI1_7002490 = 0x7002490; D_VS_7003650 = 0x7003650; @@ -2118,7 +2118,7 @@ D_VS_7004010 = 0x7004010; D_VS_7004050 = 0x7004050; D_VS_7004150 = 0x7004150; D_VS_70041F0 = 0x70041F0; -D_7004240 = 0x7004240; +D_END_7004240 = 0x7004240; D_VS_70042F0 = 0x70042F0; D_VS_7004360 = 0x7004360; D_VS_7004460 = 0x7004460; @@ -2143,8 +2143,8 @@ D_TI1_700A990 = 0x700A990; D_TI1_700B9C0 = 0x700B9C0; D_TI1_700BB10 = 0x700BB10; D_TI1_700C4B0 = 0x700C4B0; -D_700C620 = 0x700C620; -D_700C8B0 = 0x700C8B0; +D_END_700C620 = 0x700C620; +D_END_700C8B0 = 0x700C8B0; D_TI1_700C8D8 = 0x700C8D8; D_TI1_700C964 = 0x700C964; D_TI1_700C980 = 0x700C980; @@ -2155,76 +2155,76 @@ D_TI1_700D700 = 0x700D700; D_TI2_700E244 = 0x700E244; D_TI1_700E3F0 = 0x700E3F0; D_VS_700E9A0 = 0x700E9A0; -D_700E9E0 = 0x700E9E0; -D_700EA38 = 0x700EA38; -D_700F240 = 0x700F240; -D_700F320 = 0x700F320; -D_7010970 = 0x7010970; -D_7010E10 = 0x7010E10; -D_7010EE0 = 0x7010EE0; -D_7010F00 = 0x7010F00; -D_7010FD0 = 0x7010FD0; -D_7010FF0 = 0x7010FF0; -D_70110C0 = 0x70110C0; -D_70110E0 = 0x70110E0; -D_70111B0 = 0x70111B0; +D_END_700E9E0 = 0x700E9E0; +D_END_700EA38 = 0x700EA38; +D_END_700F240 = 0x700F240; +D_END_700F320 = 0x700F320; +D_END_7010970 = 0x7010970; +D_END_7010E10 = 0x7010E10; +D_END_7010EE0 = 0x7010EE0; +D_END_7010F00 = 0x7010F00; +D_END_7010FD0 = 0x7010FD0; +D_END_7010FF0 = 0x7010FF0; +D_END_70110C0 = 0x70110C0; +D_END_70110E0 = 0x70110E0; +D_END_70111B0 = 0x70111B0; D_VS_70118E0 = 0x70118E0; -D_70122E0 = 0x70122E0; +D_END_70122E0 = 0x70122E0; D_VS_70123F8 = 0x70123F8; -D_8000000 = 0x8000000; -D_8000400 = 0x8000400; -D_8000680 = 0x8000680; -D_80006A0 = 0x80006A0; +D_OPT_8000000 = 0x8000000; +D_OPT_8000400 = 0x8000400; +D_OPT_8000680 = 0x8000680; +D_OPT_80006A0 = 0x80006A0; 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; -D_80037C0 = 0x80037C0; -D_80038C0 = 0x80038C0; -D_80038E0 = 0x80038E0; -D_8003930 = 0x8003930; -D_8003950 = 0x8003950; -D_80039A8 = 0x80039A8; -D_8003A70 = 0x8003A70; -D_8003AB8 = 0x8003AB8; -D_8003AE0 = 0x8003AE0; -D_8003B28 = 0x8003B28; -D_8003B50 = 0x8003B50; -D_80046B0 = 0x80046B0; -D_8004C50 = 0x8004C50; -D_8005CD0 = 0x8005CD0; -D_8006280 = 0x8006280; -D_80064F0 = 0x80064F0; -D_80069C0 = 0x80069C0; -D_8006D10 = 0x8006D10; -D_8006E50 = 0x8006E50; -D_8007210 = 0x8007210; -D_80076E0 = 0x80076E0; -D_80079F0 = 0x80079F0; -D_80080F0 = 0x80080F0; -D_80084B0 = 0x80084B0; -D_8008A30 = 0x8008A30; -D_8008DA0 = 0x8008DA0; +D_OPT_80016A0 = 0x80016A0; +D_OPT_80017A0 = 0x80017A0; +D_OPT_80017C0 = 0x80017C0; +D_OPT_80037C0 = 0x80037C0; +D_OPT_80038C0 = 0x80038C0; +D_OPT_80038E0 = 0x80038E0; +D_OPT_8003930 = 0x8003930; +D_OPT_8003950 = 0x8003950; +D_OPT_80039A8 = 0x80039A8; +D_OPT_8003A70 = 0x8003A70; +D_OPT_8003AB8 = 0x8003AB8; +D_OPT_8003AE0 = 0x8003AE0; +D_OPT_8003B28 = 0x8003B28; +D_OPT_8003B50 = 0x8003B50; +D_OPT_80046B0 = 0x80046B0; +D_OPT_8004C50 = 0x8004C50; +D_OPT_8005CD0 = 0x8005CD0; +D_OPT_8006280 = 0x8006280; +D_OPT_80064F0 = 0x80064F0; +D_OPT_80069C0 = 0x80069C0; +D_OPT_8006D10 = 0x8006D10; +D_OPT_8006E50 = 0x8006E50; +D_OPT_8007210 = 0x8007210; +D_OPT_80076E0 = 0x80076E0; +D_OPT_80079F0 = 0x80079F0; +D_OPT_80080F0 = 0x80080F0; +D_OPT_80084B0 = 0x80084B0; +D_OPT_8008A30 = 0x8008A30; +D_OPT_8008DA0 = 0x8008DA0; D_TI_8008FE8 = 0x8008FE8; -D_80098E0 = 0x80098E0; -D_8009980 = 0x8009980; -D_8009B00 = 0x8009B00; -D_8009CE0 = 0x8009CE0; -D_800B5E0 = 0x800B5E0; -D_800B680 = 0x800B680; -D_800C640 = 0x800C640; -D_800CD90 = 0x800CD90; -D_800D070 = 0x800D070; -D_800D170 = 0x800D170; -D_800D1F0 = 0x800D1F0; -D_800E130 = 0x800E130; -D_800E170 = 0x800E170; -D_8015550 = 0x8015550; -D_8015DF0 = 0x8015DF0; -D_8025080 = 0x8025080; +D_OPT_80098E0 = 0x80098E0; +D_OPT_8009980 = 0x8009980; +D_OPT_8009B00 = 0x8009B00; +D_OPT_8009CE0 = 0x8009CE0; +D_OPT_800B5E0 = 0x800B5E0; +D_OPT_800B680 = 0x800B680; +D_OPT_800C640 = 0x800C640; +D_OPT_800CD90 = 0x800CD90; +D_OPT_800D070 = 0x800D070; +D_OPT_800D170 = 0x800D170; +D_OPT_800D1F0 = 0x800D1F0; +D_OPT_800E130 = 0x800E130; +D_OPT_800E170 = 0x800E170; +D_OPT_8015550 = 0x8015550; +D_OPT_8015DF0 = 0x8015DF0; +D_OPT_8025080 = 0x8025080; D_VE1_9002CF0 = 0x9002CF0; D_VE1_9003330 = 0x9003330; D_VE1_9003890 = 0x9003890; diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c index d64e8d40..df591319 100644 --- a/src/libultra/gu/lookat.c +++ b/src/libultra/gu/lookat.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/ultratypes.h" #include "PR/gbi.h" #include "PR/gu.h" diff --git a/src/libultra/gu/ortho.c b/src/libultra/gu/ortho.c index cc4b9030..f389ab26 100644 --- a/src/libultra/gu/ortho.c +++ b/src/libultra/gu/ortho.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/ultratypes.h" #include "PR/gu.h" void guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale) { diff --git a/src/libultra/gu/sqrtf.c b/src/libultra/gu/sqrtf.c index 311571a0..57df68b3 100644 --- a/src/libultra/gu/sqrtf.c +++ b/src/libultra/gu/sqrtf.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "PR/ultratypes.h" +#include "libc/math.h" f32 guSqrtf(f32 value) { return sqrtf(value); diff --git a/src/libultra/io/ai.c b/src/libultra/io/ai.c index 64dd0de9..f297634f 100644 --- a/src/libultra/io/ai.c +++ b/src/libultra/io/ai.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "libc/stdbool.h" #include "PR/rcp.h" s32 __osAiDeviceBusy(void) { diff --git a/src/libultra/io/aigetlen.c b/src/libultra/io/aigetlen.c index ec37b969..582f180c 100644 --- a/src/libultra/io/aigetlen.c +++ b/src/libultra/io/aigetlen.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/rcp.h" u32 osAiGetLength() { return IO_READ(AI_LEN_REG); diff --git a/src/libultra/io/aisetfreq.c b/src/libultra/io/aisetfreq.c index c8a1a8a4..6225e1ee 100644 --- a/src/libultra/io/aisetfreq.c +++ b/src/libultra/io/aisetfreq.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/rcp.h" extern s32 osViClock; diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c index 5d1e3de3..07bb0438 100644 --- a/src/libultra/io/controller.c +++ b/src/libultra/io/controller.c @@ -1,4 +1,3 @@ -#include "global.h" #include "PR/controller.h" #include "siint.h" diff --git a/src/libultra/io/motor.c b/src/libultra/io/motor.c index 1cfe125f..11986c03 100644 --- a/src/libultra/io/motor.c +++ b/src/libultra/io/motor.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/controller.h" #include "siint.h" OSPifRam _MotorStopData[MAXCONTROLLERS] ALIGNED(8); diff --git a/src/libultra/io/pidma.c b/src/libultra/io/pidma.c index fdeebeb6..f5e39f2e 100644 --- a/src/libultra/io/pidma.c +++ b/src/libultra/io/pidma.c @@ -1,4 +1,3 @@ -#include "global.h" #include "piint.h" s32 osPiStartDma(OSIoMesg* mb, s32 pri, s32 rw, u32 devAddr, void* dramAddr, u32 size, OSMesgQueue* piHandle) { diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c index 83221f88..b950076a 100644 --- a/src/libultra/io/pimgr.c +++ b/src/libultra/io/pimgr.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "macros.h" #include "piint.h" #include "PR/rdb.h" diff --git a/src/libultra/libc/ldiv.c b/src/libultra/libc/ldiv.c index 657071f6..2f6dace1 100644 --- a/src/libultra/libc/ldiv.c +++ b/src/libultra/libc/ldiv.c @@ -1,4 +1,3 @@ -#include "global.h" #include "libc/stdlib.h" lldiv_t lldiv(long long numer, long long denom) { diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c index 750d8ec5..dc92907c 100644 --- a/src/libultra/libc/string.c +++ b/src/libultra/libc/string.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/ultratypes.h" void* memcpy(void* s1, const void* s2, size_t n) { unsigned char* su1 = (unsigned char*) s1; diff --git a/src/libultra/libc/xlitob.c b/src/libultra/libc/xlitob.c index 4c82854b..c74fd7ff 100644 --- a/src/libultra/libc/xlitob.c +++ b/src/libultra/libc/xlitob.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "PR/xstdio.h" #include "libc/string.h" #include "libc/stdlib.h" diff --git a/src/libultra/os/stopthread.c b/src/libultra/os/stopthread.c index 952d43a7..4edbb00e 100644 --- a/src/libultra/os/stopthread.c +++ b/src/libultra/os/stopthread.c @@ -1,4 +1,3 @@ -#include "global.h" #include "osint.h" void osStopThread(OSThread* t) { diff --git a/src/main/fox_360.c b/src/main/fox_360.c index c0024a8b..0c1ab49c 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" #include "assets/ast_star_wolf.h" #include "assets/ast_allies.h" #include "assets/ast_vs_player.h" @@ -2279,7 +2280,7 @@ void func_80035448(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 3); } else { - gSPDisplayList(gMasterDisp++, D_40068F0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40068F0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 2); } diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index a4f23859..702e2166 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -1,5 +1,6 @@ #include "global.h" -#include "prevent_bss_reordering.h" +#include "assets.h" +// #include "prevent_bss_reordering.h" extern f32 D_i3_801C4188; @@ -23,6 +24,7 @@ f32 D_80161394; // can be static #include "assets/ast_aquas.h" #include "assets/ast_andross.h" #include "assets/ast_warp_zone.h" +#include "assets/ast_area_6.h" f32 D_800C9C30 = 0.0f; u16 D_800C9C34 = 1; diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index 176dea2b..ac475b53 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -5,14 +5,15 @@ */ #include "global.h" +#include "assets.h" #include "assets/ast_sector_x.h" #include "assets/ast_aquas.h" #include "assets/ast_great_fox.h" #include "assets/ast_enmy_space.h" #include "assets/ast_enmy_planet.h" +#include "assets/ast_ending.h" extern Gfx D_60320E0[]; -extern Gfx D_7010970[]; extern s32 D_800C9E90[]; @@ -2561,7 +2562,7 @@ void func_8004FEC0(Actor* actor) { case 1000: RCP_SetupDL(&gMasterDisp, 0x2D); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, actor->unk_046); - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); if (actor->unk_046 >= 0x33) { func_8005ADAC(actor); @@ -2932,7 +2933,7 @@ void func_800515C4(void) { if (gGameState == GSTATE_TITLE) { var_fp = D_60320E0; } else if (gGameState == GSTATE_CREDITS) { - var_fp = D_7010970; + var_fp = D_END_7010970; } else { var_fp = D_1024AC0; } diff --git a/src/main/fox_display.c b/src/main/fox_display.c index cd7f5a6b..592bc321 100644 --- a/src/main/fox_display.c +++ b/src/main/fox_display.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" s16 D_80161410; Vec3f D_801613B0[4]; diff --git a/src/main/fox_edata.c b/src/main/fox_edata.c index c38ce60c..ade73873 100644 --- a/src/main/fox_edata.c +++ b/src/main/fox_edata.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" #include "fox_edata_1C.c" diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index 39c6b9fd..0ad19830 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" #include "assets/ast_vs_player.h" #include "assets/ast_arwing.h" @@ -8,6 +9,7 @@ #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" #include "assets/ast_ve1_boss.h" +#include "assets/ast_area_6.h" f32 D_800CBE70[] = { 1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f, diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 6b321c5c..a880623c 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -1,6 +1,7 @@ #include "global.h" -#include "prevent_bss_reordering.h" +#include "assets.h" +// #include "prevent_bss_reordering.h" Vec3f D_801615D0; Vec3f D_801615E0; s32 D_801615EC; @@ -309,7 +310,7 @@ void func_8005A094(Actor* actor) { gSPDisplayList(gMasterDisp++, D_800CFB28[actor->unk_048]); break; case 45: - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); break; case 46: if ((actor->unk_048 == 2) || (actor->unk_048 == 3) || (actor->unk_048 == 4)) { @@ -535,7 +536,7 @@ void func_8005B388(Actor* actor) { } func_80053658(&D_80161630); } else if (gLevelType == LEVELTYPE_PLANET) { - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); } else if (gPlayer[0].unk_204 == 2) { gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4003BD0); } else { @@ -573,7 +574,7 @@ void func_8005B848(Actor* actor) { if (gCurrentLevel == LEVEL_AREA_6) { gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400B390); } else { - gSPDisplayList(gMasterDisp++, D_4007AF0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4007AF0); } break; } diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 6e1e3c4d..40b3f2eb 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -1,5 +1,5 @@ #include "global.h" -#include "hud.h" +#include "assets.h" // rodata const char D_800D7230[] = "Enm->wrk3=<%d>\n"; @@ -12,8 +12,6 @@ extern Gfx D_6003580[]; extern Gfx D_6003620[]; extern Gfx D_60036C0[]; extern Gfx D_6004900[]; -extern Gfx D_A6_6012550[]; -extern u16 D_A6_6012840[]; extern Gfx D_6016880[]; extern Gfx D_6018AF0[]; extern Gfx D_601BAD0[]; @@ -25,6 +23,7 @@ extern Gfx D_601BAD0[]; #include "assets/ast_training.h" #include "assets/ast_sector_x.h" #include "assets/ast_aquas.h" +#include "assets/ast_area_6.h" #include "assets/ast_A_ti.h" #include "assets/ast_ve1_boss.h" #include "assets/ast_enmy_planet.h" @@ -2229,7 +2228,7 @@ void func_8007DED4(Effect* effect) { case 0: Graphics_SetScaleMtx(effect->scale2); RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_4008CE0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008CE0); RCP_SetupDL(&gMasterDisp, 0x40); break; @@ -2238,7 +2237,7 @@ void func_8007DED4(Effect* effect) { Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_40(); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_4008F70); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008F70); RCP_SetupDL(&gMasterDisp, 0x40); break; } diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index 198b5fcc..8bc4ec1a 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" #include "assets/ast_sector_x.h" #include "assets/ast_aquas.h" #include "assets/ast_andross.h" diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 94de16ed..c69e537c 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" s32 D_800CFF80[4] = { 0, 0, 0, 0 }; s32 D_800CFF90 = 0; @@ -863,15 +864,15 @@ void func_8006D350(Object_80* obj80) { } UnkStruct_D003C D_800D003C[108] = { - { D_40068F0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_4006E90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_40068F0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_4006E90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { D_4009800, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_4009800, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_ENMY_PLANET_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { D_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { D_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, + { D_ENMY_PLANET_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, { NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, { D_ENMY_SPACE_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { D_ENMY_SPACE_4001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, @@ -3453,14 +3454,14 @@ void func_80072594(Actor* actor) { func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y - 20, actor->obj.pos.z - 180.0f, 0.0f, RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2); } - } else if (actor->unk_0B6 >= Animation_GetFrameCount(&D_40057AC)) { + } else if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) { actor->unk_0B6 = 0; } break; case 9: actor->unk_0B6++; - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_40001A4)) { + if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40001A4)) { actor->unk_0B6 = 0; } if (actor->iwork[6] == 0) { @@ -3850,7 +3851,7 @@ void func_80074FF0(Actor* actor) { case 43: if (gLevelType == LEVELTYPE_PLANET) { - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); } else { gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4007870); } @@ -3869,8 +3870,8 @@ void func_80074FF0(Actor* actor) { Animation_DrawSkeleton(1, D_6006558, sp114, NULL, NULL, actor, &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } else { - Animation_GetFrameData(&D_40057AC, actor->unk_0B6, sp114); - Animation_DrawSkeleton(1, D_40058B8, sp114, NULL, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_ENMY_PLANET_40057AC, actor->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, sp114, NULL, NULL, actor, &gIdentityMatrix); } break; @@ -3881,8 +3882,8 @@ void func_80074FF0(Actor* actor) { case 9: Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); - Animation_GetFrameData(&D_40001A4, actor->unk_0B6, sp114); - Animation_DrawSkeleton(1, D_4000270, sp114, NULL, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_ENMY_PLANET_40001A4, actor->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_ENMY_PLANET_4000270, sp114, NULL, NULL, actor, &gIdentityMatrix); break; case 18: diff --git a/src/main/fox_game.c b/src/main/fox_game.c index 97093b6f..7fd7b9e3 100644 --- a/src/main/fox_game.c +++ b/src/main/fox_game.c @@ -2,7 +2,6 @@ #include "global.h" #include "sf64dma.h" #include "assets/ast_logo.h" -#include "audioseq_cmd.h" f32 D_80161A10; f32 D_80161A14; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 4bec820d..915e6776 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -19,6 +19,15 @@ // placed before global.h for reordering reasons +typedef struct { + /* 0x00 */ u8* unk_00; + /* 0x04 */ s32 width; + /* 0x08 */ s32 height; + /* 0x0C */ u8* unk_0C; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; +} UnkStruct_D_800D1AEC; + Vec3f D_801616A0; Vec3f D_801616B0; f32 D_801616BC; @@ -73,7 +82,7 @@ s32 D_80161900[20]; // BSS SECTION END #include "global.h" -#include "hud.h" +#include "assets.h" void func_80087788(void); diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 47cff957..43019597 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering2.h" #include "global.h" +#include "assets.h" #include "fox_map.h" #include "assets/ast_training.h" #include "assets/ast_sector_x.h" @@ -7,6 +8,7 @@ #include "assets/ast_andross.h" #include "assets/ast_arwing.h" #include "assets/ast_vs_player.h" +#include "assets/ast_area_6.h" UNK_TYPE D_800D2F50 = 0; s32 D_800D2F54 = 0; diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index 544d5e75..21ea0508 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" u16** D_80178720; s32 D_80178724; @@ -18,6 +19,7 @@ s32 D_80178748; #include "assets/ast_aquas.h" #include "assets/ast_star_wolf.h" #include "assets/ast_great_fox.h" +#include "assets/ast_area_6.h" s32 gCurrentMsgPri = 0; diff --git a/src/main/fox_tank.c b/src/main/fox_tank.c index 9bcf8568..5dfa6a9e 100644 --- a/src/main/fox_tank.c +++ b/src/main/fox_tank.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" #include "assets/ast_landmaster.h" void func_80047754(Player* player); diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index 4f79150e..f4a624fa 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1,4 +1,5 @@ -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering2.h" +#include "prevent_bss_reordering.h" #include "global.h" #include "fox_option.h" #include "assets/ast_versus.h" diff --git a/src/main/wave_samples.c b/src/main/wave_samples.c index 86258ff4..b21d31be 100644 --- a/src/main/wave_samples.c +++ b/src/main/wave_samples.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "sys.h" // clang-format off s16 gSawtoothWaveSample[] = { diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c index d4df2fc5..fc5314e2 100644 --- a/src/overlays/ovl_ending/fox_end1.c +++ b/src/overlays/ovl_ending/fox_end1.c @@ -1,44 +1,31 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets/ast_title.h" #include "assets/ast_ending_award_front.h" #include "assets/ast_ending_award_back.h" #include "assets/ast_allies.h" #include "assets/ast_great_fox.h" +#include "assets/ast_ending.h" void func_ending_8018CE20(s32); void func_ending_801926D4(void); extern u32 D_ending_80192E70; - +extern Gfx D_6041070[]; extern Animation D_601E424; extern Animation D_601F8E0; extern Animation D_6020058; extern Animation D_60246F8; extern Animation D_6029BE4; extern Animation D_602A710; -extern Animation D_70111D0; -extern Animation D_70143C0; -extern Animation D_7018708; + extern Limb* D_602FBAC[]; extern Limb* D_603088C[]; extern Limb* D_60313AC[]; extern Limb* D_6032084[]; -extern Limb* D_70187B4[]; + extern Animation D_60338DC; extern Animation D_603531C; extern Animation D_6036278; -extern Gfx D_700C620[]; -extern Gfx D_700C8B0[]; -extern Gfx D_700F240[]; -extern Gfx D_700F320[]; -extern Gfx D_7010970[]; -extern u8 D_7010E10[]; -extern u16 D_7010EE0[]; -extern u8 D_7010F00[]; -extern u16 D_7010FD0[]; -extern u8 D_7010FF0[]; -extern u16 D_70110C0[]; -extern u8 D_70110E0[]; -extern u16 D_70111B0[]; bool func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data); void func_ending_8018ABE8(void); @@ -370,7 +357,7 @@ void func_ending_80188030(s32 arg0) { s32 func_ending_80188394(void) { s32 i; UnkStruct_196D08 sp14[2] = { - { &D_70143C0, + { &D_END_70143C0, NULL, 17, { 0.0f, -3830.0f, -7000.0f }, @@ -380,8 +367,8 @@ s32 func_ending_80188394(void) { 0, 0, { 0, 0, 0, 0 } }, - { &D_7018708, - D_70187B4, + { &D_END_7018708, + D_END_70187B4, 23, { 0.0f, -310.0f, -370.0f }, { 0.0f, 0.0f, 0.0f }, @@ -461,16 +448,16 @@ void func_ending_801886F4(void) { switch ((D_ending_80196F90 % 8) / 2) { case 3: - TextureRect_4bCI(&gMasterDisp, D_70110E0, D_70111B0, 16, 26, temp + 31.0f, 18.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_END_70110E0, D_END_70111B0, 16, 26, temp + 31.0f, 18.0f, 1.0f, 1.0f); /* fallthrough */ case 2: - TextureRect_4bCI(&gMasterDisp, D_7010FF0, D_70110C0, 16, 26, temp + 24.0f, 18.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_END_7010FF0, D_END_70110C0, 16, 26, temp + 24.0f, 18.0f, 1.0f, 1.0f); /* fallthrough */ case 1: - TextureRect_4bCI(&gMasterDisp, D_7010F00, D_7010FD0, 16, 26, temp + 18.0f, 18.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_END_7010F00, D_END_7010FD0, 16, 26, temp + 18.0f, 18.0f, 1.0f, 1.0f); /* fallthrough */ case 0: - TextureRect_4bCI(&gMasterDisp, D_7010E10, D_7010EE0, 16, 26, temp, 18.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_END_7010E10, D_END_7010EE0, 16, 26, temp, 18.0f, 1.0f, 1.0f); } } @@ -525,7 +512,7 @@ void func_ending_80188DB4(void) { s32 j; Vec3f sp1B4 = { 0.0f, 0.0f, 0.0f }; UnkStruct_196D08 sp74[5] = { - { &D_70111D0, + { &D_END_70111D0, NULL, 17, { 0.0f, -2960.0f, -6600.0f }, @@ -1768,7 +1755,7 @@ void func_ending_8018C21C(void) { RCP_SetupDL(&gMasterDisp, 0x11); Matrix_Translate(gGfxMatrix, 0.0f, -1200.0f, -6000.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700C8B0); + gSPDisplayList(gMasterDisp++, D_END_700C8B0); Matrix_Pop(&gGfxMatrix); } else { Matrix_Push(&gGfxMatrix); @@ -1776,7 +1763,7 @@ void func_ending_8018C21C(void) { Matrix_Translate(gGfxMatrix, -2000.0f, -3000.0f, 3000.0f, 1); Matrix_RotateY(gGfxMatrix, 110.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700C8B0); + gSPDisplayList(gMasterDisp++, D_END_700C8B0); Matrix_Pop(&gGfxMatrix); } @@ -1817,7 +1804,7 @@ void func_ending_8018C21C(void) { Matrix_Scale(gGfxMatrix, scale->x, scale->y, scale->z, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); scale = &spF4[gGameFrameCount % 2]; @@ -1825,7 +1812,7 @@ void func_ending_8018C21C(void) { Matrix_Scale(gGfxMatrix, scale->x, scale->y, scale->z, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); Matrix_Pop(&gGfxMatrix); } } else { @@ -1849,7 +1836,7 @@ void func_ending_8018C21C(void) { Matrix_RotateX(gGfxMatrix, gActors[i].obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, gActors[i].obj.rot.z * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700F240); + gSPDisplayList(gMasterDisp++, D_END_700F240); break; case 2: @@ -1860,7 +1847,7 @@ void func_ending_8018C21C(void) { Matrix_RotateX(gGfxMatrix, gActors[i].obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, gActors[i].obj.rot.z * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700F320); + gSPDisplayList(gMasterDisp++, D_END_700F320); break; case 3: @@ -1880,7 +1867,7 @@ void func_ending_8018C21C(void) { Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); Matrix_Pop(&gGfxMatrix); spE4 = gActors[i].fwork[1]; RCP_SetupDL(&gMasterDisp, 0x29); @@ -1911,7 +1898,7 @@ void func_ending_8018C21C(void) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -17.5f, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700C620); + gSPDisplayList(gMasterDisp++, D_END_700C620); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, -70.0f, 0.0f, -100.0f, 1); @@ -1919,7 +1906,7 @@ void func_ending_8018C21C(void) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -17.5f, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_700C620); + gSPDisplayList(gMasterDisp++, D_END_700C620); Matrix_Pop(&gGfxMatrix); break; } diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index ace8c9c4..30530586 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -2,6 +2,13 @@ #include "assets/ast_arwing.h" #include "assets/ast_ending_expert.h" #include "assets/ast_allies.h" + +WingInfo D_ending_80198590; +Vec3f D_ending_801985D0; +Vec3f D_ending_801985E0; +Vec3f D_ending_801985F0; +Vec3f D_ending_80198600[300]; + #include "fox_end2_data.c" void func_ending_8018CE20(u32 arg0) { @@ -352,7 +359,7 @@ void func_ending_8018E1B8(u32 arg0, AssetInfo* asset) { } Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); } void func_ending_8018E7B8(u32 arg0, AssetInfo* asset) { @@ -409,7 +416,7 @@ void func_ending_8018E7B8(u32 arg0, AssetInfo* asset) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); } void func_ending_8018EDB8(u32 arg0, AssetInfo* asset) { @@ -440,7 +447,7 @@ void func_ending_8018EDB8(u32 arg0, AssetInfo* asset) { Matrix_SetGfxMtx(&gMasterDisp); - gDPLoadTextureBlock(gMasterDisp++, D_700EA38, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, + gDPLoadTextureBlock(gMasterDisp++, D_END_700EA38, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 5, G_TX_NOLOD, G_TX_NOLOD); gDPTileSync(gMasterDisp++); @@ -448,7 +455,7 @@ void func_ending_8018EDB8(u32 arg0, AssetInfo* asset) { G_TX_WRAP, 5, 0, G_TX_WRAP, 5, 0); gDPSetTileSize(gMasterDisp++, 0, arg0 * 14, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC); - gSPDisplayList(gMasterDisp++, D_700E9E0); + gSPDisplayList(gMasterDisp++, D_END_700E9E0); } void func_ending_8018F2A8(u32 arg0, AssetInfo* asset) { @@ -542,7 +549,7 @@ void func_ending_8018F64C(u32 arg0, AssetInfo* asset) { Matrix_Scale(gGfxMatrix, 0.8f + (arg0 % 3) * 0.01f, 0.3f + (arg0 % 3) * 0.01f, 0.8f + (arg0 % 3) * 0.01f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); } void func_ending_8018FC60(u32 arg0, AssetInfo* asset) { @@ -605,7 +612,7 @@ void func_ending_8018FC60(u32 arg0, AssetInfo* asset) { Matrix_Scale(gGfxMatrix, 0.5f + (arg0 % 3) * 0.01f, 0.3f + (arg0 % 3) * 0.01f, 0.5f + (arg0 % 3) * 0.01f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7010970); + gSPDisplayList(gMasterDisp++, D_END_7010970); } void func_ending_80190274(u32 arg0, AssetInfo* asset) { @@ -634,7 +641,7 @@ void func_ending_80190274(u32 arg0, AssetInfo* asset) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7004240); + gSPDisplayList(gMasterDisp++, D_END_7004240); } void func_ending_80190648(s32 arg0, AssetInfo* asset) { @@ -648,7 +655,7 @@ void func_ending_80190648(s32 arg0, AssetInfo* asset) { Matrix_Scale(gGfxMatrix, asset->unk_30.x, asset->unk_30.y, asset->unk_30.z, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_7002120); + gSPDisplayList(gMasterDisp++, D_END_7002120); } void func_ending_80190778(u32 arg0, AssetInfo* asset) { diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c index ac85d231..d02f9b0f 100644 --- a/src/overlays/ovl_ending/fox_end2_data.c +++ b/src/overlays/ovl_ending/fox_end2_data.c @@ -4,6 +4,8 @@ #include "global.h" #include "assets/ast_arwing.h" #include "assets/ast_font.h" +#include "assets/ast_title.h" +#include "assets/ast_ending.h" typedef struct { /* 0x00 */ u8* unk_00; @@ -81,12 +83,6 @@ void func_ending_80190CF0(u32 arg0, AssetInfo* asset); void func_ending_80191234(s32 arg0, s32 arg1); void func_ending_80191294(u32 arg0, AssetInfo* asset); -WingInfo D_ending_80198590; -Vec3f D_ending_801985D0; -Vec3f D_ending_801985E0; -Vec3f D_ending_801985F0; -Vec3f D_ending_80198600[300]; - extern Animation D_602F8E0; extern Limb* D_602FBAC[]; extern Animation D_60305C0; @@ -95,13 +91,6 @@ extern Animation D_6031120; extern Limb* D_60313AC[]; extern Animation D_6031DB8; extern Limb* D_6032084[]; -extern Gfx D_END_7000000[]; -extern Gfx D_7002120[]; -extern Gfx D_7004240[]; -extern Gfx D_700E9E0[]; -extern u16 D_700EA38[]; -extern Gfx D_7010970[]; -extern Gfx D_7016540[]; // clang-format off @@ -270,7 +259,7 @@ AssetInfo D_ending_801934B4[] = { { NULL, func_ending_8018D2C8, 36, 1310, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_8018D250, 4, 3000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, { NULL, func_ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 13.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { D_7016540, NULL, 17, 3100, 1800, 1.0f, 0.0f, -2700.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { D_END_7016540, NULL, 17, 3100, 1800, 1.0f, 0.0f, -2700.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_8018F2A8, 23, 3800, 950, 1.0f, 8000.0f, -5500.0f, -10000.0f, -10.0f, -90.0f, 0.0f, 3.0f, 3.0f, 3.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_8018E7B8, 67, 3800, 950, 1.0f, 12330.0f, -6500.0f, -9200.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, { NULL, func_ending_8018E7B8, 67, 3800, 950, 1.0f, 15600.0f, -6710.0f, -9960.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, @@ -286,17 +275,17 @@ AssetInfo D_ending_801934B4[] = { { &D_6031120, D_60313AC, 23, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_8018D250, 5, 5000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 }, { NULL, func_ending_8018D4BC, 0, 5100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { D_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { D_7016540, NULL, 17, 5410, 1490, 1.0f, 0.0f, -4040.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { D_END_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { D_END_7016540, NULL, 17, 5410, 1490, 1.0f, 0.0f, -4040.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_80190CF0, 62, 6520, 380, 1.0f, 0.0f, 0.0f, -7000.0f, 0.0f, 0.0f, 0.0f, 12.0f, 12.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 200, 0, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, - { D_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, + { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 }, - { D_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 5, 0 }, + { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 5, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, - { D_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 7, 0 }, + { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 7, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 }, - { D_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 11, 0 }, + { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 11, 0 }, { NULL, func_ending_8018F2A8, 29, 5100, 1800, 1.0f, 0.0f, 0.0f, -220.0f, 0.0f, 180.0f, 0.0f, 0.1f, 0.1f, 0.1f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { NULL, func_ending_8018DA0C, 76, 6520, 380, 1.0f, 224.0f, 164.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, { NULL, func_ending_8018D638, 36, 6900, 300, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index b4adba60..a5e2479c 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" #include "assets/ast_arwing.h" // bss diff --git a/src/overlays/ovl_i1/fox_tr.c b/src/overlays/ovl_i1/fox_tr.c index 9a91dbfe..3a738930 100644 --- a/src/overlays/ovl_i1/fox_tr.c +++ b/src/overlays/ovl_i1/fox_tr.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets/ast_training.h" void func_i1_801988E0(void) { if (D_80177E80 != 0) { diff --git a/src/overlays/ovl_i1/fox_tr360.c b/src/overlays/ovl_i1/fox_tr360.c index a9a8bcf2..a1dc2806 100644 --- a/src/overlays/ovl_i1/fox_tr360.c +++ b/src/overlays/ovl_i1/fox_tr360.c @@ -1,6 +1,5 @@ #include "global.h" - -extern ObjectInit D_TR_6008EF8[]; +#include "assets/ast_training.h" void func_i1_80198C50(void) { Object_58* obj58; diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c index 27ebcaed..5893a419 100644 --- a/src/overlays/ovl_i1/fox_ve1.c +++ b/src/overlays/ovl_i1/fox_ve1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" #include "assets/ast_ve1_boss.h" typedef struct { diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c index 2c9f5916..dbaf4ef2 100644 --- a/src/overlays/ovl_i2/fox_me.c +++ b/src/overlays/ovl_i2/fox_me.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" extern s32 D_800C9E90[]; diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c index 0a54714d..aabaf87a 100644 --- a/src/overlays/ovl_i3/fox_a6.c +++ b/src/overlays/ovl_i3/fox_a6.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets/ast_area_6.h" void func_i3_8018A1B0(Boss* bossA6, s32 arg1); void func_i3_8018A2C4(Boss* bossA6); diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index 7700ff67..3a3886f7 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" typedef void (*BossSOfunc)(Boss*); diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 385a8576..da99400b 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.h" #include "assets/ast_enmy_planet.h" // f32 temp[] = { @@ -1034,7 +1035,7 @@ void func_i3_80191680(Actor* actor) { } } actor->unk_0B6++; - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_40057AC)) { + if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) { actor->unk_0B6 = 0; } if (actor->timer_0BC == 0) { @@ -1095,8 +1096,8 @@ void func_i3_80191680(Actor* actor) { } void func_i3_80191B4C(Actor* actor) { - Animation_GetFrameData(&D_40057AC, actor->unk_0B6, actor->vwork); - Animation_DrawSkeleton(1, D_40058B8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix); + Animation_GetFrameData(&D_ENMY_PLANET_40057AC, actor->unk_0B6, actor->vwork); + Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix); } void func_i3_80191BB8(Actor* actor) { diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c index d272752c..b01da384 100644 --- a/src/overlays/ovl_i4/fox_bo.c +++ b/src/overlays/ovl_i4/fox_bo.c @@ -1,6 +1,7 @@ #include "prevent_bss_reordering.h" // #include "prevent_bss_reordering2.h" #include "global.h" +#include "assets.h" typedef struct UnkStruct_D_i4_801A03E0 { f32 unk_00; diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c index a7c7330c..8988f7b8 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" extern Animation D_6007854; extern Limb* D_6007980[]; diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index 0e4f6f28..f08fa05a 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -1,5 +1,6 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" Vec3f D_i4_8019F0F0[] = { { 7000.0f, 500.0f, -50 }, { 7700.0f, 550.0f, -50.0f }, { 6000.0f, 300.0f, 1950.0f } }; Vec3f D_i4_8019F114[] = { { -30.0f, 0.0f, 0.0f }, { -30.0f, 0.0f, 0.0f }, { 0.0f, 5.0f, -40.0f } }; diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index 5f2e22e9..62940f13 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" s32 D_i4_801A0560; s32 D_i4_801A0564; diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 6792cd31..56cbc03a 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1,5 +1,6 @@ -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" #include "assets/ast_landmaster.h" #include "assets/ast_enmy_planet.h" @@ -5327,7 +5328,7 @@ void func_i5_801ADAC8(Actor* actor) { case 0: Graphics_SetScaleMtx(actor->scale); RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_4008CE0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008CE0); RCP_SetupDL(&gMasterDisp, 0x40); break; case 1: @@ -5335,7 +5336,7 @@ void func_i5_801ADAC8(Actor* actor) { Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_40(); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_4008F70); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008F70); RCP_SetupDL(&gMasterDisp, 0x40); break; } diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index c4503cb3..5dcf732a 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -1,5 +1,6 @@ -#include "prevent_bss_reordering.h" +// #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" #include "assets/ast_bg_planet.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_7_ti_2.h" @@ -2486,7 +2487,7 @@ void func_i5_8019002C(s32 limbIndex, Vec3f* rot, void* data) { Matrix_RotateX(gGfxMatrix, -(M_DTOR * 90.0f), 1); Matrix_RotateZ(gGfxMatrix, -(M_DTOR * 90.0f), 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -47.0f, 1); Matrix_GetYRPAngles(gGfxMatrix, &sp64); Matrix_RotateZ(gGfxMatrix, -sp64.z * M_DTOR, 1); @@ -2998,7 +2999,7 @@ void func_i5_80191AE8(s32 limbIndex, Vec3f* rot, void* data) { Matrix_RotateX(gGfxMatrix, -(M_DTOR * 90.0f), 1); Matrix_RotateZ(gGfxMatrix, -(M_DTOR * 90.0f), 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_40018A0); + gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -47.0f, 1); Matrix_GetYRPAngles(gGfxMatrix, &sp78); Matrix_RotateZ(gGfxMatrix, -sp78.z * M_DTOR, 1); diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index 0feaba66..56329818 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -1,6 +1,7 @@ #include "prevent_bss_reordering2.h" #include "prevent_bss_reordering.h" #include "global.h" +#include "assets.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" #include "assets/ast_vs_player.h" diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index 0ae5ef45..f6c5a770 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" extern Animation D_6003348; extern Animation D_60034C4; diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index b587ceab..0b1af107 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "assets.h" void func_i6_80196210(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], boss->fwork[1], 0.5f, 5.0f, 0.0f); diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index d84fc3ad..15bec487 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -9,7 +9,8 @@ #include "fox_map.h" #include "fox_option.h" #include "prevent_bss_reordering.h" -#include "prevent_bss_reordering2.h" +// #include "prevent_bss_reordering2.h" +#include "assets/ast_map.h" // BSS STARTS HERE u8 D_menu_801B9410[96 * 96]; @@ -188,8 +189,6 @@ s32 D_menu_801CF11C; s32 D_menu_801CF120; f32 D_menu_801CF124; -extern u16 D_6000000[]; - #include "assets/ast_font.h" #include "assets/ast_font_3d.h" @@ -396,22 +395,22 @@ PlanetId sPlanetList[] = { PLANET_SECTOR_Z, PLANET_ZONESS, PLANET_KATINA, PLANET_SECTOR_Y, PLANET_SOLAR, }; -Gfx* D_menu_801AF824[4] = { D_604A710, D_604A400, D_604A190, D_6049F80 }; +Gfx* D_menu_801AF824[4] = { D_MAP_604A710, D_MAP_604A400, D_MAP_604A190, D_MAP_6049F80 }; TitleCard D_menu_801AF834[14] = { - { D_6007B90, 128, 28, 95.0f }, { D_60030D0, 96, 28, 110.0f }, { D_60131A0, 176, 12, 73.0f }, - { D_6009AD0, 168, 28, 77.0f }, { D_600B9B0, 168, 28, 74.0f }, { D_6001C80, 96, 13, 106.0f }, - { D_TEX_6011660, 176, 12, 75.0f }, { D_6010010, 112, 13, 109.0f }, { D_6017640, 112, 28, 101.0f }, - { D_6015CE0, 96, 28, 108.0f }, { D_600E210, 160, 28, 78.0f }, { D_6014360, 176, 12, 73.0f }, - { D_6004AC0, 168, 19, 72.0f }, { D_6006320, 104, 28, 105.0f }, + { D_MAP_6007B90, 128, 28, 95.0f }, { D_MAP_60030D0, 96, 28, 110.0f }, { D_MAP_60131A0, 176, 12, 73.0f }, + { D_MAP_6009AD0, 168, 28, 77.0f }, { D_MAP_600B9B0, 168, 28, 74.0f }, { D_MAP_6001C80, 96, 13, 106.0f }, + { D_MAP_6011660, 176, 12, 75.0f }, { D_MAP_6010010, 112, 13, 109.0f }, { D_MAP_6017640, 112, 28, 101.0f }, + { D_MAP_6015CE0, 96, 28, 108.0f }, { D_MAP_600E210, 160, 28, 78.0f }, { D_MAP_6014360, 176, 12, 73.0f }, + { D_MAP_6004AC0, 168, 19, 72.0f }, { D_MAP_6006320, 104, 28, 105.0f }, }; TitleCard D_menu_801AF914[] = { - { D_6008990, 232, 19, 46.0f }, { D_6003B50, 208, 19, 56.0f }, { D_60139E0, 128, 19, 98.0f }, - { D_600AD30, 168, 19, 77.0f }, { D_600CC10, 128, 19, 95.0f }, { D_6002160, 208, 19, 57.0f }, - { D_6011EA0, 256, 19, 40.0f }, { D_60105C0, 224, 19, 49.0f }, { D_6018280, 184, 19, 70.0f }, - { D_6016760, 200, 18, 61.0f }, { D_600F390, 168, 19, 75.0f }, { D_6014BA0, 232, 19, 43.0f }, - { D_6005740, 160, 19, 81.0f }, { D_6006E80, 176, 19, 70.0f }, + { D_MAP_6008990, 232, 19, 46.0f }, { D_MAP_6003B50, 208, 19, 56.0f }, { D_MAP_60139E0, 128, 19, 98.0f }, + { D_MAP_600AD30, 168, 19, 77.0f }, { D_MAP_600CC10, 128, 19, 95.0f }, { D_MAP_6002160, 208, 19, 57.0f }, + { D_MAP_6011EA0, 256, 19, 40.0f }, { D_MAP_60105C0, 224, 19, 49.0f }, { D_MAP_6018280, 184, 19, 70.0f }, + { D_MAP_6016760, 200, 18, 61.0f }, { D_MAP_600F390, 168, 19, 75.0f }, { D_MAP_6014BA0, 232, 19, 43.0f }, + { D_MAP_6005740, 160, 19, 81.0f }, { D_MAP_6006E80, 176, 19, 70.0f }, }; char* sPlanetNames[] = { @@ -419,8 +418,8 @@ char* sPlanetNames[] = { }; Gfx* D_menu_801AFA30[2] = { - D_6055F20, - D_6051D20, + D_MAP_6055F20, + D_MAP_6051D20, }; ObjPosition D_menu_801AFA38[] = { @@ -719,7 +718,7 @@ Gfx D_menu_801B4A40[] = { }; Gfx D_menu_801B4D70[] = { - gsDPLoadTLUT_pal256(D_6026C90), + gsDPLoadTLUT_pal256(D_MAP_6026C90), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801BB810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -766,7 +765,7 @@ Gfx D_menu_801B4D70[] = { }; Gfx D_menu_801B50D8[] = { - gsDPLoadTLUT_pal256(D_6029170), + gsDPLoadTLUT_pal256(D_MAP_6029170), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(&D_menu_801BDC10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -813,7 +812,7 @@ Gfx D_menu_801B50D8[] = { }; Gfx D_menu_801B5440[] = { - gsDPLoadTLUT_pal256(D_6022340), + gsDPLoadTLUT_pal256(D_MAP_6022340), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801C0010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -860,7 +859,7 @@ Gfx D_menu_801B5440[] = { }; Gfx D_menu_801B57A8[] = { - gsDPLoadTLUT_pal256(D_60247E0), + gsDPLoadTLUT_pal256(D_MAP_60247E0), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801C2410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -907,7 +906,7 @@ Gfx D_menu_801B57A8[] = { }; Gfx D_menu_801B5B10[] = { - gsDPLoadTLUT_pal256(D_602FF60), + gsDPLoadTLUT_pal256(D_MAP_602FF60), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801C4810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -954,7 +953,7 @@ Gfx D_menu_801B5B10[] = { }; Gfx D_menu_801B5E78[] = { - gsDPLoadTLUT_pal256(D_602B620), + gsDPLoadTLUT_pal256(D_MAP_602B620), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801C6C10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -1001,7 +1000,7 @@ Gfx D_menu_801B5E78[] = { }; Gfx D_menu_801B61E0[] = { - gsDPLoadTLUT_pal256(D_602DAD0), + gsDPLoadTLUT_pal256(D_MAP_602DAD0), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801C9010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -1048,7 +1047,7 @@ Gfx D_menu_801B61E0[] = { }; Gfx D_menu_801B6548[] = { - gsDPLoadTLUT_pal256(D_60323D0), + gsDPLoadTLUT_pal256(D_MAP_60323D0), gsSPVertex(D_menu_801B4740, 16, 0), gsDPLoadTextureBlock(D_menu_801CB410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -1100,39 +1099,40 @@ void* D_menu_801B68B0[] = { }; u8* D_menu_801B68D4[] = { - D_6029220, D_602B6D0, D_602FFD0, D_6024890, D_602DB60, D_601FF40, D_6026D70, D_60223E0, D_60190B0, + D_MAP_6029220, D_MAP_602B6D0, D_MAP_602FFD0, D_MAP_6024890, D_MAP_602DB60, + D_MAP_601FF40, D_MAP_6026D70, D_MAP_60223E0, D_MAP_60190B0, }; Gfx* D_menu_801B68F8[] = { - D_6060610, D_601DE80, D_604B750, D_601F6B0, D_601C0D0, - D_601C960, D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, - D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_604DB10, + D_MAP_6060610, D_MAP_601DE80, D_MAP_604B750, D_MAP_601F6B0, D_MAP_601C0D0, + D_MAP_601C960, D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, + D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_MAP_604DB10, }; -extern u8 D_6000840[]; // ast_map -extern u8 D_6001080[]; // ast_map -extern u8 D_60018C0[]; -extern u8 D_600D590[]; -extern u8 D_6019030[]; -extern Gfx D_601D1F0[]; +extern u8 D_MAP_6000840[]; // ast_map +extern u8 D_MAP_6001080[]; // ast_map +extern u8 D_MAP_60018C0[]; +extern u8 D_MAP_600D590[]; +extern u8 D_MAP_6019030[]; +extern Gfx D_MAP_601D1F0[]; extern u8 D_601DC10[]; extern u16 D_601DC90[]; -extern Gfx D_601DCF0[]; +extern Gfx D_MAP_601DCF0[]; extern u8 D_601DCA0[]; extern u16 D_601DCD8[]; -extern Gfx D_601E9A0[]; -extern u16 D_6044820[]; +extern Gfx D_MAP_601E9A0[]; +extern u16 D_MAP_6044820[]; extern u16 D_6046AA0[]; -extern u16 D_6046CD0[]; -extern Gfx D_60479D0[]; -extern Gfx D_6047E70[]; -extern u8 D_6047F80[]; -extern u8 D_6048F80[]; -extern Gfx D_604C350[]; -extern Gfx D_604C540[]; -extern Gfx D_604CDE0[]; -extern Gfx D_604D680[]; -extern Gfx D_605A120[]; +extern u16 D_MAP_6046CD0[]; +extern Gfx D_MAP_60479D0[]; +extern Gfx D_MAP_6047E70[]; +extern u8 D_MAP_6047F80[]; +extern u8 D_MAP_6048F80[]; +extern Gfx D_MAP_604C350[]; +extern Gfx D_MAP_604C540[]; +extern Gfx D_MAP_604CDE0[]; +extern Gfx D_MAP_604D680[]; +extern Gfx D_MAP_605A120[]; void func_menu_8019E800(void); void func_menu_8019E99C(void); @@ -1999,7 +1999,7 @@ void func_menu_801A01A8(void) { D_menu_801CEEC4 = 0; } - Texture_Mottle((u16*) D_6047F80, (u16*) D_6048F80, 5); + Texture_Mottle((u16*) D_MAP_6047F80, (u16*) D_MAP_6048F80, 5); } s32 func_menu_801A05B4(void) { @@ -2188,7 +2188,7 @@ void func_menu_801A0D14(void) { static f32 D_menu_801B694C = 71.0f; static f32 D_menu_801B6950 = 205.0f; static u16* D_menu_801B6954[] = { - D_6041A80, D_6035780, D_6033080, D_603A580, D_603F380, D_6037E80, D_603CC80, + D_MAP_6041A80, D_MAP_6035780, D_MAP_6033080, D_MAP_603A580, D_MAP_603F380, D_MAP_6037E80, D_MAP_603CC80, }; func_menu_801A116C(); @@ -2204,8 +2204,8 @@ void func_menu_801A0D14(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f); - TextureRect_8bIA_MirY(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f); + TextureRect_8bIA(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f); + TextureRect_8bIA_MirY(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f); func_8003DE68(0x47, 0x76); func_8003DE68(0xCD, 0xEF); @@ -2406,9 +2406,9 @@ void func_menu_801A19A8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA9C); for (i = 0; i < 4; i++) { - TextureRect_8bIA(&gMasterDisp, D_600D590 + (i * 168 * 4), 168, 4, 72.0f, 104.0f + (4.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_MAP_600D590 + (i * 168 * 4), 168, 4, 72.0f, 104.0f + (4.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_600D590 + (168 * 16), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_MAP_600D590 + (168 * 16), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f); } void func_menu_801A1AE8(void) { @@ -3852,16 +3852,16 @@ void func_menu_801A5834(void) { } if (gLifeCount[gPlayerNum]) { - texture = D_6001080; + texture = D_MAP_6001080; } else { - texture = (u8*) D_6000000; + texture = D_MAP_6000000; } RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); - TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, x, y, 4.6f, D_menu_801B6A6C[var_t0]); + TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, x, y, 4.6f, D_menu_801B6A6C[var_t0]); mask = 0xFFFFFFFF; if (D_menu_801CF000[colorIndex] != 0) { @@ -3872,7 +3872,7 @@ void func_menu_801A5834(void) { if (gGameFrameCount & mask) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255); - TextureRect_8bIA(&gMasterDisp, D_6000840, 96, 22, x + 11.0f, y + 3.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_MAP_6000840, 96, 22, x + 11.0f, y + 3.0f, 1.0f, 1.0f); } z = 24.0f; colorIndex++; @@ -3886,7 +3886,7 @@ void func_menu_801A5834(void) { if (gGameFrameCount & mask) { gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255); - TextureRect_8bIA(&gMasterDisp, D_60018C0, 96, 10, x + 10.0f, y + z + 8.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_MAP_60018C0, 96, 10, x + 10.0f, y + z + 8.0f, 1.0f, 1.0f); } z += 18.0f; colorIndex++; @@ -4702,7 +4702,7 @@ void func_menu_801A77B0(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_605C230); + gSPDisplayList(gMasterDisp++, D_MAP_605C230); Matrix_Pop(&gGfxMatrix); } @@ -4724,7 +4724,7 @@ void func_menu_801A791C(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604C540); + gSPDisplayList(gMasterDisp++, D_MAP_604C540); Matrix_Pop(&gGfxMatrix); } @@ -4744,7 +4744,7 @@ void func_menu_801A7A84(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604CDE0); + gSPDisplayList(gMasterDisp++, D_MAP_604CDE0); Matrix_Pop(&gGfxMatrix); } @@ -4769,7 +4769,7 @@ void func_menu_801A7BEC(f32* zAngle, f32 next, f32 scale) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6047E70); + gSPDisplayList(gMasterDisp++, D_MAP_6047E70); Matrix_Pop(&gGfxMatrix); @@ -4831,7 +4831,7 @@ void func_menu_801A7F1C(PlanetId planetId) { Matrix_Copy(gGfxMatrix, &D_menu_801CE1E0[planetId]); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604D680); + gSPDisplayList(gMasterDisp++, D_MAP_604D680); Matrix_Pop(&gGfxMatrix); @@ -4874,7 +4874,7 @@ void func_menu_801A809C(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604D680); + gSPDisplayList(gMasterDisp++, D_MAP_604D680); Matrix_Pop(&gGfxMatrix); @@ -4910,7 +4910,7 @@ void func_menu_801A809C(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604D680); + gSPDisplayList(gMasterDisp++, D_MAP_604D680); Matrix_Pop(&gGfxMatrix); } @@ -4935,7 +4935,7 @@ void func_menu_801A809C(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601D1F0); + gSPDisplayList(gMasterDisp++, D_MAP_601D1F0); Matrix_Pop(&gGfxMatrix); @@ -4973,7 +4973,7 @@ void func_menu_801A809C(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601D1F0); + gSPDisplayList(gMasterDisp++, D_MAP_601D1F0); Matrix_Pop(&gGfxMatrix); @@ -5030,7 +5030,7 @@ void func_menu_801A8738(void) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_60479D0); + gSPDisplayList(gMasterDisp++, D_MAP_60479D0); Matrix_Pop(&gGfxMatrix); } @@ -5115,7 +5115,7 @@ void func_menu_801A89BC(PlanetId planetId, s32 arg1) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_60479D0); + gSPDisplayList(gMasterDisp++, D_MAP_60479D0); Matrix_Pop(&gGfxMatrix); } @@ -5147,7 +5147,7 @@ void func_menu_801A8F40(void) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601DCF0); + gSPDisplayList(gMasterDisp++, D_MAP_601DCF0); Matrix_Pop(&gGfxMatrix); @@ -5298,7 +5298,7 @@ void func_menu_801A9448(void) { Matrix_MultVec3f(gCalcMatrix, &dest, &src); Lights_SetOneLight(&gMasterDisp, src.x, src.y, src.z, 80, 80, 60, 0, 0, 0); - gSPDisplayList(gMasterDisp++, D_601E9A0); + gSPDisplayList(gMasterDisp++, D_MAP_601E9A0); Matrix_Pop(&gGfxMatrix); } @@ -5556,10 +5556,10 @@ void func_menu_801AA1CC(s32 arg0) { } else { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); } - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, 28.0f + x + 24.0f, y + 11.0f, 2.0f, 0.2f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, 28.0f + x + 24.0f, y + 11.0f, 2.0f, 0.2f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_16bRGBA(&gMasterDisp, D_6047550, 24, 24, 28.0f + x, y, 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_6047550, 24, 24, 28.0f + x, y, 1.0f, 1.0f); } } @@ -5759,7 +5759,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { } Matrix_Scale(gGfxMatrix, 1.6f, 1.6f, 1.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_605C230); + gSPDisplayList(gMasterDisp++, D_MAP_605C230); } Matrix_Pop(&gGfxMatrix); } @@ -5785,7 +5785,7 @@ void func_menu_801AB17C(f32 x, f32 y, f32 z) { Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601D1F0); + gSPDisplayList(gMasterDisp++, D_MAP_601D1F0); Matrix_Pop(&gGfxMatrix); } @@ -5962,7 +5962,7 @@ void func_menu_801AB978(s32 arg0) { f32 yPos; s32 sp90[3]; static f32 D_menu_801B6B0C[3] = { 205.0f, 237.0f, 269.0f }; - static u16* D_menu_801B6B18[3] = { D_6032A60, D_6044180, D_6032440 }; + static u16* D_menu_801B6B18[3] = { D_MAP_6032A60, D_MAP_6044180, D_MAP_6032440 }; switch (arg0) { case 10: @@ -5979,13 +5979,13 @@ void func_menu_801AB978(s32 arg0) { yPos = 77.0f; for (i = 0; i < 12; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_6044820 + (i * 92 * 4), 92, 4, xPos, yPos + (i * 4.0f), 1.0f, - 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_6044820 + (i * 92 * 4), 92, 4, xPos, yPos + (i * 4.0f), + 1.0f, 1.0f); } - TextureRect_16bRGBA(&gMasterDisp, D_6044820 + (92 * 12 * 4), 92, 3, xPos, yPos + 48.0f, 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_6044820 + (92 * 12 * 4), 92, 3, xPos, yPos + 48.0f, 1.0f, 1.0f); if (arg0 == 21) { - TextureRect_16bRGBA(&gMasterDisp, D_6046CD0, 32, 34, xPos + 47.0, yPos, 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_6046CD0, 32, 34, xPos + 47.0, yPos, 1.0f, 1.0f); } for (i = 0; i < 3; i++) { @@ -6089,7 +6089,7 @@ void func_menu_801ABF1C(void) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_605A120); + gSPDisplayList(gMasterDisp++, D_MAP_605A120); } Matrix_Pop(&gGfxMatrix); @@ -6110,7 +6110,7 @@ void func_menu_801ABF1C(void) { Matrix_SetGfxMtx(&gMasterDisp); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_604C350); + gSPDisplayList(gMasterDisp++, D_MAP_604C350); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } Matrix_Pop(&gGfxMatrix); @@ -6267,7 +6267,7 @@ void func_menu_801AC530(s32 index) { Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, 50, 50, 40, 0, 0, 0); - gSPDisplayList(gMasterDisp++, D_604A9F0); + gSPDisplayList(gMasterDisp++, D_MAP_604A9F0); Matrix_Pop(&gGfxMatrix); } @@ -6304,7 +6304,7 @@ void func_menu_801AC80C(PathType pathType) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_604D680); + gSPDisplayList(gMasterDisp++, D_MAP_604D680); Matrix_Pop(&gGfxMatrix); diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 50db3327..05e4d567 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -25,6 +25,7 @@ extern Gfx D_menu_801B57A8[]; #include "assets/ast_font_3d.h" #include "assets/ast_option.h" #include "assets/ast_versus.h" +#include "assets/ast_map.h" extern f32 D_menu_801CD818[]; @@ -172,42 +173,42 @@ static f32 D_menu_801AE620[] = { 1.9f, 2.4f, 0.9f, 1.9f, 1.8f, 2.4f }; // D_menu_801AE638 static OptionEntry sOptionCardList[] = { { - { 0, 0, D_8003B50, 0, 72, 12, 126.0f, 46.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8003B50, 0, 72, 12, 126.0f, 46.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, 30.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, 27.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_8003EB0, 0, 80, 12, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8003EB0, 0, 80, 12, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, 18.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, 16.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_8004270, 0, 32, 10, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8004270, 0, 32, 10, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, 6.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, 6.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_80043B0, 0, 64, 12, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_80043B0, 0, 64, 12, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, -6.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, -5.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_80046B0, 0, 64, 10, 110.0f, 116.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_80046B0, 0, 64, 10, 110.0f, 116.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, -18.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, -16.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_8004930, 0, 80, 10, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8004930, 0, 80, 10, 126.0f, 184.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, -30.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, -27.0f, 80.0f }, 1, @@ -218,21 +219,21 @@ static OptionEntry sOptionCardList[] = { // D_menu_801AE878 static OptionEntry sOptionVSCardList[] = { { - { 0, 0, D_8005010, 0, 96, 13, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8005010, 0, 96, 13, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, 11.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, 11.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_80054F0, 0, 96, 10, 110.0f, 116.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_80054F0, 0, 96, 10, 110.0f, 116.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, 0.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, 0.0f, 80.0f }, 1, 1, }, { - { 0, 0, D_8005910, 0, 96, 10, 110.0f, 138.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, + { 0, 0, D_OPT_8005910, 0, 96, 10, 110.0f, 138.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, { 0.0f, -11.0f, -130.0f, 0.2f, 0.11f }, { -40.0f, -11.0f, 80.0f }, 1, @@ -248,22 +249,22 @@ static f32 D_menu_801AE9A0[4] = { 62.0f, 222.0f, 75.0f, 235.0f }; static f32 D_menu_801AE9B0[4] = { 43.0f, 43.0f, 46.0f, 46.0f }; static OptionTexture D_menu_801AE9C0[4] = { - { 2, 0, D_80143B0, D_80147B0, 32, 32, 56.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, - { 2, 0, D_80143B0, D_80147B0, 32, 32, 216.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, - { 1, 0, D_80039D0, D_8003A50, 16, 16, 69.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, - { 1, 0, D_80039D0, D_8003A50, 16, 16, 229.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 2, 0, D_OPT_80143B0, D_OPT_80147B0, 32, 32, 56.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 2, 0, D_OPT_80143B0, D_OPT_80147B0, 32, 32, 216.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 1, 0, D_OPT_80039D0, D_OPT_8003A50, 16, 16, 69.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 1, 0, D_OPT_80039D0, D_OPT_8003A50, 16, 16, 229.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, }; static OptionTexture D_menu_801AEAA0[3] = { - { 3, 0, D_8013990, 0, 104, 10, 151.0f, 135.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, - { 3, 0, D_8013990, 0, 104, 10, 151.0f, 161.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, - { 3, 0, D_8013990, 0, 104, 10, 151.0f, 188.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 135.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 161.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 188.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, }; static OptionTexture D_menu_801AEB48[3] = { - { 3, 0, D_80141B0, 0, 16, 16, 245.0f, 132.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, - { 3, 0, D_80141B0, 0, 16, 16, 245.0f, 158.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, - { 3, 0, D_80141B0, 0, 16, 16, 245.0f, 185.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 132.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 158.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, + { 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 185.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, }; static Vtx D_menu_801AEBF0[] = { @@ -328,9 +329,9 @@ static UnkStruct_D_menu_801AED4C D_menu_801AED4C[24] = { }; static Gfx* D_menu_801AEE6C[16] = { - D_6060610, D_601DE80, D_604B750, D_601F6B0, D_601C0D0, D_601C960, + D_MAP_6060610, D_MAP_601DE80, D_MAP_604B750, D_MAP_601F6B0, D_MAP_601C0D0, D_MAP_601C960, D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, D_menu_801B5B10, D_menu_801B5440, - D_menu_801B50D8, D_604DB10, D_menu_801B57A8, D_menu_801B57A8, + D_menu_801B50D8, D_MAP_604DB10, D_menu_801B57A8, D_menu_801B57A8, }; static char* D_menu_801AEEAC[] = { @@ -368,10 +369,10 @@ void Option_Setup(void) { D_80137E78 = 2; - sOptionCardList[0].unk_00.unk_08 = D_8003B50; + sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; sOptionCardList[0].unk_00.unk_10 = 72; sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[4].unk_00.unk_08 = D_80046B0; + sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; sOptionCardList[4].unk_00.unk_10 = 64; sOptionCardList[4].unk_00.unk_14 = 10; @@ -922,13 +923,13 @@ void Option_MainMenuUpdate(void) { if (temp2 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); if (D_menu_801B91B0) { - sOptionCardList[0].unk_00.unk_08 = D_8004C50; + sOptionCardList[0].unk_00.unk_08 = D_OPT_8004C50; sOptionCardList[0].unk_00.unk_10 = 80; sOptionCardList[0].unk_00.unk_14 = 12; sOptionCardList[0].unk_00.unk_18 = 125.0f; sOptionCardList[0].unk_00.unk_1C = 55.0f; } else { - sOptionCardList[0].unk_00.unk_08 = D_8003B50; + sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; sOptionCardList[0].unk_00.unk_10 = 72; sOptionCardList[0].unk_00.unk_14 = 12; sOptionCardList[0].unk_00.unk_18 = 124.0f; @@ -942,13 +943,13 @@ void Option_MainMenuUpdate(void) { if (temp2 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); if (D_menu_801B91AC) { - sOptionCardList[4].unk_00.unk_08 = D_8004C50; + sOptionCardList[4].unk_00.unk_08 = D_OPT_8004C50; sOptionCardList[4].unk_00.unk_10 = 80; sOptionCardList[4].unk_00.unk_14 = 12; sOptionCardList[4].unk_00.unk_18 = 125.0f; sOptionCardList[4].unk_00.unk_1C = 151.0f; } else { - sOptionCardList[4].unk_00.unk_08 = D_80046B0; + sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; sOptionCardList[4].unk_00.unk_10 = 64; sOptionCardList[4].unk_00.unk_14 = 10; sOptionCardList[4].unk_00.unk_18 = 133.0f; @@ -1460,11 +1461,12 @@ void Option_SoundDraw(void) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_menu_801AEFA8[0], D_menu_801AEFD4[0], D_menu_801AF000, 0.2f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AEFA8[0], D_menu_801AEFD4[0], D_menu_801AF000, + 0.2f); RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_8005CD0, 112, 13, D_menu_801AEFA8[1], D_menu_801AEFD4[1], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8005CD0, 112, 13, D_menu_801AEFA8[1], D_menu_801AEFD4[1], 1.0f, 1.0f); for (i = 0; i < 4; i++) { if (D_menu_801B9288 == i) { @@ -1476,43 +1478,43 @@ void Option_SoundDraw(void) { colorGB = D_menu_801B9270[0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_8006280, 48, 13, D_menu_801AEFA8[2], D_menu_801AEFD4[2], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8006280, 48, 13, D_menu_801AEFA8[2], D_menu_801AEFD4[2], 1.0f, 1.0f); colorGB = D_menu_801B9270[1]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_80064F0, 88, 14, D_menu_801AEFA8[3], D_menu_801AEFD4[3], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80064F0, 88, 14, D_menu_801AEFA8[3], D_menu_801AEFD4[3], 1.0f, 1.0f); colorGB = D_menu_801B9270[2]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_80069C0, 56, 15, D_menu_801AEFA8[4], D_menu_801AEFD4[4], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80069C0, 56, 15, D_menu_801AEFA8[4], D_menu_801AEFD4[4], 1.0f, 1.0f); colorGB = D_menu_801B9270[3]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_8006D10, 24, 13, D_menu_801AEFA8[5], D_menu_801AEFD4[5], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8006D10, 24, 13, D_menu_801AEFA8[5], D_menu_801AEFD4[5], 1.0f, 1.0f); if (D_menu_801B9288 == 0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AEFA8[6], D_menu_801AEFD4[6], 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AEFA8[7], D_menu_801AEFD4[7], 1.0f, 1.0f); + TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[6], D_menu_801AEFD4[6], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[7], D_menu_801AEFD4[7], 1.0f, 1.0f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); switch (gSoundMode) { case OPTIONSOUND_STEREO: - TextureRect_8bIA(&gMasterDisp, D_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f); break; case OPTIONSOUND_MONO: - TextureRect_8bIA(&gMasterDisp, D_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f); break; case OPTIONSOUND_HEADSET: - TextureRect_8bIA(&gMasterDisp, D_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f); break; } - TextureRect_8bIA(&gMasterDisp, D_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); for (i = 0; i < 3; i++) { Option_DrawCardLabel(D_menu_801AEAA0[i]); @@ -1724,7 +1726,7 @@ void Option_ExpertSoundDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_80079F0, 128, 14, 49.0f, 81.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80079F0, 128, 14, 49.0f, 81.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C / 10], 16, 15, 230.0f, 82.0f, 1.0f, 1.0f); @@ -1737,8 +1739,8 @@ void Option_ExpertSoundDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 50, 50, 200, 255); for (i = 0; i < 4; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_menu_801AF014[i], D_menu_801AF024[i], D_menu_801AF034[i], - D_menu_801AF044[i]); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AF014[i], D_menu_801AF024[i], + D_menu_801AF034[i], D_menu_801AF044[i]); } if (D_menu_801B9320 != 0) { @@ -1869,10 +1871,10 @@ void Option_DataUpdate(void) { gExpertMode = false; - sOptionCardList[0].unk_00.unk_08 = D_8003B50; + sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; sOptionCardList[0].unk_00.unk_10 = 72; sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[4].unk_00.unk_08 = D_80046B0; + sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; sOptionCardList[4].unk_00.unk_10 = 64; sOptionCardList[4].unk_00.unk_14 = 10; @@ -1947,14 +1949,15 @@ void Option_DataDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 2; i++) { - TextureRect_8bIA(&gMasterDisp, D_80084B0 + (i * 176 * 4), 176, 4, D_menu_801AF094[0], + TextureRect_8bIA(&gMasterDisp, D_OPT_80084B0 + (i * 176 * 4), 176, 4, D_menu_801AF094[0], D_menu_801AF0AC[0] + (4.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_80084B0 + 1408, 176, 5, D_menu_801AF094[0], D_menu_801AF0AC[0] + 8.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80084B0 + 1408, 176, 5, D_menu_801AF094[0], D_menu_801AF0AC[0] + 8.0f, 1.0f, + 1.0f); if (D_menu_801B91CC < 2) { - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); + TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); func_menu_8019C824(&D_menu_801AED20[D_menu_801B91C0]); D_menu_801AED20[!D_menu_801B91C0] = 255.0f; @@ -1972,13 +1975,13 @@ void Option_DataDraw(void) { if (gGameFrameCount & sp74[1]) { sp7C[1] = D_menu_801AED20[1]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[1], sp7C[1], 255); - TextureRect_8bIA(&gMasterDisp, D_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f); } if (gGameFrameCount & sp74[0]) { sp7C[0] = D_menu_801AED20[0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[0], sp7C[0], 255); - TextureRect_8bIA(&gMasterDisp, D_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f); } } @@ -1987,10 +1990,10 @@ void Option_DataDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 9; i++) { - TextureRect_8bIA(&gMasterDisp, D_8008DA0 + (160 * 2 * i), 160, 2, D_menu_801AF094[3], + TextureRect_8bIA(&gMasterDisp, D_OPT_8008DA0 + (160 * 2 * i), 160, 2, D_menu_801AF094[3], D_menu_801AF0AC[3] + (2.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_8008DA0 + 2880, 160, 1, D_menu_801AF094[3], D_menu_801AF0AC[3] + 18.0f, + TextureRect_8bIA(&gMasterDisp, D_OPT_8008DA0 + 2880, 160, 1, D_menu_801AF094[3], D_menu_801AF0AC[3] + 18.0f, 1.0f, 1.0f); break; @@ -1999,19 +2002,19 @@ void Option_DataDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 20; i++) { - TextureRect_8bIA(&gMasterDisp, D_8009CE0 + (160 * 2 * i), 160, 2, D_menu_801AF094[4], + TextureRect_8bIA(&gMasterDisp, D_OPT_8009CE0 + (160 * 2 * i), 160, 2, D_menu_801AF094[4], D_menu_801AF0AC[4] + (2.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_8009CE0 + 6400, 160, 1, D_menu_801AF094[4], D_menu_801AF0AC[4] + 40.0f, + TextureRect_8bIA(&gMasterDisp, D_OPT_8009CE0 + 6400, 160, 1, D_menu_801AF094[4], D_menu_801AF0AC[4] + 40.0f, 1.0f, 1.0f); break; case 3: gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 32, 32, 255); - TextureRect_8bIA(&gMasterDisp, D_800B680, 144, 28, D_menu_801AF094[5], D_menu_801AF0AC[5], 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800B680 + 4032, 144, 13, D_menu_801AF094[5], D_menu_801AF0AC[5] + 28.0f, - 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800B680, 144, 28, D_menu_801AF094[5], D_menu_801AF0AC[5], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800B680 + 4032, 144, 13, D_menu_801AF094[5], + D_menu_801AF0AC[5] + 28.0f, 1.0f, 1.0f); break; } @@ -2181,8 +2184,8 @@ void func_menu_8019752C(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f); - TextureRect_8bIA_MirY(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f); + TextureRect_8bIA_MirY(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f); func_8003DE68(0, 70); func_8003DE68(170, 239); @@ -2196,7 +2199,7 @@ void func_menu_8019752C(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } - TextureRect_8bIA(&gMasterDisp, D_800D070, 16, 16, 150.0f, 44.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 44.0f, 1.0f, 1.0f); if (D_menu_801B91D4 <= -1055.0f) { gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255); @@ -2206,7 +2209,7 @@ void func_menu_8019752C(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } - TextureRect_8bIA_MirY(&gMasterDisp, D_800D070, 16, 16, 150.0f, 200.0f, 1.0f, 1.0f); + TextureRect_8bIA_MirY(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 200.0f, 1.0f, 1.0f); } static Vec3f D_menu_801AF100[2] = { { 0.0f, 167.0f, 0.0f }, { 0.0f, -167.0f, 0.0f } }; @@ -2247,19 +2250,21 @@ void func_menu_80197A3C(s32 arg0, s32 arg1, s32 arg2) { switch (arg0) { case 0: - TextureRect_4bCI(&gMasterDisp, D_8003A70, D_8003AB8, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_8003A70, D_OPT_8003AB8, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f); break; case 1: - TextureRect_4bCI(&gMasterDisp, D_80038E0, D_8003930, 16, 10, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_80038E0, D_OPT_8003930, 16, 10, arg1 + 17.0f, arg2 - 19.0f, 1.0f, + 1.0f); break; case 2: - TextureRect_4bCI(&gMasterDisp, D_8003950, D_80039A8, 16, 11, arg1 + 17.0f, arg2 - 20.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_8003950, D_OPT_80039A8, 16, 11, arg1 + 17.0f, arg2 - 20.0f, 1.0f, + 1.0f); break; default: - TextureRect_4bCI(&gMasterDisp, D_8003AE0, D_8003B28, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_8003AE0, D_OPT_8003B28, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f); break; } } @@ -2282,7 +2287,7 @@ void func_menu_80197D30(s32 arg0, s32 arg1, s32 arg2) { void func_menu_80197DE4(s32 arg0, s32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); - TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, arg1, arg2, 3.17f, 1.05f); + TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, arg1, arg2, 3.17f, 1.05f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); Graphics_DisplaySmallText(arg1, arg2, 1.0f, 1.0f, "TOTAL HITS"); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -2369,10 +2374,10 @@ void func_menu_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { } } gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255); - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, arg2 + 24.0f, arg3 + 11.0f, 2.0f, 0.2f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, arg2 + 24.0f, arg3 + 11.0f, 2.0f, 0.2f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_16bRGBA(&gMasterDisp, D_6047550, 24, 24, arg2, arg3, 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_MAP_6047550, 24, 24, arg2, arg3, 1.0f, 1.0f); } } @@ -2560,7 +2565,7 @@ void func_menu_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 1.6f, 1.6f, 1.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_605C230); + gSPDisplayList(gMasterDisp++, D_MAP_605C230); Matrix_Pop(&gGfxMatrix); break; @@ -2591,7 +2596,7 @@ void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2) { Matrix_Translate(gGfxMatrix, arg0 - D_menu_801AF140, arg1 + D_menu_801AF144, arg2, 1); Matrix_Scale(gGfxMatrix, D_menu_801AF13C, D_menu_801AF13C, D_menu_801AF13C, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601D1F0); + gSPDisplayList(gMasterDisp++, D_MAP_601D1F0); Matrix_Pop(&gGfxMatrix); } @@ -2820,10 +2825,10 @@ void func_menu_80199820(s32 arg0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D4, + TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D4, D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D8, + TextureRect_8bIA(&gMasterDisp, D_OPT_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_VS_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC, @@ -3180,7 +3185,7 @@ void func_menu_8019AB30(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 190); - TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f); + TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f); if (D_menu_801B912C == 0) { func_menu_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255); @@ -3231,7 +3236,7 @@ void func_menu_8019AD84(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 190); - TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, 93.0f, 42.0f, 5.1f, 1.1f); + TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, 93.0f, 42.0f, 5.1f, 1.1f); if (D_menu_801B912C == 0) { D_menu_801B9324 = 97.0f; @@ -3437,8 +3442,8 @@ void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) { void func_menu_8019B7D4(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); } void func_menu_8019B8A0(s32 arg0) { @@ -3475,7 +3480,7 @@ void Option_DrawMenuCard(MenuContext_38 arg0) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_8015550); + gSPDisplayList(gMasterDisp++, D_OPT_8015550); Matrix_Pop(&gGfxMatrix); @@ -3512,7 +3517,7 @@ void func_menu_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { RCP_SetupDL_55(); - gSPDisplayList(gMasterDisp++, D_604A9F0); + gSPDisplayList(gMasterDisp++, D_MAP_604A9F0); Matrix_Pop(&gGfxMatrix); } @@ -3578,7 +3583,7 @@ void func_menu_8019C04C(void) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_8015DF0); + gSPDisplayList(gMasterDisp++, D_OPT_8015DF0); Matrix_Pop(&gGfxMatrix); @@ -4411,33 +4416,34 @@ void Option_InvoiceDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_4bCI(&gMasterDisp, D_8000000, D_8000680, 128, 16, D_menu_801AF3D0[0], D_menu_801AF3F0[0], 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_8000000, D_OPT_8000680, 128, 16, D_menu_801AF3D0[0], D_menu_801AF3F0[0], 1.0f, + 1.0f); - TextureRect_4bCI(&gMasterDisp, D_8000000 + 1024, D_8000680, 128, 10, D_menu_801AF3D0[0], D_menu_801AF3F0[0] + 16.0f, - 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_8000000 + 1024, D_OPT_8000680, 128, 10, D_menu_801AF3D0[0], + D_menu_801AF3F0[0] + 16.0f, 1.0f, 1.0f); for (i = 0; i < 2; i++) { - TextureRect_4bCI(&gMasterDisp, D_80006A0 + (256 * 16 * i) / 2, D_80017A0, 256, 16, D_menu_801AF3D0[1], + TextureRect_4bCI(&gMasterDisp, D_OPT_80006A0 + (256 * 16 * i) / 2, D_OPT_80017A0, 256, 16, D_menu_801AF3D0[1], D_menu_801AF3F0[1] + (16 * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_80006A0 + 256 * 16, D_80017A0, 256, 2, D_menu_801AF3D0[1], + TextureRect_4bCI(&gMasterDisp, D_OPT_80006A0 + 256 * 16, D_OPT_80017A0, 256, 2, D_menu_801AF3D0[1], D_menu_801AF3F0[1] + 32.0f, 1.0f, 1.0f); for (i = 0; i < 4; i++) { - TextureRect_4bCI(&gMasterDisp, D_80017C0 + (256 * 16 * i) / 2, D_80038C0, 256, 16, D_menu_801AF3D0[2], + TextureRect_4bCI(&gMasterDisp, D_OPT_80017C0 + (256 * 16 * i) / 2, D_OPT_80038C0, 256, 16, D_menu_801AF3D0[2], D_menu_801AF3F0[2] + (16 * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_80017C0 + 8192, D_80038C0, 256, 2, D_menu_801AF3D0[2], D_menu_801AF3F0[2] + 64.0f, - 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_OPT_80017C0 + 8192, D_OPT_80038C0, 256, 2, D_menu_801AF3D0[2], + D_menu_801AF3F0[2] + 64.0f, 1.0f, 1.0f); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 30; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_800E170 + (188 * 2 * i), 188, 2, D_menu_801AF3D0[3], + TextureRect_16bRGBA(&gMasterDisp, D_OPT_800E170 + (188 * 2 * i), 188, 2, D_menu_801AF3D0[3], D_menu_801AF3F0[3] + (2.0f * i), 1.0f, 1.0f); } @@ -4453,7 +4459,7 @@ void Option_InvoiceDraw(void) { if (D_menu_801B9090) { gDPSetPrimColor(gMasterDisp++, 0, 0, 120, 0, 0, 192); for (i = 0; i < 3; i++) { - TextureRect_8bIA(&gMasterDisp, D_800D1F0 + (80 * 16 * i), 80, 16, D_menu_801AF3D0[5], + TextureRect_8bIA(&gMasterDisp, D_OPT_800D1F0 + (80 * 16 * i), 80, 16, D_menu_801AF3D0[5], D_menu_801AF3F0[5] + (16.0f * i), 1.0f, 1.0f); } } diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index 7c4be863..40a61492 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -3,10 +3,12 @@ * System: Title * Description: Starfox Title Handler */ -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" // #include "prevent_bss_reordering2.h" #include "global.h" +#include "assets.h" #include "fox_title.h" +#include "assets/ast_title.h" extern Animation D_602F8E0; extern Animation D_60305C0;