From 09541d8ad312b7760f3e92897f7e11bcbb99ecd6 Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:40:09 -0500 Subject: [PATCH] None of woman born Shall export Macbeth (#183) * macbeth * fix * forgot header --- .vscode/settings.json | 6 +- assets/yaml/us/ast_A_ti.yaml | 30 +- assets/yaml/us/ast_macbeth.yaml | 908 ++++++++++++++++++++++++++++ assets/yaml/us/ast_vs_player.yaml | 8 +- include/assets.h | 84 --- include/assets/ast_macbeth.h | 8 - include/fox_enmy2_assets.h | 10 - include/fox_enmy_assets.h | 1 - linker_scripts/us/undefined_syms.ld | 369 +++++------ src/main/fox_A4290_colheaders.c | 27 +- src/main/fox_bg.c | 13 +- src/main/fox_edata_1C.c | 81 +-- src/main/fox_edisplay.c | 7 +- src/main/fox_effect.c | 13 +- src/main/fox_enmy.c | 1 + src/main/fox_enmy2.c | 11 +- src/main/fox_hud.c | 2 +- src/main/fox_play.c | 1 + src/main/fox_radio.c | 6 +- src/overlays/ovl_i5/fox_ma.c | 354 ++++------- src/overlays/ovl_menu/fox_title.c | 2 +- yamls/us/assets.yaml | 6 +- 22 files changed, 1338 insertions(+), 610 deletions(-) create mode 100644 assets/yaml/us/ast_macbeth.yaml delete mode 100644 include/assets/ast_macbeth.h diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e33aee2..57d633ee 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -111,7 +111,11 @@ "ast_titania.h": "c", "ast_bg_planet.h": "c", "assets.h": "c", - "ast_title.h": "c" + "ast_title.h": "c", + "any": "c", + "memory_resource": "c", + "ast_andross.h": "c", + "sf64object.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/assets/yaml/us/ast_A_ti.yaml b/assets/yaml/us/ast_A_ti.yaml index a408b65b..42e5ae85 100644 --- a/assets/yaml/us/ast_A_ti.yaml +++ b/assets/yaml/us/ast_A_ti.yaml @@ -10,7 +10,7 @@ - '#include "structs.h"' D_TI_A000000: - {type: "GFX", offset: 0xA000000, symbol: D_TI_A000000} + {type: GFX, offset: 0xA000000, symbol: D_TI_A000000} D_TI_A0000C8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x0A0000C8, symbol: D_TI_A0000C8, tlut: 0x0A0001C8 } @@ -19,44 +19,44 @@ D_TI_A0001C8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 60, offset: 0x0A0001C8, symbol: D_TI_A0001C8 } D_TI_A0002BC: - {type: "SF64:ANIM", offset: 0xA0002BC, symbol: D_TI_A0002BC} + {type: SF64:ANIM, offset: 0xA0002BC, symbol: D_TI_A0002BC} D_TI_A00047C: - {type: "SF64:ANIM", offset: 0xA00047C, symbol: D_TI_A00047C} + {type: SF64:ANIM, offset: 0xA00047C, symbol: D_TI_A00047C} D_TI_A000568: - {type: "SF64:SKELETON", offset: 0xA000568, symbol: D_TI_A000568} + {type: SF64:SKELETON, offset: 0xA000568, symbol: D_TI_A000568} D_TI_A000858: - {type: "SF64:ANIM", offset: 0xA000858, symbol: D_TI_A000858} + {type: SF64:ANIM, offset: 0xA000858, symbol: D_TI_A000858} D_TI_A000934: - {type: "SF64:ANIM", offset: 0xA000934, symbol: D_TI_A000934} + {type: SF64:ANIM, offset: 0xA000934, symbol: D_TI_A000934} D_TI_A000D50: - {type: "SF64:ANIM", offset: 0xA000D50, symbol: D_TI_A000D50} + {type: SF64:ANIM, offset: 0xA000D50, symbol: D_TI_A000D50} D_TI_A000EDC: - {type: "SF64:SKELETON", offset: 0xA000EDC, symbol: D_TI_A000EDC} + {type: SF64:SKELETON, offset: 0xA000EDC, symbol: D_TI_A000EDC} D_TI_A001A70: - {type: "SF64:SKELETON", offset: 0xA001A70, symbol: D_TI_A001A70} + {type: SF64:SKELETON, offset: 0xA001A70, symbol: D_TI_A001A70} D_TI_A001BE0: - {type: "GFX", offset: 0xA001BE0, symbol: D_TI_A001BE0} + {type: GFX, offset: 0xA001BE0, symbol: D_TI_A001BE0} D_TI_A001DB0: - {type: "GFX", offset: 0xA001DB0, symbol: D_TI_A001DB0} + {type: GFX, offset: 0xA001DB0, symbol: D_TI_A001DB0} D_TI_A001EC0: - {type: "GFX", offset: 0xA001EC0, symbol: D_TI_A001EC0} + {type: GFX, offset: 0xA001EC0, symbol: D_TI_A001EC0} D_TI_A001FA0: - {type: "GFX", offset: 0xA001FA0, symbol: D_TI_A001FA0} + {type: GFX, offset: 0xA001FA0, symbol: D_TI_A001FA0} D_TI_A002170: - {type: "GFX", offset: 0xA002170, symbol: D_TI_A002170} + {type: GFX, offset: 0xA002170, symbol: D_TI_A002170} D_TI_A009990: - {type: "SF64:ANIM", offset: 0xA009990, symbol: D_TI_A009990} + {type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990} diff --git a/assets/yaml/us/ast_macbeth.yaml b/assets/yaml/us/ast_macbeth.yaml new file mode 100644 index 00000000..3594e8bb --- /dev/null +++ b/assets/yaml/us/ast_macbeth.yaml @@ -0,0 +1,908 @@ +:config: + segments: + - [0x06, 0xBC23D0] + header: + code: + - '#include "assets/ast_macbeth.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + - '#include "sf64level.h"' + +D_MA_6000000: + {type: TEXTURE, format: IA8, ctype: u8, width: 160, height: 28, offset: 0x6000000, symbol: D_MA_6000000} + +D_MA_6001180: + {type: GFX, offset: 0x6001180, symbol: D_MA_6001180} + +D_MA_60012A0: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60012A0, symbol: D_MA_60012A0, tlut: 0x60013A0} + +D_MA_60013A0: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 128, offset: 0x60013A0, symbol: D_MA_60013A0} + +D_MA_60014A0: + {type: GFX, offset: 0x60014A0, symbol: D_MA_60014A0} + +D_MA_6001578: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6001578, symbol: D_MA_6001578, tlut: 0x6001978} + +D_MA_6001978: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6001978, symbol: D_MA_6001978} + +D_MA_6001B38: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6001B38, symbol: D_MA_6001B38, tlut: 0x6001C38} + +D_MA_6001C38: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6001C38, symbol: D_MA_6001C38} + +D_MA_6001C78: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6001C78, symbol: D_MA_6001C78, tlut: 0x6002078} + +D_MA_6002078: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x6002078, symbol: D_MA_6002078} + +D_MA_6002118: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6002118, symbol: D_MA_6002118, tlut: 0x6002518} + +D_MA_6002518: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 240, offset: 0x6002518, symbol: D_MA_6002518} + +D_MA_60026F8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60026F8, symbol: D_MA_60026F8, tlut: 0x60027F8} + +D_MA_60027F8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x60027F8, symbol: D_MA_60027F8} + +D_MA_6002890: + {type: GFX, offset: 0x6002890, symbol: D_MA_6002890} + +D_MA_6002C20: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 16, offset: 0x6002C20, symbol: D_MA_6002C20, tlut: 0x6002E20} + +D_MA_6002E20: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6002E20, symbol: D_MA_6002E20} + +D_MA_6002E60: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6002E60, symbol: D_MA_6002E60, tlut: 0x6002F60} + +D_MA_6002F60: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x6002F60, symbol: D_MA_6002F60} + +D_MA_6002FF0: + { type: TEXTURE, format: CI8, ctype: u8, width: 8, height: 8, offset: 0x6002FF0, symbol: D_MA_6002FF0, tlut: 0x6003030} + +D_MA_6003030: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6003030, symbol: D_MA_6003030} + +D_MA_6003070: + {type: GFX, offset: 0x6003070, symbol: D_MA_6003070} + +D_MA_6003138: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6003138, symbol: D_MA_6003138, tlut: 0x6003238} + +D_MA_6003238: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 152, offset: 0x6003238, symbol: D_MA_6003238} + +D_MA_6003370: + {type: GFX, offset: 0x6003370, symbol: D_MA_6003370} + +D_MA_6003B58: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6003B58, symbol: D_MA_6003B58, tlut: 0x6003F58} + +D_MA_6003F58: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 56, offset: 0x6003F58, symbol: D_MA_6003F58} + +D_MA_6003FC8: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6003FC8, symbol: D_MA_6003FC8, tlut: 0x60043C8} + +D_MA_60043C8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 56, offset: 0x60043C8, symbol: D_MA_60043C8} + +D_MA_6004440: + {type: GFX, offset: 0x6004440, symbol: D_MA_6004440} + +D_MA_6004640: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6004640, symbol: D_MA_6004640, tlut: 0x6004A40} + +D_MA_6004A40: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 256, offset: 0x6004A40, symbol: D_MA_6004A40} + +D_MA_60050F8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60050F8, symbol: D_MA_60050F8, tlut: 0x60051F8} + +D_MA_60051F8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x60051F8, symbol: D_MA_60051F8} + +D_MA_6005238: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6005238, symbol: D_MA_6005238, tlut: 0x6005638} + +D_MA_6005638: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 248, offset: 0x6005638, symbol: D_MA_6005638} + +D_MA_6005828: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6005828, symbol: D_MA_6005828} + +D_MA_6006030: + {type: GFX, offset: 0x6006030, symbol: D_MA_6006030} + +D_MA_60066A0: + {type: GFX, offset: 0x60066A0, symbol: D_MA_60066A0} + +D_MA_60069A8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60069A8, symbol: D_MA_60069A8, tlut: 0x6006AA8} + +D_MA_6006AA8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 160, offset: 0x6006AA8, symbol: D_MA_6006AA8} + +D_MA_6006BE8: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6006BE8, symbol: D_MA_6006BE8, tlut: 0x6006FE8} + +D_MA_6006FE8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 232, offset: 0x6006FE8, symbol: D_MA_6006FE8} + +D_MA_60071C0: + {type: GFX, offset: 0x60071C0, symbol: D_MA_60071C0} + +D_MA_6007290: + {type: GFX, offset: 0x6007290, symbol: D_MA_6007290} + +D_MA_6007360: + {type: GFX, offset: 0x6007360, symbol: D_MA_6007360} + +D_MA_6007430: + {type: GFX, offset: 0x6007430, symbol: D_MA_6007430} + +D_MA_6007500: + {type: GFX, offset: 0x6007500, symbol: D_MA_6007500} + +D_MA_60075D0: + {type: GFX, offset: 0x60075D0, symbol: D_MA_60075D0} + +D_MA_60092E0: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x60092E0, symbol: D_MA_60092E0} + +D_MA_6009AE0: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009AE0, symbol: D_MA_6009AE0, tlut: 0x6009BE0} + +D_MA_6009BE0: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 56, offset: 0x6009BE0, symbol: D_MA_6009BE0} + +D_MA_6009C50: + {type: GFX, offset: 0x6009C50, symbol: D_MA_6009C50} + +D_MA_6009D18: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009D18, symbol: D_MA_6009D18, tlut: 0x6009E18} + +D_MA_6009E18: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 120, offset: 0x6009E18, symbol: D_MA_6009E18} + +D_MA_6009F10: + {type: GFX, offset: 0x6009F10, symbol: D_MA_6009F10} + +D_MA_6009FD8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009FD8, symbol: D_MA_6009FD8, tlut: 0x600A0D8} + +D_MA_600A0D8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A0D8, symbol: D_MA_600A0D8} + +D_MA_600A1F0: + {type: GFX, offset: 0x600A1F0, symbol: D_MA_600A1F0} + +D_MA_600A2B8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A2B8, symbol: D_MA_600A2B8, tlut: 0x600A3B8} + +D_MA_600A3B8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A3B8, symbol: D_MA_600A3B8} + +D_MA_600A4D0: + {type: GFX, offset: 0x600A4D0, symbol: D_MA_600A4D0} + +D_MA_600A598: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A598, symbol: D_MA_600A598, tlut: 0x600A698} + +D_MA_600A698: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 152, offset: 0x600A698, symbol: D_MA_600A698} + +D_MA_600A7D0: + {type: GFX, offset: 0x600A7D0, symbol: D_MA_600A7D0} + +D_MA_600A898: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A898, symbol: D_MA_600A898, tlut: 0x600A998} + +D_MA_600A998: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 104, offset: 0x600A998, symbol: D_MA_600A998} + +D_MA_600AA70: + {type: GFX, offset: 0x600AA70, symbol: D_MA_600AA70} + +D_MA_600AB38: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600AB38, symbol: D_MA_600AB38, tlut: 0x600AC38} + +D_MA_600AC38: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600AC38, symbol: D_MA_600AC38} + +D_MA_600AD50: + {type: GFX, offset: 0x600AD50, symbol: D_MA_600AD50} + +D_MA_600AE18: + { type: TEXTURE, format: CI8, ctype: u8, width: 8, height: 16, offset: 0x600AE18, symbol: D_MA_600AE18, tlut: 0x600AE98} + +D_MA_600AE98: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98} + +D_MA_600AF40: + {type: GFX, offset: 0x600AF40, symbol: D_MA_600AF40} + +D_MA_600B2E0: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0} + +D_MA_600C2E0: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600C2E0, symbol: D_MA_600C2E0, tlut: 0x600C3E0} + +D_MA_600C3E0: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 40, offset: 0x600C3E0, symbol: D_MA_600C3E0} + +D_MA_600C4D0: + {type: SF64:ANIM, offset: 0x600C4D0, symbol: D_MA_600C4D0} + +D_MA_600C65C: + {type: SF64:SKELETON, offset: 0x600C65C, symbol: D_MA_600C65C} + +D_MA_600CD18: + {type: SF64:ANIM, offset: 0x600CD18, symbol: D_MA_600CD18} + +D_MA_600D1E4: + {type: SF64:SKELETON, offset: 0x600D1E4, symbol: D_MA_600D1E4} + +D_MA_600D280: + { type: TEXTURE, format: IA16, ctype: u16, width: 16, height: 16, offset: 0x600D280, symbol: D_MA_600D280} + +D_MA_600D480: + {type: GFX, offset: 0x600D480, symbol: D_MA_600D480} + +D_MA_600D878: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600D878, symbol: D_MA_600D878, tlut: 0x600D978} + +D_MA_600D978: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x600D978, symbol: D_MA_600D978} + +D_MA_600DA10: + {type: GFX, offset: 0x600DA10, symbol: D_MA_600DA10} + +D_MA_600DF60: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600DF60, symbol: D_MA_600DF60, tlut: 0x600E360} + +D_MA_600E360: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 128, offset: 0x600E360, symbol: D_MA_600E360} + +D_MA_600E460: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 4, offset: 0x600E460, symbol: D_MA_600E460} + +D_MA_600E480: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600E480, symbol: D_MA_600E480, tlut: 0x600E880} + +D_MA_600E880: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 232, offset: 0x600E880, symbol: D_MA_600E880} + +D_MA_600EE38: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600EE38, symbol: D_MA_600EE38, tlut: 0x600EF38} + +D_MA_600EF38: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 48, offset: 0x600EF38, symbol: D_MA_600EF38} + +D_MA_600EF98: + { type: TEXTURE, format: CI4, ctype: u8, width: 16, height: 16, offset: 0x600EF98, symbol: D_MA_600EF98, tlut: 0x600F018} + +D_MA_600F018: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 8, offset: 0x600F018, symbol: D_MA_600F018} + +D_MA_600F028: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600F028, symbol: D_MA_600F028, tlut: 0x600F128} + +D_MA_600F128: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 24, offset: 0x600F128, symbol: D_MA_600F128} + +D_MA_600FEC4: + {type: SF64:ANIM, offset: 0x600FEC4, symbol: D_MA_600FEC4} + +D_MA_6010144: + {type: SF64:ANIM, offset: 0x6010144, symbol: D_MA_6010144} + +D_MA_6010220: + {type: SF64:ANIM, offset: 0x6010220, symbol: D_MA_6010220} + +D_MA_601042C: + {type: SF64:SKELETON, offset: 0x601042C, symbol: D_MA_601042C} + +D_MA_6010470: + {type: GFX, offset: 0x6010470, symbol: D_MA_6010470} + +D_MA_6010700: + {type: GFX, offset: 0x6010700, symbol: D_MA_6010700} + +D_MA_6010C20: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 44, height: 44, offset: 0x6010C20, symbol: D_MA_6010C20} + +D_MA_6011B40: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 44, height: 44, offset: 0x6011B40, symbol: D_MA_6011B40} + +D_MA_6012A60: + {type: GFX, offset: 0x6012A60, symbol: D_MA_6012A60} + +D_MA_6012BC0: + { type: TEXTURE, format: IA8, ctype: u8, width: 8, height: 8, offset: 0x6012BC0, symbol: D_MA_6012BC0} + +D_MA_6012C00: + {type: GFX, offset: 0x6012C00, symbol: D_MA_6012C00} + +D_MA_6012C98: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 8, offset: 0x6012C98, symbol: D_MA_6012C98} + +D_MA_6012F50: + {type: GFX, offset: 0x6012F50, symbol: D_MA_6012F50} + +D_MA_6012FE0: + { type: TEXTURE, format: IA8, ctype: u8, width: 16, height: 8, offset: 0x6012FE0, symbol: D_MA_6012FE0} + +D_MA_6013060: + {type: GFX, offset: 0x6013060, symbol: D_MA_6013060} + +D_MA_6013158: + { type: TEXTURE, format: IA16, ctype: u16, width: 32, height: 32, offset: 0x6013158, symbol: D_MA_6013158} + +D_MA_6013960: + {type: GFX, offset: 0x6013960, symbol: D_MA_6013960} + +D_MA_6013F58: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6013F58, symbol: D_MA_6013F58, tlut: 0x6014058} + +D_MA_6014058: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 88, offset: 0x6014058, symbol: D_MA_6014058} + +D_MA_6014458: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x6014458, symbol: D_MA_6014458} + +D_MA_6015494: + {type: SF64:ANIM, offset: 0x6015494, symbol: D_MA_6015494} + +D_MA_6015500: + {type: SF64:SKELETON, offset: 0x6015500, symbol: D_MA_6015500} + +D_MA_6015510: + {type: GFX, offset: 0x6015510, symbol: D_MA_6015510} + +D_MA_6015C24: + {type: SF64:ANIM, offset: 0x6015C24, symbol: D_MA_6015C24} + +D_MA_6016040: + {type: SF64:ANIM, offset: 0x6016040, symbol: D_MA_6016040} + +D_MA_60163F0: + {type: SF64:ANIM, offset: 0x60163F0, symbol: D_MA_60163F0} + +D_MA_6016B2C: + {type: SF64:ANIM, offset: 0x6016B2C, symbol: D_MA_6016B2C} + +D_MA_6017714: + {type: SF64:ANIM, offset: 0x6017714, symbol: D_MA_6017714} + +D_MA_6017720: + {type: GFX, offset: 0x6017720, symbol: D_MA_6017720} + +D_MA_6017EB8: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6017EB8, symbol: D_MA_6017EB8} + +D_MA_60186B8: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x60186B8, symbol: D_MA_60186B8, tlut: 0x6018AB8} + +D_MA_6018AB8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 232, offset: 0x6018AB8, symbol: D_MA_6018AB8} + +D_MA_6019028: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6019028, symbol: D_MA_6019028, tlut: 0x6019128} + +D_MA_6019128: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 120, offset: 0x6019128, symbol: D_MA_6019128} + +D_MA_6019220: + {type: GFX, offset: 0x6019220, symbol: D_MA_6019220} + +D_MA_60192B0: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x60192B0, symbol: D_MA_60192B0} + +D_MA_601A2B0: + {type: GFX, offset: 0x601A2B0, symbol: D_MA_601A2B0} + +D_MA_601A5E8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601A5E8, symbol: D_MA_601A5E8, tlut: 0x601A6E8} + +D_MA_601A6E8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 88, offset: 0x601A6E8, symbol: D_MA_601A6E8} + +D_MA_601A7A0: + {type: GFX, offset: 0x601A7A0, symbol: D_MA_601A7A0} + +D_MA_601A840: + {type: GFX, offset: 0x601A840, symbol: D_MA_601A840} + +D_MA_601A8C8: + { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x601A8C8, symbol: D_MA_601A8C8} + +D_MA_601B0D0: + {type: GFX, offset: 0x601B0D0, symbol: D_MA_601B0D0} + +D_MA_601B7C0: + {type: GFX, offset: 0x601B7C0, symbol: D_MA_601B7C0} + +D_MA_601BB78: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BB78, symbol: D_MA_601BB78, tlut: 0x601BC78} + +D_MA_601BC78: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x601BC78, symbol: D_MA_601BC78} + +D_MA_601BD08: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BD08, symbol: D_MA_601BD08, tlut: 0x601BE08} + +D_MA_601BE08: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 64, offset: 0x601BE08, symbol: D_MA_601BE08} + +D_MA_601BE90: + {type: GFX, offset: 0x601BE90, symbol: D_MA_601BE90} + +D_MA_601C000: + {type: GFX, offset: 0x601C000, symbol: D_MA_601C000} + +D_MA_601C170: + {type: GFX, offset: 0x601C170, symbol: D_MA_601C170} + +D_MA_601C520: + {type: GFX, offset: 0x601C520, symbol: D_MA_601C520} + +D_MA_601D188: + {type: SF64:ANIM, offset: 0x601D188, symbol: D_MA_601D188} + +D_MA_601EA28: + {type: SF64:ANIM, offset: 0x601EA28, symbol: D_MA_601EA28} + +D_MA_601EAB0: + {type: SF64:ANIM, offset: 0x601EAB0, symbol: D_MA_601EAB0} + +D_MA_601EBBC: + {type: SF64:SKELETON, offset: 0x601EBBC, symbol: D_MA_601EBBC} + +D_MA_601F1D0: + {type: GFX, offset: 0x601F1D0, symbol: D_MA_601F1D0} + +D_MA_601F270: + {type: GFX, offset: 0x601F270, symbol: D_MA_601F270} + +D_MA_6022200: + {type: GFX, offset: 0x6022200, symbol: D_MA_6022200} + +D_MA_60223C0: + {type: GFX, offset: 0x60223C0, symbol: D_MA_60223C0} + +D_MA_6022450: + { type: GFX, offset: 0x6022450, symbol: D_MA_6022450} + +D_MA_6022530: + {type: GFX, offset: 0x6022530, symbol: D_MA_6022530} + +D_MA_6022610: + {type: GFX, offset: 0x6022610, symbol: D_MA_6022610} + +D_MA_60227F0: + {type: GFX, offset: 0x60227F0, symbol: D_MA_60227F0} + +D_MA_6022B68: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6022B68, symbol: D_MA_6022B68, tlut: 0x6022F68} + +D_MA_6022F68: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6022F68, symbol: D_MA_6022F68} + +D_MA_60230C8: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60230C8, symbol: D_MA_60230C8, tlut: 0x60231C8} + +D_MA_60231C8: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 48, offset: 0x60231C8, symbol: D_MA_60231C8} + +D_MA_6023228: + { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6023228, symbol: D_MA_6023228, tlut: 0x6023328} + +D_MA_6023328: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 48, offset: 0x6023328, symbol: D_MA_6023328} + +D_MA_6023388: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6023388, symbol: D_MA_6023388, tlut: 0x6023788} + +D_MA_6023788: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6023788, symbol: D_MA_6023788} + +D_MA_60238F0: + {type: GFX, offset: 0x60238F0, symbol: D_MA_60238F0} + +D_MA_60239D0: + {type: GFX, offset: 0x60239D0, symbol: D_MA_60239D0} + +D_MA_6024010: + {type: GFX, offset: 0x6024010, symbol: D_MA_6024010} + +D_MA_6024230: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6024230, symbol: D_MA_6024230, tlut: 0x6024630} + +D_MA_6024630: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6024630, symbol: D_MA_6024630} + +D_MA_6024670: + {type: GFX, offset: 0x6024670, symbol: D_MA_6024670} + +D_MA_60251A0: + {type: GFX, offset: 0x60251A0, symbol: D_MA_60251A0} + +D_MA_60253E0: + {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0} + +D_MA_60257B0: + {type: GFX, offset: 0x60257B0, symbol: D_MA_60257B0} + +D_MA_6025850: + {type: GFX, offset: 0x6025850, symbol: D_MA_6025850} + +D_MA_6025A70: + {type: GFX, offset: 0x6025A70, symbol: D_MA_6025A70} + +D_MA_6025B50: + { type: GFX, offset: 0x6025B50, symbol: D_MA_6025B50} + +D_MA_6025CA0: + {type: SF64:ANIM, offset: 0x6025CA0, symbol: D_MA_6025CA0} + +D_MA_6025DAC: + {type: SF64:SKELETON, offset: 0x6025DAC, symbol: D_MA_6025DAC} + +D_MA_6026860: + {type: GFX, offset: 0x6026860, symbol: D_MA_6026860} + +D_MA_60269E0: + {type: GFX, offset: 0x60269E0, symbol: D_MA_60269E0} + +D_MA_6026C00: + { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6026C00, symbol: D_MA_6026C00, tlut: 0x6027000} + +D_MA_6027000: + { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6027000, symbol: D_MA_6027000} + +D_MA_60270E0: + {type: GFX, offset: 0x60270E0, symbol: D_MA_60270E0} + +D_MA_6027180: + { type: GFX, offset: 0x6027180, symbol: D_MA_6027180} + +D_MA_6027320: + {type: SF64:ANIM, offset: 0x6027320, symbol: D_MA_6027320} + +D_MA_602742C: + {type: SF64:SKELETON, offset: 0x602742C, symbol: D_MA_602742C} + +D_MA_6027900: + {type: GFX, offset: 0x6027900, symbol: D_MA_6027900} + +D_MA_6027A04: + {type: SF64:ANIM, offset: 0x6027A04, symbol: D_MA_6027A04} + +D_MA_6027AF0: + {type: SF64:SKELETON, offset: 0x6027AF0, symbol: D_MA_6027AF0} + +D_MA_6027BF0: + {type: GFX, offset: 0x6027BF0, symbol: D_MA_6027BF0} + +D_MA_6027D40: + {type: GFX, offset: 0x6027D40, symbol: D_MA_6027D40} + +D_MA_6027EB0: + {type: GFX, offset: 0x6027EB0, symbol: D_MA_6027EB0} + +D_MA_60288A0: + {type: GFX, offset: 0x60288A0, symbol: D_MA_60288A0} + +D_MA_6029890: + {type: GFX, offset: 0x6029890, symbol: D_MA_6029890} + +D_MA_VTX_602A0D0: + {type: VTX, count: 395, offset: 0x602A0D0, symbol: D_MA_VTX_602A0D0} + +D_MA_602B980: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 16, height: 16, offset: 0x602B980, symbol: D_MA_602B980} + +D_MA_602BB80: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602BB80, symbol: D_MA_602BB80} + +D_MA_602C380: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602C380, symbol: D_MA_602C380} + +D_MA_602CB80: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602CB80, symbol: D_MA_602CB80} + +D_MA_602D380: + {type: GFX, offset: 0x602D380, symbol: D_MA_602D380} + +D_MA_602DAE0: + {type: GFX, offset: 0x602DAE0, symbol: D_MA_602DAE0} + +D_MA_602DB80: + {type: GFX, offset: 0x602DB80, symbol: D_MA_602DB80} + +D_MA_602DC20: + {type: GFX, offset: 0x602DC20, symbol: D_MA_602DC20} + +D_MA_602DCB8: + {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x602DCB8, symbol: D_MA_602DCB8} + +D_MA_602EA0C: + {type: SF64:ANIM, offset: 0x602EA0C, symbol: D_MA_602EA0C} + +D_MA_602EBB8: + {type: SF64:SKELETON, offset: 0x602EBB8, symbol: D_MA_602EBB8} + +D_MA_602F098: + {type: SF64:ANIM, offset: 0x602F098, symbol: D_MA_602F098} + +D_MA_602F264: + {type: SF64:SKELETON, offset: 0x602F264, symbol: D_MA_602F264} + +D_MA_602F2E0: + {type: SF64:ANIM, offset: 0x602F2E0, symbol: D_MA_602F2E0} + +D_MA_602F36C: + {type: SF64:SKELETON, offset: 0x602F36C, symbol: D_MA_602F36C} + +D_MA_602F380: + {type: GFX, offset: 0x602F380, symbol: D_MA_602F380} + +D_MA_602FBF0: + {type: GFX, offset: 0x602FBF0, symbol: D_MA_602FBF0} + +D_MA_602FEB4: + {type: SF64:ANIM, offset: 0x602FEB4, symbol: D_MA_602FEB4} + +D_MA_602FFA0: + {type: SF64:SKELETON, offset: 0x602FFA0, symbol: D_MA_602FFA0} + +D_MA_602FFC0: + {type: GFX, offset: 0x602FFC0, symbol: D_MA_602FFC0} + +D_MA_6030500: + {type: GFX, offset: 0x6030500, symbol: D_MA_6030500} + +D_MA_6030630: + {type: GFX, offset: 0x6030630, symbol: D_MA_6030630} + +D_MA_60306D0: + {type: GFX, offset: 0x60306D0, symbol: D_MA_60306D0} + +D_MA_6030750: + {type: GFX, offset: 0x6030750, symbol: D_MA_6030750} + +D_MA_60309D0: + {type: GFX, offset: 0x60309D0, symbol: D_MA_60309D0} + +D_MA_6030C50: + {type: GFX, offset: 0x6030C50, symbol: D_MA_6030C50} + +D_MA_6030E30: + {type: SF64:ENV_SETTINGS, offset: 0x6030E30, symbol: D_MA_6030E30} + +D_MA_6030E74: + {type: SF64:TRIANGLE, count: 2, offset: 0x6030E74, symbol: D_MA_6030E74, mesh_symbol: D_MA_OFFSET} + +D_MA_6030EB0: + {type: SF64:TRIANGLE, count: 2, offset: 0x6030EB0, symbol: D_MA_6030EB0, mesh_symbol: D_MA_OFFSET} + +D_MA_6030EEC: + {type: SF64:TRIANGLE, count: 2, offset: 0x6030EEC, symbol: D_MA_6030EEC, mesh_symbol: D_MA_OFFSET} + +D_MA_6030F28: + {type: SF64:TRIANGLE, count: 2, offset: 0x6030F28, symbol: D_MA_6030F28, mesh_symbol: D_MA_OFFSET} + +D_MA_6030F64: + {type: SF64:TRIANGLE, count: 4, offset: 0x6030F64, symbol: D_MA_6030F64, mesh_symbol: D_MA_OFFSET} + +D_MA_6030FC4: + {type: SF64:TRIANGLE, count: 2, offset: 0x6030FC4, symbol: D_MA_6030FC4, mesh_symbol: D_MA_OFFSET} + +D_MA_6031000: + {type: SF64:OBJECT_INIT, offset: 0x6031000, symbol: D_MA_6031000} + +D_MA_6035678: + {type: SF64:OBJECT_INIT, offset: 0x6035678, symbol: D_MA_6035678} + +D_MA_60357CC: + {type: SF64:OBJECT_INIT, offset: 0x60357CC, symbol: D_MA_60357CC} + +D_MA_6035920: + {type: SF64:OBJECT_INIT, offset: 0x6035920, symbol: D_MA_6035920} + +D_MA_60359AC: + {type: SF64:HITBOX, offset: 0x60359AC, symbol: D_MA_60359AC} + +D_MA_60359C8: + {type: SF64:HITBOX, offset: 0x60359C8, symbol: D_MA_60359C8} + +D_MA_6035A14: + {type: SF64:HITBOX, offset: 0x6035A14, symbol: D_MA_6035A14} + +D_MA_6035A48: + {type: SF64:HITBOX, offset: 0x6035A48, symbol: D_MA_6035A48} + +D_MA_6035A94: + {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94} + +D_MA_6035AE0: + {type: SF64:HITBOX, offset: 0x6035AE0, symbol: D_MA_6035AE0} + +D_MA_6035B44: + {type: SF64:HITBOX, offset: 0x6035B44, symbol: D_MA_6035B44} + +D_MA_6035BA8: + {type: SF64:HITBOX, offset: 0x6035BA8, symbol: D_MA_6035BA8} + +D_MA_6035C0C: + {type: SF64:HITBOX, offset: 0x6035C0C, symbol: D_MA_6035C0C} + +D_MA_6035C70: + {type: SF64:HITBOX, offset: 0x6035C70, symbol: D_MA_6035C70} + +D_MA_6035CD4: + {type: SF64:HITBOX, offset: 0x6035CD4, symbol: D_MA_6035CD4} + +D_MA_6035D38: + {type: SF64:HITBOX, offset: 0x6035D38, symbol: D_MA_6035D38} + +D_MA_6035D9C: + {type: SF64:HITBOX, offset: 0x6035D9C, symbol: D_MA_6035D9C} + +D_MA_6035DD0: + {type: SF64:HITBOX, offset: 0x6035DD0, symbol: D_MA_6035DD0} + +D_MA_6035E04: + {type: SF64:HITBOX, offset: 0x6035E04, symbol: D_MA_6035E04} + +D_MA_6035E68: + {type: SF64:HITBOX, offset: 0x6035E68, symbol: D_MA_6035E68} + +D_MA_6035ECC: + {type: SF64:HITBOX, offset: 0x6035ECC, symbol: D_MA_6035ECC} + +D_MA_6035F30: + {type: SF64:HITBOX, offset: 0x6035F30, symbol: D_MA_6035F30} + +D_MA_6035F94: + {type: SF64:HITBOX, offset: 0x6035F94, symbol: D_MA_6035F94} + +D_MA_6035FF8: + {type: SF64:HITBOX, offset: 0x6035FF8, symbol: D_MA_6035FF8} + +D_MA_603605C: + {type: SF64:HITBOX, offset: 0x603605C, symbol: D_MA_603605C} + +D_MA_60360C0: + {type: SF64:HITBOX, offset: 0x60360C0, symbol: D_MA_60360C0} + +D_MA_6036154: + {type: SF64:HITBOX, offset: 0x6036154, symbol: D_MA_6036154} + +D_MA_6036188: + {type: SF64:HITBOX, offset: 0x6036188, symbol: D_MA_6036188} + +D_MA_6036204: + {type: SF64:HITBOX, offset: 0x6036204, symbol: D_MA_6036204} + +D_MA_6036250: + {type: SF64:HITBOX, offset: 0x6036250, symbol: D_MA_6036250} + +D_MA_603626C: + {type: SF64:HITBOX, offset: 0x603626C, symbol: D_MA_603626C} + +D_MA_6036288: + {type: SF64:HITBOX, offset: 0x6036288, symbol: D_MA_6036288} + +D_MA_60362A4: + {type: SF64:HITBOX, offset: 0x60362A4, symbol: D_MA_60362A4} + +D_MA_60362D8: + {type: SF64:HITBOX, offset: 0x60362D8, symbol: D_MA_60362D8} + +D_MA_60362F4: + {type: SF64:HITBOX, offset: 0x60362F4, symbol: D_MA_60362F4} + +D_MA_6036328: + {type: SF64:HITBOX, offset: 0x6036328, symbol: D_MA_6036328} + +D_MA_6036344: + {type: SF64:HITBOX, offset: 0x6036344, symbol: D_MA_6036344} + +D_MA_6036370: + {type: SF64:HITBOX, offset: 0x6036370, symbol: D_MA_6036370} + +D_MA_603638C: + {type: SF64:HITBOX, offset: 0x603638C, symbol: D_MA_603638C} + +D_MA_60363B8: + {type: SF64:HITBOX, offset: 0x60363B8, symbol: D_MA_60363B8} + +D_MA_60363E4: + {type: SF64:HITBOX, offset: 0x60363E4, symbol: D_MA_60363E4} + +D_MA_6036410: + {type: SF64:HITBOX, offset: 0x6036410, symbol: D_MA_6036410} + +D_MA_603643C: + {type: SF64:HITBOX, offset: 0x603643C, symbol: D_MA_603643C} + +D_MA_6036458: + {type: SF64:HITBOX, offset: 0x6036458, symbol: D_MA_6036458} + +D_MA_603648C: + {type: SF64:HITBOX, offset: 0x603648C, symbol: D_MA_603648C} + +D_MA_60364C0: + {type: SF64:HITBOX, offset: 0x60364C0, symbol: D_MA_60364C0} + +D_MA_60364DC: + {type: SF64:HITBOX, offset: 0x60364DC, symbol: D_MA_60364DC} + +D_MA_6036520: + {type: SF64:HITBOX, offset: 0x6036520, symbol: D_MA_6036520} + +D_MA_6036594: + {type: SF64:HITBOX, offset: 0x6036594, symbol: D_MA_6036594} + +D_MA_6036668: + {type: SF64:HITBOX, offset: 0x6036668, symbol: D_MA_6036668} + +D_MA_60366EC: + {type: SF64:HITBOX, offset: 0x60366EC, symbol: D_MA_60366EC} + +D_MA_6036708: + {type: SF64:HITBOX, offset: 0x6036708, symbol: D_MA_6036708} + +D_MA_6036724: + {type: SF64:HITBOX, offset: 0x6036724, symbol: D_MA_6036724} + +D_MA_6036728: + {type: SF64:HITBOX, offset: 0x6036728, symbol: D_MA_6036728} + +D_MA_6036744: + {type: SF64:HITBOX, offset: 0x6036744, symbol: D_MA_6036744} + +D_MA_6036760: + {type: SF64:HITBOX, offset: 0x6036760, symbol: D_MA_6036760} + +D_MA_603677C: + {type: SF64:HITBOX, offset: 0x603677C, symbol: D_MA_603677C} + +D_MA_6036818: + {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818} + +D_MA_6036894: + {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894} + +D_MA_60368E0: + {type: SF64:HITBOX, offset: 0x60368E0, symbol: D_MA_60368E0} + +D_MA_60368FC: + {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC} + +D_MA_6036930: + {type: SF64:HITBOX, offset: 0x6036930, symbol: D_MA_6036930} + +D_MA_603694C: + {type: SF64:HITBOX, offset: 0x603694C, symbol: D_MA_603694C} + +D_MA_6036968: + {type: SF64:HITBOX, offset: 0x6036968, symbol: D_MA_6036968} + +D_MA_60381D8: + {type: SF64:SCRIPT, offset: 0x60381D8, symbol: D_MA_60381D8} diff --git a/assets/yaml/us/ast_vs_player.yaml b/assets/yaml/us/ast_vs_player.yaml index 0c352fb9..f8d8cc8b 100644 --- a/assets/yaml/us/ast_vs_player.yaml +++ b/assets/yaml/us/ast_vs_player.yaml @@ -723,16 +723,16 @@ D_vs_player_302EE9C: { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_vs_player_302EE9C} D_vs_player_302EEE8: - { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_vs_player_302EEE8, mesh_symbol: "D_vs_player_OFFSET"} + { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_vs_player_302EEE8, mesh_symbol: D_vs_player_OFFSET} D_vs_player_302EF6C: - { type: SF64:TRIANGLE, count: 4, offset: 0x302EF6C, symbol: D_vs_player_302EF6C, mesh_symbol: "D_vs_player_OFFSET"} + { type: SF64:TRIANGLE, count: 4, offset: 0x302EF6C, symbol: D_vs_player_302EF6C, mesh_symbol: D_vs_player_OFFSET} D_vs_player_302EFF0: - { type: SF64:TRIANGLE, count: 4, offset: 0x302EFF0, symbol: D_vs_player_302EFF0, mesh_symbol: "D_vs_player_OFFSET"} + { type: SF64:TRIANGLE, count: 4, offset: 0x302EFF0, symbol: D_vs_player_302EFF0, mesh_symbol: D_vs_player_OFFSET} D_vs_player_302F044: - { type: SF64:TRIANGLE, count: 14, offset: 0x302F044, symbol: D_vs_player_302F044, mesh_symbol: "D_vs_player_OFFSET"} + { type: SF64:TRIANGLE, count: 14, offset: 0x302F044, symbol: D_vs_player_302F044, mesh_symbol: D_vs_player_OFFSET} D_vs_player_302E56C: {type: VEC3F, count: 20, offset: 0x302E56C, symbol: D_vs_player_302E56C} diff --git a/include/assets.h b/include/assets.h index a6d4129c..c0f7f472 100644 --- a/include/assets.h +++ b/include/assets.h @@ -49,7 +49,6 @@ extern Gfx D_6006BE0[]; extern u16 D_6006EA0[]; extern Gfx D_6006F50[]; extern Gfx D_6007410[]; -extern Gfx D_60075D0[]; extern Gfx D_6007650[]; extern Gfx D_60079B0[]; extern Gfx D_6007CF0[]; @@ -70,7 +69,6 @@ extern Vtx D_6009ED0[]; extern Gfx D_6009F90[]; extern Gfx D_600A420[]; extern Gfx D_600A810[]; -extern Gfx D_600AF40[]; extern Gfx D_600B0E0[]; extern Animation D_600B1B4; extern Gfx D_600B4B0[]; @@ -92,7 +90,6 @@ extern u16 D_600D5C0[]; extern Gfx D_600D730[]; extern u16 D_600D990[]; extern Gfx D_600D9F0[]; -extern Gfx D_600DA10[]; extern Gfx D_600DBC0[]; extern u8 D_600DDC0[]; extern Gfx D_600DDF0[]; @@ -135,10 +132,8 @@ extern u8 D_6010090[]; extern u16 D_6010198[]; extern CollisionPoly D_6010294[]; extern u8 D_60106B0[]; -extern Gfx D_6010700[]; extern Gfx D_6010960[]; extern Gfx D_6010A50[]; -extern u16 D_6010C20[]; extern Gfx D_6010E00[]; extern u8 D_6010FA0[]; extern EnvSettings D_KA_6011000; @@ -147,21 +142,18 @@ extern f32 D_601115C[]; extern Vec3s D_601170C[]; extern u8 D_6011890[]; extern f32 D_6011B24[]; -extern u16 D_6011B40[]; extern f32 D_6011BF4[]; extern f32 D_6011C10[]; extern f32 D_6011C48[]; extern f32 D_6011C80[]; extern u8 D_6012310[]; extern u8 D_60123F0[]; -extern Gfx D_6012C00_Gfx[]; extern Animation D_6012C00_Anim; extern Gfx D_60132B0[]; extern u8 D_6013470[]; extern Gfx D_6013480[]; extern Gfx D_60137B0[]; extern Animation D_601388C; -extern Gfx D_6013960[]; extern Gfx D_6013B50[]; extern u8 D_6014140[]; extern Gfx D_60143E0[]; @@ -194,11 +186,8 @@ extern Gfx D_6018450[]; extern Gfx D_6018C00[]; // possible collision extern Gfx D_6018D40[]; extern Gfx D_6018E80[]; -extern Gfx D_6019220[]; -extern Gfx D_601A7A0[]; extern Gfx D_601A7D0[]; extern Gfx D_601AE40[]; -extern Gfx D_601B0D0[]; extern u16* D_VE1_601B1E4[]; extern f32 D_601B4C4[]; extern f32 D_601B4E0[]; @@ -214,7 +203,6 @@ extern u16 D_601B6C0[]; extern f32 D_601B6C4[]; extern f32 D_F32_601B710[]; extern f32 D_601B75C[]; -extern Gfx D_601B7C0[]; extern f32 D_601B7F8[]; extern f32 D_601B830[]; extern f32 D_601B868[]; @@ -233,7 +221,6 @@ extern u16 D_601E1E8[]; extern Animation D_601E8C4; extern Limb* D_601E9D0[]; extern Gfx D_601EAA0[]; -extern Gfx D_601F1D0[]; extern EnvSettings D_SO_601F1F0; extern Gfx D_601F500[]; extern Gfx D_601F5A0[]; @@ -248,37 +235,25 @@ extern Gfx D_6020B40[]; extern u16* D_SO_600631C[]; extern Gfx D_6020E60[]; extern u16 D_6020F60[]; -extern Gfx D_60223C0[]; -extern Gfx D_6022450[]; -extern Gfx D_6022530[]; extern u16 D_6022760[]; extern Gfx D_6022920[]; extern u16 D_60229A4[]; extern f32 D_60231A4[]; -extern Gfx D_60238F0[]; extern Gfx D_6023AC0[]; -extern Gfx D_6024010[]; extern Gfx D_6024220[]; extern Gfx D_60244A0[]; extern u16 D_60245E0[]; extern Gfx D_6024AC0[]; extern Gfx D_6024B60[]; extern u16 D_6025500[]; -extern Gfx D_6025B50[]; extern u16 D_6026420[]; extern EnvSettings D_ZO_60266D0; extern EnvSettings D_ME_6026C80; -extern Gfx D_60270E0[]; -extern Gfx D_6027180[]; -extern Animation D_6027320; extern u16 D_6027340[]; -extern Limb* D_602742C[]; -extern Gfx D_6027900[]; extern u16 D_6028260[]; extern u16 D_6028A60[]; extern Animation D_6029528; extern Limb* D_6029674[]; -extern Gfx D_6029890[]; extern Gfx D_602A720[]; extern u16* D_ZO_602AAC0[]; extern u16 D_602AC50[]; @@ -304,11 +279,7 @@ extern Triangle D_602CACC[]; extern Vec3f D_602CB80[]; extern Gfx D_602D5F0[]; extern Gfx D_602DA20[]; -extern Gfx D_602DAE0[]; -extern Gfx D_602DB80[]; -extern Gfx D_602DC20[]; extern Gfx D_602DCA0[]; -extern u16 D_602DCB8[]; extern Gfx D_602E080[]; extern Gfx D_602E380[]; extern Gfx D_602E570[]; @@ -328,23 +299,8 @@ extern f32 D_602FA50[]; extern CollisionPoly D_602FA9C[]; extern Vec3s D_60300C8[]; extern CollisionPoly D_6030208[]; -extern Gfx D_6030500[]; extern Vec3s D_6030550[]; extern CollisionPoly D_60305DC[]; -extern Gfx D_6030630[]; -extern Gfx D_60306D0[]; -extern EnvSettings D_MA_6030E30; -extern Triangle D_6030E74[]; -extern Vec3f D_6030E80[]; -extern Triangle D_6030EB0[]; -extern Vec3f D_6030EBC[]; -extern Triangle D_6030EEC[]; -extern Vec3f D_6030EF8[]; -extern Triangle D_6030F28[]; -extern Vec3f D_6030F34[]; -extern Triangle D_6030F64[]; -extern Vec3f D_6030F7C[]; -extern Triangle D_6030FC4[]; extern Vec3s D_603184C[]; extern Gfx D_60320E0[]; extern Gfx D_6032580[]; @@ -352,53 +308,14 @@ extern Gfx D_6032BC0[]; extern Gfx D_6033000[]; extern Vec3s D_6033E08[]; extern Gfx D_6034B90[]; -extern f32 D_60359C8[]; -extern f32 D_6035A14[]; -extern f32 D_6035A48[]; -extern f32 D_6035AE0[]; -extern f32 D_6035D9C[]; extern Gfx D_6035DA0[]; -extern f32 D_6035E04[]; extern Gfx D_6035F10[]; -extern f32 D_60360C0[]; -extern f32 D_6036154[]; extern Gfx D_60361F0[]; // possible collision -extern f32 D_6036204[]; -extern f32 D_603626C[]; -extern f32 D_6036288[]; -extern f32 D_60362A4[]; -extern f32 D_60362D8[]; -extern f32 D_60362F4[]; -extern f32 D_6036328[]; -extern f32 D_6036344[]; -extern f32 D_6036370[]; -extern f32 D_603638C[]; extern Gfx D_60363B0[]; -extern f32 D_60363B8[]; -extern f32 D_60363E4[]; -extern f32 D_6036410[]; -extern f32 D_603643C[]; -extern f32 D_6036458[]; -extern f32 D_60364C0[]; -extern f32 D_60364DC[]; -extern f32 D_6036594[]; -extern f32 D_60366EC[]; -extern f32 D_6036708[]; -extern f32 D_6036724[]; -extern f32 D_6036728[]; -extern f32 D_6036744[]; -extern f32 D_6036760[]; -extern f32 D_603677C[]; extern Gfx D_6036840[]; -extern f32 D_6036894[]; -extern f32 D_60368E0[]; -extern f32 D_6036930[]; -extern f32 D_603694C[]; -extern f32 D_6036968[]; extern Gfx D_6036CD0[]; extern EnvSettings D_CO_6037160; extern Gfx D_6037CF0[]; -extern u16* D_MA_60381D8[]; extern ObjectInit D_603B074[]; extern u16* D_CO_603D9E8[]; extern f32 D_603DCA4[]; @@ -421,7 +338,6 @@ extern Gfx D_601A700[]; extern Gfx D_6019670[]; extern Gfx D_60185E0[]; extern Gfx D_6017550[]; - extern f32 D_603E118[]; extern f32 D_603E14C[]; extern f32 D_603E1B4[]; diff --git a/include/assets/ast_macbeth.h b/include/assets/ast_macbeth.h deleted file mode 100644 index c148718b..00000000 --- a/include/assets/ast_macbeth.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_MACBETH_H -#define AST_MACBETH_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h index 65ab2796..6ef38af6 100644 --- a/include/fox_enmy2_assets.h +++ b/include/fox_enmy2_assets.h @@ -15,25 +15,15 @@ extern Gfx D_6018960[]; extern Gfx D_6009F50[]; extern Gfx D_600C2A0[]; extern Gfx D_600BD40[]; -extern Gfx D_601C520[]; -extern Gfx D_600AF40[]; extern Gfx D_600AC70[]; -extern Gfx D_601A2B0[]; extern Gfx D_6002500[]; extern Gfx D_60043F0[]; extern Gfx D_6004310[]; -extern Gfx D_6002890[]; - extern f32 D_602C1A0[]; extern f32 D_602F604[]; extern f32 D_602C294[]; extern f32 D_601B474[]; extern f32 D_601B43C[]; -extern f32 D_60368FC[]; -extern f32 D_60368E0[]; -extern f32 D_60364C0[]; extern f32 D_601B944[]; -extern f32 D_6009D18[]; -extern f32 D_60368E0[]; #endif diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h index 5a35b8f0..0ad5c66e 100644 --- a/include/fox_enmy_assets.h +++ b/include/fox_enmy_assets.h @@ -8,7 +8,6 @@ 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[]; diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 520537b1..d1231359 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -131,6 +131,9 @@ D_500A7D0 = 0x0500A7D0; D_6000E00 = 0x06000E00; D_6001360 = 0x06001360; +D_KA_60012A0 = 0x060012A0; +D_ZO_60012A0 = 0x060012A0; +D_MA_60012A0 = 0x060012A0; D_60012A0 = 0x060012A0; D_TI_60023B0 = 0x060023B0; D_6002990 = 0x06002990; @@ -167,7 +170,7 @@ D_TI_6006BF0 = 0x06006BF0; D_TI_6006C44 = 0x06006C44; D_6006F50 = 0x06006F50; D_6007410 = 0x06007410; -D_60075D0 = 0x060075D0; +D_MA_60075D0 = 0x060075D0; D_60079B0 = 0x060079B0; D_6007B90 = 0x06007B90; D_6007D80 = 0x06007D80; @@ -175,7 +178,7 @@ D_6008370 = 0x06008370; D_6008E08 = 0x06008E08; D_6009AD0 = 0x06009AD0; D_600A420 = 0x0600A420; -D_600AF40 = 0x0600AF40; +D_MA_600AF40 = 0x0600AF40; D_600B8B0 = 0x0600B8B0; D_600BAF0 = 0x0600BAF0; D_AQ_600BF80 = 0x0600BF80; @@ -214,11 +217,11 @@ D_6011C48 = 0x06011C48; D_6011C80 = 0x06011C80; D_AQ_6011EE0 = 0x06011EE0; D_AQ_60120F0 = 0x060120F0; -D_6012C00_Gfx = 0x06012C00; +D_MA_6012C00 = 0x06012C00; D_6012C00_Anim = 0x06012C00; D_60132B0 = 0x060132B0; D_60137B0 = 0x060137B0; -D_6013960 = 0x06013960; +D_MA_6013960 = 0x06013960; D_6013B50 = 0x06013B50; D_60143E0 = 0x060143E0; D_6014500 = 0x06014500; @@ -243,7 +246,7 @@ D_6018450 = 0x06018450; D_6018C00 = 0x06018C00; D_6018E80 = 0x06018E80; D_601A7D0 = 0x0601A7D0; -D_601B0D0 = 0x0601B0D0; +D_MA_601B0D0 = 0x0601B0D0; D_601B4E0 = 0x0601B4E0; D_601B4FC = 0x0601B4FC; D_601B518 = 0x0601B518; @@ -255,7 +258,7 @@ D_601B678 = 0x0601B678; D_601B6C4 = 0x0601B6C4; D_601B710 = 0x0601B710; D_601B75C = 0x0601B75C; -D_601B7C0 = 0x0601B7C0; +D_MA_601B7C0 = 0x0601B7C0; D_601B7F8 = 0x0601B7F8; D_601B830 = 0x0601B830; D_601B868 = 0x0601B868; @@ -264,24 +267,24 @@ D_601B8D8 = 0x0601B8D8; D_601BEC0 = 0x0601BEC0; D_601C9B0 = 0x0601C9B0; D_AQ_601DE60 = 0x0601DE60; -D_601F1D0 = 0x0601F1D0; +D_MA_601F1D0 = 0x0601F1D0; D_601F500 = 0x0601F500; D_601F5A0 = 0x0601F5A0; D_601FCB0 = 0x0601FCB0; D_6022340 = 0x06022340; D_AQ_6022110 = 0x06022110; D_AQ_60231C0 = 0x060231C0; -D_60238F0 = 0x060238F0; +D_MA_60238F0 = 0x060238F0; D_60239E0 = 0x060239E0; D_6023730 = 0x06023730; -D_6024010 = 0x06024010; +D_MA_6024010 = 0x06024010; D_60244A0 = 0x060244A0; D_60247E0 = 0x060247E0; D_6024AC0 = 0x06024AC0; D_6026C90 = 0x06026C90; -D_60270E0 = 0x060270E0; -D_6027180 = 0x06027180; -D_6027900 = 0x06027900; +D_MA_60270E0 = 0x060270E0; +D_MA_6027180 = 0x06027180; +D_MA_6027900 = 0x06027900; D_A6_6028454 = 0x06028454; D_6029170 = 0x06029170; D_6029220 = 0x06029220; @@ -305,11 +308,12 @@ D_602C294 = 0x0602C294; D_602C2B0 = 0x0602C2B0; D_602CACC = 0x0602CACC; D_602CB80 = 0x0602CB80; +D_MA_602CB80 = 0x0602CB80; D_602D5F0 = 0x0602D5F0; D_602DAD0 = 0x0602DAD0; -D_602DAE0 = 0x0602DAE0; -D_602DB80 = 0x0602DB80; -D_602DC20 = 0x0602DC20; +D_MA_602DAE0 = 0x0602DAE0; +D_MA_602DB80 = 0x0602DB80; +D_MA_602DC20 = 0x0602DC20; D_602DCA0 = 0x0602DCA0; D_602E080 = 0x0602E080; D_602E570 = 0x0602E570; @@ -328,10 +332,10 @@ D_602FA9C = 0x0602FA9C; D_602FF60 = 0x0602FF60; D_60300C8 = 0x060300C8; D_6030208 = 0x06030208; -D_6030500 = 0x06030500; +D_MA_6030500 = 0x06030500; D_6030550 = 0x06030550; D_60305DC = 0x060305DC; -D_6030630 = 0x06030630; +D_MA_6030630 = 0x06030630; D_AQ_6030B10 = 0x06030B10; D_AQ_6030BE0 = 0x06030BE0; D_AQ_6030BFC = 0x06030BFC; @@ -346,18 +350,18 @@ D_AQ_6030E14 = 0x06030E14; D_AQ_6030E30_Hitbox = 0x06030E30; D_AQ_6030E4C = 0x06030E4C; D_AQ_6030E68 = 0x06030E68; -D_6030E74 = 0x06030E74; +D_MA_6030E74 = 0x06030E74; D_6030E80 = 0x06030E80; -D_6030EB0 = 0x06030EB0; +D_MA_6030EB0 = 0x06030EB0; D_6030EBC = 0x06030EBC; -D_6030EEC = 0x06030EEC; +D_MA_6030EEC = 0x06030EEC; D_6030EF8 = 0x06030EF8; -D_6030F28 = 0x06030F28; +D_MA_6030F28 = 0x06030F28; D_6030F34 = 0x06030F34; -D_6030F64 = 0x06030F64; +D_MA_6030F64 = 0x06030F64; D_AQ_6030F74 = 0x06030F74; D_6030F7C = 0x06030F7C; -D_6030FC4 = 0x06030FC4; +D_MA_6030FC4 = 0x06030FC4; D_6030FD0 = 0x06030FD0; D_AQ_6031398 = 0x06031398; D_AQ_60313CC = 0x060313CC; @@ -382,46 +386,46 @@ D_SX_6032488 = 0x06032488; D_SX_60324EC = 0x060324EC; D_SX_6032550 = 0x06032550; D_6033E08 = 0x06033E08; -D_60359C8 = 0x060359C8; -D_6035A14 = 0x06035A14; -D_6035A48 = 0x06035A48; -D_6035AE0 = 0x06035AE0; -D_6035D9C = 0x06035D9C; -D_6035E04 = 0x06035E04; +D_MA_60359C8 = 0x060359C8; +D_MA_6035A14 = 0x06035A14; +D_MA_6035A48 = 0x06035A48; +D_MA_6035AE0 = 0x06035AE0; +D_MA_6035D9C = 0x06035D9C; +D_MA_6035E04 = 0x06035E04; D_6035F10 = 0x06035F10; -D_60360C0 = 0x060360C0; -D_6036154 = 0x06036154; +D_MA_60360C0 = 0x060360C0; +D_MA_6036154 = 0x06036154; D_60361F0 = 0x060361F0; -D_6036204 = 0x06036204; -D_603626C = 0x0603626C; -D_6036288 = 0x06036288; -D_60362A4 = 0x060362A4; -D_60362D8 = 0x060362D8; -D_60362F4 = 0x060362F4; -D_6036328 = 0x06036328; -D_6036344 = 0x06036344; -D_6036370 = 0x06036370; -D_603638C = 0x0603638C; -D_60363B8 = 0x060363B8; -D_60363E4 = 0x060363E4; -D_6036410 = 0x06036410; -D_603643C = 0x0603643C; -D_6036458 = 0x06036458; -D_60364C0 = 0x060364C0; -D_60364DC = 0x060364DC; -D_6036594 = 0x06036594; -D_60366EC = 0x060366EC; -D_6036708 = 0x06036708; -D_6036724 = 0x06036724; -D_6036728 = 0x06036728; -D_6036744 = 0x06036744; -D_6036760 = 0x06036760; -D_603677C = 0x0603677C; -D_6036894 = 0x06036894; -D_60368E0 = 0x060368E0; -D_6036930 = 0x06036930; -D_603694C = 0x0603694C; -D_6036968 = 0x06036968; +D_MA_6036204 = 0x06036204; +D_MA_603626C = 0x0603626C; +D_MA_6036288 = 0x06036288; +D_MA_60362A4 = 0x060362A4; +D_MA_60362D8 = 0x060362D8; +D_MA_60362F4 = 0x060362F4; +D_MA_6036328 = 0x06036328; +D_MA_6036344 = 0x06036344; +D_MA_6036370 = 0x06036370; +D_MA_603638C = 0x0603638C; +D_MA_60363B8 = 0x060363B8; +D_MA_60363E4 = 0x060363E4; +D_MA_6036410 = 0x06036410; +D_MA_603643C = 0x0603643C; +D_MA_6036458 = 0x06036458; +D_MA_60364C0 = 0x060364C0; +D_MA_60364DC = 0x060364DC; +D_MA_6036594 = 0x06036594; +D_MA_60366EC = 0x060366EC; +D_MA_6036708 = 0x06036708; +D_MA_6036724 = 0x06036724; +D_MA_6036728 = 0x06036728; +D_MA_6036744 = 0x06036744; +D_MA_6036760 = 0x06036760; +D_MA_603677C = 0x0603677C; +D_MA_6036894 = 0x06036894; +D_MA_60368E0 = 0x060368E0; +D_MA_6036930 = 0x06036930; +D_MA_603694C = 0x0603694C; +D_MA_6036968 = 0x06036968; D_603DCA4 = 0x0603DCA4; D_603DD40 = 0x0603DD40; D_603DDF0 = 0x0603DDF0; @@ -1030,7 +1034,7 @@ D_600C2A0 = 0x0600C2A0; D_600BD40 = 0x0600BD40; D_VE1_9012180 = 0x09012180; D_VE1_900EFC0 = 0x0900EFC0; -D_601C520 = 0x0601C520; +D_MA_601C520 = 0x0601C520; D_600AC70 = 0x0600AC70; D_6002500 = 0x06002500; D_60043F0 = 0x060043F0; @@ -1058,11 +1062,11 @@ D_601B474 = 0x0601B474; D_AQ_6030B4C = 0x06030B4C; D_601B43C = 0x0601B43C; D_AQ_6030B30 = 0x06030B30; -D_60368FC = 0x060368FC; -D_60368E0 = 0x060368E0; -D_60364C0 = 0x060364C0; +D_MA_60368FC = 0x060368FC; +D_MA_60368E0 = 0x060368E0; +D_MA_60364C0 = 0x060364C0; D_601B944 = 0x0601B944; -D_60368E0 = 0x060368E0; +D_MA_60368E0 = 0x060368E0; // fox_option @@ -1451,13 +1455,13 @@ D_AQ_6000DB0 = 0x6000DB0; D_AQ_6000E10 = 0x6000E10; D_6001080 = 0x6001080; D_SX_60010C0 = 0x60010C0; -D_6001180 = 0x6001180; +D_MA_6001180 = 0x6001180; D_6001260 = 0x6001260; D_60012A0 = 0x60012A0; D_60012D0 = 0x60012D0; D_6001310 = 0x6001310; D_6001360 = 0x6001360; -D_60014A0 = 0x60014A0; +D_MA_60014A0 = 0x60014A0; D_6001530 = 0x6001530; D_60018C0 = 0x60018C0; D_SX_6001950 = 0x6001950; @@ -1471,17 +1475,19 @@ D_6002020 = 0x6002020; D_AQ_6002628 = 0x6002628; D_AQ_6002874 = 0x6002874; D_6002890 = 0x6002890; +D_MA_6002890 = 0x6002890; D_A6_60029A0 = 0x60029A0; D_6002E10 = 0x6002E10; D_6002E60 = 0x6002E60; -D_6003070 = 0x6003070; +D_MA_6002E60 = 0x6002E60; +D_MA_6003070 = 0x6003070; D_6003090 = 0x6003090; -D_6003370 = 0x6003370; +D_MA_6003370 = 0x6003370; D_A6_60038C0 = 0x60038C0; D_60038E0 = 0x60038E0; D_60038F8 = 0x60038F8; D_6004380 = 0x6004380; -D_6004440 = 0x6004440; +D_MA_6004440 = 0x6004440; D_6004500 = 0x6004500; D_60046F0 = 0x60046F0; D_6004900 = 0x6004900; @@ -1494,7 +1500,7 @@ D_TI_600631C = 0x600631C; D_6006360 = 0x6006360; D_600636C = 0x600636C; D_6006558 = 0x6006558; -D_60066A0 = 0x60066A0; +D_MA_60066A0 = 0x60066A0; D_60066D0 = 0x60066D0; D_SX_60066F0 = 0x60066F0; D_6006750 = 0x6006750; @@ -1516,12 +1522,12 @@ D_TI_6006BF0 = 0x6006BF0; D_TI_6006C0C = 0x6006C0C; D_TI_6006C28 = 0x6006C28; D_6006EA0 = 0x6006EA0; -D_60071C0 = 0x60071C0; -D_6007290 = 0x6007290; +D_MA_60071C0 = 0x60071C0; +D_MA_6007290 = 0x6007290; D_6007300 = 0x6007300; -D_6007360 = 0x6007360; -D_6007430 = 0x6007430; -D_6007500 = 0x6007500; +D_MA_6007360 = 0x6007360; +D_MA_6007430 = 0x6007430; +D_MA_6007500 = 0x6007500; D_6007650 = 0x6007650; D_6007854 = 0x6007854; D_6007980 = 0x6007980; @@ -1541,23 +1547,23 @@ D_6009300 = 0x6009300; D_TI_6009BB8 = 0x6009BB8; D_6009BC0 = 0x6009BC0; D_SX_6009C30 = 0x6009C30; -D_6009C50 = 0x6009C50; +D_MA_6009C50 = 0x6009C50; D_6009D30 = 0x6009D30; D_6009E30 = 0x6009E30; D_6009ED0 = 0x6009ED0; -D_6009F10 = 0x6009F10; +D_MA_6009F10 = 0x6009F10; D_6009F90 = 0x6009F90; D_SX_6009FF8 = 0x6009FF8; -D_600A1F0 = 0x600A1F0; +D_MA_600A1F0 = 0x600A1F0; D_AQ_600A220 = 0x600A220; D_SX_600A2D4 = 0x600A2D4; -D_600A4D0 = 0x600A4D0; -D_600A7D0 = 0x600A7D0; +D_MA_600A4D0 = 0x600A4D0; +D_MA_600A7D0 = 0x600A7D0; D_600A810 = 0x600A810; -D_600AA70 = 0x600AA70; +D_MA_600AA70 = 0x600AA70; D_AQ_600AB10 = 0x600AB10; D_AQ_600AB68 = 0x600AB68; -D_600AD50 = 0x600AD50; +D_MA_600AD50 = 0x600AD50; D_600AD80 = 0x600AD80; D_600B0E0 = 0x600B0E0; D_600B1B4 = 0x600B1B4; @@ -1576,32 +1582,32 @@ D_600C15C = 0x600C15C; D_600C200 = 0x600C200; D_600C2AC = 0x600C2AC; D_600C2D0 = 0x600C2D0; -D_600C4D0 = 0x600C4D0; +D_MA_600C4D0 = 0x600C4D0; D_600C4E0 = 0x600C4E0; D_600C560 = 0x600C560; -D_600C65C = 0x600C65C; +D_MA_600C65C = 0x600C65C; D_600C6A0 = 0x600C6A0; D_600C740 = 0x600C740; D_600C780 = 0x600C780; D_600CAA0 = 0x600CAA0; D_600CBD8 = 0x600CBD8; -D_600CD18 = 0x600CD18; +D_MA_600CD18 = 0x600CD18; D_600CD60 = 0x600CD60; D_600CDC0 = 0x600CDC0; D_600CF88 = 0x600CF88; D_600D090 = 0x600D090; D_600D190 = 0x600D190; -D_600D1E4 = 0x600D1E4; +D_MA_600D1E4 = 0x600D1E4; D_600D290 = 0x600D290; D_600D3DC = 0x600D3DC; -D_600D480 = 0x600D480; +D_MA_600D480 = 0x600D480; D_600D4E0 = 0x600D4E0; D_600D590 = 0x600D590; D_600D5C0 = 0x600D5C0; D_600D730 = 0x600D730; D_600D990 = 0x600D990; D_600D9F0 = 0x600D9F0; -D_600DA10 = 0x600DA10; +D_MA_600DA10 = 0x600DA10; D_AQ_600DB80 = 0x600DB80; D_600DBC0 = 0x600DBC0; D_600DDC0 = 0x600DDC0; @@ -1611,6 +1617,7 @@ D_600E050 = 0x600E050; D_A6_600E0C0 = 0x600E0C0; D_600E2C4 = 0x600E2C4; D_600E360 = 0x600E360; +D_MA_600E360 = 0x600E360; D_600E470 = 0x600E470; D_600E5EC = 0x600E5EC; D_600E7D8 = 0x600E7D8; @@ -1633,20 +1640,20 @@ D_SX_600F890 = 0x600F890; D_SX_600F8A0 = 0x600F8A0; D_600F940 = 0x600F940; D_600F9B0 = 0x600F9B0; -D_600FEC4 = 0x600FEC4; +D_MA_600FEC4 = 0x600FEC4; D_600FF64 = 0x600FF64; D_6010088 = 0x6010088; D_6010090 = 0x6010090; -D_6010144 = 0x6010144; +D_MA_6010144 = 0x6010144; D_6010198 = 0x6010198; -D_6010220 = 0x6010220; -D_601042C = 0x601042C; -D_6010470 = 0x6010470; +D_MA_6010220 = 0x6010220; +D_MA_601042C = 0x601042C; +D_MA_6010470 = 0x6010470; D_60105D8 = 0x60105D8; D_60106B0 = 0x60106B0; -D_6010700 = 0x6010700; +D_MA_6010700 = 0x6010700; D_6010744 = 0x6010744; -D_6010C20 = 0x6010C20; +D_MA_6010C20 = 0x6010C20; D_6010EF0 = 0x6010EF0; D_6010FA0 = 0x6010FA0; D_60117E0 = 0x60117E0; @@ -1654,7 +1661,7 @@ D_6011890 = 0x6011890; D_A6_6011910 = 0x6011910; D_AQ_60119A0 = 0x60119A0; D_AQ_6011A78 = 0x6011A78; -D_6011B40 = 0x6011B40; +D_MA_6011B40 = 0x6011B40; D_6011BA4 = 0x6011BA4; D_6011E28 = 0x6011E28; D_6012310 = 0x6012310; @@ -1662,12 +1669,12 @@ D_SX_60123BC = 0x60123BC; D_60123F0 = 0x60123F0; D_A6_6012550 = 0x6012550; D_A6_6012840 = 0x6012840; -D_6012A60 = 0x6012A60; +D_MA_6012A60 = 0x6012A60; D_6012C00 = 0x6012C00; D_AQ_6012C98 = 0x6012C98; -D_6012C98 = 0x6012C98; -D_6012F50 = 0x6012F50; -D_6013060 = 0x6013060; +D_MA_6012C98 = 0x6012C98; +D_MA_6012F50 = 0x6012F50; +D_MA_6013060 = 0x6013060; D_6013330 = 0x6013330; D_6013470 = 0x6013470; D_6013480 = 0x6013480; @@ -1696,21 +1703,21 @@ D_6014904 = 0x6014904; D_60149D0 = 0x60149D0; D_AQ_6014FD0 = 0x6014FD0; D_6015430 = 0x6015430; -D_6015510 = 0x6015510; +D_MA_6015510 = 0x6015510; D_SX_60158C4 = 0x60158C4; -D_6015C24 = 0x6015C24; +D_MA_6015C24 = 0x6015C24; D_A6_6015EE0 = 0x6015EE0; -D_6016040 = 0x6016040; +D_MA_6016040 = 0x6016040; D_6016240 = 0x6016240; -D_60163F0 = 0x60163F0; +D_MA_60163F0 = 0x60163F0; D_6016880 = 0x6016880; -D_6016B2C = 0x6016B2C; +D_MA_6016B2C = 0x6016B2C; D_6016CF0 = 0x6016CF0; D_SX_6016E28 = 0x6016E28; D_6017090 = 0x6017090; D_6017370 = 0x6017370; -D_6017714 = 0x6017714; -D_6017720 = 0x6017720; +D_MA_6017714 = 0x6017714; +D_MA_6017720 = 0x6017720; D_6017950 = 0x6017950; D_6017AD0 = 0x6017AD0; D_60181E0 = 0x60181E0; @@ -1727,7 +1734,7 @@ D_AQ_6018C78 = 0x6018C78; D_6018D40 = 0x6018D40; D_6019030 = 0x6019030; D_AQ_6019078 = 0x6019078; -D_6019220 = 0x6019220; +D_MA_6019220 = 0x6019220; D_AQ_6019238 = 0x6019238; D_AQ_6019338 = 0x6019338; D_AQ_60194D0 = 0x60194D0; @@ -1741,10 +1748,10 @@ D_6019E18 = 0x6019E18; D_AQ_6019E80 = 0x6019E80; D_6019EB0 = 0x6019EB0; D_A6_601A120 = 0x601A120; -D_601A2B0 = 0x601A2B0; +D_MA_601A2B0 = 0x601A2B0; D_601A340 = 0x601A340; -D_601A7A0 = 0x601A7A0; -D_601A840 = 0x601A840; +D_MA_601A7A0 = 0x601A7A0; +D_MA_601A840 = 0x601A840; D_SX_601AA28 = 0x601AA28; D_601AA48 = 0x601AA48; D_601AB14 = 0x601AB14; @@ -1761,16 +1768,16 @@ D_601B6C0 = 0x601B6C0; D_601BAD0 = 0x601BAD0; D_A6_601BB40 = 0x601BB40; D_601BCC0 = 0x601BCC0; -D_601BE90 = 0x601BE90; -D_601C000 = 0x601C000; +D_MA_601BE90 = 0x601BE90; +D_MA_601C000 = 0x601C000; D_AQ_601C080 = 0x601C080; -D_601C170 = 0x601C170; +D_MA_601C170 = 0x601C170; D_601C590 = 0x601C590; D_SX_601C690 = 0x601C690; D_601C7C0 = 0x601C7C0; D_601C820 = 0x601C820; D_601C8E0 = 0x601C8E0; -D_601D188 = 0x601D188; +D_MA_601D188 = 0x601D188; D_601D1F0 = 0x601D1F0; D_601D680 = 0x601D680; D_601D750 = 0x601D750; @@ -1788,13 +1795,13 @@ D_601E1E8 = 0x601E1E8; D_601E8C4 = 0x601E8C4; D_601E9A0 = 0x601E9A0; D_601E9D0 = 0x601E9D0; -D_601EA28 = 0x601EA28; +D_MA_601EA28 = 0x601EA28; D_601EAA0 = 0x601EAA0; -D_601EAB0 = 0x601EAB0; -D_601EBBC = 0x601EBBC; +D_MA_601EAB0 = 0x601EAB0; +D_MA_601EBBC = 0x601EBBC; D_AQ_601EC68 = 0x601EC68; D_AQ_601EDB4 = 0x601EDB4; -D_601F270 = 0x601F270; +D_MA_601F270 = 0x601F270; D_601F874 = 0x601F874; D_601F8E0 = 0x601F8E0; D_601F920 = 0x601F920; @@ -1820,69 +1827,69 @@ D_6021B88 = 0x6021B88; D_SX_6021ED0 = 0x6021ED0; D_AQ_602201C = 0x602201C; D_AQ_60220E8 = 0x60220E8; -D_6022200 = 0x6022200; -D_60223C0 = 0x60223C0; -D_6022450 = 0x6022450; -D_6022530 = 0x6022530; -D_6022610 = 0x6022610; +D_MA_6022200 = 0x6022200; +D_MA_60223C0 = 0x60223C0; +D_MA_6022450 = 0x6022450; +D_MA_6022530 = 0x6022530; +D_MA_6022610 = 0x6022610; D_6022760 = 0x6022760; -D_60227F0 = 0x60227F0; +D_MA_60227F0 = 0x60227F0; D_6022920 = 0x6022920; D_60229A4 = 0x60229A4; D_60231A4 = 0x60231A4; -D_6023228 = 0x6023228; -D_6023388 = 0x6023388; +D_MA_6023228 = 0x6023228; +D_MA_6023388 = 0x6023388; D_60236F0 = 0x60236F0; D_AQ_6023780 = 0x6023780; D_6023810 = 0x6023810; D_AQ_602390C = 0x602390C; -D_60239D0 = 0x60239D0; +D_MA_60239D0 = 0x60239D0; D_6023AC0 = 0x6023AC0; D_6023D50 = 0x6023D50; D_60240B0 = 0x60240B0; D_6024220 = 0x6024220; D_60245E0 = 0x60245E0; -D_6024670 = 0x6024670; +D_MA_6024670 = 0x6024670; D_60246F8 = 0x60246F8; D_AQ_6024A50 = 0x6024A50; D_6024AD0 = 0x6024AD0; D_6024B60 = 0x6024B60; D_AQ_6024F80 = 0x6024F80; D_AQ_602512C = 0x602512C; -D_60251A0 = 0x60251A0; -D_60253E0 = 0x60253E0; +D_MA_60251A0 = 0x60251A0; +D_MA_60253E0 = 0x60253E0; D_6025500 = 0x6025500; -D_60257B0 = 0x60257B0; -D_6025850 = 0x6025850; -D_6025B50 = 0x6025B50; -D_6025CA0 = 0x6025CA0; -D_6025DAC = 0x6025DAC; +D_MA_60257B0 = 0x60257B0; +D_MA_6025850 = 0x6025850; +D_MA_6025B50 = 0x6025B50; +D_MA_6025CA0 = 0x6025CA0; +D_MA_6025DAC = 0x6025DAC; D_6025E60 = 0x6025E60; D_AQ_60260EC = 0x60260EC; D_60263F0 = 0x60263F0; D_AQ_60263F8 = 0x60263F8; D_6026420 = 0x6026420; -D_6026860 = 0x6026860; -D_60269E0 = 0x60269E0; -D_6027320 = 0x6027320; +D_MA_6026860 = 0x6026860; +D_MA_60269E0 = 0x60269E0; +D_MA_6027320 = 0x6027320; D_6027340 = 0x6027340; -D_602742C = 0x602742C; -D_6027A04 = 0x6027A04; -D_6027AF0 = 0x6027AF0; -D_6027BF0 = 0x6027BF0; -D_6027D40 = 0x6027D40; -D_6027EB0 = 0x6027EB0; +D_MA_602742C = 0x602742C; +D_MA_6027A04 = 0x6027A04; +D_MA_6027AF0 = 0x6027AF0; +D_MA_6027BF0 = 0x6027BF0; +D_MA_6027D40 = 0x6027D40; +D_MA_6027EB0 = 0x6027EB0; D_A6_6027F50 = 0x6027F50; D_6028260 = 0x6028260; D_A6_6028454 = 0x6028454; D_A6_6028578 = 0x6028578; -D_60288A0 = 0x60288A0; +D_MA_60288A0 = 0x60288A0; D_A6_60289FC = 0x60289FC; D_6028A60 = 0x6028A60; D_6029528 = 0x6029528; D_6029674 = 0x6029674; D_SX_6029890 = 0x6029890; -D_6029890 = 0x6029890; +D_MA_6029890 = 0x6029890; D_602991C = 0x602991C; D_6029A48 = 0x6029A48; D_602A520 = 0x602A520; @@ -1906,31 +1913,31 @@ D_AQ_602C030 = 0x602C030; D_AQ_602C088 = 0x602C088; D_602C0D0 = 0x602C0D0; D_602C2CC = 0x602C2CC; -D_602D380 = 0x602D380; +D_MA_602D380 = 0x602D380; D_602D400 = 0x602D400; D_602D5AC = 0x602D5AC; D_602DA20 = 0x602DA20; -D_602DCB8 = 0x602DCB8; +D_MA_602DCB8 = 0x602DCB8; D_602E380 = 0x602E380; D_AQ_602E584 = 0x602E584; -D_602EA0C = 0x602EA0C; -D_602EBB8 = 0x602EBB8; -D_602F098 = 0x602F098; +D_MA_602EA0C = 0x602EA0C; +D_MA_602EBB8 = 0x602EBB8; +D_MA_602F098 = 0x602F098; D_SX_602F18C = 0x602F18C; -D_602F264 = 0x602F264; -D_602F2E0 = 0x602F2E0; -D_602F36C = 0x602F36C; -D_602F380 = 0x602F380; +D_MA_602F264 = 0x602F264; +D_MA_602F2E0 = 0x602F2E0; +D_MA_602F36C = 0x602F36C; +D_MA_602F380 = 0x602F380; D_ME_602F3AC = 0x602F3AC; D_602F638 = 0x602F638; -D_602FBF0 = 0x602FBF0; -D_602FEB4 = 0x602FEB4; -D_602FFA0 = 0x602FFA0; -D_602FFC0 = 0x602FFC0; -D_60306D0 = 0x60306D0; -D_6030750 = 0x6030750; +D_MA_602FBF0 = 0x602FBF0; +D_MA_602FEB4 = 0x602FEB4; +D_MA_602FFA0 = 0x602FFA0; +D_MA_602FFC0 = 0x602FFC0; +D_MA_60306D0 = 0x60306D0; +D_MA_6030750 = 0x6030750; D_AQ_60308B8 = 0x60308B8; -D_60309D0 = 0x60309D0; +D_MA_60309D0 = 0x60309D0; D_AQ_6030D3C = 0x6030D3C; D_AQ_6030D58 = 0x6030D58; D_AQ_60314AC = 0x60314AC; @@ -1953,26 +1960,26 @@ D_6033000 = 0x6033000; D_60338DC = 0x60338DC; D_6034B90 = 0x6034B90; D_603531C = 0x603531C; -D_6035678 = 0x6035678; -D_60357CC = 0x60357CC; -D_6035920 = 0x6035920; -D_60359AC = 0x60359AC; -D_6035A94 = 0x6035A94; +D_MA_6035678 = 0x6035678; +D_MA_60357CC = 0x60357CC; +D_MA_6035920 = 0x6035920; +D_MA_60359AC = 0x60359AC; +D_MA_6035A94 = 0x6035A94; D_6035DA0 = 0x6035DA0; -D_6035DD0 = 0x6035DD0; -D_6035E68 = 0x6035E68; -D_6035ECC = 0x6035ECC; -D_6035F30 = 0x6035F30; -D_6035F94 = 0x6035F94; -D_6035FF8 = 0x6035FF8; -D_603605C = 0x603605C; +D_MA_6035DD0 = 0x6035DD0; +D_MA_6035E68 = 0x6035E68; +D_MA_6035ECC = 0x6035ECC; +D_MA_6035F30 = 0x6035F30; +D_MA_6035F94 = 0x6035F94; +D_MA_6035FF8 = 0x6035FF8; +D_MA_603605C = 0x603605C; D_60361F0 = 0x60361F0; D_6036278 = 0x6036278; D_60363B0 = 0x60363B0; -D_603648C = 0x603648C; -D_6036520 = 0x6036520; -D_603677C = 0x603677C; -D_6036818 = 0x6036818; +D_MA_603648C = 0x603648C; +D_MA_6036520 = 0x6036520; +D_MA_603677C = 0x603677C; +D_MA_6036818 = 0x6036818; D_6036840 = 0x6036840; D_6036CD0 = 0x6036CD0; D_6037CF0 = 0x6037CF0; diff --git a/src/main/fox_A4290_colheaders.c b/src/main/fox_A4290_colheaders.c index b1df6a29..e870cad3 100644 --- a/src/main/fox_A4290_colheaders.c +++ b/src/main/fox_A4290_colheaders.c @@ -3,12 +3,11 @@ #include "variables.h" #include "assets.h" #include "assets/ast_aquas.h" +#include "assets/ast_macbeth.h" #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_vs_player.h" -extern Vec3f D_6030FD0[]; - static Vec3f D_800D2920[16] = { { 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f }, { 291.0f, 558.0f, 0.0f }, { 0.0f, 354.0f, -291.0f }, { 202.0f, 594.0f, 202.0f }, { 772.0f, 0.0f, 622.0f }, @@ -165,43 +164,43 @@ CollisionHeader2 D_800D2CA0[19] = { { -900.0f, -110.0f, -1900.0f }, { 900.0f, 190.0f, 100.0f }, 2, - D_6030E74, - D_6030E80, + D_MA_6030E74, + D_MA_6030E80, }, { { -900.0f, -100.0f, -1000.0f }, { 900.0f, 250.0f, 100.0f }, 2, - D_6030EB0, - D_6030EBC, + D_MA_6030EB0, + D_MA_6030EBC, }, { { -900.0f, -190.0f, -1900.0f }, { 900.0f, 100.0f, 100.0f }, 2, - D_6030EEC, - D_6030EF8, + D_MA_6030EEC, + D_MA_6030EF8, }, { { -500.0f, -250.0f, -1010.0f }, { 500.0f, 100.0f, 100.0f }, 2, - D_6030F28, - D_6030F34, + D_MA_6030F28, + D_MA_6030F34, }, { { -1200.0f, 0.0f, -1800.0f }, { 0.0f, 900.0f, 1500.0f }, 4, - D_6030F64, - D_6030F7C, + D_MA_6030F64, + D_MA_6030F7C, }, { { -400.0f, 0.0f, -900.0f }, { 400.0f, 0.0f, 0.0f }, 2, - D_6030FC4, - D_6030FD0, + D_MA_6030FC4, + D_MA_6030FD0, }, { { -74.0f, 0.0f, -84.0f }, diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index 04d9645c..e01e2026 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -1,6 +1,6 @@ #include "global.h" #include "assets.h" -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" extern f32 D_i3_801C4188; @@ -25,6 +25,7 @@ f32 D_80161394; // can be static #include "assets/ast_sector_z.h" #include "assets/ast_aquas.h" #include "assets/ast_titania.h" +#include "assets/ast_macbeth.h" #include "assets/ast_andross.h" #include "assets/ast_warp_zone.h" #include "assets/ast_area_6.h" @@ -466,7 +467,7 @@ void func_8003E1E8(void) { if (gCurrentLevel == LEVEL_TITANIA) { gSPDisplayList(gMasterDisp++, D_TI_6000A80); } else if (gCurrentLevel == LEVEL_MACBETH) { - gSPDisplayList(gMasterDisp++, D_6019220); + gSPDisplayList(gMasterDisp++, D_MA_6019220); } else if (gCurrentLevel == LEVEL_ZONESS) { gSPDisplayList(gMasterDisp++, D_6013480); } else if (gCurrentLevel == LEVEL_SOLAR) { @@ -482,7 +483,7 @@ void func_8003E1E8(void) { if (gCurrentLevel == LEVEL_TITANIA) { gSPDisplayList(gMasterDisp++, D_TI_6000A80); } else if (gCurrentLevel == LEVEL_MACBETH) { - gSPDisplayList(gMasterDisp++, D_6019220); + gSPDisplayList(gMasterDisp++, D_MA_6019220); } else if (gCurrentLevel == LEVEL_ZONESS) { gSPDisplayList(gMasterDisp++, D_6013480); } else if (gCurrentLevel == LEVEL_SOLAR) { @@ -929,8 +930,8 @@ void func_80040CE4(void) { G_TX_NOLOD); break; case LEVEL_MACBETH: - sp1C4 = D_602DCB8; - sp1C0 = D_60306D0; + sp1C4 = D_MA_602DCB8; + sp1C0 = D_MA_60306D0; 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); @@ -1063,7 +1064,7 @@ void func_80040CE4(void) { } else if (gCurrentLevel == LEVEL_BOLSE) { gSPDisplayList(gMasterDisp++, D_600A810); } else if (gCurrentLevel == LEVEL_VENOM_2) { - gSPDisplayList(gMasterDisp++, D_6010700); + gSPDisplayList(gMasterDisp++, D_MA_6010700); } Matrix_Pop(&gGfxMatrix); } diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index 7d354755..092fba29 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_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" @@ -143,25 +144,25 @@ ObjectInfo D_800CC124[0x190] = { /* 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_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 }, - /* OBJ_80_62, */ {(void*) D_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_63, */ {(void*) D_6013960, 0, (ObjectFunc) NULL, D_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_64, */ {(void*) D_600AF40, 0, (ObjectFunc) NULL, D_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_66, */ {(void*) D_601F1D0, 0, (ObjectFunc) NULL, D_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_67, */ {(void*) D_60238F0, 0, (ObjectFunc) NULL, D_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_68, */ {(void*) D_601B7C0, 0, (ObjectFunc) NULL, D_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_69, */ {(void*) D_6030500, 0, (ObjectFunc) NULL, D_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_70, */ {(void*) D_602DAE0, 0, (ObjectFunc) NULL, D_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_71, */ {(void*) D_6027900, 0, (ObjectFunc) NULL, D_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_72, */ {(void*) D_602DB80, 0, (ObjectFunc) NULL, D_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_73, */ {(void*) D_6030630, 0, (ObjectFunc) NULL, D_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_74, */ {(void*) D_602DC20, 0, (ObjectFunc) NULL, D_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_75, */ {(void*) D_601B0D0, 0, (ObjectFunc) NULL, D_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_76, */ {(void*) D_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_60, */ {(void*) D_MA_6027180, 0, (ObjectFunc) NULL, D_MA_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_64, */ {(void*) D_MA_600AF40, 0, (ObjectFunc) NULL, D_MA_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_66, */ {(void*) D_MA_601F1D0, 0, (ObjectFunc) NULL, D_MA_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_67, */ {(void*) D_MA_60238F0, 0, (ObjectFunc) NULL, D_MA_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_68, */ {(void*) D_MA_601B7C0, 0, (ObjectFunc) NULL, D_MA_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_69, */ {(void*) D_MA_6030500, 0, (ObjectFunc) NULL, D_MA_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_70, */ {(void*) D_MA_602DAE0, 0, (ObjectFunc) NULL, D_MA_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_71, */ {(void*) D_MA_6027900, 0, (ObjectFunc) NULL, D_MA_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_72, */ {(void*) D_MA_602DB80, 0, (ObjectFunc) NULL, D_MA_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_73, */ {(void*) D_MA_6030630, 0, (ObjectFunc) NULL, D_MA_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_78, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_79, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_80, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, @@ -188,8 +189,8 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_101 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_102 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_103 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_107 */ {(void*) D_SY_601D730, 0, (ObjectFunc) NULL, D_SY_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, @@ -289,25 +290,25 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_ACTOR_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, /* OBJ_ACTOR_203 */ {(void*) func_i2_8018F884, 1, (ObjectFunc) func_i2_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_ACTOR_204 */ {(void*) func_i6_801A4CB0, 1, (ObjectFunc) func_i6_801A3BD4, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, - /* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, - /* 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_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_MA_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_MA_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_MA_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_MA_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_MA_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_MA_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_MA_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_MA_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_MA_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, + /* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_MA_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_MA_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_MA_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_MA_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_MA_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_MA_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_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 }, diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 4aeb53de..e90c5af5 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -1,7 +1,7 @@ #include "global.h" #include "assets.h" -// #include "prevent_bss_reordering.h" +#include "prevent_bss_reordering.h" Vec3f D_801615D0; Vec3f D_801615E0; s32 D_801615EC; @@ -11,6 +11,7 @@ WingInfo D_80161630; #include "fox_edisplay_assets.h" #include "assets/ast_sector_x.h" #include "assets/ast_aquas.h" +#include "assets/ast_macbeth.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" #include "assets/ast_star_wolf.h" @@ -54,7 +55,7 @@ void func_800598DC(s32 arg0) { void func_800598E8(Actor* actor) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_6025B50); + gSPDisplayList(gMasterDisp++, D_MA_6025B50); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } @@ -1792,7 +1793,7 @@ void TexturedLine_Draw(void) { } else { Matrix_SetGfxMtx(&gMasterDisp); if (gCurrentLevel == LEVEL_MACBETH) { - gSPDisplayList(gMasterDisp++, D_6012C00_Gfx); + gSPDisplayList(gMasterDisp++, D_MA_6012C00); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->unk_2C, texLine->unk_2D, texLine->unk_2E, texLine->unk_2F); diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index c91c4d7b..0bf8caaf 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -19,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_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_area_6.h" #include "assets/ast_A_ti.h" @@ -730,25 +731,25 @@ void func_800798F0(Effect* effect) { switch (effect->unk_44) { case 1: if (effect->index & 1) { - gSPDisplayList(gMasterDisp++, D_6022530); + gSPDisplayList(gMasterDisp++, D_MA_6022530); } else { - gSPDisplayList(gMasterDisp++, D_6022450); + gSPDisplayList(gMasterDisp++, D_MA_6022450); } break; case 2: RCP_SetupDL(&gMasterDisp, 0x39); if (effect->index & 1) { - gSPDisplayList(gMasterDisp++, D_601A7A0); + gSPDisplayList(gMasterDisp++, D_MA_601A7A0); } else { - gSPDisplayList(gMasterDisp++, D_60223C0); + gSPDisplayList(gMasterDisp++, D_MA_60223C0); } RCP_SetupDL(&gMasterDisp, 0x1D); break; case 7: - Animation_GetFrameData(&D_6027320, 0, frameJointTable); - Animation_DrawSkeleton(1, D_602742C, frameJointTable, func_800798C4, NULL, effect, + Animation_GetFrameData(&D_MA_6027320, 0, frameJointTable); + Animation_DrawSkeleton(1, D_MA_602742C, frameJointTable, func_800798C4, NULL, effect, &gIdentityMatrix); break; diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index 6f42160a..9b16225e 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_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_area_6.h" diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index f16c904a..48460da2 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_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_7_ti_1.h" #include "assets/ast_andross.h" @@ -956,15 +957,15 @@ UnkStruct_D003C D_800D003C[108] = { { D_VE1_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_601C520, D_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { D_600AF40, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_MA_600AF40, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_WZ_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_WZ_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_WZ_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { D_WZ_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 }, { D_WZ_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, { D_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { D_601A2B0, D_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 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 }, @@ -973,7 +974,7 @@ UnkStruct_D003C D_800D003C[108] = { { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, { NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 0, 0, 6, 0, 0.0f, 0 }, - { D_6002890, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_MA_6002890, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, }; u8 D_800D0DBC[6][4] = { // could be in-function @@ -4035,7 +4036,7 @@ void func_80074FF0(Actor* actor) { case 82: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_600DA10); + gSPDisplayList(gMasterDisp++, D_MA_600DA10); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); break; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index e4bc0861..956a8368 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -82,6 +82,7 @@ s32 D_80161900[20]; #include "assets/ast_training.h" #include "assets/ast_area_6.h" #include "assets/ast_aquas.h" +#include "assets/ast_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" @@ -96,7 +97,6 @@ void func_80087788(void); extern u8 D_CO_6000000[]; extern u8 D_ME_6000000[]; -extern u8 D_MA_6000000[]; extern u8 D_FO_6000000[]; extern u8 D_KA_6000000[]; extern u8 D_SO_6000000[]; diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 24dff739..842d71a6 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_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index 1c649039..1ae13964 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -17,7 +17,7 @@ s32 D_80178748; #include "assets/ast_training.h" #include "assets/ast_sector_x.h" #include "assets/ast_sector_y.h" -#include "assets/ast_aquas.h" +#include "assets/ast_macbeth.h" #include "assets/ast_star_wolf.h" #include "assets/ast_great_fox.h" #include "assets/ast_area_6.h" @@ -306,10 +306,10 @@ void func_800BAAE8(void) { sp44 = D_SY_6019E50; break; case RCID_BOSS_MACBETH: - sp44 = D_6010C20; + sp44 = D_MA_6010C20; break; case RCID_BOSS_MACBETH_OPEN: - sp44 = D_6011B40; + sp44 = D_MA_6011B40; break; case RCID_ROB64_RED: D_80178744 = 1; diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 02a1492d..d45f935c 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1,108 +1,10 @@ #include "global.h" -#include "assets.h" +#include "prevent_bss_reordering.h" +#include "assets/ast_macbeth.h" #include "assets/ast_landmaster.h" #include "assets/ast_enmy_planet.h" -extern u8 D_6023228[]; -extern u8 D_6023388[]; extern u8 D_Unk_800DB4B8[]; -extern f32 D_6035DD0[]; -extern f32 D_60359AC[]; -extern f32 D_6035E68[]; -extern f32 D_6035ECC[]; -extern f32 D_6035F30[]; -extern f32 D_6035F94[]; -extern f32 D_6035FF8[]; -extern f32 D_603605C[]; -extern Gfx D_6010470[]; -extern Gfx D_6003370[]; -extern Gfx D_6004440[]; -extern Animation D_600FEC4; -extern Animation D_6010144; -extern Animation D_6010220; -extern Limb* D_601042C[]; -extern Gfx D_6017720[]; -extern Gfx D_601BE90[]; -extern Animation D_601EAB0; -extern Limb* D_601EBBC; -extern Gfx D_6022200[]; -extern Gfx D_60227F0[]; -extern Gfx D_60239D0[]; -extern Gfx D_6024670[]; -extern Gfx D_60269E0[]; -extern Animation D_6027A04; -extern Limb* D_6027AF0[]; -extern Gfx D_6027BF0[]; -extern Gfx D_6027D40[]; -extern Gfx D_6027EB0[]; -extern Gfx D_60288A0[]; -extern Animation D_602EA0C; -extern Limb* D_602EBB8[]; -extern Gfx D_6001180[]; -extern Gfx D_60014A0[]; -extern Gfx D_601C170[]; -extern Gfx D_6022610[]; -extern Animation D_6025CA0; -extern Limb* D_6025DAC[]; -extern Gfx D_6026860[]; -extern Gfx D_602D380[]; -extern Gfx D_602FBF0[]; -extern Gfx D_6030750[]; -extern Gfx D_60309D0[]; -extern Gfx D_601C000[]; -extern Gfx D_60253E0[]; -extern Gfx D_6003070[]; -extern Gfx D_60066A0[]; -extern Gfx D_60071C0[]; -extern Gfx D_6007290[]; -extern Gfx D_6007360[]; -extern Gfx D_6007430[]; -extern Gfx D_6007500[]; -extern Gfx D_6009C50[]; -extern Gfx D_6009F10[]; -extern Gfx D_600A1F0[]; -extern Gfx D_600A4D0[]; -extern Gfx D_600A7D0[]; -extern Gfx D_600AA70[]; -extern Gfx D_600AD50[]; -extern Animation D_600C4D0; -extern Limb* D_600C65C[]; -extern f32 D_603648C[]; -extern Gfx D_602F380[]; -extern Animation D_602FEB4; -extern Limb* D_602FFA0[]; -extern Gfx D_602FFC0[]; -extern Gfx D_601A2B0[]; -extern f32 D_6036520[]; -extern Animation D_602F098; -extern Limb* D_602F264[]; -extern Animation D_602F2E0; -extern Limb* D_602F36C[]; -extern Gfx D_601A840[]; -extern Gfx D_6012A60[]; -extern Gfx D_60251A0[]; -extern Gfx D_6025850[]; -extern Gfx D_60257B0[]; -extern Gfx D_601F270[]; -extern u16 D_6012C98[]; -extern Animation D_600CD18; -extern Animation D_6015C24; -extern Animation D_6016040; -extern Animation D_60163F0; -extern Animation D_6016B2C; -extern Animation D_6017714; -extern Animation D_601D188; -extern f32 D_6036818[]; -extern Limb* D_600D1E4[]; -extern Animation D_601EA28; -extern f32 D_6035A94[]; -extern ObjectInit D_6035678[]; -extern ObjectInit D_60357CC[]; -extern ObjectInit D_6035920[]; -extern Gfx D_600D480[]; -extern Gfx D_6013060[]; -extern Gfx D_6012F50[]; -extern Gfx D_6015510[]; void func_i5_80199A40(u8*, u8*, f32); void func_i5_80199C20(u8*, s32, s32, s32, s32); @@ -515,8 +417,8 @@ void func_i5_80199F8C(Actor* actor) { } void func_i5_8019A128(void) { - func_i5_80199C20(D_6023228, 16, 16, 0, 8); - func_i5_80199A40(D_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f); + func_i5_80199C20(D_MA_6023228, 16, 16, 0, 8); + func_i5_80199A40(D_MA_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f); } void func_i5_8019A198(Actor* actor) { @@ -1097,7 +999,7 @@ void func_i5_8019D048(Actor* actor) { actor->obj.pos.y + actor->fwork[8] + 290.0f, actor->obj.pos.z + 175.0f, actor->iwork[4] * 35.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 14, 5); actor->iwork[3]++; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035DD0); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035DD0); } break; case 2: @@ -1284,27 +1186,27 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 actor->iwork[22] |= (var_v0); switch (actor->iwork[22]) { case 1: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035E68); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035E68); break; case 2: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035ECC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035ECC); break; case 3: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035F30); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F30); break; case 4: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035F94); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F94); break; case 5: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035FF8); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035FF8); break; case 6: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603605C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603605C); break; case 7: actor->state = 1; actor->timer_0BC = 60; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); break; } (*arg1)++; @@ -1417,7 +1319,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 case 3: func_i5_8019A8C8(actor, 1); *arg6 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); (*arg1)++; actor->state = 1; break; @@ -1495,7 +1397,7 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 case 1: func_i5_8019AF34(actor); *arg6 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); (*arg1)++; return; case 2: @@ -1751,7 +1653,7 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3 0.0f, 0.0f, 20.0f, 20); } *arg7 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); (*arg1)++; actor->state = 1; break; @@ -2100,7 +2002,7 @@ bool func_i5_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* if (limbIndex == 5) { RCP_SetupDL(&gMasterDisp, 0x22); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801BE368[20], D_i5_801BE368[21], D_i5_801BE368[22], 255); - gSPDisplayList(gMasterDisp++, D_6010470); + gSPDisplayList(gMasterDisp++, D_MA_6010470); RCP_SetupDL(&gMasterDisp, 0x1D); } } @@ -2148,12 +2050,12 @@ void func_i5_801A12C4(Actor* actor) { if ((actor->obj.id != OBJ_ACTOR_206) && (actor->obj.id != OBJ_ACTOR_205)) { if (((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) && (D_i5_801BE310 != actor->iwork[5])) { - gSPDisplayList(gMasterDisp++, D_6027BF0); - gSPDisplayList(gMasterDisp++, D_601BE90); + gSPDisplayList(gMasterDisp++, D_MA_6027BF0); + gSPDisplayList(gMasterDisp++, D_MA_601BE90); } else { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); - Animation_GetFrameData(&D_602EA0C, 0, spD0); - Animation_DrawSkeleton(1, D_602EBB8, spD0, func_i5_801A0A74, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_602EA0C, 0, spD0); + Animation_DrawSkeleton(1, D_MA_602EBB8, spD0, func_i5_801A0A74, NULL, actor, &gIdentityMatrix); } } switch (actor->obj.id) { @@ -2166,14 +2068,14 @@ void func_i5_801A12C4(Actor* actor) { if (actor->iwork[7] > 0) { actor->iwork[7]--; } - Animation_GetFrameData(&D_6027320, 0, spD0); - Animation_DrawSkeleton(1, D_602742C, spD0, func_i5_801A0B20, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_6027320, 0, spD0); + Animation_DrawSkeleton(1, D_MA_602742C, spD0, func_i5_801A0B20, NULL, actor, &gIdentityMatrix); } break; case OBJ_ACTOR_210: if (actor->iwork[13] == 0) { - Animation_GetFrameData(&D_6027A04, 0, spD0); - Animation_DrawSkeleton(1, D_6027AF0, spD0, func_i5_801A0B00, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_6027A04, 0, spD0); + Animation_DrawSkeleton(1, D_MA_6027AF0, spD0, func_i5_801A0B00, NULL, actor, &gIdentityMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 205.0f, 0.0f, 1); Matrix_RotateZ(gGfxMatrix, actor->fwork[4] * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2185,9 +2087,9 @@ void func_i5_801A12C4(Actor* actor) { actor->iwork[7]--; } if (actor->iwork[3] >= 3) { - gSPDisplayList(gMasterDisp++, D_6027EB0); + gSPDisplayList(gMasterDisp++, D_MA_6027EB0); } else { - gSPDisplayList(gMasterDisp++, D_60288A0); + gSPDisplayList(gMasterDisp++, D_MA_60288A0); } } break; @@ -2202,7 +2104,7 @@ void func_i5_801A12C4(Actor* actor) { if (actor->iwork[8] > 0) { actor->iwork[8]--; } - gSPDisplayList(gMasterDisp++, D_6029890); + gSPDisplayList(gMasterDisp++, D_MA_6029890); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } break; @@ -2219,11 +2121,11 @@ void func_i5_801A12C4(Actor* actor) { } if (actor->iwork[17] == 0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6004440); + gSPDisplayList(gMasterDisp++, D_MA_6004440); } else { RCP_SetupDL(&gMasterDisp, 0x39); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6022200); + gSPDisplayList(gMasterDisp++, D_MA_6022200); RCP_SetupDL(&gMasterDisp, 0x1D); } RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -2241,7 +2143,7 @@ void func_i5_801A12C4(Actor* actor) { if (actor->iwork[7] > 0) { actor->iwork[7]--; } - gSPDisplayList(gMasterDisp++, D_6024670); + gSPDisplayList(gMasterDisp++, D_MA_6024670); RCP_SetupDL(&gMasterDisp, 0x1D); } break; @@ -2257,33 +2159,33 @@ void func_i5_801A12C4(Actor* actor) { if (actor->iwork[13] == 0) { Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_60269E0); + gSPDisplayList(gMasterDisp++, D_MA_60269E0); } else { Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6017720); + gSPDisplayList(gMasterDisp++, D_MA_6017720); } gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); } break; case OBJ_ACTOR_206: - Animation_GetFrameData(&D_601EAB0, 0, spD0); - Animation_DrawSkeleton(1, &D_601EBBC, spD0, func_i5_801AC5AC, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_601EAB0, 0, spD0); + Animation_DrawSkeleton(1, D_MA_601EBBC, spD0, func_i5_801AC5AC, NULL, actor, &gIdentityMatrix); break; case OBJ_ACTOR_205: Matrix_Translate(gGfxMatrix, actor->fwork[3], 0.0f, 0.0f, 1); if (D_i5_801BE320[21] == 0) { - Animation_GetFrameData(&D_6010220, 0, spD0); + Animation_GetFrameData(&D_MA_6010220, 0, spD0); } else if (D_i5_801BE320[21] == 1) { - Animation_GetFrameData(&D_600FEC4, D_i5_801BE320[22], spD0); + Animation_GetFrameData(&D_MA_600FEC4, D_i5_801BE320[22], spD0); } else { - Animation_GetFrameData(&D_6010144, D_i5_801BE320[22], spD0); + Animation_GetFrameData(&D_MA_6010144, D_i5_801BE320[22], spD0); } - Animation_DrawSkeleton(1, D_601042C, spD0, func_i5_801A0EB8, func_i5_801A1268, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_601042C, spD0, func_i5_801A0EB8, func_i5_801A1268, actor, &gIdentityMatrix); if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); - gSPDisplayList(gMasterDisp++, D_6003370); + gSPDisplayList(gMasterDisp++, D_MA_6003370); } break; } @@ -2295,11 +2197,11 @@ void func_i5_801A12C4(Actor* actor) { Matrix_SetGfxMtx(&gMasterDisp); Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); if ((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) { - gSPDisplayList(gMasterDisp++, D_6027D40); + gSPDisplayList(gMasterDisp++, D_MA_6027D40); } else if (actor->vel.z > -2.0f) { - gSPDisplayList(gMasterDisp++, D_60227F0); + gSPDisplayList(gMasterDisp++, D_MA_60227F0); } else { - gSPDisplayList(gMasterDisp++, D_60239D0); + gSPDisplayList(gMasterDisp++, D_MA_60239D0); } Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); @@ -2310,11 +2212,11 @@ void func_i5_801A12C4(Actor* actor) { Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL(&gMasterDisp, 0x1D); if ((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) { - gSPDisplayList(gMasterDisp++, D_6027D40); + gSPDisplayList(gMasterDisp++, D_MA_6027D40); } else if (actor->vel.z > -2.0f) { - gSPDisplayList(gMasterDisp++, D_60227F0); + gSPDisplayList(gMasterDisp++, D_MA_60227F0); } else { - gSPDisplayList(gMasterDisp++, D_60239D0); + gSPDisplayList(gMasterDisp++, D_MA_60239D0); } Matrix_Pop(&gGfxMatrix); id = actor->obj.id; @@ -2334,11 +2236,11 @@ void func_i5_801A12C4(Actor* actor) { } if (actor->iwork[13] == 0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6004440); + gSPDisplayList(gMasterDisp++, D_MA_6004440); } else { RCP_SetupDL(&gMasterDisp, 0x39); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6022200); + gSPDisplayList(gMasterDisp++, D_MA_6022200); RCP_SetupDL(&gMasterDisp, 0x1D); } RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -2359,11 +2261,11 @@ void func_i5_801A12C4(Actor* actor) { } if (actor->iwork[21] == 0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6004440); + gSPDisplayList(gMasterDisp++, D_MA_6004440); } else { RCP_SetupDL(&gMasterDisp, 0x39); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_6022200); + gSPDisplayList(gMasterDisp++, D_MA_6022200); RCP_SetupDL(&gMasterDisp, 0x1D); } RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -2382,35 +2284,35 @@ void func_i5_801A23AC(Object_80* obj80) { if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && ((gPlayer[0].unk_138 - obj80->obj.pos.z) < -2500.0f)) { Object_Kill(&obj80->obj, obj80->sfxSource); } - gSPDisplayList(gMasterDisp++, D_6026860); + gSPDisplayList(gMasterDisp++, D_MA_6026860); break; case OBJ_80_95: case OBJ_80_98: if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && ((gPlayer[0].unk_138 - obj80->obj.pos.z) < -2500.0f)) { Object_Kill(&obj80->obj, obj80->sfxSource); } - gSPDisplayList(gMasterDisp++, D_602FBF0); + gSPDisplayList(gMasterDisp++, D_MA_602FBF0); break; case OBJ_80_96: case OBJ_80_99: - gSPDisplayList(gMasterDisp++, D_6022610); + gSPDisplayList(gMasterDisp++, D_MA_6022610); break; case OBJ_80_100: case OBJ_80_102: - gSPDisplayList(gMasterDisp++, D_60309D0); + gSPDisplayList(gMasterDisp++, D_MA_60309D0); break; case OBJ_80_101: case OBJ_80_103: - gSPDisplayList(gMasterDisp++, D_6030750); + gSPDisplayList(gMasterDisp++, D_MA_6030750); break; case OBJ_80_105: RCP_SetupDL(&gMasterDisp, 0x1D); - gSPDisplayList(gMasterDisp++, D_602D380); + gSPDisplayList(gMasterDisp++, D_MA_602D380); break; case OBJ_80_104: Matrix_Push(&gGfxMatrix); - Animation_GetFrameData(&D_6025CA0, 0, sp78); - Animation_DrawSkeleton(1, D_6025DAC, sp78, func_i5_801A0DD8, func_i5_801A0E2C, obj80, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_6025CA0, 0, sp78); + Animation_DrawSkeleton(1, D_MA_6025DAC, sp78, func_i5_801A0DD8, func_i5_801A0E2C, obj80, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); if ((obj80->state == 1) && (obj80->timer_4C <= 0)) { Matrix_Push(&gGfxMatrix); @@ -2451,22 +2353,22 @@ void func_i5_801A23AC(Object_80* obj80) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1800.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601C170); + gSPDisplayList(gMasterDisp++, D_MA_601C170); Matrix_Pop(&gGfxMatrix); } else { Matrix_Push(&gGfxMatrix); Matrix_RotateY(gGfxMatrix, -(D_PI / 18), 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1800.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_601C170); + gSPDisplayList(gMasterDisp++, D_MA_601C170); Matrix_Pop(&gGfxMatrix); } break; case OBJ_80_92: - gSPDisplayList(gMasterDisp++, D_60014A0); + gSPDisplayList(gMasterDisp++, D_MA_60014A0); break; case OBJ_80_93: - gSPDisplayList(gMasterDisp++, D_6001180); + gSPDisplayList(gMasterDisp++, D_MA_6001180); break; } RCP_SetupDL(&gMasterDisp, 0x1D); @@ -2475,8 +2377,8 @@ void func_i5_801A23AC(Object_80* obj80) { void func_i5_801A2A78(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x39); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_60253E0); - gSPDisplayList(gMasterDisp++, D_601C000); + gSPDisplayList(gMasterDisp++, D_MA_60253E0); + gSPDisplayList(gMasterDisp++, D_MA_601C000); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); RCP_SetupDL(&gMasterDisp, 0x1D); } @@ -2488,46 +2390,46 @@ void func_i5_801A2B24(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x39); switch (obj80->obj.id) { case OBJ_80_77: - gSPDisplayList(gMasterDisp++, D_60066A0); + gSPDisplayList(gMasterDisp++, D_MA_60066A0); break; case OBJ_80_78: - gSPDisplayList(gMasterDisp++, D_6007430); + gSPDisplayList(gMasterDisp++, D_MA_6007430); break; case OBJ_80_79: - gSPDisplayList(gMasterDisp++, D_6007360); + gSPDisplayList(gMasterDisp++, D_MA_6007360); break; case OBJ_80_80: - gSPDisplayList(gMasterDisp++, D_6007290); + gSPDisplayList(gMasterDisp++, D_MA_6007290); break; case OBJ_80_81: - gSPDisplayList(gMasterDisp++, D_60071C0); + gSPDisplayList(gMasterDisp++, D_MA_60071C0); break; case OBJ_80_82: - gSPDisplayList(gMasterDisp++, D_6007500); + gSPDisplayList(gMasterDisp++, D_MA_6007500); break; case OBJ_80_84: - gSPDisplayList(gMasterDisp++, D_600AD50); + gSPDisplayList(gMasterDisp++, D_MA_600AD50); break; case OBJ_80_85: - gSPDisplayList(gMasterDisp++, D_600AA70); + gSPDisplayList(gMasterDisp++, D_MA_600AA70); break; case OBJ_80_86: - gSPDisplayList(gMasterDisp++, D_6003070); + gSPDisplayList(gMasterDisp++, D_MA_6003070); break; case OBJ_80_87: - gSPDisplayList(gMasterDisp++, D_600A7D0); + gSPDisplayList(gMasterDisp++, D_MA_600A7D0); break; case OBJ_80_88: - gSPDisplayList(gMasterDisp++, D_600A4D0); + gSPDisplayList(gMasterDisp++, D_MA_600A4D0); break; case OBJ_80_89: - gSPDisplayList(gMasterDisp++, D_600A1F0); + gSPDisplayList(gMasterDisp++, D_MA_600A1F0); break; case OBJ_80_90: - gSPDisplayList(gMasterDisp++, D_6009F10); + gSPDisplayList(gMasterDisp++, D_MA_6009F10); break; case OBJ_80_91: - gSPDisplayList(gMasterDisp++, D_6009C50); + gSPDisplayList(gMasterDisp++, D_MA_6009C50); break; } RCP_SetupDL(&gMasterDisp, 0x1D); @@ -2600,8 +2502,8 @@ void func_i5_801A3240(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - Animation_GetFrameData(&D_600C4D0, 0, sp38); - Animation_DrawSkeleton(1, D_600C65C, sp38, NULL, func_i5_801A30B8, obj80, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_600C4D0, 0, sp38); + Animation_DrawSkeleton(1, D_MA_600C65C, sp38, NULL, func_i5_801A30B8, obj80, &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } @@ -2865,7 +2767,7 @@ void func_i5_801A3E98(Actor* actor) { Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f); if (actor->fwork[1] <= -180.0f) { AUDIO_PLAY_SFX(0x19033008, actor->sfxSource, 0); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603648C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603648C); actor->iwork[0] = 2; actor->state = 2; } @@ -2923,15 +2825,15 @@ void func_i5_801A43BC(Actor* actor) { Vec3f sp50[50]; Matrix_Push(&gGfxMatrix); - Animation_GetFrameData(&D_602FEB4, 0, sp50); - Animation_DrawSkeleton(1, D_602FFA0, sp50, func_i5_801A41B0, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_602FEB4, 0, sp50); + Animation_DrawSkeleton(1, D_MA_602FFA0, sp50, func_i5_801A41B0, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[2] + 204.0f, 0.0f, 1); Matrix_RotateY(gGfxMatrix, actor->fwork[1] * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_602FFC0); + gSPDisplayList(gMasterDisp++, D_MA_602FFC0); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x22); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); @@ -2940,7 +2842,7 @@ void func_i5_801A43BC(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[2] + 204.0f, 0.0f, 1); Matrix_RotateY(gGfxMatrix, actor->fwork[1] * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_602F380); + gSPDisplayList(gMasterDisp++, D_MA_602F380); gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); Matrix_Pop(&gGfxMatrix); } @@ -3037,7 +2939,7 @@ void func_i5_801A4A64(Actor* actor) { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); Matrix_SetGfxMtx(&gMasterDisp); } - gSPDisplayList(gMasterDisp++, D_601A2B0); + gSPDisplayList(gMasterDisp++, D_MA_601A2B0); } } @@ -3077,7 +2979,7 @@ void func_i5_801A4B24(Actor* actor) { break; case 1: if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 2000.0f) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036520); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036520); actor->state = 2; } break; @@ -3196,12 +3098,12 @@ void func_i5_801A54E8(Actor* actor) { Vec3f sp28[50]; Matrix_Push(&gGfxMatrix); - Animation_GetFrameData(&D_602F2E0, 0, sp28); - Animation_DrawSkeleton(1, D_602F36C, sp28, func_i5_801A54AC, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_602F2E0, 0, sp28); + Animation_DrawSkeleton(1, D_MA_602F36C, sp28, func_i5_801A54AC, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Animation_GetFrameData(&D_602F098, 0, sp28); - Animation_DrawSkeleton(1, D_602F264, sp28, func_i5_801A5124, NULL, actor, &gIdentityMatrix); + Animation_GetFrameData(&D_MA_602F098, 0, sp28); + Animation_DrawSkeleton(1, D_MA_602F264, sp28, func_i5_801A5124, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); } @@ -3294,7 +3196,7 @@ void func_i5_801A57D0(Effect* effect) { void func_i5_801A5AF0(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x3C); - gSPDisplayList(gMasterDisp++, D_601A840); + gSPDisplayList(gMasterDisp++, D_MA_601A840); RCP_SetupDL(&gMasterDisp, 0x40); } @@ -3337,7 +3239,7 @@ void func_i5_801A5D68(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 112, 255, 243, effect->unk_44); gDPSetEnvColor(gMasterDisp++, 255, 255, 255, effect->unk_44); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6012A60); + gSPDisplayList(gMasterDisp++, D_MA_6012A60); RCP_SetupDL(&gMasterDisp, 0x40); } @@ -3366,7 +3268,7 @@ void func_i5_801A5E54(Actor* actor) { } void func_i5_801A5F90(Actor* actor) { - gSPDisplayList(gMasterDisp++, D_60251A0); + gSPDisplayList(gMasterDisp++, D_MA_60251A0); } void func_i5_801A5FC4(s32 arg0) { @@ -3390,7 +3292,7 @@ void func_i5_801A5FD0(Actor* actor) { } void func_i5_801A6100(Actor* actor) { - gSPDisplayList(gMasterDisp++, D_6025850); + gSPDisplayList(gMasterDisp++, D_MA_6025850); } void func_i5_801A6134(Actor* actor) { @@ -3448,7 +3350,7 @@ void func_i5_801A6540(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x3A); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); } - gSPDisplayList(gMasterDisp++, D_60257B0); + gSPDisplayList(gMasterDisp++, D_MA_60257B0); RCP_SetupDL(&gMasterDisp, 0x1D); } @@ -3470,9 +3372,9 @@ void func_i5_801A6608(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x22); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, obj80->vel.x, 0, 0, 255); } - gSPDisplayList(gMasterDisp++, D_6010700); + gSPDisplayList(gMasterDisp++, D_MA_6010700); RCP_SetupDL(&gMasterDisp, 0x1D); - gSPDisplayList(gMasterDisp++, D_601F270); + gSPDisplayList(gMasterDisp++, D_MA_601F270); } void func_i5_801A67BC(s32 arg0) { @@ -3570,7 +3472,7 @@ void func_i5_801A6984(Actor* actor) { spA0 = temp_fs3_2; sp9C = temp_fs4; } - func_i5_80199D88(D_6012C98, 4, 8); + func_i5_80199D88(D_MA_6012C98, 4, 8); } void func_i5_801A6C78(Actor* actor) { @@ -3911,7 +3813,7 @@ void func_i5_801A7E7C(Actor* actor) { D_i5_801BE320[7] = 1; if ((actor->fwork[5] + 500.0f) <= actor->obj.pos.y) { Radio_PlayMessage(gMsg_ID_17430, RCID_BOSS_MACBETH); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); actor->state = 3; } } @@ -4055,16 +3957,16 @@ void func_i5_801A7E7C(Actor* actor) { break; case 7: if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 1200.0f) { - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_601D188) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_601D188) - 1)) { D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036818); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036818); AUDIO_PLAY_SFX(0x2902405E, actor->sfxSource, 4); } } else { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); if ((gPlayer[0].pos.y + 1200.0f) < actor->obj.pos.y) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4111,7 +4013,7 @@ void func_i5_801A7E7C(Actor* actor) { } func_i5_801A74C4(actor); func_i5_801A6984(actor); - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6017714) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6017714) - 1)) { D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); } else { D_i5_801BE320[3] = 0; @@ -4233,7 +4135,7 @@ void func_i5_801A7E7C(Actor* actor) { func_i5_801A6FB4(actor); func_i5_801A6984(actor); if (actor->timer_0BC == 0) { - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016B2C) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016B2C) - 1)) { D_i5_801BE320[3]++; } else { D_i5_801BE320[3] = 0; @@ -4263,7 +4165,7 @@ void func_i5_801A7E7C(Actor* actor) { D_i5_801BE368[0] * 0.8f, -10.0f, 8.0f); D_i5_801BE320[11]++; if (D_i5_801BE320[11] >= var_s0) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4298,7 +4200,7 @@ void func_i5_801A7E7C(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_60163F0) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_60163F0) - 1)) { D_i5_801BE320[3]++; } else { D_i5_801BE320[3] = 0; @@ -4340,7 +4242,7 @@ void func_i5_801A7E7C(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016040) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) { D_i5_801BE320[3]++; } func_i5_8019A198(actor); @@ -4375,7 +4277,7 @@ void func_i5_801A7E7C(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016040) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) { D_i5_801BE320[3]++; } func_i5_8019A198(actor); @@ -4385,7 +4287,7 @@ void func_i5_801A7E7C(Actor* actor) { D_i5_801BE320[8] = 1; if (actor->timer_0BC == 0) { actor->vel.y = 0.0f; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4447,7 +4349,7 @@ void func_i5_801A7E7C(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138 - 250.0f, 0.1f, 15.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, 250.0f, 0.1f, 10.0f, 0.01f); - if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6015C24) - 1)) { + if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6015C24) - 1)) { D_i5_801BE320[3]++; } func_i5_8019A198(actor); @@ -4525,7 +4427,7 @@ void func_i5_801A7E7C(Actor* actor) { } if (actor->timer_0BC == 0) { Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19006035); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4736,15 +4638,15 @@ void func_i5_801A7E7C(Actor* actor) { switch (D_i5_801BE320[2]) { case 1: - temp_a3 = Animation_GetFrameData(&D_600CD18, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_600CD18, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 100.0f, 0.01f); break; case 2: - temp_a3 = Animation_GetFrameData(&D_601D188, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_601D188, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.15f, 100.0f, 0.01f); break; case 3: - temp_a3 = Animation_GetFrameData(&D_6017714, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_6017714, D_i5_801BE320[3], spD4); if (D_i5_801BE320[31] != 0) { Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 100.0f, 0.01f); } else { @@ -4752,19 +4654,19 @@ void func_i5_801A7E7C(Actor* actor) { } break; case 4: - temp_a3 = Animation_GetFrameData(&D_6016B2C, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_6016B2C, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 50.0f, 0.01f); break; case 5: - temp_a3 = Animation_GetFrameData(&D_60163F0, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_60163F0, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 100.0f, 0.01f); break; case 6: - temp_a3 = Animation_GetFrameData(&D_6016040, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_6016040, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 50.0f, 0.01f); break; case 7: - temp_a3 = Animation_GetFrameData(&D_6015C24, D_i5_801BE320[3], spD4); + temp_a3 = Animation_GetFrameData(&D_MA_6015C24, D_i5_801BE320[3], spD4); Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 50.0f, 0.01f); break; } @@ -4926,9 +4828,9 @@ void func_i5_801AC294(Actor* actor) { Matrix_Translate(gCalcMatrix, actor->fwork[25], 0.0f, 0.0f, 1); Matrix_RotateY(gCalcMatrix, actor->fwork[26] * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, actor->fwork[29] * M_DTOR, 1); - Animation_GetFrameData(&D_601EA28, D_i5_801BE320[3], D_i5_801BE430); + Animation_GetFrameData(&D_MA_601EA28, D_i5_801BE320[3], D_i5_801BE430); } - Animation_DrawSkeleton(3, D_600D1E4, D_i5_801BE430, func_i5_801ABC14, func_i5_801AC1C0, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_MA_600D1E4, D_i5_801BE430, func_i5_801ABC14, func_i5_801AC1C0, actor, gCalcMatrix); } void func_i5_801AC42C(s32 arg0) { @@ -4943,7 +4845,7 @@ void func_i5_801AC438(Actor* actor) { if (actor->iwork[1] != 0) { Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH); AUDIO_PLAY_SFX(0x19034066, actor->sfxSource, 4); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035A94); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94); actor->state += 1; } func_i5_8019A830(actor); @@ -5007,7 +4909,7 @@ void func_i5_801AC754(Player* player) { switch (player->unk_1D0) { case 0: - var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_6035678); + var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035678); for (i = 0; var_s0->id != OBJ_INVALID; i++, var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); @@ -5150,7 +5052,7 @@ void func_i5_801ACF6C(void) { void func_i5_801ACFBC(void) { ObjectInit* var_s0; - for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } @@ -5158,7 +5060,7 @@ void func_i5_801ACFBC(void) { void func_i5_801AD080(void) { ObjectInit* var_s0; - for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_6035920); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } @@ -5482,7 +5384,7 @@ void func_i5_801AE2C0(Actor* actor) { gDPSetEnvColor(gMasterDisp++, 255, 48, 0, actor->iwork[0]); Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6013060); + gSPDisplayList(gMasterDisp++, D_MA_6013060); RCP_SetupDL(&gMasterDisp, 0x43); Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, 1); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 53, 53, 53, 255 - actor->iwork[0]); @@ -5497,7 +5399,7 @@ void func_i5_801AE2C0(Actor* actor) { actor->iwork[7]--; } } - gSPDisplayList(gMasterDisp++, D_600D480); + gSPDisplayList(gMasterDisp++, D_MA_600D480); } } @@ -5698,7 +5600,7 @@ void func_i5_801AEC04(Actor* actor) { } void func_i5_801AEEFC(Actor* actor) { - gSPDisplayList(gMasterDisp++, D_6015510); + gSPDisplayList(gMasterDisp++, D_MA_6015510); Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[2], 1.0f, 1); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, -10.0f, 0.0f, 1); @@ -5706,7 +5608,7 @@ void func_i5_801AEEFC(Actor* actor) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 111, 175, 64, actor->fwork[1]); gDPSetEnvColor(gMasterDisp++, 255, 255, 208, actor->fwork[1]); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6012F50); + gSPDisplayList(gMasterDisp++, D_MA_6012F50); Matrix_Pop(&gGfxMatrix); } diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index a44e1ae0..e68b2ef5 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -3,7 +3,7 @@ * System: Title * Description: Starfox Title Handler */ -#include "prevent_bss_reordering.h" +// #include "prevent_bss_reordering.h" #include "prevent_bss_reordering2.h" #include "global.h" #include "assets.h" diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 57b5b74d..7fdfab87 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -266,8 +266,12 @@ - name: ast_macbeth exclusive_ram_id: segment_06 - type: bin + type: code + dir: assets + vram: 0x06000000 start: 0xBC23D0 + subsegments: + - [0xBC23D0, .data, ast_macbeth/ast_macbeth] - name: ast_warp_zone exclusive_ram_id: segment_07