diff --git a/.vscode/settings.json b/.vscode/settings.json index 8b799875..0e33aee2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -104,7 +104,14 @@ "ast_option.h": "c", "ast_area_6.h": "c", "ast_bg_space.h": "c", - "ast_sector_y.h": "c" + "ast_sector_y.h": "c", + "ast_vs_player.h": "c", + "ast_enmy_planet.h": "c", + "ast_sector_z.h": "c", + "ast_titania.h": "c", + "ast_bg_planet.h": "c", + "assets.h": "c", + "ast_title.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/assets/yaml/us/ast_aquas.yaml b/assets/yaml/us/ast_aquas.yaml index 820473f2..e3d1e591 100644 --- a/assets/yaml/us/ast_aquas.yaml +++ b/assets/yaml/us/ast_aquas.yaml @@ -453,7 +453,7 @@ D_AQ_602E584: { type: SF64:ENV_SETTINGS, offset: 0x602E584, symbol: D_AQ_602E584 } D_AQ_602E584: - { type: SF64:OBJECT_INIT, offset: 0x602E5C8, symbol: D_602E5C8 } + { type: SF64:OBJECT_INIT, offset: 0x602E5C8, symbol: D_AQ_602E5C8 } D_AQ_60308B8: { type: SF64:SCRIPT, offset: 0x60308B8, symbol: D_AQ_60308B8 } diff --git a/assets/yaml/us/ast_titania.yaml b/assets/yaml/us/ast_titania.yaml new file mode 100644 index 00000000..59a30934 --- /dev/null +++ b/assets/yaml/us/ast_titania.yaml @@ -0,0 +1,185 @@ +:config: + segments: + - [0x06, 0x9D2FD0] + header: + code: + - '#include "assets/ast_titania.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + - '#include "sf64level.h"' + +D_TI_6000000: + {type: TEXTURE, format: IA8, ctype: u8, width: 96, height: 28, offset: 0x6000000, symbol: D_TI_6000000} + +D_TI_6000A80: + {type: GFX, offset: 0x6000A80, symbol: D_TI_6000A80} + +D_TI_6000B10: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x6000B10, symbol: D_TI_6000B10} + +D_TI_6001B10: + {type: GFX, offset: 0x6001B10, symbol: D_TI_6001B10} + +D_TI_6001BA8: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6001BA8, symbol: D_TI_6001BA8} + +D_TI_60023B0: + {type: GFX, offset: 0x60023B0, symbol: D_TI_60023B0} + +D_TI_6002438: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x6002438, symbol: D_TI_6002438} + +D_TI_6003440: + {type: GFX, offset: 0x6003440, symbol: D_TI_6003440} + +D_TI_60034E0: + {type: GFX, offset: 0x60034E0, symbol: D_TI_60034E0} + +D_TI_6003580: + {type: GFX, offset: 0x6003580, symbol: D_TI_6003580} + +D_TI_6003620: + {type: GFX, offset: 0x6003620, symbol: D_TI_6003620} + +D_TI_60036C0: + {type: GFX, offset: 0x60036C0, symbol: D_TI_60036C0} + +D_TI_6003760: + {type: GFX, offset: 0x6003760, symbol: D_TI_6003760} + +D_TI_6003800: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6003800, symbol: D_TI_6003800} + +D_TI_6003C00: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6003C00, symbol: D_TI_6003C00} + +D_TI_6004000: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6004000, symbol: D_TI_6004000} + +D_TI_6004400: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6004400, symbol: D_TI_6004400} + +D_TI_6004800: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6004800, symbol: D_TI_6004800} + +D_TI_6004C00: + {type: TEXTURE, format: IA8, ctype: u8, width: 32, height: 32, offset: 0x6004C00, symbol: D_TI_6004C00} + +D_TI_6005000: + {type: SF64:ENV_SETTINGS, offset: 0x6005000, symbol: D_TI_6005000} + +D_TI_600631C: + {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C} + +D_TI_60064AC: + {type: SF64:HITBOX, offset: 0x60064AC, symbol: D_TI_60064AC} + +D_TI_60064C8: + {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8} + +D_TI_60064FC: + {type: SF64:HITBOX, offset: 0x60064FC, symbol: D_TI_60064FC} + +D_TI_6006518: + {type: SF64:HITBOX, offset: 0x6006518, symbol: D_TI_6006518} + +D_TI_6006564: + {type: SF64:HITBOX, offset: 0x6006564, symbol: D_TI_6006564} + +D_TI_60065B0: + {type: SF64:HITBOX, offset: 0x60065B0, symbol: D_TI_60065B0} + +D_TI_60065FC: + {type: SF64:HITBOX, offset: 0x60065FC, symbol: D_TI_60065FC} + +D_TI_6006648: + {type: SF64:HITBOX, offset: 0x6006648, symbol: D_TI_6006648} + +D_TI_6006694: + {type: SF64:HITBOX, offset: 0x6006694, symbol: D_TI_6006694} + +D_TI_60066E0: + {type: SF64:HITBOX, offset: 0x60066E0, symbol: D_TI_60066E0} + +D_TI_600672C: + {type: SF64:HITBOX, offset: 0x600672C, symbol: D_TI_600672C} + +D_TI_6006778: + {type: SF64:HITBOX, offset: 0x6006778, symbol: D_TI_6006778} + +D_TI_60067C4: + {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4} + +D_TI_6006808: + {type: SF64:HITBOX, offset: 0x6006808, symbol: D_TI_6006808} + +D_TI_6006A3C: + {type: SF64:HITBOX, offset: 0x6006A3C, symbol: D_TI_6006A3C} + +D_TI_600683C: + {type: SF64:HITBOX, offset: 0x600683C, symbol: D_TI_600683C} + +D_TI_6006858: + {type: SF64:HITBOX, offset: 0x6006858, symbol: D_TI_6006858} + +D_TI_6006874: + {type: SF64:HITBOX, offset: 0x6006874, symbol: D_TI_6006874} + +D_TI_6006890: + {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890} + +D_TI_60068BC: + {type: SF64:HITBOX, offset: 0x60068BC, symbol: D_TI_60068BC} + +D_TI_60068F0: + {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0} + +D_TI_6006940: + {type: SF64:HITBOX, offset: 0x6006940, symbol: D_TI_6006940} + +D_TI_600695C: + {type: SF64:HITBOX, offset: 0x600695C, symbol: D_TI_600695C} + +D_TI_6006978: + {type: SF64:HITBOX, offset: 0x6006978, symbol: D_TI_6006978} + +D_TI_6006994: + {type: SF64:HITBOX, offset: 0x6006994, symbol: D_TI_6006994} + +D_TI_60069B0: + {type: SF64:HITBOX, offset: 0x60069B0, symbol: D_TI_60069B0} + +D_TI_60069CC: + {type: SF64:HITBOX, offset: 0x60069CC, symbol: D_TI_60069CC} + +D_TI_60069E8: + {type: SF64:HITBOX, offset: 0x60069E8, symbol: D_TI_60069E8} + +D_TI_6006A04: + {type: SF64:HITBOX, offset: 0x6006A04, symbol: D_TI_6006A04} + +D_TI_6006A20: + {type: SF64:HITBOX, offset: 0x6006A20, symbol: D_TI_6006A20} + +D_TI_6006BF0: + {type: SF64:HITBOX, offset: 0x6006BF0, symbol: D_TI_6006BF0} + +D_TI_6006924: + {type: SF64:HITBOX, offset: 0x6006924, symbol: D_TI_6006924} + +D_TI_6006C0C: + {type: SF64:HITBOX, offset: 0x6006C0C, symbol: D_TI_6006C0C} + +D_TI_6006C28: + {type: SF64:HITBOX, offset: 0x6006C28, symbol: D_TI_6006C28} + +D_TI_6006C44: + {type: SF64:HITBOX, offset: 0x6006C44, symbol: D_TI_6006C44} + +D_TI_6006C60: + {type: SF64:OBJECT_INIT, offset: 0x6006C60, symbol: D_TI_6006C60} + +D_TI_6009BB8: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6009BB8, symbol: D_TI_6009BB8} diff --git a/include/assets.h b/include/assets.h index 319fe631..a6d4129c 100644 --- a/include/assets.h +++ b/include/assets.h @@ -16,7 +16,6 @@ * ast_katina, ast_macbeth, ast_title, ast_map, ast_training */ extern Gfx D_60005B0[]; // fox_bg -extern Gfx D_6000A80[]; // fox_bg, fox_effect extern Gfx D_6000E00[]; // fox_edata_1C extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka @@ -24,66 +23,29 @@ extern Gfx D_6001A60[]; // fox_effect extern u8 D_6001B80[]; // fox_hud extern Vtx D_6001C50[]; // fox_play extern u8 D_60020D0[]; // fox_hud -extern Gfx D_60023B0[]; // fox_edata_1C extern Gfx D_6002990[]; // fox_edata_1C extern Gfx D_6002E60[]; // fox_bg extern Gfx D_6003000[]; // fox_edata_1C extern Gfx D_60030F0[]; // fox_edata_1C -extern Gfx D_6003760[]; extern Gfx D_60038E0[]; extern u16 D_60038F8[]; extern Gfx D_6004170[]; extern Vtx D_6004500[]; extern Gfx D_60046F0[]; extern Gfx D_6004900[]; -extern EnvSettings D_TI_6005000; extern u16 D_6005710[]; extern Gfx D_6005780[]; extern Gfx D_6005880[]; extern Gfx D_60059F0[]; extern Gfx D_6006140[]; extern Gfx D_6006310[]; -extern u16* D_TI_600631C[]; extern Animation D_600636C; -extern f32 D_60064AC[]; -extern f32 D_60064C8[]; -extern f32 D_60064FC[]; -extern f32 D_6006518[]; extern Limb* D_6006558[]; -extern f32 D_6006564[]; -extern f32 D_60065B0[]; -extern f32 D_60065FC[]; -extern f32 D_6006648[]; -extern f32 D_6006694[]; extern Gfx D_60066D0[]; -extern f32 D_60066E0_f32[]; -extern Gfx D_60066E0_Gfx[]; -extern f32 D_600672C[]; extern u16 D_6006750[]; -extern f32 D_6006778[]; -extern f32 D_60067C4[]; -extern f32 D_6006808[]; -extern f32 D_600683C[]; -extern f32 D_6006858[]; -extern f32 D_6006890_f32[]; -extern Gfx D_6006890_Gfx[]; -extern f32 D_60068BC[]; -extern f32 D_60068F0[]; -extern f32 D_6006940[]; -extern f32 D_600695C[]; -extern f32 D_6006978[]; -extern f32 D_6006994[]; -extern f32 D_60069B0[]; -extern f32 D_60069CC[]; -extern f32 D_60069E8[]; -extern f32 D_6006A04[]; -extern f32 D_6006A20[]; -extern f32 D_6006A3C[]; extern EnvSettings D_6006A60; extern Gfx D_6006A80[]; extern Gfx D_6006BE0[]; -extern f32 D_6006BF0[]; -extern f32 D_6006C44[]; extern u16 D_6006EA0[]; extern Gfx D_6006F50[]; extern Gfx D_6007410[]; @@ -100,7 +62,6 @@ extern Gfx D_6008830[]; extern Gfx D_6008AA0[]; extern Gfx D_6009250[]; extern u16* D_6009B34[]; -extern u16 D_6009BB8[]; extern f32 D_6009CC4[]; extern f32 D_6009CFC[]; extern Animation D_6009D30; diff --git a/include/assets/ast_titania.h b/include/assets/ast_titania.h deleted file mode 100644 index 52a650ad..00000000 --- a/include/assets/ast_titania.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_TITANIA_H -#define AST_TITANIA_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h index 854bbc3a..5a35b8f0 100644 --- a/include/fox_enmy_assets.h +++ b/include/fox_enmy_assets.h @@ -3,17 +3,15 @@ #include "sf64object.h" -extern ObjectInit D_60371A4[]; -extern ObjectInit D_6026CC4[]; -extern ObjectInit D_6007E74[]; -extern ObjectInit D_601F234[]; -extern ObjectInit D_6026714[]; -extern ObjectInit D_6031000[]; -extern ObjectInit D_6006C60[]; -extern ObjectInit D_602E5C8[]; -extern ObjectInit D_600EAD4[]; -extern ObjectInit D_6011044[]; -extern ObjectInit D_600FF74[]; -extern ObjectInit D_6014D94[]; +extern ObjectInit D_CO_60371A4[]; +extern ObjectInit D_ME_6026CC4[]; +extern ObjectInit D_VE1_6007E74[]; +extern ObjectInit D_SO_601F234[]; +extern ObjectInit D_ZO_6026714[]; +extern ObjectInit D_MA_6031000[]; +extern ObjectInit D_FO_600EAD4[]; +extern ObjectInit D_KA_6011044[]; +extern ObjectInit D_BO_600FF74[]; +extern ObjectInit D_VE2_600FF74[]; #endif diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index f7ebe2e1..520537b1 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -132,7 +132,7 @@ D_500A7D0 = 0x0500A7D0; D_6000E00 = 0x06000E00; D_6001360 = 0x06001360; D_60012A0 = 0x060012A0; -D_60023B0 = 0x060023B0; +D_TI_60023B0 = 0x060023B0; D_6002990 = 0x06002990; D_6003000 = 0x06003000; D_AQ_6003610 = 0x06003610; @@ -140,31 +140,31 @@ D_6004170 = 0x06004170; D_6004AC0 = 0x06004AC0; D_6005780 = 0x06005780; D_6006310 = 0x06006310; -D_60064AC = 0x060064AC; -D_60064C8 = 0x060064C8; -D_60064FC = 0x060064FC; -D_6006518 = 0x06006518; -D_6006564 = 0x06006564; -D_60065B0 = 0x060065B0; -D_60065FC = 0x060065FC; -D_6006648 = 0x06006648; -D_6006694 = 0x06006694; -D_60066E0_f32 = 0x060066E0; -D_60066E0_Gfx = 0x060066E0; -D_600672C = 0x0600672C; -D_6006778 = 0x06006778; -D_60067C4 = 0x060067C4; -D_6006808 = 0x06006808; -D_600683C = 0x0600683C; -D_6006858 = 0x06006858; -D_6006890_f32 = 0x06006890; -D_6006890_Gfx = 0x06006890; -D_60068BC = 0x060068BC; -D_60068F0 = 0x060068F0; -D_6006A3C = 0x06006A3C; +D_TI_60064AC = 0x060064AC; +D_TI_60064C8 = 0x060064C8; +D_TI_60064FC = 0x060064FC; +D_TI_6006518 = 0x06006518; +D_TI_6006564 = 0x06006564; +D_TI_60065B0 = 0x060065B0; +D_TI_60065FC = 0x060065FC; +D_TI_6006648 = 0x06006648; +D_TI_6006694 = 0x06006694; +D_TI_60066E0_f32 = 0x060066E0; +D_TI_60066E0_Gfx = 0x060066E0; +D_TI_600672C = 0x0600672C; +D_TI_6006778 = 0x06006778; +D_TI_60067C4 = 0x060067C4; +D_TI_6006808 = 0x06006808; +D_TI_600683C = 0x0600683C; +D_TI_6006858 = 0x06006858; +D_TI_6006890_f32 = 0x06006890; +D_TI_6006890_Gfx = 0x06006890; +D_TI_60068BC = 0x060068BC; +D_TI_60068F0 = 0x060068F0; +D_TI_6006A3C = 0x06006A3C; D_6006A80 = 0x06006A80; -D_6006BF0 = 0x06006BF0; -D_6006C44 = 0x06006C44; +D_TI_6006BF0 = 0x06006BF0; +D_TI_6006C44 = 0x06006C44; D_6006F50 = 0x06006F50; D_6007410 = 0x06007410; D_60075D0 = 0x060075D0; @@ -471,11 +471,11 @@ D_604A190 = 0x0604A190; D_604A400 = 0x0604A400; D_604A710 = 0x0604A710; D_6049F80 = 0x06049F80; -D_6003440 = 0x06003440; -D_60034E0 = 0x060034E0; -D_6003580 = 0x06003580; -D_6003620 = 0x06003620; -D_60036C0 = 0x060036C0; +D_TI_6003440 = 0x06003440; +D_TI_60034E0 = 0x060034E0; +D_TI_6003580 = 0x06003580; +D_TI_6003620 = 0x06003620; +D_TI_60036C0 = 0x060036C0; D_CO_6037160 = 0x06037160; D_601E424 = 0x0601E424; D_6026C80 = 0x06026C80; @@ -986,23 +986,23 @@ D_1010920 = 0x01010920; D_1010970 = 0x01010970; // fox_enmy -D_60371A4 = 0x0060371A4; -D_6026CC4 = 0x006026CC4; +D_CO_60371A4 = 0x0060371A4; +D_ME_6026CC4 = 0x006026CC4; D_SX_602A164 = 0x00602A164; D_A6_6023F64 = 0x006023F64; D_A6_60287A4 = 0x0060287A4; -D_6007E74 = 0x006007E74; -D_601F234 = 0x00601F234; -D_6026714 = 0x006026714; +D_VE1_6007E74 = 0x006007E74; +D_SO_601F234 = 0x00601F234; +D_ZO_6026714 = 0x006026714; D_C035154 = 0x00C035154; D_TR_6006AA4 = 0x006006AA4; -D_6031000 = 0x006031000; -D_6006C60 = 0x006006C60; -D_602E5C8 = 0x00602E5C8; -D_600EAD4 = 0x00600EAD4; -D_6011044 = 0x006011044; -D_600FF74 = 0x00600FF74; -D_6014D94 = 0x006014D94; +D_MA_6031000 = 0x006031000; +D_TI_6006C60 = 0x006006C60; +D_AQ_602E5C8 = 0x00602E5C8; +D_FO_600EAD4 = 0x00600EAD4; +D_KA_6011044 = 0x006011044; +D_BO_600FF74 = 0x00600FF74; +D_VE2_600FF74 = 0x006014D94; // fox_enmy2 D_6011F90 = 0x06011F90; @@ -1442,7 +1442,7 @@ D_500A500 = 0x500A500; D_500B600 = 0x500B600; D_6000000 = 0x6000000; D_60005B0 = 0x60005B0; -D_6000A80 = 0x6000A80; +D_TI_6000A80 = 0x6000A80; D_AQ_6000AE4 = 0x6000AE4; D_A6_6000B60 = 0x6000B60; D_6000C80 = 0x6000C80; @@ -1463,7 +1463,7 @@ D_60018C0 = 0x60018C0; D_SX_6001950 = 0x6001950; D_6001A60 = 0x6001A60; D_A6_6001A80 = 0x6001A80; -D_6001BA8 = 0x6001BA8; +D_TI_6001BA8 = 0x6001BA8; D_6001C50 = 0x6001C50; D_6001C64 = 0x6001C64; D_6001FB0 = 0x6001FB0; @@ -1499,22 +1499,22 @@ D_60066D0 = 0x60066D0; D_SX_60066F0 = 0x60066F0; D_6006750 = 0x6006750; D_SX_6006810 = 0x6006810; -D_60068F0 = 0x60068F0; +D_TI_60068F0 = 0x60068F0; D_6006910 = 0x6006910; -D_6006924 = 0x6006924; -D_6006940 = 0x6006940; -D_600695C = 0x600695C; -D_6006978 = 0x6006978; -D_6006994 = 0x6006994; -D_60069B0 = 0x60069B0; -D_60069CC = 0x60069CC; -D_60069E8 = 0x60069E8; -D_6006A04 = 0x6006A04; -D_6006A20 = 0x6006A20; +D_TI_6006924 = 0x6006924; +D_TI_6006940 = 0x6006940; +D_TI_600695C = 0x600695C; +D_TI_6006978 = 0x6006978; +D_TI_6006994 = 0x6006994; +D_TI_60069B0 = 0x60069B0; +D_TI_60069CC = 0x60069CC; +D_TI_60069E8 = 0x60069E8; +D_TI_6006A04 = 0x6006A04; +D_TI_6006A20 = 0x6006A20; D_6006BE0 = 0x6006BE0; -D_6006BF0 = 0x6006BF0; -D_6006C0C = 0x6006C0C; -D_6006C28 = 0x6006C28; +D_TI_6006BF0 = 0x6006BF0; +D_TI_6006C0C = 0x6006C0C; +D_TI_6006C28 = 0x6006C28; D_6006EA0 = 0x6006EA0; D_60071C0 = 0x60071C0; D_6007290 = 0x6007290; @@ -1538,7 +1538,7 @@ D_TR_6008EF8 = 0x6008EF8; D_AQ_6008FC8 = 0x6008FC8; D_6009250 = 0x6009250; D_6009300 = 0x6009300; -D_6009BB8 = 0x6009BB8; +D_TI_6009BB8 = 0x6009BB8; D_6009BC0 = 0x6009BC0; D_SX_6009C30 = 0x6009C30; D_6009C50 = 0x6009C50; diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index 5ede2aed..04d9645c 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -24,6 +24,7 @@ f32 D_80161394; // can be static #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_warp_zone.h" #include "assets/ast_area_6.h" @@ -463,7 +464,7 @@ void func_8003E1E8(void) { } Matrix_SetGfxMtx(&gMasterDisp); if (gCurrentLevel == LEVEL_TITANIA) { - gSPDisplayList(gMasterDisp++, D_6000A80); + gSPDisplayList(gMasterDisp++, D_TI_6000A80); } else if (gCurrentLevel == LEVEL_MACBETH) { gSPDisplayList(gMasterDisp++, D_6019220); } else if (gCurrentLevel == LEVEL_ZONESS) { @@ -479,7 +480,7 @@ void func_8003E1E8(void) { Matrix_Translate(gGfxMatrix, 7280.0f * sp13C, 0.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); if (gCurrentLevel == LEVEL_TITANIA) { - gSPDisplayList(gMasterDisp++, D_6000A80); + gSPDisplayList(gMasterDisp++, D_TI_6000A80); } else if (gCurrentLevel == LEVEL_MACBETH) { gSPDisplayList(gMasterDisp++, D_6019220); } else if (gCurrentLevel == LEVEL_ZONESS) { diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index bd80c8b9..7d354755 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -8,6 +8,7 @@ #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" #include "assets/ast_ve1_boss.h" @@ -112,16 +113,16 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_26, */ {(void*) D_6010A50, 0, (ObjectFunc) NULL, D_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_27, */ {(void*) D_60143E0, 0, (ObjectFunc) NULL, D_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_28, */ {(void*) D_6014A20, 0, (ObjectFunc) NULL, D_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60066E0_f32, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60066E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_39, */ {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -140,8 +141,8 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_TI_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_59, */ {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_60, */ {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, @@ -218,7 +219,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, /* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - /* OBJ_80_135 */ {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, /* OBJ_80_138 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -234,7 +235,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_148 */ {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_149 */ {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_150 */ {(void*) D_6006310, 0, (ObjectFunc) NULL, D_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_151 */ {(void*) D_60066E0_Gfx, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_151 */ {(void*) D_TI_60066E0, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_152 */ {(void*) D_600F4C0, 0, (ObjectFunc) NULL, D_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_153 */ {(void*) D_600B8B0, 0, (ObjectFunc) NULL, D_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_154 */ {(void*) D_600BAF0, 0, (ObjectFunc) NULL, D_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -252,7 +253,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_169 */ {(void*) D_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_i1_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, @@ -308,15 +309,15 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, /* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_i5_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, - /* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, - /* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, - /* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, - /* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, - /* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, - /* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, - /* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, - /* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, + /* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, + /* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_TI_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_TI_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, + /* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_TI_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, + /* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, + /* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, + /* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, /* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 }, /* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 }, /* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 6f1bb389..c91c4d7b 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -6,11 +6,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n"; const char D_800D7240[] = "a=<%d>\n"; const char D_800D7248[] = "a=<%d>\n"; -extern Gfx D_6003440[]; -extern Gfx D_60034E0[]; -extern Gfx D_6003580[]; -extern Gfx D_6003620[]; -extern Gfx D_60036C0[]; extern Gfx D_6004900[]; extern Gfx D_6016880[]; extern Gfx D_6018AF0[]; @@ -24,6 +19,7 @@ extern Gfx D_601BAD0[]; #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_area_6.h" #include "assets/ast_A_ti.h" #include "assets/ast_ve1_boss.h" @@ -489,7 +485,7 @@ void func_80078BE0(Effect* effect) { void func_80078C84(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 192); - gSPDisplayList(gMasterDisp++, D_6000A80); + gSPDisplayList(gMasterDisp++, D_TI_6000A80); } void func_80078CE8(Effect* effect) { @@ -1047,7 +1043,7 @@ void func_8007A994(Effect* effect) { effect->unk_4A++; } -Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_TR_6003760 }; +Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TR_6003760 }; void func_8007AA60(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x44); diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index fab46474..6f42160a 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -5,6 +5,7 @@ #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_area_6.h" #include "assets/ast_training.h" @@ -17,9 +18,9 @@ u8 D_80161684; #include "fox_enmy_assets.h" ObjectInit* D_800CFDA0[] = { - D_60371A4, D_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_6007E74, - D_601F234, D_6026714, D_C035154, D_TR_6006AA4, D_6031000, D_6006C60, D_602E5C8, - D_600EAD4, NULL, D_6011044, D_600FF74, D_SZ_6006EB4, D_6014D94, D_vs_player_302DE3C, + D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74, + D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8, + D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_vs_player_302DE3C, }; s32 D_800CFDF4[] = { OBJ_80_0, @@ -1031,31 +1032,31 @@ void Object_Init(s32 index, ObjectId objId) { } break; case OBJ_80_30: - func_80063E5C(&gObjects80[index], D_6006940); + func_80063E5C(&gObjects80[index], D_TI_6006940); break; case OBJ_80_31: - func_80063E5C(&gObjects80[index], D_600695C); + func_80063E5C(&gObjects80[index], D_TI_600695C); break; case OBJ_80_32: - func_80063E5C(&gObjects80[index], D_6006978); + func_80063E5C(&gObjects80[index], D_TI_6006978); break; case OBJ_80_33: - func_80063E5C(&gObjects80[index], D_6006994); + func_80063E5C(&gObjects80[index], D_TI_6006994); break; case OBJ_80_34: - func_80063E5C(&gObjects80[index], D_60069B0); + func_80063E5C(&gObjects80[index], D_TI_60069B0); break; case OBJ_80_35: - func_80063E5C(&gObjects80[index], D_60069CC); + func_80063E5C(&gObjects80[index], D_TI_60069CC); break; case OBJ_80_36: - func_80063E5C(&gObjects80[index], D_60069E8); + func_80063E5C(&gObjects80[index], D_TI_60069E8); break; case OBJ_80_37: - func_80063E5C(&gObjects80[index], D_6006A04); + func_80063E5C(&gObjects80[index], D_TI_6006A04); break; case OBJ_80_38: - func_80063E5C(&gObjects80[index], D_6006A20); + func_80063E5C(&gObjects80[index], D_TI_6006A20); break; case OBJ_80_23: func_80063CAC(&gObjects80[index]); diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index fed9eb31..f16c904a 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -13,6 +13,7 @@ s32 D_80161690; #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" #include "assets/ast_area_6.h" diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index de722af5..e4bc0861 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -72,20 +72,23 @@ s32 D_80161900[20]; #include "global.h" #include "assets.h" -#include "assets/ast_blue_marine.h" -#include "assets/ast_landmaster.h" -#include "assets/ast_training.h" -#include "assets/ast_andross.h" -#include "assets/ast_star_wolf.h" -#include "assets/ast_font.h" -#include "assets/ast_vs_player.h" -#include "assets/ast_bg_planet.h" #include "assets/ast_bg_space.h" +#include "assets/ast_bg_planet.h" +#include "assets/ast_arwing.h" +#include "assets/ast_landmaster.h" +#include "assets/ast_blue_marine.h" +#include "assets/ast_vs_player.h" +#include "assets/ast_font.h" +#include "assets/ast_training.h" #include "assets/ast_area_6.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" +#include "assets/ast_andross.h" +#include "assets/ast_allies.h" +#include "assets/ast_star_wolf.h" void func_80087788(void); @@ -98,23 +101,14 @@ extern u8 D_FO_6000000[]; extern u8 D_KA_6000000[]; extern u8 D_SO_6000000[]; extern u8 D_ZO_6000000[]; -extern u8 D_TI_6000000[]; extern u8 D_BO_6000000[]; - -extern u16 D_6000C80[]; extern u8 D_VE1_6000D80[]; -extern u8 D_6001260[]; extern u8 D_VE2_60012D0[]; +extern u8 D_6000C80[]; +extern u8 D_6001260[]; extern u8 D_6002890[]; extern Gfx D_6003090[]; -#include "assets/ast_blue_marine.h" -#include "assets/ast_arwing.h" -#include "assets/ast_bg_space.h" -#include "assets/ast_bg_planet.h" -#include "assets/ast_allies.h" -#include "assets/ast_font.h" - // DATA SECTION START s16 D_800D1970 = 0; @@ -2024,17 +2018,18 @@ s32 func_8008A4DC(void) { f32 z1; f32 x; f32 y; + s32 pad; f32 temp; - s32 ret = 0; - f32 temp2, temp3; + f32 temp2; + f32 temp3; if (!gVersusMode) { if (gLevelMode != LEVELMODE_ALL_RANGE) { - return ret; + return 0; } if (D_80177AB0 >= 5) { - return ret; + return 0; } if (D_80177838) { @@ -2044,7 +2039,7 @@ s32 func_8008A4DC(void) { } if (D_800D1E10 == 60.0f) { - return ret; + return 0; } switch (gCurrentLevel) { @@ -2088,11 +2083,9 @@ s32 func_8008A4DC(void) { x = 254.000f + D_800D1E10; y = 162.000f; x1 += D_800D1E10 * temp3; - } - - else { + } else { if ((D_80177E7C == 0) || (D_80178750 != 0)) { - return ret; + return 0; } temp2 = 13000.00f; @@ -2150,7 +2143,7 @@ s32 func_8008A4DC(void) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, x1, y1, z1, 1); - if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_80161710)) { + if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_80161710 != 0)) { Matrix_Push(&gGfxMatrix); func_80089D28(); Matrix_Pop(&gGfxMatrix); @@ -2158,11 +2151,8 @@ s32 func_8008A4DC(void) { } for (i = 64; i >= 0; i--) { - if (gRadarMarks[i].unk_00 == 0) { - continue; - } - - if (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f) || fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f)) { + if ((gRadarMarks[i].unk_00 == 0) || (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f)) || + (fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f))) { continue; } @@ -2184,7 +2174,7 @@ s32 func_8008A4DC(void) { } Matrix_Pop(&gGfxMatrix); - return ret; + return 0; } s32 func_8008AC54(s32 arg0) { diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 46e2a9c2..24dff739 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -7,6 +7,7 @@ #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" +#include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" #include "assets/ast_vs_player.h" diff --git a/src/main/fox_tank.c b/src/main/fox_tank.c index 5dfa6a9e..23b2ca37 100644 --- a/src/main/fox_tank.c +++ b/src/main/fox_tank.c @@ -1,6 +1,6 @@ #include "global.h" -#include "assets.h" #include "assets/ast_landmaster.h" +#include "assets/ast_titania.h" void func_80047754(Player* player); void func_80047D38(Player* player, f32); @@ -491,7 +491,7 @@ void func_80044868(Player* player) { if (player->unk_0D0 > 0.0f) { Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0); if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) { - func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f); + func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); } if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) { func_80043280(D_landmaster_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f); @@ -500,7 +500,7 @@ void func_80044868(Player* player) { if (player->unk_0D0 > 10.0f) { Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0); if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) { - func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f); + func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); } } func_800A46A0(player); diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index 3a3886f7..bd6970fe 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -1,5 +1,6 @@ #include "global.h" #include "assets.h" +#include "assets/ast_bg_planet.h" typedef void (*BossSOfunc)(Boss*); @@ -166,8 +167,6 @@ s32 D_i3_801C2740[10]; f32 D_i3_801C2768[14]; s32 D_i3_801C27A0[8]; // unused? part of previous? -#include "assets/ast_bg_planet.h" - void func_i3_8019E7F0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index d5ddb9f8..0998bd8a 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -1,13 +1,20 @@ #include "global.h" -#include "assets.h" #include "assets/ast_sector_z.h" s32 D_i4_801A0560; s32 D_i4_801A0564; -Vec3f D_i4_8019F4C0[] = { 0.0f, 0.0f, 35000.0f, -2000.0f, 0.0f, 35000.0f, 2000.0f, 0.0f, 35000.0f }; -Vec3f D_i4_8019F4E4[] = { -700.0f, -200.0f, 200.0f, 500.0f, 200.0f, -300.0f, - 300.0f, -300.0f, -200.0f, 200.0f, 400.0f, 500.0f }; +Vec3f D_i4_8019F4C0[] = { + { 0.0f, 0.0f, 35000.0f }, + { -2000.0f, 0.0f, 35000.0f }, + { 2000.0f, 0.0f, 35000.0f }, +}; +Vec3f D_i4_8019F4E4[] = { + { -700.0f, -200.0f, 200.0f }, + { 500.0f, 200.0f, -300.0f }, + { 300.0f, -300.0f, -200.0f }, + { 200.0f, 400.0f, 500.0f }, +}; extern s32 D_80161710; diff --git a/src/overlays/ovl_i5/fox_ground.c b/src/overlays/ovl_i5/fox_ground.c index 44b9af62..81072e5d 100644 --- a/src/overlays/ovl_i5/fox_ground.c +++ b/src/overlays/ovl_i5/fox_ground.c @@ -1,12 +1,11 @@ -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" #include "global.h" +#include "assets/ast_titania.h" void func_i5_801B5244(s32 arg0, s32 arg1); void func_i5_801B5FE0(s32 arg0, s32 arg1, s32 arg2); void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2); -extern u16 D_6001BA8[]; - typedef struct { /* 0x00 */ s32 unk_00; /* 0x04 */ s32 unk_04; @@ -372,7 +371,7 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) { if (D_i5_801C5C14 & 2) { gDPSetupTile((*dList)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadTileTexture((*dList)++, D_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); + gDPLoadTileTexture((*dList)++, D_TI_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); gSPMatrix((*dList)++, &gIdentityMtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); Matrix_Translate(gGfxMatrix, D_i5_801C62D8.x, D_i5_801C62D8.y, D_i5_801C62D8.z + D_i5_801C5C10, 0); Matrix_ToMtx(gGfxMtx); @@ -563,7 +562,7 @@ void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2) { gDPSetupTile((*dlist)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadTileTexture((*dlist)++, D_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); + gDPLoadTileTexture((*dlist)++, D_TI_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); Matrix_Translate(gGfxMatrix, D_i5_801C62D8.x, D_i5_801C62D8.y, D_i5_801C62D8.z + D_i5_801C5C10, 0); Matrix_ToMtx(gGfxMtx); gSPMatrix((*dlist)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index 0564010b..11c87aea 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -1,7 +1,7 @@ // #include "prevent_bss_reordering.h" #include "global.h" -#include "assets.h" #include "assets/ast_bg_planet.h" +#include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_7_ti_2.h" #include "assets/ast_8_ti.h" @@ -12,10 +12,6 @@ extern Gfx D_Gfx_800D94D0[]; -extern f32 D_6006924[]; -extern f32 D_6006C0C[]; -extern f32 D_6006C28[]; - s32* D_i5_801BBEF0; f32* D_i5_801BBEF4; s32* D_i5_801BBEF8; @@ -317,7 +313,7 @@ void func_i5_80189B80(Actor* actor) { func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp2C, &actor->obj.pos.y, &sp2C); actor->health = 10; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60068F0); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_60068F0); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); @@ -348,7 +344,7 @@ void func_i5_80189CC8(Actor* actor) { actor->info.unk_1C = 0.0f; func_80066254(actor); actor->info.bonus = 0; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006924); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006924); func_8007D0E0(actor->fwork[0], actor->fwork[1], actor->fwork[2], 2.0f); } } @@ -2113,13 +2109,13 @@ void func_i5_8018F4D8(Object_80* obj80) { if (obj80->unk_44 != 0) { if (obj80->obj.rot.z == 0.0f) { obj80->obj.pos.x = obj80->vel.z; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006BF0); + obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006BF0); } else if (obj80->obj.rot.z > 0.0f) { obj80->obj.pos.x = obj80->vel.z - 75.0f; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006C28); + obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C28); } else { obj80->obj.pos.x = obj80->vel.z + 75.0f; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006C0C); + obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C0C); } } } diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index 7b98fe89..9ef57249 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -1,9 +1,6 @@ #include "global.h" -#include "assets.h" #include "assets/ast_sector_y.h" -extern f32 D_6034124[]; - void func_i6_80198244(Boss*); void func_i6_80198ABC(Boss*); void func_i6_80199D64(Boss*); diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index e86ad8d4..a44e1ae0 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -4,7 +4,7 @@ * Description: Starfox Title Handler */ #include "prevent_bss_reordering.h" -// #include "prevent_bss_reordering2.h" +#include "prevent_bss_reordering2.h" #include "global.h" #include "assets.h" #include "fox_title.h" diff --git a/tools/Torch b/tools/Torch index db11318e..a7d7acdc 160000 --- a/tools/Torch +++ b/tools/Torch @@ -1 +1 @@ -Subproject commit db11318e5cbf915cf483395672b8409d2564dd98 +Subproject commit a7d7acdc4219d474597960b55fea06b06e1911ad diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index e85a62f2..57b5b74d 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -126,8 +126,12 @@ - name: ast_titania exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets + vram: 0x06000000 start: 0x9D2FD0 + subsegments: + - [0x9D2FD0, .data, ast_titania/ast_titania] - name: ast_7_ti_2 exclusive_ram_id: segment_07