From 9604a29140f73d3022ff93987abaf21d51d027e4 Mon Sep 17 00:00:00 2001 From: Lywx Date: Mon, 1 Apr 2024 10:54:47 -0600 Subject: [PATCH] export configuration for ast_fortuna, ast_katina, ast_venom_1 & ast_venom_2 (#190) * Matched ast_fortuna * Added FO prefix into every asset * Fully matched PR * Removed katina from assets.h * WIP ast_venom_2 * Debinarized ast_venom_2 * Removed venom_2 from assets.h * Renamed VE1 to VE1B * Matched ast_venom_1 * Renamed to D_VE1 * Renamed venom_1 boss assets back to D_VE1 * Fixed merge conflicts --- assets/yaml/us/ast_fortuna.yaml | 172 +++++++++++++++++++++++++ assets/yaml/us/ast_katina.yaml | 175 ++++++++++++++++++++++++++ assets/yaml/us/ast_test.yaml | 14 --- assets/yaml/us/ast_venom_1.yaml | 176 ++++++++++++++++++++++++++ assets/yaml/us/ast_venom_2.yaml | 203 ++++++++++++++++++++++++++++++ include/assets.h | 100 ++++----------- include/assets/ast_fortuna.h | 8 -- include/assets/ast_katina.h | 8 -- include/assets/ast_venom_1.h | 8 -- include/assets/ast_venom_2.h | 8 -- include/fox_edisplay_assets.h | 2 +- include/fox_enmy2_assets.h | 6 +- src/main/fox_360.c | 15 ++- src/main/fox_A4290_colheaders.c | 10 +- src/main/fox_bg.c | 26 ++-- src/main/fox_demo.c | 3 +- src/main/fox_edata.c | 4 +- src/main/fox_edata_1C.c | 64 +++++----- src/main/fox_edisplay.c | 18 +-- src/main/fox_enmy.c | 3 +- src/main/fox_enmy2.c | 16 +-- src/main/fox_hud.c | 20 +-- src/main/fox_play.c | 4 + src/overlays/ovl_i4/fox_fo.c | 11 +- src/overlays/ovl_i4/fox_ka.c | 39 +++--- src/overlays/ovl_i6/fox_andross.c | 43 +++---- src/overlays/ovl_i6/fox_ve2.c | 10 +- yamls/us/assets.yaml | 24 +++- 28 files changed, 915 insertions(+), 275 deletions(-) create mode 100644 assets/yaml/us/ast_fortuna.yaml create mode 100644 assets/yaml/us/ast_katina.yaml delete mode 100644 assets/yaml/us/ast_test.yaml create mode 100644 assets/yaml/us/ast_venom_1.yaml create mode 100644 assets/yaml/us/ast_venom_2.yaml delete mode 100644 include/assets/ast_fortuna.h delete mode 100644 include/assets/ast_katina.h delete mode 100644 include/assets/ast_venom_1.h delete mode 100644 include/assets/ast_venom_2.h diff --git a/assets/yaml/us/ast_fortuna.yaml b/assets/yaml/us/ast_fortuna.yaml new file mode 100644 index 00000000..65e76252 --- /dev/null +++ b/assets/yaml/us/ast_fortuna.yaml @@ -0,0 +1,172 @@ +:config: + segments: + - [0x6, 0xB1CA50] + header: + code: + - '#include "assets/ast_fortuna.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "sf64level.h"' + - '#include "structs.h"' + +# Fortuna +# Former Defense Post +D_FO_6000000: + { type: TEXTURE, format: IA8, width: 168, height: 28, offset: 0x6000000, ctype: u8, symbol: D_FO_6000000 } + +D_FO_6001260: + { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6001260, ctype: u8, symbol: D_FO_6001260 } + +D_FO_6001360: + { type: GFX, offset: 0x6001360, symbol: D_FO_6001360 } + +D_FO_6001890: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6001890, ctype: u16, symbol: D_FO_6001890 } + +D_FO_6002090: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002090, ctype: u16, symbol: D_FO_6002090 } + +D_FO_6002890: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002890, ctype: u16, symbol: D_FO_6002890 } + +D_FO_6003090: + { type: GFX, offset: 0x6003090, symbol: D_FO_6003090 } + +D_FO_6003EC0: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003EC0, ctype: u16, symbol: D_FO_6003EC0 } + +D_FO_60046C0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60046C0, ctype: u16, symbol: D_FO_60046C0 } + +D_FO_60048C0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60048C0, ctype: u16, symbol: D_FO_60048C0 } + +D_FO_6004AC0: + { type: TEXTURE, format: RGBA16, width: 32, height: 64, offset: 0x6004AC0, ctype: u16, symbol: D_FO_6004AC0 } + +D_FO_6005AC0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6005AC0, ctype: u16, symbol: D_FO_6005AC0 } + +D_FO_6005CC0: + { type: GFX, offset: 0x6005CC0, symbol: D_FO_6005CC0 } + +D_FO_6005F20: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6005F20, ctype: u16, symbol: D_FO_6005F20 } + +D_FO_6006120: + { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x6006120, ctype: u8, symbol: D_FO_6006120 } + +D_FO_6006220: + { type: TEXTURE, format: TLUT, colors: 120, offset: 0x6006220, ctype: u16, symbol: D_FO_6006220 } + +D_FO_6006310: + { type: GFX, offset: 0x6006310, symbol: D_FO_6006310 } + +D_FO_60066E0: + { type: GFX, offset: 0x60066E0, symbol: D_FO_60066E0 } + +ast_fortuna_seg6_vtx_6898: + { type: VTX, count: 52, offset: 0x6006898, symbol: ast_fortuna_seg6_vtx_6898 } + +D_FO_6006BE0: + { type: GFX, offset: 0x6006BE0, symbol: D_FO_6006BE0 } + +ast_fortuna_seg6_vtx_6D00: + { type: VTX, count: 62, offset: 0x6006D00, symbol: ast_fortuna_seg6_vtx_6D00 } + +D_FO_60070E0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60070E0, ctype: u16, symbol: D_FO_60070E0 } + +D_FO_60072E0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60072E0, ctype: u16, symbol: D_FO_60072E0 } + +D_FO_6007854: + { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 } + +D_FO_6007980: + { type: SF64:SKELETON, offset: 0x6007980, symbol: D_FO_6007980 } + +D_FO_60079B0: + { type: GFX, offset: 0x60079B0, symbol: D_FO_60079B0 } + +D_FO_6007D80: + { type: GFX, offset: 0x6007D80, symbol: D_FO_6007D80 } + +D_FO_6008150: + { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6008150, ctype: u16, symbol: D_FO_6008150 } + +D_FO_6009070: + { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009070, ctype: u16, symbol: D_FO_6009070 } + +D_FO_6009F90: + { type: GFX, offset: 0x6009F90, symbol: D_FO_6009F90 } + +D_FO_600A018: + { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 } + +D_FO_600A420: + { type: GFX, offset: 0x600A420, symbol: D_FO_600A420 } + +D_FO_600A4A8: + { type: TEXTURE, format: RGBA16, width: 32, height: 64, offset: 0x600A4A8, ctype: u16, symbol: D_FO_600A4A8 } + +D_FO_600B4B0: + { type: GFX, offset: 0x600B4B0, symbol: D_FO_600B4B0 } + +D_FO_600B5C0: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600B5C0, ctype: u16, symbol: D_FO_600B5C0 } + +D_FO_600C5C0: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600C5C0, ctype: u16, symbol: D_FO_600C5C0 } + +D_FO_600D5C0: + { type: GFX, offset: 0x600D5C0, symbol: D_FO_600D5C0 } + +D_FO_600D7E8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 } + +D_FO_600D9F0: + { type: GFX, offset: 0x600D9F0, symbol: D_FO_600D9F8 } + +D_FO_600DA88: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600DA88, ctype: u16, symbol: D_FO_600DA88 } + +D_FO_600EA90: + { type: SF64:ENV_SETTINGS, offset: 0x600EA90, symbol: D_FO_600EA90 } + +D_FO_600EAD4: + { type: SF64:OBJECT_INIT, offset: 0x600EAD4, symbol: D_FO_600EAD4 } + +D_FO_600F1DC: + { type: SF64:COLPOLY, offset: 0x600F1DC, count: 22, symbol: D_FO_600F1DC } + +D_FO_600F3F4: + { type: SF64:COLPOLY, offset: 0x600F3F4, count: 22, symbol: D_FO_600F3F4 } + +D_FO_600F60C: + { type: SF64:COLPOLY, offset: 0x600F60C, count: 93, symbol: D_FO_600F60C } + +D_FO_600FE9C: + { type: SF64:HITBOX, offset: 0x600FE9C, symbol: D_FO_600FE9C } + +D_FO_600FEB8: + { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 } + +D_FO_600FF30: + { type: SF64:HITBOX, offset: 0x600FF30, symbol: D_FO_600FF30 } + +D_FO_600FF64: + { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 } + +D_FO_600FF80: + { type: SF64:HITBOX, offset: 0x600FF80, symbol: D_FO_600FF80 } + +D_FO_600FFA0: + { type: SF64:HITBOX, offset: 0x600FFA0, symbol: D_FO_600FFA0 } + +D_FO_600FFC0: + { type: SF64:HITBOX, offset: 0x600FFC0, symbol: D_FO_600FFC0 } + +D_FO_600FFE0: + { type: SF64:HITBOX, offset: 0x600FFE0, symbol: D_FO_600FFE0 } \ No newline at end of file diff --git a/assets/yaml/us/ast_katina.yaml b/assets/yaml/us/ast_katina.yaml new file mode 100644 index 00000000..8c7ac9fd --- /dev/null +++ b/assets/yaml/us/ast_katina.yaml @@ -0,0 +1,175 @@ +:config: + segments: + - [0x6, 0xBB11D0] + header: + code: + - '#include "assets/ast_katina.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "sf64level.h"' + - '#include "structs.h"' + +# Katina +# Frontline Base +D_KA_6000000: + { type: TEXTURE, format: IA8, width: 168, height: 28, offset: 0x6000000, ctype: u8, symbol: D_KA_6000000 } + +D_KA_6001260: + { type: TEXTURE, format: IA8, width: 8, height: 8, offset: 0x6001260, ctype: u8, symbol: D_KA_6001260 } + +D_KA_60012A0: + { type: GFX, offset: 0x60012A0, symbol: D_KA_60012A0 } + +D_KA_6001530: + { type: GFX, offset: 0x6001530, symbol: D_KA_6001530 } + +D_KA_6001968: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6001968, ctype: u16, symbol: D_KA_6001968 } + +D_KA_6002170: + { type: GFX, offset: 0x6002170, symbol: D_KA_6002170 } + +D_KA_6004078: + { type: TEXTURE, format: RGBA16, width: 8, height: 8, offset: 0x6004078, ctype: u16, symbol: D_KA_6004078 } + +D_KA_60040F8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60040F8, ctype: u16, symbol: D_KA_60040F8 } + +D_KA_60048F8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60048F8, ctype: u16, symbol: D_KA_60048F8 } + +D_KA_60050F8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60050F8, ctype: u16, symbol: D_KA_60050F8 } + +D_KA_60052F8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60052F8, ctype: u16, symbol: D_KA_60052F8 } + +D_KA_6005AF8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6005AF8, ctype: u16, symbol: D_KA_6005AF8 } + +D_KA_60062F8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60062F8, ctype: u16, symbol: D_KA_60062F8 } + +D_KA_6006AF8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006AF8, ctype: u16, symbol: D_KA_6006AF8 } + +D_KA_6007300: + { type: GFX, offset: 0x6007300, symbol: D_KA_6007300 } + +D_KA_6009250: + { type: GFX, offset: 0x6009250, symbol: D_KA_6009250 } + +D_KA_60094A8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60094A8, ctype: u16, symbol: D_KA_60094A8 } + +D_KA_6009CB0: + { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009CB0, ctype: u16, symbol: D_KA_6009CB0 } + +D_KA_600ABD0: + { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x600ABD0, ctype: u16, symbol: D_KA_600ABD0 } + +D_KA_600BAF0: + { type: GFX, offset: 0x600BAF0, symbol: D_KA_600BAF0 } + +D_KA_600BDB0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600BDB0, ctype: u16, symbol: D_KA_600BDB0 } + +D_KA_600C2D8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600C2D8, ctype: u16, symbol: D_KA_600C2D8 } + +D_KA_600C4E0: + { type: GFX, offset: 0x600C4E0, symbol: D_KA_600C4E0 } + +D_KA_600C760: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600C760, ctype: u16, symbol: D_KA_600C760 } + +D_KA_600C960: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600C960, ctype: u16, symbol: D_KA_600C960 } + +D_KA_600CB60: + { type: GFX, offset: 0x600CB60, symbol: D_KA_600CB60 } + +D_KA_600BFB0: + { type: GFX, offset: 0x600BFB0, symbol: D_KA_600BFB0 } + +D_KA_600CDC0: + { type: GFX, offset: 0x600CDC0, symbol: D_KA_600CDC0 } + +D_KA_600D090: + { type: GFX, offset: 0x600D090, symbol: D_KA_600D090 } + +D_KA_600D290: + { type: GFX, offset: 0x600D290, symbol: D_KA_600D290 } + +D_KA_600D4E0: + { type: GFX, offset: 0x600D4E0, symbol: D_KA_600D4E0 } + +D_KA_600D730: + { type: GFX, offset: 0x600D730, symbol: D_KA_600D730 } + +D_KA_600D7B8: + { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600D7B8, ctype: u8, symbol: D_KA_600D7B8 } + +D_KA_600DBC0: + { type: GFX, offset: 0x600DBC0, symbol: D_KA_600DBC0 } + +D_KA_600DC48: + { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600DC48, ctype: u8, symbol: D_KA_600DC48 } + +D_KA_600E050: + { type: GFX, offset: 0x600E050, symbol: D_KA_600E050 } + +D_KA_600E7E8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600E7E8, ctype: u16, symbol: D_KA_600E7E8 } + +D_KA_600E9E8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600E9E8, ctype: u16, symbol: D_KA_600E9E8 } + +D_KA_600EBE8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600EBE8, ctype: u16, symbol: D_KA_600EBE8 } + +D_KA_600EDE8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600EDE8, ctype: u16, symbol: D_KA_600EDE8 } + +D_KA_600EFF0: + { type: GFX, offset: 0x600EFF0, symbol: D_KA_600EFF0 } + +D_KA_600F1D0: + { type: GFX, offset: 0x600F1D0, symbol: D_KA_600F1D0 } + +D_KA_600F260: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600F260, ctype: u16, symbol: D_KA_600F260 } + +D_KA_6010260: + { type: GFX, offset: 0x6010260, symbol: D_KA_6010260 } + +D_KA_60105D8: + { type: SF64:ANIM, offset: 0x60105D8, symbol: D_KA_60105D8 } + +D_KA_6010A60: + { type: GFX, offset: 0x6010A60, symbol: D_KA_6010A60 } + +D_KA_6010D20: + { type: GFX, offset: 0x6010D20, symbol: D_KA_6010D20 } + +D_KA_6010744: + { type: SF64:SKELETON, offset: 0x6010744, symbol: D_KA_6010744 } + +D_KA_6010780: + { type: GFX, offset: 0x6010780, symbol: D_KA_6010780 } + +D_KA_6011000: + { type: SF64:ENV_SETTINGS, offset: 0x6011000, symbol: D_KA_6011000 } + +D_KA_6011044: + { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 } + +D_KA_6011058: + { type: SF64:HITBOX, offset: 0x6011058, symbol: D_KA_6011058 } + +D_KA_601115C: + { type: SF64:HITBOX, offset: 0x601115C, symbol: D_KA_601115C } + +D_KA_60111D8: + { type: SF64:HITBOX, offset: 0x60111D8, symbol: D_KA_60111D8 } \ No newline at end of file diff --git a/assets/yaml/us/ast_test.yaml b/assets/yaml/us/ast_test.yaml deleted file mode 100644 index 24d73b67..00000000 --- a/assets/yaml/us/ast_test.yaml +++ /dev/null @@ -1,14 +0,0 @@ -:config: - segments: - - [0x06, 0xACF960] - header: - code: - - '#include "assets/ast_test.h"' - header: - - '#include "gfx.h"' - - '#include "sf64object.h"' - - '#include "structs.h"' - - '#include "sf64level.h"' - -D_6014FEC: - {type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_6014FEC, mesh_symbol: D_OFFSET} diff --git a/assets/yaml/us/ast_venom_1.yaml b/assets/yaml/us/ast_venom_1.yaml new file mode 100644 index 00000000..46ba936e --- /dev/null +++ b/assets/yaml/us/ast_venom_1.yaml @@ -0,0 +1,176 @@ +:config: + segments: + - [0x6, 0xAB4000] + header: + code: + - '#include "assets/ast_venom_1.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "sf64level.h"' + - '#include "structs.h"' + +D_VE1_6000000: + { type: TEXTURE, format: IA8, width: 96, height: 28, offset: 0x6000000, ctype: u8, symbol: D_VE1_6000000 } + +D_VE1_6000A80: + { type: TEXTURE, format: IA8, width: 40, height: 19, offset: 0x6000A80, ctype: u8, symbol: D_VE1_6000A80 } + +D_VE1_6000D80: + { type: TEXTURE, format: IA8, width: 128, height: 28, offset: 0x6000D80, ctype: u8, symbol: D_VE1_6000D80 } + +D_VE1_6001B80: + { type: TEXTURE, format: IA8, width: 128, height: 19, offset: 0x6001B80, ctype: u8, symbol: D_VE1_6001B80 } + +D_VE1_6002500: + { type: GFX, offset: 0x6002500, symbol: D_VE1_6002500 } + +D_VE1_60029F8: + { type: TEXTURE, format: CI8, width: 8, height: 16, offset: 0x60029F8, tlut: 0x6002A78, ctype: u8, symbol: D_VE1_60029F8 } + +D_VE1_6002A78: + { type: TEXTURE, format: TLUT, colors: 24, offset: 0x6002A78, ctype: u16, symbol: D_VE1_6002A78 } + +D_VE1_6002AA8: + { type: TEXTURE, format: CI8, width: 32, height: 32, offset: 0x6002AA8, tlut: 0x6002EA8, ctype: u8, symbol: D_VE1_6002AA8 } + +D_VE1_6002EA8: + { type: TEXTURE, format: TLUT, colors: 232, offset: 0x6002EA8, ctype: u16, symbol: D_VE1_6002EA8 } + +D_VE1_6003078: + { type: TEXTURE, format: CI8, width: 32, height: 32, offset: 0x6003078, tlut: 0x6003478, ctype: u8, symbol: D_VE1_6003078 } + +D_VE1_6003478: + { type: TEXTURE, format: TLUT, colors: 204, offset: 0x6003478, ctype: u16, symbol: D_VE1_6003478 } + +D_VE1_6003610: + { type: GFX, offset: 0x6003610, symbol: D_VE1_6003610 } + +D_VE1_6003B10: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 } + +D_VE1_6004310: + { type: GFX, offset: 0x6004310, symbol: D_VE1_6004310 } + +D_VE1_60043F0: + { type: GFX, offset: 0x60043F0, symbol: D_VE1_60043F0 } + +D_VE1_60044D0: + { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60048D0, ctype: u8, symbol: D_VE1_60044D0 } + +D_VE1_60045D0: + { type: TEXTURE, format: TLUT, colors: 216, offset: 0x60045D0, ctype: u16, symbol: D_VE1_60045D0 } + +D_VE1_6004780: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 } + +D_VE1_6005780: + { type: GFX, offset: 0x6005780, symbol: D_VE1_6005780 } + +D_VE1_6005E50: + { type: TEXTURE, format: TLUT, colors: 160, offset: 0x6005E50, ctype: u16, symbol: D_VE1_6005E50 } + +D_VE1_6005D50: + { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x6005D50, tlut: 0x6005E50, ctype: u8, symbol: D_VE1_6005D50 } + +D_VE1_6005F90: + { type: TEXTURE, format: CI8, width: 32, height: 32, offset: 0x6005F90, tlut: 0x6006390, ctype: u8, symbol: D_VE1_6005F90 } + +D_VE1_6006390: + { type: TEXTURE, format: TLUT, colors: 208, offset: 0x6006390, ctype: u16, symbol: D_VE1_6006390 } + +D_VE1_6006530: + { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x6006530, ctype: u8, symbol: D_VE1_6006530 } + +D_VE1_6006630: + { type: TEXTURE, format: TLUT, colors: 80, offset: 0x6006630, ctype: u16, symbol: D_VE1_6006630 } + +D_VE1_60066D0: + { type: GFX, offset: 0x60066D0, symbol: D_VE1_60066D0 } + +D_VE1_6006750: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006750, ctype: u16, symbol: D_VE1_6006750 } + +D_VE1_6006F50: + { type: GFX, offset: 0x6006F50, symbol: D_VE1_6006F50 } + +D_VE1_6007410: + { type: GFX, offset: 0x6007410, symbol: D_VE1_6007410 } + +D_VE1_60074E8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 } + +D_VE1_6007CF0: + { type: GFX, offset: 0x6007CF0, symbol: D_VE1_6007CF0 } + +D_VE1_6007D90: + { type: GFX, offset: 0x6007D90, symbol: D_VE1_6007D90 } + +D_VE1_6007E30: + { type: SF64:ENV_SETTINGS, offset: 0x6007E30, symbol: D_VE1_6007E30 } + +D_VE1_6007E74: + { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 } + +D_VE1_601B1E4: + { type: SF64:SCRIPT, offset: 0x601B1E4, symbol: D_VE1_601B1E4 } + +D_VE1_6010088: + { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } + +D_VE1_601B43C: + { type: SF64:HITBOX, offset: 0x601B43C, symbol: D_VE1_601B43C } + +D_VE1_601B474: + { type: SF64:HITBOX, offset: 0x601B474, symbol: D_VE1_601B474 } + +D_VE1_601B4C4: + { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 } + +D_VE1_601B4E0: + { type: SF64:HITBOX, offset: 0x601B4E0, symbol: D_VE1_601B4E0 } + +D_VE1_601B4FC: + { type: SF64:HITBOX, offset: 0x601B4FC, symbol: D_VE1_601B4FC } + +D_VE1_601B518: + { type: SF64:HITBOX, offset: 0x601B518, symbol: D_VE1_601B518 } + +D_VE1_601B584: + { type: SF64:HITBOX, offset: 0x601B584, symbol: D_VE1_601B584 } + +D_VE1_601B5F4: + { type: SF64:HITBOX, offset: 0x601B5F4, symbol: D_VE1_601B5F4 } + +D_VE1_601B644: + { type: SF64:HITBOX, offset: 0x601B644, symbol: D_VE1_601B644 } + +D_VE1_601B678: + { type: SF64:HITBOX, offset: 0x601B678, symbol: D_VE1_601B678 } + +D_VE1_601B6C4: + { type: SF64:HITBOX, offset: 0x601B6C4, symbol: D_VE1_601B6C4 } + +D_VE1_601B710: + { type: SF64:HITBOX, offset: 0x601B710, symbol: D_VE1_601B710 } + +D_VE1_601B75C: + { type: SF64:HITBOX, offset: 0x601B75C, symbol: D_VE1_601B75C } + +D_VE1_601B7F8: + { type: SF64:HITBOX, offset: 0x601B7F8, symbol: D_VE1_601B7F8 } + +D_VE1_601B830: + { type: SF64:HITBOX, offset: 0x601B830, symbol: D_VE1_601B830 } + +D_VE1_601B868: + { type: SF64:HITBOX, offset: 0x601B868, symbol: D_VE1_601B868 } + +D_VE1_601B8A0: + { type: SF64:HITBOX, offset: 0x601B8A0, symbol: D_VE1_601B8A0 } + +D_VE1_601B8D8: + { type: SF64:HITBOX, offset: 0x601B8D8, symbol: D_VE1_601B8D8 } + +D_VE1_601B944: + { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 } \ No newline at end of file diff --git a/assets/yaml/us/ast_venom_2.yaml b/assets/yaml/us/ast_venom_2.yaml new file mode 100644 index 00000000..f4200825 --- /dev/null +++ b/assets/yaml/us/ast_venom_2.yaml @@ -0,0 +1,203 @@ +:config: + segments: + - [0x6, 0xACF960] + header: + code: + - '#include "assets/ast_venom_2.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "sf64level.h"' + - '#include "structs.h"' + +D_VE2_6000000: + { type: TEXTURE, format: IA8, width: 96, height: 28, offset: 0x6000000, ctype: u8, symbol: D_VE2_6000000 } + +D_VE2_6000A80: + { type: TEXTURE, format: IA8, width: 112, height: 19, offset: 0x6000A80, ctype: u8, symbol: D_VE2_6000A80 } + +D_VE2_60012D0: + { type: TEXTURE, format: IA8, width: 128, height: 28, offset: 0x60012D0, ctype: u8, symbol: D_VE2_60012D0 } + +D_VE2_60020D0: + { type: TEXTURE, format: IA8, width: 104, height: 19, offset: 0x60020D0, ctype: u8, symbol: D_VE2_60020D0 } + +D_VE2_6002890: + { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6002890, ctype: u8, symbol: D_VE2_6002890 } + +D_VE2_6002990: + { type: GFX, offset: 0x6002990, symbol: D_VE2_6002990 } + +D_VE2_6003000: + { type: GFX, offset: 0x6003000, symbol: D_VE2_6003000 } + +D_VE2_60038E0: + { type: GFX, offset: 0x60038E0, symbol: D_VE2_60038E0 } + +D_VE2_6003970: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003970, ctype: u16, symbol: D_VE2_6003970 } + +D_VE2_6004170: + { type: GFX, offset: 0x6004170, symbol: D_VE2_6004170 } + +D_VE2_6004888: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6004888, ctype: u16, symbol: D_VE2_6004888 } + +D_VE2_6005088: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6005088, ctype: u16, symbol: D_VE2_6005088 } + +D_VE2_6005888: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6005888, ctype: u16, symbol: D_VE2_6005888 } + +D_VE2_6006088: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006088, ctype: u16, symbol: D_VE2_6006088 } + +D_VE2_60030D8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60030D8, ctype: u16, symbol: D_VE2_60030D8 } + +D_VE2_6006890: + { type: GFX, offset: 0x6006890, symbol: D_VE2_6006890 } + +D_VE2_6006E20: + { type: GFX, offset: 0x6006E20, symbol: D_VE2_6006E20 } + +D_VE2_6007650: + { type: GFX, offset: 0x6007650, symbol: D_VE2_6007650 } + +D_VE2_6007E20: + { type: GFX, offset: 0x6007E20, symbol: D_VE2_6007E20 } + +D_VE2_6008170: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 } + +D_VE2_6008370: + { type: GFX, offset: 0x6008370, symbol: D_VE2_6008370 } + +D_VE2_6008AF8: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 } + +D_VE2_6009300: + { type: GFX, offset: 0x6009300, symbol: D_VE2_6009300 } + +D_VE2_6009390: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009390, ctype: u16, symbol: D_VE2_6009390 } + +D_VE2_6009B90: + { type: GFX, offset: 0x6009B90, symbol: D_VE2_6009B90 } + +D_VE2_6009E80: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009E80, ctype: u16, symbol: D_VE2_6009E80 } + +D_VE2_600A680: + { type: GFX, offset: 0x600A680, symbol: D_VE2_600A680 } + +D_VE2_600B708: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x600B708, ctype: u16, symbol: D_VE2_600B708 } + +D_VE2_600C038: + { type: SF64:ANIM, offset: 0x600C038, symbol: D_VE2_600C038 } + +D_VE2_600C0A4: + { type: SF64:SKELETON, offset: 0x600C0A4, symbol: D_VE2_600C0A4 } + +D_VE2_600C200: + { type: SF64:ANIM, offset: 0x600C200, symbol: D_VE2_600C200 } + +D_VE2_600C2AC: + { type: SF64:SKELETON, offset: 0x600C2AC, symbol: D_VE2_600C2AC } + +D_VE2_600C2D0: + { type: GFX, offset: 0x600C2D0, symbol: D_VE2_600C2D0 } + +D_VE2_600C360: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600C360, ctype: u16, symbol: D_VE2_600C360 } + +D_VE2_600C560: + { type: GFX, offset: 0x600C560, symbol: D_VE2_600C560 } + +D_VE2_600C5F0: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600C5F0, ctype: u16, symbol: D_VE2_600C5F0 } + +D_VE2_600C7F0: + { type: GFX, offset: 0x600C7F0, symbol: D_VE2_600C7F0 } + +D_VE2_600C8F0: + { type: GFX, offset: 0x600C8F0, symbol: D_VE2_600C8F0 } + +D_VE2_600CA50: + { type: GFX, offset: 0x600CA50, symbol: D_VE2_600CA50 } + +D_VE2_600CBB0: + { type: GFX, offset: 0x600CBB0, symbol: D_VE2_600CBB0 } + +D_VE2_600D7F0: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x600D7F0, ctype: u16, symbol: D_VE2_600D7F0 } + +D_VE2_600DFF0: + { type: GFX, offset: 0x600DFF0, symbol: D_VE2_600DFF0 } + +D_VE2_600E3E0: + { type: GFX, offset: 0x600E3E0, symbol: D_VE2_600E3E0 } + +D_VE2_600E780: + { type: GFX, offset: 0x600E780, symbol: D_VE2_600E780 } + +D_VE2_600EB40: + { type: GFX, offset: 0x600EB40, symbol: D_VE2_600EB40 } + +D_VE2_600EEF0: + { type: GFX, offset: 0x600EEF0, symbol: D_VE2_600EEF0 } + +D_VE2_600F290: + { type: GFX, offset: 0x600F290, symbol: D_VE2_600F290 } + +D_VE2_600F670: + { type: GFX, offset: 0x600F670, symbol: D_VE2_600F670 } + +D_VE2_600F700: + { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600F700, ctype: u16, symbol: D_VE2_600F700 } + +D_VE2_6010700: + { type: GFX, offset: 0x6010700, symbol: D_VE2_6010700 } + +D_VE2_6010960: + { type: GFX, offset: 0x6010960, symbol: D_VE2_6010960 } + +D_VE2_6010CA0: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6010CA0, ctype: u16, symbol: D_VE2_6010CA0 } + +D_VE2_60114A0: + { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60114A0, ctype: u16, symbol: D_VE2_60114A0 } + +D_VE2_6013AF8: + { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6013AF8, ctype: u16, symbol: D_VE2_6013AF8 } + +D_VE2_6014658: + { type: SF64:ANIM, offset: 0x6014658, symbol: D_VE2_6014658 } + +D_VE2_6014844: + { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 } + +D_VE2_6014904: + { type: SF64:ANIM, offset: 0x6014904, symbol: D_VE2_6014904 } + +D_VE2_60149D0: + { type: SF64:SKELETON, offset: 0x60149D0, symbol: D_VE2_60149D0 } + +D_VE2_6014D50: + { type: SF64:ENV_SETTINGS, offset: 0x6014D50, symbol: D_VE2_6014D50 } + +D_VE2_6014D94: + { type: SF64:OBJECT_INIT, offset: 0x6014D94, symbol: D_VE2_6014D94 } + +D_VE2_6014FEC: + { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC } + +D_VE2_601668C: + { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C } + +D_VE2_60166F4: + { type: SF64:HITBOX, offset: 0x60166F4, symbol: D_VE2_60166F4 } + +D_VE2_6016714: + { type: SF64:HITBOX, offset: 0x6016714, symbol: D_VE2_6016714 } \ No newline at end of file diff --git a/include/assets.h b/include/assets.h index c266c1b7..d6b56fa6 100644 --- a/include/assets.h +++ b/include/assets.h @@ -16,41 +16,23 @@ * ast_katina, ast_macbeth, ast_title, ast_map, ast_training */ extern Gfx D_60005B0[]; // fox_bg -extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka 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_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_60038E0[]; -extern Gfx D_6004170[]; extern Vtx D_6004500[]; extern Gfx D_60046F0[]; extern u16 D_6005710[]; -extern Gfx D_6005780[]; extern Gfx D_6005880[]; extern Gfx D_6006140[]; -extern Gfx D_6006310[]; extern Animation D_600636C; extern Limb* D_6006558[]; -extern Gfx D_60066D0[]; -extern u16 D_6006750[]; extern EnvSettings D_6006A60; -extern Gfx D_6006BE0[]; extern u16 D_6006EA0[]; -extern Gfx D_6006F50[]; -extern Gfx D_6007410[]; -extern Gfx D_6007650[]; -extern Gfx D_60079B0[]; -extern Gfx D_6007CF0[]; -extern Gfx D_6007D80[]; -extern Gfx D_6007D90[]; -extern EnvSettings D_VE1_6007E30; -extern Gfx D_6008370[]; +extern Gfx D_6007C40[]; +extern Gfx D_60084C0[]; +extern Gfx D_6008770[]; extern Gfx D_6008830[]; extern Gfx D_6009250[]; extern u16* D_6009B34[]; @@ -62,62 +44,39 @@ extern Gfx D_6009F90[]; extern Gfx D_600A420[]; extern Gfx D_600B0E0[]; extern Animation D_600B1B4; -extern Gfx D_600B4B0[]; -extern Gfx D_600BAF0[]; +extern Gfx D_600B8B0[]; extern u16 D_600BEA0[]; extern Animation D_600C15C; -extern Animation D_600C200; -extern Limb* D_600C2AC[]; extern u16 D_600C6A0[]; extern Vtx D_600C780[]; extern Animation D_600D3DC; -extern u16 D_600D5C0[]; -extern Gfx D_600D730[]; extern u16 D_600D990[]; extern Gfx D_600D9F0[]; -extern Gfx D_600DBC0[]; extern u8 D_600DDC0[]; -extern Gfx D_600E050[]; +extern Gfx D_600DDF0[]; extern Animation D_600E2C4; extern u8 D_600E360[]; extern Limb* D_600E470[]; extern Animation D_600E5EC; extern Gfx D_600E820[]; extern u8 D_600E980[]; -extern EnvSettings D_FO_600EA90; extern Gfx D_600EC90[]; -extern Gfx D_600EFF0[]; extern Gfx D_600F160[]; -extern Gfx D_600F1D0[]; -extern CollisionPoly D_600F1DC[]; extern Gfx D_600F2F0[]; extern Vec3s D_600F394[]; extern Gfx D_600F3D0[]; extern CollisionPoly D_600F3F4[]; extern Gfx D_600F560[]; extern Vec3s D_600F5AC[]; -extern CollisionPoly D_600F60C[]; -extern Gfx D_600F670[]; extern Animation D_600F744; extern u8 D_600F940[]; extern Gfx D_600F9B0[]; extern Vec3s D_600FD50[]; -extern f32 D_600FE9C[]; -extern f32 D_600FEB8[]; -extern f32 D_600FF30_Hitbox[]; -extern f32 D_600FF80[]; -extern f32 D_600FFA0[]; -extern f32 D_600FFC0[]; -extern f32 D_600FFE0[]; -extern ObjectInit* D_6010088[]; extern u8 D_6010090[]; extern u16 D_6010198[]; extern u8 D_60106B0[]; -extern Gfx D_6010960[]; extern u8 D_6010FA0[]; -extern EnvSettings D_KA_6011000; -extern f32 D_6011058[]; -extern f32 D_601115C[]; +extern Vec3s D_601170C[]; extern u8 D_6011890[]; extern u8 D_6012310[]; extern u8 D_60123F0[]; @@ -127,38 +86,27 @@ extern Gfx D_6013480[]; extern Animation D_601388C; extern u8 D_6014140[]; extern u16 D_6014510[]; -extern Animation D_6014658; extern u16 D_60147C0[]; extern u8 D_60147E0[]; extern u8 D_60148B0[]; -extern EnvSettings D_VE2_6014D50; -extern CollisionPoly D_6014FEC[]; extern u16 D_6015430[]; extern Gfx D_6016270[]; extern Vec3s D_6016374[]; -extern f32 D_601668C[]; -extern f32 D_60166F4[]; -extern f32 D_6016714[]; extern Gfx D_6016CF0[]; extern Gfx D_6017090[]; extern Gfx D_6017370[]; extern u16* D_VE1_601B1E4[]; -extern f32 D_601B4C4[]; -extern f32 D_601B4E0[]; -extern f32 D_601B4FC[]; -extern f32 D_601B518[]; -extern f32 D_601B584[]; -extern f32 D_601B5F4[]; -extern f32 D_601B644[]; -extern f32 D_601B678[]; -extern f32 D_601B6C4[]; +extern Gfx D_6018C00[]; // possible collision +extern Gfx D_6019670[]; +extern Gfx D_6008D40[]; +extern Gfx D_60185E0[]; +extern Gfx D_6017550[]; +extern Gfx D_601A700[]; +extern u16* D_SO_600631C[]; +extern Gfx D_601AE40[]; extern f32 D_F32_601B710[]; -extern f32 D_601B75C[]; -extern f32 D_601B7F8[]; -extern f32 D_601B830[]; -extern f32 D_601B868[]; -extern f32 D_601B8A0[]; -extern f32 D_601B8D8[]; +extern Gfx D_601B790[]; +extern Gfx D_601B790[]; extern Gfx D_601C820[]; extern Gfx D_601E150[]; extern u16 D_601E1E8[]; @@ -168,17 +116,16 @@ extern Limb* D_601F920[]; extern Gfx D_601FCB0[]; extern Gfx D_60200E0[]; extern Gfx D_6020A30[]; -extern u16* D_SO_600631C[]; extern Gfx D_6020E60[]; extern u16 D_6020F60[]; extern u16 D_6022760[]; extern u16 D_60229A4[]; extern f32 D_60231A4[]; +extern u16* D_ZO_602AAC0[]; extern Gfx D_6024220[]; extern Gfx D_6024AC0[]; extern EnvSettings D_ZO_60266D0; extern Gfx D_602A720[]; -extern u16* D_ZO_602AAC0[]; extern u16 D_602AC50[]; extern f32 D_602B9EC[]; extern f32 D_602BA20[]; @@ -195,21 +142,16 @@ extern f32 D_602C218[]; extern f32 D_602C234[]; extern f32 D_602C250[]; extern f32 D_602C294[]; +extern u16* D_ME_602F3AC[]; extern f32 D_602C2B0[]; extern u16 D_602C2CC[]; extern Triangle D_602CACC[]; extern Vec3f D_602CB80[]; extern CollisionPoly D_602FA9C[]; extern Vec3s D_6033E08[]; -extern Gfx D_60084C0[]; -extern Gfx D_6008D40[]; -extern Gfx D_6007C40[]; -extern Gfx D_601B790[]; -extern Gfx D_601B790[]; -extern Gfx D_601A700[]; -extern Gfx D_6019670[]; -extern Gfx D_60185E0[]; -extern Gfx D_6017550[]; extern Gfx D_6041070[]; +extern EnvSettings D_BO_600FF30; +extern EnvSettings D_ME_6026C80; +extern EnvSettings D_ZO_60266D0; #endif // ASSETS_H diff --git a/include/assets/ast_fortuna.h b/include/assets/ast_fortuna.h deleted file mode 100644 index 793619da..00000000 --- a/include/assets/ast_fortuna.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_FORTUNA_H -#define AST_FORTUNA_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/assets/ast_katina.h b/include/assets/ast_katina.h deleted file mode 100644 index 4ccbe831..00000000 --- a/include/assets/ast_katina.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_KATINA_H -#define AST_KATINA_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/assets/ast_venom_1.h b/include/assets/ast_venom_1.h deleted file mode 100644 index da493725..00000000 --- a/include/assets/ast_venom_1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_VENOM_1_H -#define AST_VENOM_1_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/assets/ast_venom_2.h b/include/assets/ast_venom_2.h deleted file mode 100644 index b8051371..00000000 --- a/include/assets/ast_venom_2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_VENOM_2_H -#define AST_VENOM_2_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h index 4eb7811a..0ed76ff6 100644 --- a/include/fox_edisplay_assets.h +++ b/include/fox_edisplay_assets.h @@ -136,7 +136,7 @@ extern Gfx D_6023EB0[]; extern Gfx D_60249C0[]; extern Gfx D_6023B80[]; extern Gfx D_601B570[]; -extern Gfx D_601B710[]; +extern Gfx D_VE1_601B710[]; extern Gfx D_60209B0[]; extern Gfx D_6020B70[]; extern Gfx D_6020D50[]; diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h index 5e598b22..437ec461 100644 --- a/include/fox_enmy2_assets.h +++ b/include/fox_enmy2_assets.h @@ -11,8 +11,8 @@ extern Gfx D_60043F0[]; extern Gfx D_6004310[]; extern f32 D_602C1A0[]; extern f32 D_602C294[]; -extern f32 D_601B474[]; -extern f32 D_601B43C[]; -extern f32 D_601B944[]; +extern f32 D_VE1_601B474[]; +extern f32 D_VE1_601B43C[]; +extern f32 D_VE1_601B944[]; #endif diff --git a/src/main/fox_360.c b/src/main/fox_360.c index ec7dd9a6..c1106e84 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -1,6 +1,9 @@ #include "prevent_bss_reordering.h" #include "global.h" #include "assets.h" +#include "assets/ast_katina.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_fortuna.h" #include "assets/ast_star_wolf.h" #include "assets/ast_allies.h" #include "assets/ast_bolse.h" @@ -2078,7 +2081,7 @@ void func_800319AC(Actor* this) { func_8002EE64(this); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { this->unk_04A++; - if (this->unk_04A >= Animation_GetFrameCount(&D_600C200)) { + if (this->unk_04A >= Animation_GetFrameCount(&D_VE2_600C200)) { this->unk_04A = 0; } } @@ -2241,17 +2244,17 @@ void func_80035448(Actor* actor) { if (gCurrentLevel == LEVEL_FORTUNA) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 60.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6006BE0); + gSPDisplayList(gMasterDisp++, D_FO_6006BE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -100.0f, 1); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1); func_8005B1E8(actor, 2); } else if (gCurrentLevel == LEVEL_KATINA) { switch (actor->unk_0B6) { case 0: - gSPDisplayList(gMasterDisp++, D_600EFF0); + gSPDisplayList(gMasterDisp++, D_KA_600EFF0); break; case 1: - gSPDisplayList(gMasterDisp++, D_600E050); + gSPDisplayList(gMasterDisp++, D_KA_600E050); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 0); break; @@ -2271,9 +2274,9 @@ void func_80035448(Actor* actor) { Matrix_Pop(&gGfxMatrix); func_80034E64(actor); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - Animation_GetFrameData(&D_600C200, actor->unk_04A, actor->vwork); + Animation_GetFrameData(&D_VE2_600C200, actor->unk_04A, actor->vwork); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1); - Animation_DrawSkeleton(0, D_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE2_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); } else if (gCurrentLevel == LEVEL_VERSUS) { gSPDisplayList(gMasterDisp++, D_versus_3015740); } else if (gCurrentLevel == LEVEL_TRAINING) { diff --git a/src/main/fox_A4290_colheaders.c b/src/main/fox_A4290_colheaders.c index 737662ba..b9bb1f04 100644 --- a/src/main/fox_A4290_colheaders.c +++ b/src/main/fox_A4290_colheaders.c @@ -7,6 +7,8 @@ #include "assets/ast_meteo.h" #include "assets/ast_corneria.h" #include "assets/ast_macbeth.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_fortuna.h" #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_versus.h" @@ -66,21 +68,21 @@ CollisionHeader D_800D2B38[10] = { { -1308.0f, 0.0f, -1460.0f }, { 1310.0f, 666.0f, 807.0f }, 93, - D_600F60C, + D_FO_600F60C, D_600FD50, }, { { -951.0f, 0.0f, -1075.0f }, { 1075.0f, 1014.0f, 1075.0f }, 22, - D_600F3F4, + D_FO_600F3F4, D_600F5AC, }, { { -951.0f, 0.0f, -1075.0f }, { 1075.0f, 384.0f, 1075.0f }, 22, - D_600F1DC, + D_FO_600F1DC, D_600F394, }, { @@ -101,7 +103,7 @@ CollisionHeader D_800D2B38[10] = { { -671.0f, 0.0f, -671.0f }, { 671.0f, 648.0f, 671.0f }, 250, - D_6014FEC, + D_VE2_6014FEC, D_6016374, }, }; diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index 86ef8844..744daa5f 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -17,6 +17,10 @@ f32 D_8015F984; UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80] f32 D_80161394; // can be static +#include "assets/ast_katina.h" +#include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_fortuna.h" #include "assets/ast_bg_planet.h" #include "assets/ast_versus.h" #include "assets/ast_corneria.h" @@ -291,10 +295,10 @@ void func_8003E1E8(void) { gSPDisplayList(gMasterDisp++, D_600D9F0); break; case LEVEL_KATINA: - gSPDisplayList(gMasterDisp++, D_600F1D0); + gSPDisplayList(gMasterDisp++, D_KA_600F1D0); break; case LEVEL_VENOM_2: - gSPDisplayList(gMasterDisp++, D_600F670); + gSPDisplayList(gMasterDisp++, D_VE2_600F670); break; } Matrix_Translate(gGfxMatrix, 7280.0f, 0.0f, 0.0f, 1); @@ -313,10 +317,10 @@ void func_8003E1E8(void) { gSPDisplayList(gMasterDisp++, D_600D9F0); break; case LEVEL_KATINA: - gSPDisplayList(gMasterDisp++, D_600F1D0); + gSPDisplayList(gMasterDisp++, D_KA_600F1D0); break; case LEVEL_VENOM_2: - gSPDisplayList(gMasterDisp++, D_600F670); + gSPDisplayList(gMasterDisp++, D_VE2_600F670); break; } break; @@ -352,7 +356,7 @@ void func_8003E1E8(void) { Matrix_RotateZ(gGfxMatrix, gPlayer[gPlayerNum].unk_034 * M_DTOR, 1); Matrix_Translate(gGfxMatrix, 0.0f, -4000.0f, -7000.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_600F670); + gSPDisplayList(gMasterDisp++, D_VE2_600F670); } else if ((D_80177AB0 == 3) || (D_80177AB0 == 4)) { RCP_SetupDL(&gMasterDisp, 0x3E); if (D_80177AB0 == 4) { @@ -374,10 +378,10 @@ void func_8003E1E8(void) { Matrix_Translate(gGfxMatrix, sp13C, -2000.0f + sp134, -6000.0f, 1); Matrix_Translate(gGfxMatrix, 0.0f, -2500.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_60038E0); + gSPDisplayList(gMasterDisp++, D_VE2_60038E0); Matrix_Translate(gGfxMatrix, 7280.0f, 0.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_60038E0); + gSPDisplayList(gMasterDisp++, D_VE2_60038E0); } else { fake_label: // fake RCP_SetupDL(&gMasterDisp, 0x3E); @@ -608,7 +612,7 @@ void func_8003E1E8(void) { Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1); Matrix_Scale(gGfxMatrix, sp128, sp128, sp128, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_600B4B0); + gSPDisplayList(gMasterDisp++, D_FO_600B4B0); break; case LEVEL_BOLSE: sp128 = 1.0f; @@ -926,8 +930,8 @@ void func_80040CE4(void) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); switch (gCurrentLevel) { case LEVEL_VENOM_1: - sp1C4 = D_6006750; - sp1C0 = D_60066D0; + sp1C4 = D_VE1_6006750; + sp1C0 = D_VE1_60066D0; gDPLoadTextureBlock(gMasterDisp++, sp1C4, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -1061,7 +1065,7 @@ void func_80040CE4(void) { Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1); Matrix_SetGfxMtx(&gMasterDisp); if (gCurrentLevel == LEVEL_FORTUNA) { - gSPDisplayList(gMasterDisp++, D_6001360); + gSPDisplayList(gMasterDisp++, D_FO_6001360); } else if (gCurrentLevel == LEVEL_KATINA) { gSPDisplayList(gMasterDisp++, D_6009250); } else if (gCurrentLevel == LEVEL_BOLSE) { diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index 057e03b6..9226a477 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -17,6 +17,7 @@ #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_title.h" +#include "assets/ast_katina.h" extern s32 D_800C9E90[]; @@ -2749,7 +2750,7 @@ void func_8004FEC0(Actor* actor) { if ((actor->index == 3) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) { gSPDisplayList(gMasterDisp++, D_D00B880); } else { - gSPDisplayList(gMasterDisp++, D_600E050); + gSPDisplayList(gMasterDisp++, D_KA_600E050); } Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 0); diff --git a/src/main/fox_edata.c b/src/main/fox_edata.c index ade73873..e4447a5a 100644 --- a/src/main/fox_edata.c +++ b/src/main/fox_edata.c @@ -9,7 +9,7 @@ void func_800594F0(Object_80* obj80) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6007D90); + gSPDisplayList(gMasterDisp++, D_VE1_6007D90); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } @@ -17,7 +17,7 @@ void func_800595D0(Object_80* obj80) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6007CF0); + gSPDisplayList(gMasterDisp++, D_VE1_6007CF0); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index 05c0795b..98edfefd 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -12,7 +12,11 @@ #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" #include "assets/ast_macbeth.h" +#include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" #include "assets/ast_titania.h" +#include "assets/ast_katina.h" +#include "assets/ast_fortuna.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" #include "assets/ast_ve1_boss.h" @@ -136,12 +140,12 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_45, */ {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_46, */ {(void*) D_600E820, 0, (ObjectFunc) NULL, D_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_47, */ {(void*) D_601FCB0, 0, (ObjectFunc) NULL, D_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_48, */ {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_50, */ {(void*) D_6007410, 0, (ObjectFunc) NULL, D_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_i1_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_48, */ {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_VE1_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_VE1_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_50, */ {(void*) D_VE1_6007410, 0, (ObjectFunc) NULL, D_VE1_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_51, */ {(void*) D_VE1_6006F50, 0, (ObjectFunc) NULL, D_VE1_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_52, */ {(void*) D_VE1_6005780, 0, (ObjectFunc) func_i1_80193540, D_VE1_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_VE1_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_54, */ {(void*) D_CO_6000E00, 0, (ObjectFunc) func_8006AA98, D_CO_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_55, */ {(void*) D_CO_6013B50, 0, (ObjectFunc) NULL, D_CO_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_CO_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, @@ -215,17 +219,17 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_VE1_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_VE1_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_F32_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_VE1_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_ANDROSS_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_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJ_80_134 */ {(void*) D_VE2_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - /* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_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_136 */ {(void*) D_VE2_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJ_80_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, /* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -236,22 +240,22 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* 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_TI_60066E0, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_148 */ {(void*) D_FO_60079B0, 0, (ObjectFunc) NULL, D_FO_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_149 */ {(void*) D_FO_6007D80, 0, (ObjectFunc) NULL, D_FO_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_150 */ {(void*) D_FO_6006310, 0, (ObjectFunc) NULL, D_FO_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_151 */ {(void*) D_TI_60066E0, 0, (ObjectFunc) NULL, D_FO_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_152 */ {(void*) D_BO_600F4C0, 0, (ObjectFunc) NULL, D_BO_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_153 */ {(void*) D_BO_600B8B0, 0, (ObjectFunc) NULL, D_BO_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 }, + /* OBJ_80_154 */ {(void*) D_KA_600BAF0, 0, (ObjectFunc) NULL, D_KA_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_156 */ {(void*) func_i6_80197CB8, 1, (ObjectFunc) NULL, D_SY_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_157 */ {(void*) D_SZ_6001DA0, 0, (ObjectFunc) NULL, D_SZ_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_158 */ {(void*) D_SZ_6001360, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_159 */ {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_160 */ {(void*) D_6010960, 0, (ObjectFunc) NULL, D_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_159 */ {(void*) D_VE2_6008370, 0, (ObjectFunc) NULL, D_VE2_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_160 */ {(void*) D_VE2_6010960, 0, (ObjectFunc) NULL, D_VE2_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_163 */ {(void*) D_600A420, 0, (ObjectFunc) func_80068FE0, D_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_163 */ {(void*) D_FO_600A420, 0, (ObjectFunc) func_80068FE0, D_FO_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_164 */ {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_4C_166 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -361,18 +365,18 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_AQ_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_BO_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 }, /* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_BO_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 }, - /* OBJ_ACTOR_273 */ {(void*) func_i4_80188FE4, 2, (ObjectFunc) func_i4_80188AD0, D_600FF30_Hitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, + /* OBJ_ACTOR_273 */ {(void*) func_i4_80188FE4, 2, (ObjectFunc) func_i4_80188AD0, D_FO_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, /* OBJ_ACTOR_274 */ {(void*) func_i4_8019E3A8, 1, (ObjectFunc) func_i4_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 }, /* OBJ_ACTOR_275 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_276 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_277 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_i3_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, /* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_i3_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, - /* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) func_i1_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_281 */ {(void*) func_i1_80192E2C, 1, (ObjectFunc) func_i1_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_284 */ {(void*) func_i1_801934D0, 1, (ObjectFunc) func_i1_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) func_i1_80192518, D_VE1_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_281 */ {(void*) func_i1_80192E2C, 1, (ObjectFunc) func_i1_80192CD4, D_VE1_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_VE1_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_VE1_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_284 */ {(void*) func_i1_801934D0, 1, (ObjectFunc) func_i1_801933DC, D_VE1_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_ACTOR_285 */ {(void*) func_i6_80193244, 1, (ObjectFunc) func_i6_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, /* OBJ_ACTOR_286 */ {(void*) func_i6_80188660, 1, (ObjectFunc) func_i6_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, /* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) func_i6_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, @@ -396,16 +400,16 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, /* OBJ_BOSS_306 */ {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, - /* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_FO_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_311 */ {(void*) func_i4_80191AFC, 2, (ObjectFunc) func_i4_801912FC, D_BO_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_312 */ {(void*) func_i6_80196288, 2, (ObjectFunc) func_i6_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_312 */ {(void*) func_i6_80196288, 2, (ObjectFunc) func_i6_80196210, D_VE2_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_313 */ {(void*) func_i4_8019E98C, 1, (ObjectFunc) func_i4_8019E454, D_SZ_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_BOSS_314 */ {(void*) func_i6_8019E2C4, 2, (ObjectFunc) func_i6_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_BOSS_SO */ {(void*) func_i3_801A71B8, 2, (ObjectFunc) func_i3_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_316 */ {(void*) func_i4_801968F4, 1, (ObjectFunc) func_i4_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_316 */ {(void*) func_i4_801968F4, 1, (ObjectFunc) func_i4_801946C4, D_KA_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_KA_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 7ff7e3b6..1bf6c6e9 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -9,6 +9,9 @@ Matrix D_801615F0; WingInfo D_80161630; #include "fox_edisplay_assets.h" +#include "assets/ast_katina.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_fortuna.h" #include "assets/ast_corneria.h" #include "assets/ast_meteo.h" #include "assets/ast_sector_x.h" @@ -193,7 +196,7 @@ Gfx* D_800CFA54[] = { D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0, D_602A8C0, D_6028E70, D_602E0A0, D_602DE70, D_602DC40, D_602D830, D_602D340, D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_602DD40, D_6033AF0, D_60186E0, - D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0, + D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_FO_6005CC0, }; Gfx* D_800CFAC4[] = { D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0, @@ -227,9 +230,8 @@ Gfx* D_800CFC0C[] = { Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 }; Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 }; Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 }; -Gfx* D_800CFC7C[] = { - D_601B570, D_601B710, D_60209B0, D_6020B70, D_6020D50, D_601B8F0, D_601B3B0, D_601B1C0, D_6011660 -}; +Gfx* D_800CFC7C[] = { D_601B570, D_VE1_601B710, D_60209B0, D_6020B70, D_6020D50, + D_601B8F0, D_601B3B0, D_601B1C0, D_6011660 }; void func_8005A094(Actor* actor) { switch (actor->state) { @@ -1291,14 +1293,14 @@ void func_8005EA24(Actor* actor) { gSPDisplayList(gMasterDisp++, D_1032780); } else if (gCurrentLevel == LEVEL_KATINA) { if ((actor->unk_0B6 == 1) || (actor->unk_0B6 == 2)) { - gSPDisplayList(gMasterDisp++, D_600D730); + gSPDisplayList(gMasterDisp++, D_KA_600D730); } else { - gSPDisplayList(gMasterDisp++, D_600DBC0); + gSPDisplayList(gMasterDisp++, D_KA_600DBC0); } } else if ((actor->unk_0E4 < 8) || (gCurrentLevel != LEVEL_FORTUNA)) { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); } else if (gCurrentLevel == LEVEL_FORTUNA) { - gSPDisplayList(gMasterDisp++, D_6009F90); + gSPDisplayList(gMasterDisp++, D_FO_6009F90); } else { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); } @@ -1448,7 +1450,7 @@ void Object_58_Draw(Object_58* obj58) { Matrix_RotateY(gGfxMatrix, M_PI / 2, 1); Matrix_Translate(gGfxMatrix, -551.0f, 0.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6007650); + gSPDisplayList(gMasterDisp++, D_VE2_6007650); } else { Matrix_RotateY(gGfxMatrix, obj58->obj.rot.y * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index 15652392..8689df60 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -5,6 +5,7 @@ #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" +#include "assets/ast_venom_1.h" #include "assets/ast_aquas.h" #include "assets/ast_bolse.h" #include "assets/ast_meteo.h" @@ -531,7 +532,7 @@ void func_80062664(void) { } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4); } else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_6010088); + D_80178310 = SEGMENTED_TO_VIRTUAL(D_VE1_6010088); } else { D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); } diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 688b62c4..480fbbf2 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -16,6 +16,8 @@ s32 D_80161690; #include "assets/ast_sector_y.h" #include "assets/ast_aquas.h" #include "assets/ast_macbeth.h" +#include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" #include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" @@ -949,11 +951,11 @@ UnkStruct_D003C D_800D003C[108] = { { D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, { NULL, D_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 }, { NULL, D_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, - { NULL, D_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 }, + { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_AQ_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 }, - { D_VE1_9012180, D_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_9012180, D_VE1_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, { D_VE1_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, @@ -968,9 +970,9 @@ UnkStruct_D003C D_800D003C[108] = { { D_WZ_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, { D_ME_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_MA_601A2B0, D_MA_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, - { D_6002500, D_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_TR_6002740, D_TR_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, @@ -1119,7 +1121,7 @@ void func_8006D36C(Actor* actor) { } if (actor->unk_0B4 == 104) { - actor->unk_0B6 = Animation_GetFrameCount(&D_6014658) - 1; + actor->unk_0B6 = Animation_GetFrameCount(&D_VE2_6014658) - 1; } if (actor->unk_0B4 < 200) { @@ -3609,7 +3611,7 @@ void func_80072594(Actor* actor) { Math_SmoothStepToF(&actor->fwork[15], 1.0f, 0.1f, 0.1f, 0.001f); if (actor->fwork[15] > 0.5f) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_601B4C4); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_VE1_601B4C4); } if (actor->unk_046 == 0) { diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 72d37071..f6ab684e 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -83,9 +83,13 @@ s32 D_80161900[20]; #include "assets/ast_training.h" #include "assets/ast_area_6.h" #include "assets/ast_aquas.h" +#include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_katina.h" #include "assets/ast_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_bolse.h" +#include "assets/ast_fortuna.h" #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" @@ -98,16 +102,12 @@ void func_80087788(void); // Segmented addresses extern u8 D_ME_6000000[]; -extern u8 D_FO_6000000[]; extern u8 D_KA_6000000[]; extern u8 D_SO_6000000[]; extern u8 D_ZO_6000000[]; extern u8 D_BO_6000000[]; extern u8 D_VE1_6000D80[]; extern u8 D_VE2_60012D0[]; -extern u8 D_6001260[]; -extern u8 D_6002890[]; -extern Gfx D_6003090[]; // DATA SECTION START @@ -579,7 +579,7 @@ void func_80086444(void) { s32 i = 9; s32 j; - u8* D_800D1C9C[] = { D_6001B80, D_60020D0 }; + u8* D_800D1C9C[] = { D_VE1_6001B80, D_VE2_60020D0 }; s32 D_800D1CA4[] = { 128, 104 }; s32 D_800D1CAC[] = { 19, 19 }; f32 D_800D1CB4[] = { 96.0f, 112.0f }; @@ -2111,7 +2111,7 @@ s32 func_8008A4DC(void) { break; case LEVEL_FORTUNA: - TextureRect_8bIA(&gMasterDisp, D_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f); + TextureRect_8bIA(&gMasterDisp, D_FO_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f); break; case LEVEL_BOLSE: @@ -2131,11 +2131,11 @@ s32 func_8008A4DC(void) { break; case LEVEL_KATINA: - TextureRect_8bIA(&gMasterDisp, D_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f); + TextureRect_8bIA(&gMasterDisp, D_KA_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f); break; case LEVEL_VENOM_2: - TextureRect_8bIA(&gMasterDisp, D_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f); + TextureRect_8bIA(&gMasterDisp, D_VE2_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f); break; } } @@ -3664,12 +3664,12 @@ void func_8008FA84(void) { void func_8008FE78(Boss* boss) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_6003090); + gSPDisplayList(gMasterDisp++, D_FO_6003090); RCP_SetupDL_34(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, (s32) boss->fwork[1], (s32) boss->fwork[2], 255); - gSPDisplayList(gMasterDisp++, D_600D5C0); + gSPDisplayList(gMasterDisp++, D_FO_600D5C0); gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); } diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 92977a3b..92b5af79 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -11,6 +11,10 @@ #include "assets/ast_bolse.h" #include "assets/ast_meteo.h" #include "assets/ast_macbeth.h" +#include "assets/ast_katina.h" +#include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_fortuna.h" #include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c index 8988f7b8..6fd5fb4d 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -1,9 +1,6 @@ #include "global.h" #include "assets.h" - -extern Animation D_6007854; -extern Limb* D_6007980[]; -extern u8 D_600FF64[]; +#include "assets/ast_fortuna.h" void func_i4_801875F0(Actor* actor) { s32 i; @@ -488,7 +485,7 @@ void func_i4_80188AD0(Actor* actor) { if ((actor->unk_0D0 != 0) && (actor->state == 0)) { actor->unk_0D0 = 0; actor->state = 1; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_600FF64); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_FO_600FF64); actor->info.unk_1C = 0.0f; actor->timer_0CA[0] = 0; actor->info.bonus = 0; @@ -569,8 +566,8 @@ s32 func_i4_80188F08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* p void func_i4_80188FE4(Actor* actor) { Vec3f vec[20]; - Animation_GetFrameData(&D_6007854, 0, vec); - Animation_DrawSkeleton(3, D_6007980, vec, func_i4_80188F08, func_i4_80188DA0, actor, gCalcMatrix); + Animation_GetFrameData(&D_FO_6007854, 0, vec); + Animation_DrawSkeleton(3, D_FO_6007980, vec, func_i4_80188F08, func_i4_80188DA0, actor, gCalcMatrix); if (actor->state == 1) { actor->state = 2; diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index f08fa05a..a34114b0 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -2,6 +2,8 @@ #include "global.h" #include "assets.h" +#include "assets/ast_katina.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 } }; Vec3f D_i4_8019F138[] = { { 0.0f, -135.0f, -5.0f }, { 0.0f, -135.0f, 15.0f }, { -10.0f, 135.0f, 0.0f } }; @@ -48,17 +50,6 @@ f32 D_i4_801A0550; f32 D_i4_801A0554; f32 D_i4_801A0558; -extern Animation D_60105D8; -extern Gfx D_60012A0[]; -extern Gfx D_6007300[]; -extern Gfx D_600BFB0[]; -extern Gfx D_600C4E0[]; -extern Gfx D_600CDC0[]; -extern Gfx D_600D090[]; -extern Gfx D_600D290[]; -extern Gfx D_600D4E0[]; -extern Limb* D_6010744[]; - extern void func_i4_80194458(Boss*, Vec3f*, f32); extern void func_i4_801995B4(Actor*); extern void func_i4_80198AA0(Actor*); @@ -420,11 +411,11 @@ void func_i4_80193B1C(Boss* boss) { Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); if (boss->state == 0) { - gSPDisplayList(gMasterDisp++, D_600BAF0); + gSPDisplayList(gMasterDisp++, D_KA_600BAF0); } else { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_600C4E0); + gSPDisplayList(gMasterDisp++, D_KA_600C4E0); } } @@ -1215,7 +1206,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->swork[10] <= 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_60012A0; + *dList = D_KA_60012A0; } break; @@ -1228,7 +1219,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->swork[11] <= 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_600CDC0; + *dList = D_KA_600CDC0; } break; @@ -1241,7 +1232,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->swork[12] <= 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_600D4E0; + *dList = D_KA_600D4E0; } break; @@ -1254,7 +1245,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->swork[13] <= 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_600D290; + *dList = D_KA_600D290; } break; @@ -1267,7 +1258,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->swork[14] <= 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_600D090; + *dList = D_KA_600D090; } break; @@ -1275,7 +1266,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d if (boss->health < 0) { RCP_SetupDL(&gMasterDisp, 57); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - *dList = D_6007300; + *dList = D_KA_6007300; } break; } @@ -1293,8 +1284,8 @@ void func_i4_801968F4(Boss* boss) { } Matrix_RotateY(gGfxMatrix, boss->fwork[13] * M_DTOR, 1); - Animation_GetFrameData(&D_60105D8, 0, jointTable); - Animation_DrawSkeleton(1, D_6010744, jointTable, func_i4_801965A8, NULL, boss, &gIdentityMatrix); + Animation_GetFrameData(&D_KA_60105D8, 0, jointTable); + Animation_DrawSkeleton(1, D_KA_6010744, jointTable, func_i4_801965A8, NULL, boss, &gIdentityMatrix); gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); if (boss->fwork[14] > 0.0f) { @@ -1325,7 +1316,7 @@ void func_i4_801968F4(Boss* boss) { Matrix_RotateX(gGfxMatrix, M_PI, 1); Matrix_Scale(gGfxMatrix, 0.3f, boss->fwork[15], 0.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_600BFB0); + gSPDisplayList(gMasterDisp++, D_KA_600BFB0); } } } @@ -2162,14 +2153,14 @@ void func_i4_801995B4(Actor* actor) { switch (actor->unk_0B6) { case 0: if (actor->iwork[23] != 0) { - gSPDisplayList(gMasterDisp++, D_600EFF0); + gSPDisplayList(gMasterDisp++, D_KA_600EFF0); } else { gSPDisplayList(gMasterDisp++, D_6001530); } break; case 1: - gSPDisplayList(gMasterDisp++, D_600E050); + gSPDisplayList(gMasterDisp++, D_KA_600E050); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 0); break; diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index b7f30245..fededa4e 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -2,18 +2,11 @@ #include "prevent_bss_reordering.h" #include "global.h" #include "assets.h" +#include "assets/ast_venom_2.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" #include "assets/ast_bg_planet.h" -extern Animation D_600C038; -extern Gfx D_6009300[]; -extern Limb* D_600C0A4[]; -extern Gfx D_600C2D0[]; -extern Gfx D_600C560[]; -extern Limb* D_6014844[]; -extern Gfx D_6007E20[]; - f32 D_i6_801A7F40; f32 D_i6_801A7F44; f32 D_i6_801A7F48; @@ -46,8 +39,8 @@ void func_i6_80187530(Actor* actor) { break; case 1: actor->unk_0B6 += (s32) actor->fwork[22]; - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6014658)) { - actor->unk_0B6 = Animation_GetFrameCount(&D_6014658) - 1; + if (actor->unk_0B6 >= Animation_GetFrameCount(&D_VE2_6014658)) { + actor->unk_0B6 = Animation_GetFrameCount(&D_VE2_6014658) - 1; } break; case 2: @@ -75,8 +68,8 @@ s32 func_i6_8018767C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d void func_i6_8018769C(Actor* actor) { Vec3f sp28[20]; - Animation_GetFrameData(&D_6014658, actor->unk_0B6, sp28); - Animation_DrawSkeleton(1, D_6014844, sp28, func_i6_8018767C, NULL, NULL, &gIdentityMatrix); + Animation_GetFrameData(&D_VE2_6014658, actor->unk_0B6, sp28); + Animation_DrawSkeleton(1, D_VE2_6014844, sp28, func_i6_8018767C, NULL, NULL, &gIdentityMatrix); } void func_i6_801876FC(void) { @@ -354,7 +347,7 @@ void func_i6_80188660(Actor* actor) { Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, 1); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6009300); + gSPDisplayList(gMasterDisp++, D_VE2_6009300); } void func_i6_801887B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { @@ -474,10 +467,10 @@ void func_i6_80188CB8(Boss* boss) { Vec3f sp44; boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_600C038)) { + if (boss->unk_04C >= Animation_GetFrameCount(&D_VE2_600C038)) { boss->unk_04C = 0; } - Animation_GetFrameData(&D_600C038, boss->unk_04C, boss->vwork); + Animation_GetFrameData(&D_VE2_600C038, boss->unk_04C, boss->vwork); if (boss->swork[3] != 0) { boss->swork[3]--; @@ -1224,7 +1217,7 @@ void func_i6_8018B8C0(Boss* boss) { Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 20.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, boss->fwork[23] + 1.0f, 1.0f - boss->fwork[23], 1.0f, 1); Matrix_Scale(gGfxMatrix, boss->unk_3F8, boss->unk_3F8, boss->unk_3F8, 1); - Animation_DrawSkeleton(0, D_600C0A4, boss->vwork, func_i6_8018B47C, NULL, boss, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE2_600C0A4, boss->vwork, func_i6_8018B47C, NULL, boss, &gIdentityMatrix); if (boss->fwork[21] >= 254) { RCP_SetupDL(&gMasterDisp, 0x36); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, 255); @@ -1255,9 +1248,9 @@ void func_i6_8018B8C0(Boss* boss) { Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); if (j == 9) { - gSPDisplayList(gMasterDisp++, D_600C2D0); + gSPDisplayList(gMasterDisp++, D_VE2_600C2D0); } else { - gSPDisplayList(gMasterDisp++, D_600C560); + gSPDisplayList(gMasterDisp++, D_VE2_600C560); } Matrix_Pop(&gGfxMatrix); } @@ -3268,7 +3261,7 @@ void func_i6_80192E94(Actor* actor) { void func_i6_80193244(Actor* actor) { - gSPDisplayList(gMasterDisp++, D_6007E20); + gSPDisplayList(gMasterDisp++, D_VE2_6007E20); if (actor->timer_0BC != 0) { f32 scale; u8 alpha; @@ -3303,8 +3296,8 @@ void func_i6_80193380(Object_80* obj80) { obj80->info.hitbox[17] = -130.0f - (obj80->unk_44 * 1.6f); obj80->info.hitbox[27] = -130.0f - (obj80->unk_44 * 1.6f); obj80->unk_44 += 2; - if (obj80->unk_44 >= Animation_GetFrameCount(&D_6014658)) { - obj80->unk_44 = Animation_GetFrameCount(&D_6014658) - 1; + if (obj80->unk_44 >= Animation_GetFrameCount(&D_VE2_6014658)) { + obj80->unk_44 = Animation_GetFrameCount(&D_VE2_6014658) - 1; } break; } @@ -3321,8 +3314,8 @@ s32 func_i6_801934EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d void func_i6_8019350C(Object_80* obj80) { Vec3f frameTable[20]; - Animation_GetFrameData(&D_6014658, obj80->unk_44, frameTable); - Animation_DrawSkeleton(1, D_6014844, frameTable, func_i6_801934EC, NULL, NULL, &gIdentityMatrix); + Animation_GetFrameData(&D_VE2_6014658, obj80->unk_44, frameTable); + Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, func_i6_801934EC, NULL, NULL, &gIdentityMatrix); } void func_i6_8019356C(Object_80* obj80) { @@ -3343,11 +3336,11 @@ s32 func_i6_801935B4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d void func_i6_801935D4(Object_80* obj80) { Vec3f frameTable[20]; - Animation_GetFrameData(&D_6014658, obj80->unk_44, frameTable); + Animation_GetFrameData(&D_VE2_6014658, obj80->unk_44, frameTable); if (gLevelMode == LEVELMODE_ALL_RANGE) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } - Animation_DrawSkeleton(1, D_6014844, frameTable, func_i6_801935B4, NULL, NULL, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, func_i6_801935B4, NULL, NULL, &gIdentityMatrix); } void func_i6_80193668(Object_80* obj80, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index 0b1af107..f7cdee2c 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -1,6 +1,8 @@ #include "global.h" #include "assets.h" +#include "assets/ast_venom_2.h" + void func_i6_80196210(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], boss->fwork[1], 0.5f, 5.0f, 0.0f); } @@ -15,13 +17,9 @@ s32 func_i6_8019624C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -extern Animation D_6014904; -extern Limb* D_60149D0[]; - void func_i6_80196288(Boss* boss) { - - Animation_GetFrameData(&D_6014904, 0, boss->vwork); - Animation_DrawSkeleton(3, D_60149D0, boss->vwork, func_i6_8019624C, NULL, boss, gCalcMatrix); + Animation_GetFrameData(&D_VE2_6014904, 0, boss->vwork); + Animation_DrawSkeleton(3, D_VE2_60149D0, boss->vwork, func_i6_8019624C, NULL, boss, gCalcMatrix); } void func_i6_801962F4(Actor* actor) { diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 9573a986..34494622 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -228,13 +228,21 @@ - name: ast_venom_1 exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets start: 0xAB4000 + vram: 0x06000000 + subsegments: + - [0xA4FBB0, .data, ast_venom_1/ast_venom_1] - name: ast_venom_2 exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets start: 0xACF960 + vram: 0x06000000 + subsegments: + - [0xA4FBB0, .data, ast_venom_2/ast_venom_2] - name: ast_ve1_boss # exclusive_ram_id: segment_06 @@ -257,8 +265,12 @@ - name: ast_fortuna exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets start: 0xB1CA50 + vram: 0x06000000 + subsegments: + - [0xB1CA50, .data, ast_fortuna/ast_fortuna] - name: ast_sector_y exclusive_ram_id: segment_06 @@ -281,8 +293,12 @@ - name: ast_katina exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets start: 0xBB11D0 + vram: 0x06000000 + subsegments: + - [0xBB11D0, .data, ast_katina/ast_katina] - name: ast_macbeth exclusive_ram_id: segment_06