From e9c93209c47047d58a78550b458f1ce757a59b51 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Mon, 1 Apr 2024 21:08:01 -0300 Subject: [PATCH] omg kill me --- .vscode/settings.json | 3 +- assets/yaml/us/ast_aquas.yaml | 195 +++++++++++++++++++++++++++++++ assets/yaml/us/ast_corneria.yaml | 18 +++ assets/yaml/us/ast_fortuna.yaml | 9 ++ assets/yaml/us/ast_sector_y.yaml | 42 +++++++ assets/yaml/us/ast_solar.yaml | 27 +++++ assets/yaml/us/ast_zoness.yaml | 91 ++++++++++++++- include/fox_edisplay_assets.h | 138 ---------------------- include/fox_enmy_assets.h | 12 -- src/main/fox_edisplay.c | 52 +++++---- src/main/fox_effect.c | 6 +- src/main/fox_enmy.c | 8 +- 12 files changed, 416 insertions(+), 185 deletions(-) delete mode 100644 include/fox_edisplay_assets.h delete mode 100644 include/fox_enmy_assets.h diff --git a/.vscode/settings.json b/.vscode/settings.json index f8e49b75..dbe4abb6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -130,7 +130,8 @@ "fox_edisplay_assets.h": "c", "ast_versus.h": "c", "ast_macbeth.h": "c", - "ast_7_ti_1.h": "c" + "ast_7_ti_1.h": "c", + "ast_meteo.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/assets/yaml/us/ast_aquas.yaml b/assets/yaml/us/ast_aquas.yaml index 2102f2cb..60bf7c80 100644 --- a/assets/yaml/us/ast_aquas.yaml +++ b/assets/yaml/us/ast_aquas.yaml @@ -42,6 +42,9 @@ D_AQ_6002D58: D_AQ_6003158: { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x6003158, symbol: D_AQ_6003158 } +D_AQ_6003350: + { type: GFX, offset: 0x6003350, symbol: D_AQ_6003350 } + D_AQ_6003610: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6003610, symbol: D_AQ_6003610 } @@ -51,6 +54,15 @@ D_AQ_60043B0: D_AQ_6004BB0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6004BB0, symbol: D_AQ_6004BB0 } +D_AQ_60040F0: + { type: GFX, offset: 0x60040F0, symbol: D_AQ_60040F0 } + +D_AQ_6004DB0: + { type: GFX, offset: 0x6004DB0, symbol: D_AQ_6004DB0 } + +D_AQ_60050F0: + { type: GFX, offset: 0x60050F0, symbol: D_AQ_60050F0 } + D_AQ_6005954: { type: SF64:ANIM, offset: 0x6005954, symbol: D_AQ_6005954 } @@ -63,12 +75,18 @@ D_AQ_6006160: D_AQ_6006960: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006960, symbol: D_AQ_6006960 } +D_AQ_6007160: + { type: GFX, offset: 0x6007160, symbol: D_AQ_6007160 } + D_AQ_6007378: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007378, symbol: D_AQ_6007378 } D_AQ_6007B80: { type: GFX, offset: 0x6007B80, symbol: D_AQ_6007B80 } +D_AQ_6007D70: + { type: GFX, offset: 0x6007D70, symbol: D_AQ_6007D70 } + D_AQ_6007F68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007F68, symbol: D_AQ_6007F68 } @@ -90,6 +108,9 @@ D_AQ_6008FC8: D_AQ_6009188: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6009188, symbol: D_AQ_6009188 } +D_AQ_6009990: + { type: GFX, offset: 0x6009990, symbol: D_AQ_6009990 } + D_AQ_6009C28: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6009C28, symbol: D_AQ_6009C28, tlut: 0x600A028 } @@ -99,12 +120,33 @@ D_AQ_600A028: D_AQ_600A220: { type: GFX, offset: 0x600A220, symbol: D_AQ_600A220 } +D_AQ_600A480: + { type: GFX, offset: 0x600A480, symbol: D_AQ_600A480 } + +D_AQ_600A520: + { type: GFX, offset: 0x600A520, symbol: D_AQ_600A520 } + +D_AQ_600A720: + { type: GFX, offset: 0x600A720, symbol: D_AQ_600A720 } + +D_AQ_600A840: + { type: GFX, offset: 0x600A840, symbol: D_AQ_600A840 } + +D_AQ_600A8E0: + { type: GFX, offset: 0x600A8E0, symbol: D_AQ_600A8E0 } + +D_AQ_600A970: + { type: GFX, offset: 0x600A970, symbol: D_AQ_600A970 } + D_AQ_600AB10: { type: GFX, offset: 0x600AB10, symbol: D_AQ_600AB10 } D_AQ_600AB68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600AB68, symbol: D_AQ_600AB68 } +D_AQ_600BD20: + { type: GFX, offset: 0x600BD20, symbol: D_AQ_600BD20 } + D_AQ_600B518: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 } @@ -123,12 +165,33 @@ D_AQ_600CB20: D_AQ_600CF20: { type: TEXTURE, ctype: u16, format: TLUT, colors: 104, offset: 0x600CF20, symbol: D_AQ_600CF20 } +D_AQ_600CFF0: + { type: GFX, offset: 0x600CFF0, symbol: D_AQ_600CFF0 } + +D_AQ_600D390: + { type: GFX, offset: 0x600D390, symbol: D_AQ_600D390 } + +D_AQ_600D4A0: + { type: GFX, offset: 0x600D4A0, symbol: D_AQ_600D4A0 } + +D_AQ_600D720: + { type: GFX, offset: 0x600D720, symbol: D_AQ_600D720 } + +D_AQ_600D810: + { type: GFX, offset: 0x600D810, symbol: D_AQ_600D810 } + +D_AQ_600D900: + { type: GFX, offset: 0x600D900, symbol: D_AQ_600D900 } + D_AQ_600DB80: { type: GFX, offset: 0x600DB80, symbol: D_AQ_600DB80 } D_AQ_600DF48: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600DF48, symbol: D_AQ_600DF48 } +D_AQ_600E150: + { type: GFX, offset: 0x600E150, symbol: D_AQ_600E150 } + D_AQ_600E368: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 } @@ -138,6 +201,9 @@ D_AQ_600EE10: D_AQ_600EEF0: { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 } +D_AQ_600F030: + { type: GFX, offset: 0x600F030, symbol: D_AQ_600F030 } + D_AQ_600F1A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600F1A0, symbol: D_AQ_600F1A0 } @@ -309,6 +375,9 @@ D_AQ_601C080: D_AQ_601C110: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x601B080, symbol: D_AQ_601B080 } +D_AQ_601D110: + { type: GFX, offset: 0x601D110, symbol: D_AQ_601D110 } + D_AQ_601DE50: { type: SF64:ANIM, offset: 0x601DE50, symbol: D_AQ_601DE50 } @@ -327,6 +396,18 @@ D_AQ_601EC68: D_AQ_601EDB4: { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 } +D_AQ_601EDE0: + { type: GFX, offset: 0x601EDE0, symbol: D_AQ_601EDE0 } + +D_AQ_601F2F0: + { type: GFX, offset: 0x601F2F0, symbol: D_AQ_601F2F0 } + +D_AQ_601F830: + { type: GFX, offset: 0x601F830, symbol: D_AQ_601F830 } + +D_AQ_601FD70: + { type: GFX, offset: 0x601FD70, symbol: D_AQ_601FD70 } + D_AQ_6020A40: { type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 } @@ -375,6 +456,18 @@ D_AQ_6023780: D_AQ_602390C: { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C } +D_AQ_6023940: + { type: GFX, offset: 0x6023940, symbol: D_AQ_6023940 } + +D_AQ_6023B80: + { type: GFX, offset: 0x6023B80, symbol: D_AQ_6023B80 } + +D_AQ_6023D70: + { type: GFX, offset: 0x6023D70, symbol: D_AQ_6023D70 } + +D_AQ_6023EB0: + { type: GFX, offset: 0x6023EB0, symbol: D_AQ_6023EB0 } + D_AQ_6023F38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6023F38, symbol: D_AQ_6023F38 } @@ -384,6 +477,9 @@ D_AQ_6024738: D_AQ_6024938: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6024938, symbol: D_AQ_6024938 } +D_AQ_60249C0: + { type: GFX, offset: 0x60249C0, symbol: D_AQ_60249C0 } + D_AQ_6024A50: { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 } @@ -399,6 +495,105 @@ D_AQ_60260EC: D_AQ_60263F8: { type: SF64:SKELETON, offset: 0x60263F8, symbol: D_AQ_60263F8 } +D_AQ_6026460: + { type: GFX, offset: 0x6026460, symbol: D_AQ_6026460 } + +D_AQ_60266B0: + { type: GFX, offset: 0x60266B0, symbol: D_AQ_60266B0 } + +D_AQ_6026950: + { type: GFX, offset: 0x6026950, symbol: D_AQ_6026950 } + +D_AQ_6026BF0: + { type: GFX, offset: 0x6026BF0, symbol: D_AQ_6026BF0 } + +D_AQ_6026C80: + { type: GFX, offset: 0x6026C80, symbol: D_AQ_6026C80 } + +D_AQ_6026D10: + { type: GFX, offset: 0x6026D10, symbol: D_AQ_6026D10 } + +D_AQ_6026DA0: + { type: GFX, offset: 0x6026DA0, symbol: D_AQ_6026DA0 } + +D_AQ_6026E30: + { type: GFX, offset: 0x6026E30, symbol: D_AQ_6026E30 } + +D_AQ_6026EC0: + { type: GFX, offset: 0x6026EC0, symbol: D_AQ_6026EC0 } + +D_AQ_6026F60: + { type: GFX, offset: 0x6026F60, symbol: D_AQ_6026F60 } + +D_AQ_6027330: + { type: GFX, offset: 0x6027330, symbol: D_AQ_6027330 } + +D_AQ_60273C0: + { type: GFX, offset: 0x60273C0, symbol: D_AQ_60273C0 } + +D_AQ_6027460: + { type: GFX, offset: 0x6027460, symbol: D_AQ_6027460 } + +D_AQ_60276F0: + { type: GFX, offset: 0x60276F0, symbol: D_AQ_60276F0 } + +D_AQ_6027810: + { type: GFX, offset: 0x6027810, symbol: D_AQ_6027810 } + +D_AQ_6027930: + { type: GFX, offset: 0x6027930, symbol: D_AQ_6027930 } + +D_AQ_6027C90: + { type: GFX, offset: 0x6027C90, symbol: D_AQ_6027C90 } + +D_AQ_6027FA0: + { type: GFX, offset: 0x6027FA0, symbol: D_AQ_6027FA0 } + +D_AQ_6028240: + { type: GFX, offset: 0x6028240, symbol: D_AQ_6028240 } + +D_AQ_6028550: + { type: GFX, offset: 0x6028550, symbol: D_AQ_6028550 } + +D_AQ_60287F0: + { type: GFX, offset: 0x60287F0, symbol: D_AQ_60287F0 } + +D_AQ_6028910: + { type: GFX, offset: 0x6028910, symbol: D_AQ_6028910 } + +D_AQ_6028A80: + { type: GFX, offset: 0x6028A80, symbol: D_AQ_6028A80 } + +D_AQ_6028F50: + { type: GFX, offset: 0x6028F50, symbol: D_AQ_6028F50 } + +D_AQ_60290C0: + { type: GFX, offset: 0x60290C0, symbol: D_AQ_60290C0 } + +D_AQ_60291B0: + { type: GFX, offset: 0x60291B0, symbol: D_AQ_60291B0 } + +D_AQ_6029240: + { type: GFX, offset: 0x6029240, symbol: D_AQ_6029240 } + +D_AQ_6029330: + { type: GFX, offset: 0x6029330, symbol: D_AQ_6029330 } + +D_AQ_60294A0: + { type: GFX, offset: 0x60294A0, symbol: D_AQ_60294A0 } + +D_AQ_6029530: + { type: GFX, offset: 0x6029530, symbol: D_AQ_6029530 } + +D_AQ_60296A0: + { type: GFX, offset: 0x60296A0, symbol: D_AQ_60296A0 } + +D_AQ_6029790: + { type: GFX, offset: 0x6029790, symbol: D_AQ_6029790 } + +D_AQ_6029900: + { type: GFX, offset: 0x6029900, symbol: D_AQ_6029900 } + D_AQ_602AC28: { type: SF64:ANIM, offset: 0x602AC28, symbol: D_AQ_602AC28 } diff --git a/assets/yaml/us/ast_corneria.yaml b/assets/yaml/us/ast_corneria.yaml index 473ee309..da00c5af 100644 --- a/assets/yaml/us/ast_corneria.yaml +++ b/assets/yaml/us/ast_corneria.yaml @@ -169,6 +169,12 @@ D_CO_60164F0: D_CO_6016580: { type: GFX, offset: 0x6016580, symbol: D_CO_6016580 } +D_CO_6017F10: + { type: GFX, offset: 0x6017F10, symbol: D_CO_6017F10 } + +D_CO_60186E0: + { type: GFX, offset: 0x60186E0, symbol: D_CO_60186E0 } + D_CO_6018E80: { type: GFX, offset: 0x6018E80, symbol: D_CO_6018E80 } @@ -247,6 +253,9 @@ D_CO_6023AC0: D_CO_6023DE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023DE8, symbol: D_CO_6023DE8 } +D_CO_6024160: + { type: GFX, offset: 0x6024160, symbol: D_CO_6024160 } + D_CO_60244A0: { type: GFX, offset: 0x60244A0, symbol: D_CO_60244A0 } @@ -319,6 +328,9 @@ D_CO_602DA20: D_CO_602DCA0: { type: GFX, offset: 0x602DCA0, symbol: D_CO_602DCA0 } +D_CO_602DD40: + { type: GFX, offset: 0x602DD40, symbol: D_CO_602DD40 } + D_CO_602E080: { type: GFX, offset: 0x602E080, symbol: D_CO_602E080 } @@ -366,6 +378,12 @@ D_CO_6033000: D_CO_6033088: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06033088, symbol: D_CO_6033088 } + +D_CO_6033290: + { type: GFX, offset: 0x6033290, symbol: D_CO_6033290 } + +D_CO_6033AF0: + { type: GFX, offset: 0x6033AF0, symbol: D_CO_6033AF0 } D_CO_6034388: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034388, symbol: D_CO_6034388 } diff --git a/assets/yaml/us/ast_fortuna.yaml b/assets/yaml/us/ast_fortuna.yaml index d95bde1c..0176cb7a 100644 --- a/assets/yaml/us/ast_fortuna.yaml +++ b/assets/yaml/us/ast_fortuna.yaml @@ -81,6 +81,15 @@ D_FO_60070E0: D_FO_60072E0: { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x60072E0, ctype: u16, symbol: D_FO_60072E0 } +D_FO_60074E0: + { type: GFX, offset: 0x60074E0, symbol: D_FO_60074E0 } + +D_FO_6007590: + { type: GFX, offset: 0x6007590, symbol: D_FO_6007590 } + +D_FO_6007730: + { type: GFX, offset: 0x6007730, symbol: D_FO_6007730 } + D_FO_6007854: { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 } diff --git a/assets/yaml/us/ast_sector_y.yaml b/assets/yaml/us/ast_sector_y.yaml index 7ce858a7..1c960f15 100644 --- a/assets/yaml/us/ast_sector_y.yaml +++ b/assets/yaml/us/ast_sector_y.yaml @@ -120,6 +120,9 @@ D_SY_6015D60: D_SY_601F3D0: { type: GFX, offset: 0x601F3D0, symbol: D_SY_601F3D0 } +D_SY_60121E0: + { type: GFX, offset: 0x60121E0, symbol: D_SY_60121E0 } + D_SY_60128A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060128A0, symbol: D_SY_60128A0 } @@ -156,6 +159,9 @@ D_SY_6015B60: D_SY_60188D0: { type: GFX, offset: 0x60188D0, symbol: D_SY_60188D0 } +D_SY_60183B0: + { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 } + D_SY_6018F30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06018F30, symbol: D_SY_6018F30 } @@ -219,15 +225,33 @@ D_SY_60265B4: D_SY_602738C: { type: SF64:ANIM, offset: 0x602738C, symbol: D_SY_602738C } +D_SY_60273A0: + { type: GFX, offset: 0x60273A0, symbol: D_SY_60273A0 } + +D_SY_6027960: + { type: GFX, offset: 0x6027960, symbol: D_SY_6027960 } + D_SY_6028668: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028668, symbol: D_SY_6028668 } +D_SY_6028E70: + { type: GFX, offset: 0x6028E70, symbol: D_SY_6028E70 } + D_SY_6029B48: { type: SF64:ANIM, offset: 0x6029B48, symbol: D_SY_6029B48 } D_SY_602A2CC: { type: SF64:ANIM, offset: 0x602A2CC, symbol: D_SY_602A2CC } +D_SY_602A2E0: + { type: GFX, offset: 0x602A2E0, symbol: D_SY_602A2E0 } + +D_SY_602A720: + { type: GFX, offset: 0x602A720, symbol: D_SY_602A720 } + +D_SY_602A8C0: + { type: GFX, offset: 0x602A8C0, symbol: D_SY_602A8C0 } + D_SY_602AFF8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0602AFF8, symbol: D_SY_602AFF8 } @@ -237,9 +261,27 @@ D_SY_602B778: D_SY_602B8DC: { type: SF64:ANIM, offset: 0x602B8DC, symbol: D_SY_602B8DC } +D_SY_602B8F0: + { type: GFX, offset: 0x602B8F0, symbol: D_SY_602B8F0 } + D_SY_602CEB4: { type: SF64:ANIM, offset: 0x602CEB4, symbol: D_SY_602CEB4 } +D_SY_602D340: + { type: GFX, offset: 0x602D340, symbol: D_SY_602D340 } + +D_SY_602D830: + { type: GFX, offset: 0x602D830, symbol: D_SY_602D830 } + +D_SY_602DC40: + { type: GFX, offset: 0x602DC40, symbol: D_SY_602DC40 } + +D_SY_602DE70: + { type: GFX, offset: 0x602DE70, symbol: D_SY_602DE70 } + +D_SY_602E0A0: + { type: GFX, offset: 0x602E0A0, symbol: D_SY_602E0A0 } + D_SY_602D140: { type: SF64:SKELETON, offset: 0x602D140, symbol: D_SY_602D140 } diff --git a/assets/yaml/us/ast_solar.yaml b/assets/yaml/us/ast_solar.yaml index 15b70a94..dc1a21e0 100644 --- a/assets/yaml/us/ast_solar.yaml +++ b/assets/yaml/us/ast_solar.yaml @@ -77,6 +77,9 @@ D_SO_600E470: D_SO_600F744: { type: SF64:ANIM, offset: 0x600F744, symbol: D_SO_600F744} +D_SO_600F750: + { type: GFX, offset: 0x600F750, symbol: D_SO_600F750} + D_SO_6010198: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6010198, symbol: D_SO_6010198} @@ -95,9 +98,33 @@ D_SO_6012C00: D_SO_601388C: { type: SF64:ANIM, offset: 0x601388C, symbol: D_SO_601388C} +D_SO_60138A0: + { type: GFX, offset: 0x60138A0, symbol: D_SO_60138A0} + D_SO_6013C70: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6013C70, symbol: D_SO_6013C70} +D_SO_6014470: + { type: GFX, offset: 0x6014470, symbol: D_SO_6014470} + +D_SO_60146D0: + { type: GFX, offset: 0x60146D0, symbol: D_SO_60146D0} + +D_SO_6014930: + { type: GFX, offset: 0x6014930, symbol: D_SO_6014930} + +D_SO_6014B80: + { type: GFX, offset: 0x6014B80, symbol: D_SO_6014B80} + +D_SO_6014DB0: + { type: GFX, offset: 0x6014DB0, symbol: D_SO_6014DB0} + +D_SO_60151A0: + { type: GFX, offset: 0x60151A0, symbol: D_SO_60151A0} + +D_SO_6015810: + { type: GFX, offset: 0x6015810, symbol: D_SO_6015810} + D_SO_6016CF0: { type: GFX, offset: 0x6016CF0, symbol: D_SO_6016CF0} diff --git a/assets/yaml/us/ast_zoness.yaml b/assets/yaml/us/ast_zoness.yaml index 7798cb8f..257f8697 100644 --- a/assets/yaml/us/ast_zoness.yaml +++ b/assets/yaml/us/ast_zoness.yaml @@ -211,6 +211,18 @@ D_ZO_6016E30: D_ZO_6016EC8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6016EC8, symbol: D_ZO_6016EC8} +D_ZO_60176D0: + { type: GFX, offset: 0x60176D0, symbol: D_ZO_60176D0} + +D_ZO_6017770: + { type: GFX, offset: 0x6017770, symbol: D_ZO_6017770} + +D_ZO_6017810: + { type: GFX, offset: 0x6017810, symbol: D_ZO_6017810} + +D_ZO_60178B0: + { type: GFX, offset: 0x60178B0, symbol: D_ZO_60178B0} + D_ZO_6017950: { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950} @@ -235,8 +247,8 @@ D_ZO_6018660: D_ZO_60186E8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x60186E8, symbol: D_ZO_60186E8} -D_ZO_6018AE8: - { type: GFX, offset: 0x6018AE8, symbol: D_ZO_6018AE8} +D_ZO_6018AF0: + { type: GFX, offset: 0x6018AF0, symbol: D_ZO_6018AF0} D_ZO_6018B78: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x6018B78, symbol: D_ZO_6018B78} @@ -280,6 +292,21 @@ D_ZO_601AFB8: D_ZO_601B184: { type: SF64:SKELETON, offset: 0x601B184, symbol: D_ZO_601B184} +D_ZO_601B1C0: + { type: GFX, offset: 0x601B1C0, symbol: D_ZO_601B1C0} + +D_ZO_601B3B0: + { type: GFX, offset: 0x601B3B0, symbol: D_ZO_601B3B0} + +D_ZO_601B570: + { type: GFX, offset: 0x601B570, symbol: D_ZO_601B570} + +D_ZO_601B710: + { type: GFX, offset: 0x601B710, symbol: D_ZO_601B710} + +D_ZO_601B8F0: + { type: GFX, offset: 0x601B8F0, symbol: D_ZO_601B8F0} + D_ZO_601BAD0: { type: GFX, offset: 0x601BAD0, symbol: D_ZO_601BAD0} @@ -313,12 +340,24 @@ D_ZO_601D680: D_ZO_601E618: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601E618, symbol: D_ZO_601E618} +D_ZO_601F260: + { type: GFX, offset: 0x601F260, symbol: D_ZO_601F260} + +D_ZO_601F420: + { type: GFX, offset: 0x601F420, symbol: D_ZO_601F420} + +D_ZO_601F620: + { type: GFX, offset: 0x601F620, symbol: D_ZO_601F620} + D_ZO_601F874: { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874} D_ZO_601F920: { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920} +D_ZO_601F940: + { type: GFX, offset: 0x601F940, symbol: D_ZO_601F940} + D_ZO_601FBC4: { type: SF64:ANIM, offset: 0x601FBC4, symbol: D_ZO_601FBC4} @@ -331,6 +370,24 @@ D_ZO_601FCB0: D_ZO_60201B0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0} +D_ZO_60209B0: + { type: GFX, offset: 0x60209B0, symbol: D_ZO_60209B0} + +D_ZO_6020B70: + { type: GFX, offset: 0x6020B70, symbol: D_ZO_6020B70} + +D_ZO_6020D50: + { type: GFX, offset: 0x6020D50, symbol: D_ZO_6020D50} + +D_ZO_6020F10: + { type: GFX, offset: 0x6020F10, symbol: D_ZO_6020F10} + +D_ZO_6021100: + { type: GFX, offset: 0x6021100, symbol: D_ZO_6021100} + +D_ZO_60214B0: + { type: GFX, offset: 0x60214B0, symbol: D_ZO_60214B0} + D_ZO_60212B0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60212B0, symbol: D_ZO_60212B0} @@ -343,15 +400,42 @@ D_ZO_6021ABC: D_ZO_6021B88: { type: SF64:SKELETON, offset: 0x6021B88, symbol: D_ZO_6021B88} +D_ZO_6021BB0: + { type: GFX, offset: 0x6021BB0, symbol: D_ZO_6021BB0} + +D_ZO_6021C50: + { type: GFX, offset: 0x6021C50, symbol: D_ZO_6021C50} + +D_ZO_6021CE0: + { type: GFX, offset: 0x6021CE0, symbol: D_ZO_6021CE0} + +D_ZO_6021D80: + { type: GFX, offset: 0x6021D80, symbol: D_ZO_6021D80} + +D_ZO_6021E20: + { type: GFX, offset: 0x6021E20, symbol: D_ZO_6021E20} + D_ZO_60220A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60220A0, symbol: D_ZO_60220A0} +D_ZO_60222A0: + { type: GFX, offset: 0x60222A0, symbol: D_ZO_60222A0} + D_ZO_60227D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60227D8, symbol: D_ZO_60227D8} D_ZO_60229D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60229D8, symbol: D_ZO_60229D8} +D_ZO_6022BE0: + { type: GFX, offset: 0x6022BE0, symbol: D_ZO_6022BE0} + +D_ZO_6022D70: + { type: GFX, offset: 0x6022D70, symbol: D_ZO_6022D70} + +D_ZO_6022F00: + { type: GFX, offset: 0x6022F00, symbol: D_ZO_6022F00} + D_ZO_6023088: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6023088, symbol: D_ZO_6023088} @@ -361,6 +445,9 @@ D_ZO_6023288: D_ZO_6023488: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6023488, symbol: D_ZO_6023488} +D_ZO_6023690: + { type: GFX, offset: 0x6023690, symbol: D_ZO_6023690} + D_ZO_6023730: { type: GFX, offset: 0x6023730, symbol: D_ZO_6023730} diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h deleted file mode 100644 index d7478428..00000000 --- a/include/fox_edisplay_assets.h +++ /dev/null @@ -1,138 +0,0 @@ -#ifndef FOX_EDISPLAY_ASSETS_H -#define FOX_EDISPLAY_ASSETS_H - -#include "sys.h" - -extern Gfx D_6027960[]; -extern Gfx D_60273A0[]; -extern Gfx D_60183B0[]; -extern Gfx D_60121E0[]; -extern Gfx D_602A2E0[]; -extern Gfx D_602A720[]; -extern Gfx D_602B8F0[]; -extern Gfx D_602A8C0[]; -extern Gfx D_6028E70[]; -extern Gfx D_602E0A0[]; -extern Gfx D_602DE70[]; -extern Gfx D_602DC40[]; -extern Gfx D_602D830[]; -extern Gfx D_602D340[]; -extern Gfx D_6031130[]; -extern Gfx D_6030850[]; -extern Gfx D_6030FD0[]; -extern Gfx D_602DD40[]; -extern Gfx D_6033AF0[]; -extern Gfx D_60186E0[]; -extern Gfx D_6024160[]; -extern Gfx D_6033290[]; -extern Gfx D_6017F10[]; -extern Gfx D_60074E0[]; -extern Gfx D_6007590[]; -extern Gfx D_6007730[]; -extern Gfx D_6005CC0[]; -extern Gfx D_60176D0[]; -extern Gfx D_6017810[]; -extern Gfx D_6017770[]; -extern Gfx D_60178B0[]; -extern Gfx D_6023690[]; -extern Gfx D_6021BB0[]; -extern Gfx D_6021C50[]; -extern Gfx D_6021CE0[]; -extern Gfx D_6021D80[]; -extern Gfx D_6021E20[]; -extern Gfx D_60222A0[]; -extern Gfx D_6022BE0[]; -extern Gfx D_6022D70[]; -extern Gfx D_6022F00[]; -extern Gfx D_6020F10[]; -extern Gfx D_6021100[]; -extern Gfx D_60214B0[]; -extern Gfx D_601F620[]; -extern Gfx D_601F420[]; -extern Gfx D_601F940[]; -extern Gfx D_601F260[]; -extern Gfx D_6014DB0[]; -extern Gfx D_60146D0[]; -extern Gfx D_6014B80[]; -extern Gfx D_6014470[]; -extern Gfx D_6014930[]; -extern Gfx D_60138A0[]; -extern Gfx D_60151A0[]; -extern Gfx D_600F750[]; -extern Gfx D_6015810[]; -extern Gfx D_600D4A0[]; -extern Gfx D_600D720[]; -extern Gfx D_600D810[]; -extern Gfx D_600CFF0[]; -extern Gfx D_600BD20[]; -extern Gfx D_600D390[]; -extern Gfx D_600E150[]; -extern Gfx D_6007160[]; -extern Gfx D_600D900[]; -extern Gfx D_600A8E0[]; -extern Gfx D_600A840[]; -extern Gfx D_600A480[]; -extern Gfx D_600A720[]; -extern Gfx D_600A970[]; -extern Gfx D_6007D70[]; -extern Gfx D_600A520[]; -extern Gfx D_6009990[]; -extern Gfx D_6026460[]; -extern Gfx D_60266B0[]; -extern Gfx D_6026950[]; -extern Gfx D_60276F0[]; -extern Gfx D_6027810[]; -extern Gfx D_6027330[]; -extern Gfx D_60273C0[]; -extern Gfx D_6026E30[]; -extern Gfx D_6026EC0[]; -extern Gfx D_6026DA0[]; -extern Gfx D_6026D10[]; -extern Gfx D_6026C80[]; -extern Gfx D_6026BF0[]; -extern Gfx D_6027460[]; -extern Gfx D_6026F60[]; -extern Gfx D_60040F0[]; -extern Gfx D_6027C90[]; -extern Gfx D_6027FA0[]; -extern Gfx D_6003350[]; -extern Gfx D_6028240[]; -extern Gfx D_6028550[]; -extern Gfx D_6004DB0[]; -extern Gfx D_6027930[]; -extern Gfx D_600F030[]; -extern Gfx D_60050F0[]; -extern Gfx D_60294A0[]; -extern Gfx D_60291B0[]; -extern Gfx D_60287F0[]; -extern Gfx D_6029330[]; -extern Gfx D_6029240[]; -extern Gfx D_6029790[]; -extern Gfx D_6029900[]; -extern Gfx D_6028F50[]; -extern Gfx D_60290C0[]; -extern Gfx D_6029530[]; -extern Gfx D_60296A0[]; -extern Gfx D_6028A80[]; -extern Gfx D_6028910[]; -extern Gfx D_601EDE0[]; -extern Gfx D_601F2F0[]; -extern Gfx D_601F830[]; -extern Gfx D_601FD70[]; -extern Gfx D_601D110[]; -extern Gfx D_6023940[]; -extern Gfx D_6023D70[]; -extern Gfx D_60249C0[]; -extern Gfx D_6023EB0[]; -extern Gfx D_60249C0[]; -extern Gfx D_6023B80[]; -extern Gfx D_601B570[]; -extern Gfx D_VE1_601B710[]; -extern Gfx D_60209B0[]; -extern Gfx D_6020B70[]; -extern Gfx D_6020D50[]; -extern Gfx D_601B8F0[]; -extern Gfx D_601B3B0[]; -extern Gfx D_601B1C0[]; - -#endif diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h deleted file mode 100644 index 206e215a..00000000 --- a/include/fox_enmy_assets.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FOX_ENMY_ASSETS_H -#define FOX_ENMY_ASSETS_H - -#include "sf64object.h" - -extern ObjectInit D_VE1_6007E74[]; -extern ObjectInit D_SO_601F234[]; -extern ObjectInit D_FO_600EAD4[]; -extern ObjectInit D_KA_6011044[]; -extern ObjectInit D_VE2_600FF74[]; - -#endif diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index a516471d..0515f059 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -1,11 +1,13 @@ #include "global.h" -#include "fox_edisplay_assets.h" #include "assets/ast_katina.h" +#include "assets/ast_venom_1.h" #include "assets/ast_venom_2.h" #include "assets/ast_fortuna.h" #include "assets/ast_corneria.h" #include "assets/ast_meteo.h" +#include "assets/ast_solar.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_7_ti_1.h" @@ -18,7 +20,7 @@ #include "assets/ast_enmy_planet.h" #include "assets/ast_ve1_boss.h" #include "assets/ast_zoness.h" -#include "prevent_bss_reordering.h" +// #include "prevent_bss_reordering.h" Vec3f D_801615D0; Vec3f D_801615E0; s32 D_801615EC; @@ -191,45 +193,47 @@ void func_8005A088(void* arg0) { } Gfx* D_800CFA54[] = { - D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0, - D_602A8C0, D_6028E70, D_602E0A0, D_602DE70, D_602DC40, D_602D830, D_602D340, - D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_602DD40, D_6033AF0, D_60186E0, - D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_FO_6005CC0, + D_SY_6027960, D_SY_60273A0, D_SY_60183B0, D_SY_60121E0, D_SY_602A2E0, D_SY_602A720, D_SY_602B8F0, + D_SY_602A8C0, D_SY_6028E70, D_SY_602E0A0, D_SY_602DE70, D_SY_602DC40, D_SY_602D830, D_SY_602D340, + D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_CO_602DD40, D_CO_6033AF0, D_CO_60186E0, + D_CO_6024160, D_CO_6033290, D_CO_6017F10, D_FO_60074E0, D_FO_6007590, D_FO_6007730, D_FO_6005CC0, }; Gfx* D_800CFAC4[] = { - D_60176D0, D_6017810, D_6017770, D_ZO_6016D90, D_ZO_6016E30, D_60178B0, + D_ZO_60176D0, D_ZO_6017810, D_ZO_6017770, D_ZO_6016D90, D_ZO_6016E30, D_ZO_60178B0, }; Gfx* D_800CFADC[] = { - D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_ZO_6016350, - D_6021E20, D_60222A0, D_6022BE0, D_6022D70, D_6022F00, + D_ZO_6023690, D_ZO_6021BB0, D_ZO_6021C50, D_ZO_6021CE0, D_ZO_6021D80, D_ZO_6016350, + D_ZO_6021E20, D_ZO_60222A0, D_ZO_6022BE0, D_ZO_6022D70, D_ZO_6022F00, }; -Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 }; +Gfx* D_800CFB08[] = { D_ZO_6020F10, D_ZO_6021100, D_ZO_60214B0 }; Gfx* D_800CFB14[] = { D_ZO_60163E0, D_ZO_60165D0, D_ZO_6016880, D_ZO_6016B50, D_ZO_6000C40 }; -Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_ZO_6018C80, D_601F940, D_601F260 }; +Gfx* D_800CFB28[] = { D_CO_6018E80, D_ZO_601F620, D_ZO_601F420, D_ZO_6018C80, D_ZO_601F940, D_ZO_601F260 }; Gfx* D_800CFB40[] = { - D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810, + D_SO_6014DB0, D_SO_60146D0, D_SO_6014B80, D_SO_6014470, D_SO_6014930, + D_SO_60138A0, D_SO_60151A0, D_SO_600F750, D_SO_6015810, }; Gfx* D_800CFB64[] = { - D_600D4A0, D_600D720, D_600D810, D_600CFF0, D_600BD20, D_600D390, D_600E150, D_6007160, D_600D900, + D_AQ_600D4A0, D_AQ_600D720, D_AQ_600D810, D_AQ_600CFF0, D_AQ_600BD20, + D_AQ_600D390, D_AQ_600E150, D_AQ_6007160, D_AQ_600D900, }; Gfx* D_800CFB88[] = { - D_600A8E0, D_600A840, D_600A480, D_600A720, D_600A970, D_6007D70, D_600A520, D_6009990, + D_AQ_600A8E0, D_AQ_600A840, D_AQ_600A480, D_AQ_600A720, D_AQ_600A970, D_AQ_6007D70, D_AQ_600A520, D_AQ_6009990, }; Gfx* D_800CFBA8[] = { - D_6026460, D_60266B0, D_6026950, D_60276F0, D_6027810, D_6027330, D_60273C0, D_6026E30, - D_6026EC0, D_6026DA0, D_6026D10, D_6026C80, D_6026BF0, D_6027460, D_6026F60, + D_AQ_6026460, D_AQ_60266B0, D_AQ_6026950, D_AQ_60276F0, D_AQ_6027810, D_AQ_6027330, D_AQ_60273C0, D_AQ_6026E30, + D_AQ_6026EC0, D_AQ_6026DA0, D_AQ_6026D10, D_AQ_6026C80, D_AQ_6026BF0, D_AQ_6027460, D_AQ_6026F60, }; -Gfx* D_800CFBE4[] = { D_60040F0, D_6027C90, D_6027FA0, D_6003350, D_6028240, - D_6028550, D_6004DB0, D_6027930, D_600F030, D_60050F0 }; +Gfx* D_800CFBE4[] = { D_AQ_60040F0, D_AQ_6027C90, D_AQ_6027FA0, D_AQ_6003350, D_AQ_6028240, + D_AQ_6028550, D_AQ_6004DB0, D_AQ_6027930, D_AQ_600F030, D_AQ_60050F0 }; Gfx* D_800CFC0C[] = { - D_60294A0, D_60291B0, D_60287F0, D_6029330, D_6029240, D_6029790, D_6029900, - D_6028F50, D_60290C0, D_6029530, D_60296A0, D_6028A80, D_6028910, + D_AQ_60294A0, D_AQ_60291B0, D_AQ_60287F0, D_AQ_6029330, D_AQ_6029240, D_AQ_6029790, D_AQ_6029900, + D_AQ_6028F50, D_AQ_60290C0, D_AQ_6029530, D_AQ_60296A0, D_AQ_6028A80, D_AQ_6028910, }; Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 }; -Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 }; -Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 }; -Gfx* D_800CFC7C[] = { D_601B570, D_VE1_601B710, D_60209B0, D_6020B70, D_6020D50, - D_601B8F0, D_601B3B0, D_601B1C0, D_ZO_6011660 }; +Gfx* D_800CFC50[] = { D_AQ_601EDE0, D_AQ_601F2F0, D_AQ_601F830, D_AQ_601FD70, D_AQ_601D110 }; +Gfx* D_800CFC64[] = { D_AQ_6023940, D_AQ_6023D70, D_AQ_60249C0, D_AQ_6023EB0, D_AQ_60249C0, D_AQ_6023B80 }; +Gfx* D_800CFC7C[] = { D_ZO_601B570, D_ZO_601B710, D_ZO_60209B0, D_ZO_6020B70, D_ZO_6020D50, + D_ZO_601B8F0, D_ZO_601B3B0, D_ZO_601B1C0, D_ZO_6011660 }; void func_8005A094(Actor* actor) { switch (actor->state) { diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 4ddb583e..79284b72 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -5,10 +5,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n"; const char D_800D7240[] = "a=<%d>\n"; const char D_800D7248[] = "a=<%d>\n"; -extern Gfx D_ZO_6016880[]; -extern Gfx D_6018AF0[]; -extern Gfx D_ZO_601BAD0[]; - #include "assets/ast_blue_marine.h" #include "assets/ast_arwing.h" #include "assets/ast_bg_space.h" @@ -3062,7 +3058,7 @@ void func_8008092C(Effect* effect) { gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255); Matrix_Scale(gGfxMatrix, 4.0f, 2.0f, 4.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_6018AF0); + gSPDisplayList(gMasterDisp++, D_ZO_6018AF0); break; case 1: diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index 29d3f8c8..51a20a05 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -4,9 +4,13 @@ #include "assets/ast_sector_y.h" #include "assets/ast_sector_z.h" #include "assets/ast_venom_1.h" +#include "assets/ast_venom_2.h" +#include "assets/ast_katina.h" +#include "assets/ast_fortuna.h" #include "assets/ast_aquas.h" #include "assets/ast_bolse.h" #include "assets/ast_meteo.h" +#include "assets/ast_solar.h" #include "assets/ast_macbeth.h" #include "assets/ast_titania.h" #include "assets/ast_andross.h" @@ -19,12 +23,10 @@ s32 D_Timer_80161670[4]; s32 D_80161680; u8 D_80161684; -#include "fox_enmy_assets.h" - ObjectInit* D_800CFDA0[] = { D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74, D_SO_601F234, D_ZO_6026714, D_ANDROSS_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8, - D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C, + D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_6014D94, D_versus_302DE3C, }; s32 D_800CFDF4[] = { OBJ_80_0,