diff options
| author | Lywx <kiritodev01@gmail.com> | 2024-05-15 19:26:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 22:26:19 -0300 |
| commit | 8019fb0fe26d91e81eda3b703429fed878161b5f (patch) | |
| tree | 3cce4bcb48c6fd275c1f7db136cc06afa00fa353 | |
| parent | 1a5569bef573af78a6b723d052e0631329f82f6c (diff) | |
Updated segment offsets to match real jp ones (#250)
50 files changed, 280 insertions, 391 deletions
diff --git a/assets/yaml/jp/rev0/ast_7_ti_1.yaml b/assets/yaml/jp/rev0/ast_7_ti_1.yaml index 011b4ff0..e1f11466 100644 --- a/assets/yaml/jp/rev0/ast_7_ti_1.yaml +++ b/assets/yaml/jp/rev0/ast_7_ti_1.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x07, 0xA0E340] + - [0x07, 0x9DE6E0] header: code: - '#include "assets/ast_7_ti_1.h"' @@ -254,7 +254,7 @@ D_TI1_700DF70: D_TI1_700E030: { type: GFX, offset: 0x700E030, symbol: D_TI1_700E030 } -D_TI1_700E1E8: +D_TI1_700E1E8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 } D_TI1_700E3F0: diff --git a/assets/yaml/jp/rev0/ast_7_ti_2.yaml b/assets/yaml/jp/rev0/ast_7_ti_2.yaml index 8d2238e2..a11ccf22 100644 --- a/assets/yaml/jp/rev0/ast_7_ti_2.yaml +++ b/assets/yaml/jp/rev0/ast_7_ti_2.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x07, 0x9DD390] + - [0x07, 0x9AD730] header: code: - '#include "assets/ast_7_ti_2.h"' diff --git a/assets/yaml/jp/rev0/ast_8_ti.yaml b/assets/yaml/jp/rev0/ast_8_ti.yaml index cbf2016a..e09bf8b2 100644 --- a/assets/yaml/jp/rev0/ast_8_ti.yaml +++ b/assets/yaml/jp/rev0/ast_8_ti.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x08, 0x9EB5E0] + - [0x08, 0x9BB980] header: code: - '#include "assets/ast_8_ti.h"' diff --git a/assets/yaml/jp/rev0/ast_9_ti.yaml b/assets/yaml/jp/rev0/ast_9_ti.yaml index 913cf7cb..e9a716a8 100644 --- a/assets/yaml/jp/rev0/ast_9_ti.yaml +++ b/assets/yaml/jp/rev0/ast_9_ti.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x09, 0x9F4880] + - [0x09, 0x9C4C20] header: code: - '#include "assets/ast_9_ti.h"' diff --git a/assets/yaml/jp/rev0/ast_A_ti.yaml b/assets/yaml/jp/rev0/ast_A_ti.yaml index e4fcb1ab..c02dc4e5 100644 --- a/assets/yaml/jp/rev0/ast_A_ti.yaml +++ b/assets/yaml/jp/rev0/ast_A_ti.yaml @@ -1,13 +1,13 @@ :config: segments: - - [0x0A, 0xA049A0] + - [0x0A, 0x9D4D40] header: code: - '#include "assets/ast_A_ti.h"' header: - '#include "gfx.h"' - '#include "sf64object.h"' - + D_TI_A000000: {type: GFX, offset: 0xA000000, symbol: D_TI_A000000} @@ -58,4 +58,3 @@ D_TI_A002170: D_TI_A009990: {type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990} - diff --git a/assets/yaml/jp/rev0/ast_allies.yaml b/assets/yaml/jp/rev0/ast_allies.yaml index 3f9594f5..0574dedf 100644 --- a/assets/yaml/jp/rev0/ast_allies.yaml +++ b/assets/yaml/jp/rev0/ast_allies.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x0D, 0x955270] + - [0x0D, 0x9257A0] header: code: - '#include "assets/ast_allies.h"' diff --git a/assets/yaml/jp/rev0/ast_andross.yaml b/assets/yaml/jp/rev0/ast_andross.yaml index 673b0167..00111e67 100644 --- a/assets/yaml/jp/rev0/ast_andross.yaml +++ b/assets/yaml/jp/rev0/ast_andross.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x0C, 0xCE9E70] + - [0x0C, 0xCAEA30] header: code: - '#include "assets/ast_andross.h"' @@ -267,6 +267,3 @@ D_ANDROSS_C039290: D_ANDROSS_C03A290: {type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0xC03A290, symbol: D_ANDROSS_C03A290} - - - diff --git a/assets/yaml/jp/rev0/ast_aquas.yaml b/assets/yaml/jp/rev0/ast_aquas.yaml index d78d5c3b..b83eba47 100644 --- a/assets/yaml/jp/rev0/ast_aquas.yaml +++ b/assets/yaml/jp/rev0/ast_aquas.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xA58F60] + - [0x06, 0xA28E60] header: code: - '#include "assets/ast_aquas.h"' @@ -34,7 +34,7 @@ D_AQ_6002628: D_AQ_6002874: { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } -# +# D_AQ_6002C10: { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 } diff --git a/assets/yaml/jp/rev0/ast_area_6.yaml b/assets/yaml/jp/rev0/ast_area_6.yaml index 100e6e03..6584145f 100644 --- a/assets/yaml/jp/rev0/ast_area_6.yaml +++ b/assets/yaml/jp/rev0/ast_area_6.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xA8B470] + - [0x06, 0xA5B8F0] header: code: - '#include "assets/ast_area_6.h"' diff --git a/assets/yaml/jp/rev0/ast_arwing.yaml b/assets/yaml/jp/rev0/ast_arwing.yaml index 43443489..45a7f400 100644 --- a/assets/yaml/jp/rev0/ast_arwing.yaml +++ b/assets/yaml/jp/rev0/ast_arwing.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x3, 0x8BFC00] + - [0x3, 0x88F730] header: code: - '#include "assets/ast_arwing.h"' diff --git a/assets/yaml/jp/rev0/ast_bg_planet.yaml b/assets/yaml/jp/rev0/ast_bg_planet.yaml index 69ee7ae3..46aaff6b 100644 --- a/assets/yaml/jp/rev0/ast_bg_planet.yaml +++ b/assets/yaml/jp/rev0/ast_bg_planet.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x02, 0x8AE0A0] + - [0x02, 0x87DBD0] header: code: - '#include "assets/ast_bg_planet.h"' diff --git a/assets/yaml/jp/rev0/ast_bg_space.yaml b/assets/yaml/jp/rev0/ast_bg_space.yaml index 32f1e5c8..bac9dc73 100644 --- a/assets/yaml/jp/rev0/ast_bg_space.yaml +++ b/assets/yaml/jp/rev0/ast_bg_space.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x02, 0x8A68C0] + - [0x02, 0x8763F0] header: code: - '#include "assets/ast_bg_space.h"' diff --git a/assets/yaml/jp/rev0/ast_blue_marine.yaml b/assets/yaml/jp/rev0/ast_blue_marine.yaml index 8889e909..4d0809de 100644 --- a/assets/yaml/jp/rev0/ast_blue_marine.yaml +++ b/assets/yaml/jp/rev0/ast_blue_marine.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x03, 0x8E1F80] + - [0x03, 0x8B1AB0] header: code: - '#include "assets/ast_blue_marine.h"' diff --git a/assets/yaml/jp/rev0/ast_bolse.yaml b/assets/yaml/jp/rev0/ast_bolse.yaml index 78e5c128..64f49f89 100644 --- a/assets/yaml/jp/rev0/ast_bolse.yaml +++ b/assets/yaml/jp/rev0/ast_bolse.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xB0AA00] + - [0x06, 0xAD8050] header: code: - '#include "assets/ast_bolse.h"' @@ -15,7 +15,7 @@ # Bolse Defense Outpost D_BO_6000000: { type: TEXTURE, ctype: u8, format: IA8, width: 168, height: 19, offset: 0x6000000, symbol: D_BO_6000000 } - + D_BO_6000C80: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x6000C80, symbol: D_BO_6000C80 } @@ -27,8 +27,8 @@ D_BO_6001908: D_BO_6001C64: { type: SF64:ANIM, offset: 0x6001C64, symbol: D_BO_6001C64 } - -D_BO_6001FB0: + +D_BO_6001FB0: { type: SF64:SKELETON, offset: 0x6001FB0, symbol: D_BO_6001FB0 } D_BO_6002020: @@ -74,19 +74,19 @@ D_BO_6008440: { type: TEXTURE, format: RGBA16, offset: 0x06008440, width: 16, height: 16, ctype: u16, symbol: D_BO_6008440 } # Unused Animation -D_BO_6008668: +D_BO_6008668: { type: SF64:ANIM, offset: 0x6008668, symbol: D_BO_6008668 } # Unused Skeleton -D_BO_60086B4: +D_BO_60086B4: { type: SF64:SKELETON, offset: 0x60086B4, symbol: D_BO_60086B4 } # Unused Animation -D_BO_60086F4: +D_BO_60086F4: { type: SF64:ANIM, offset: 0x60086F4, symbol: D_BO_60086F4 } # Unused Skeleton -D_BO_6008760: +D_BO_6008760: { type: SF64:SKELETON, offset: 0x6008760, symbol: D_BO_6008760 } D_BO_6008770: @@ -150,13 +150,13 @@ D_BO_600E2A0: D_BO_600F2E0: { type: SF64:ANIM, offset: 0x600F2E0, symbol: D_BO_600F2E0 } - -D_BO_600F36C: + +D_BO_600F36C: { type: SF64:SKELETON, offset: 0x600F36C, symbol: D_BO_600F36C } D_BO_600F3D8: { type: SF64:ANIM, offset: 0x600F3D8, symbol: D_BO_600F3D8 } - + D_BO_600F4A4: { type: SF64:SKELETON, offset: 0x600F4A4, symbol: D_BO_600F4A4 } @@ -169,7 +169,7 @@ D_BO_600F728: D_BO_600FF30: { type: SF64:ENVIRONMENT, offset: 0x600FF30, symbol: D_BO_600FF30 } -D_BO_600FF74: +D_BO_600FF74: { type: SF64:OBJECT_INIT, offset: 0x600FF74, symbol: D_BO_600FF74 } D_BO_6010294: diff --git a/assets/yaml/jp/rev0/ast_common.yaml b/assets/yaml/jp/rev0/ast_common.yaml index 5717aba9..00250513 100644 --- a/assets/yaml/jp/rev0/ast_common.yaml +++ b/assets/yaml/jp/rev0/ast_common.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x1, 0x873CB0] + - [0x1, 0x844660] header: code: - '#include "assets/ast_common.h"' diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml index cec3e86c..5f7be606 100644 --- a/assets/yaml/jp/rev0/ast_corneria.yaml +++ b/assets/yaml/jp/rev0/ast_corneria.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0x961CE0] + - [0x06, 0x932200] header: code: - '#include "assets/ast_corneria.h"' @@ -17,7 +17,7 @@ # Former Army Base D_CO_6000000: { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 28, offset: 0x6000000, symbol: D_CO_6000000 } - + D_CO_6000E00: { type: GFX, offset: 0x6000E00, symbol: D_CO_6000E00 } @@ -38,7 +38,7 @@ D_CO_60040F8: D_CO_60049F0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x060049F0, symbol: D_CO_60049F0 } - + D_CO_6004900: { type: GFX, offset: 0x6004900, symbol: D_CO_6004900 } @@ -47,7 +47,7 @@ D_CO_60059F0: D_CO_6005A80: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06005A80, symbol: D_CO_6005A80 } - + D_CO_6006A80: { type: GFX, offset: 0x6006A80, symbol: D_CO_6006A80 } @@ -57,16 +57,16 @@ D_CO_6006E08: D_CO_6007610: { type: GFX, offset: 0x6007610, symbol: D_CO_6007610 } -D_CO_60091C8: +D_CO_60091C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060091C8, symbol: D_CO_60091C8 } -D_CO_60099C8: +D_CO_60099C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060099C8, symbol: D_CO_60099C8 } -D_CO_6009BC8: +D_CO_6009BC8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009BC8, symbol: D_CO_6009BC8 } -D_CO_600A3C8: +D_CO_600A3C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600A3C8, symbol: D_CO_600A3C8 } D_CO_600ABC8: @@ -78,24 +78,24 @@ D_CO_600B3C8: D_CO_600C3D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600C3D8, symbol: D_CO_600C3D8 } -D_CO_600CBD8: +D_CO_600CBD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CBD8, symbol: D_CO_600CBD8 } D_CO_600DBD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600DBD8, symbol: D_CO_600DBD8 } - -D_CO_600E3D8: + +D_CO_600E3D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600E3D8, symbol: D_CO_600E3D8 } -D_CO_600EBD8: +D_CO_600EBD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600EBD8, symbol: D_CO_600EBD8 } - -D_CO_600F3D8: + +D_CO_600F3D8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F3D8, symbol: D_CO_600F3D8 } D_CO_6010050: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06010050, symbol: D_CO_6010050 } - + D_CO_6010250: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010250, symbol: D_CO_6010250 } @@ -116,107 +116,107 @@ D_CO_6011F90: D_CO_6012640: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 } - -D_CO_6012840: + +D_CO_6012840: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_CO_6012840 } - + D_CO_6012D00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012D00, symbol: D_CO_6012D00 } -D_CO_60132B0: +D_CO_60132B0: { type: GFX, offset: 0x60132B0, symbol: D_CO_60132B0 } D_CO_60137B0: { type: GFX, offset: 0x60137B0, symbol: D_CO_60137B0 } -D_CO_6013B50: +D_CO_6013B50: { type: GFX, offset: 0x6013B50, symbol: D_CO_6013B50 } D_CO_6013BE0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013BE0, symbol: D_CO_6013BE0 } -D_CO_60143E0: +D_CO_60143E0: { type: GFX, offset: 0x60143E0, symbol: D_CO_60143E0 } -D_CO_6014500: +D_CO_6014500: { type: GFX, offset: 0x6014500, symbol: D_CO_6014500 } -D_CO_6014670: +D_CO_6014670: { type: GFX, offset: 0x6014670, symbol: D_CO_6014670 } -D_CO_6014A20: +D_CO_6014A20: { type: GFX, offset: 0x6014A20, symbol: D_CO_6014A20 } -D_CO_6014B50: +D_CO_6014B50: { type: GFX, offset: 0x6014B50, symbol: D_CO_6014B50 } - -D_CO_60151A8: + +D_CO_60151A8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060151A8, symbol: D_CO_60151A8 } -D_CO_60153B0: +D_CO_60153B0: { type: GFX, offset: 0x60153B0, symbol: D_CO_60153B0 } -D_CO_6015F00: +D_CO_6015F00: { type: GFX, offset: 0x6015F00, symbol: D_CO_6015F00 } D_CO_6015700: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06015700, symbol: D_CO_6015700 } -D_CO_6016270: +D_CO_6016270: { type: GFX, offset: 0x6016270, symbol: D_CO_6016270 } -D_CO_60164F0: +D_CO_60164F0: { type: GFX, offset: 0x60164F0, symbol: D_CO_60164F0 } -D_CO_6016580: +D_CO_6016580: { type: GFX, offset: 0x6016580, symbol: D_CO_6016580 } -D_CO_6017F10: +D_CO_6017F10: { type: GFX, offset: 0x6017F10, symbol: D_CO_6017F10 } -D_CO_60186E0: +D_CO_60186E0: { type: GFX, offset: 0x60186E0, symbol: D_CO_60186E0 } -D_CO_6018E80: +D_CO_6018E80: { type: GFX, offset: 0x6018E80, symbol: D_CO_6018E80 } - + D_CO_60191C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060191C8, symbol: D_CO_60191C8 } - -D_CO_60199D0: + +D_CO_60199D0: { type: GFX, offset: 0x60199D0, symbol: D_CO_60199D0 } -D_CO_6019C60: +D_CO_6019C60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019C60, symbol: D_CO_6019C60 } -D_CO_6019E60: +D_CO_6019E60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019E60, symbol: D_CO_6019E60 } -D_CO_601FF58: +D_CO_601FF58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601FF58, symbol: D_CO_601FF58 } - -D_CO_601A7D0: + +D_CO_601A7D0: { type: GFX, offset: 0x601A7D0, symbol: D_CO_601A7D0 } -D_CO_601AD60: +D_CO_601AD60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AD60, symbol: D_CO_601AD60 } - -D_CO_601B560: + +D_CO_601B560: { type: GFX, offset: 0x601B560, symbol: D_CO_601B560 } - -D_CO_601B640: + +D_CO_601B640: { type: GFX, offset: 0x601B640, symbol: D_CO_601B640 } -D_CO_601B6C0: +D_CO_601B6C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B6C0, symbol: D_CO_601B6C0 } - -D_CO_601BEC0: + +D_CO_601BEC0: { type: GFX, offset: 0x601BEC0, symbol: D_CO_601BEC0 } -D_CO_601C1A8: +D_CO_601C1A8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601C1A8, symbol: D_CO_601C1A8 } - -D_CO_601C9B0: + +D_CO_601C9B0: { type: GFX, offset: 0x601C9B0, symbol: D_CO_601C9B0 } D_CO_601CAA0: @@ -224,52 +224,52 @@ D_CO_601CAA0: D_CO_601DAA0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0601DAA0, symbol: D_CO_601DAA0 } - -D_CO_601EAA0: + +D_CO_601EAA0: { type: GFX, offset: 0x601EAA0, symbol: D_CO_601EAA0 } D_CO_601ED00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601ED00, symbol: D_CO_601ED00 } - -D_CO_601F500: + +D_CO_601F500: { type: GFX, offset: 0x601F500, symbol: D_CO_601F500 } - -D_CO_601F5A0: + +D_CO_601F5A0: { type: GFX, offset: 0x601F5A0, symbol: D_CO_601F5A0 } - -D_CO_6020760: + +D_CO_6020760: { type: GFX, offset: 0x6020760, symbol: D_CO_6020760 } - -D_CO_6020B40: + +D_CO_6020B40: { type: GFX, offset: 0x6020B40, symbol: D_CO_6020B40 } -D_CO_6021188: +D_CO_6021188: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 } -D_CO_60220D0: +D_CO_60220D0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060220D0, symbol: D_CO_60220D0 } - -D_CO_6023AC0: + +D_CO_6023AC0: { type: GFX, offset: 0x6023AC0, symbol: D_CO_6023AC0 } -D_CO_6023DE8: +D_CO_6023DE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023DE8, symbol: D_CO_6023DE8 } - -D_CO_6024160: + +D_CO_6024160: { type: GFX, offset: 0x6024160, symbol: D_CO_6024160 } - -D_CO_60244A0: + +D_CO_60244A0: { type: GFX, offset: 0x60244A0, symbol: D_CO_60244A0 } D_CO_60245E0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060245E0, symbol: D_CO_60245E0 } - + D_CO_6025500: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06025500, symbol: D_CO_6025500 } - + D_CO_6026420: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06026420, symbol: D_CO_6026420 } - + D_CO_6027340: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06027340, symbol: D_CO_6027340 } @@ -278,7 +278,7 @@ D_CO_6028260: D_CO_6028A60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 } - + D_CO_6029528: { type: SF64:ANIM, offset: 0x6029528, symbol: D_CO_6029528 } @@ -287,7 +287,7 @@ D_CO_6029674: D_CO_602991C: { type: SF64:ANIM, offset: 0x602991C, symbol: D_CO_602991C } - + D_CO_6029A48: { type: SF64:SKELETON, offset: 0x6029A48, symbol: D_CO_6029A48 } @@ -297,58 +297,58 @@ D_CO_602A520: D_CO_602AA04: { type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 } -D_CO_602AA7C: +D_CO_602AA7C: { type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C } - -D_CO_602AB48: + +D_CO_602AB48: { type: SF64:SKELETON, offset: 0x602AB48, symbol: D_CO_602AB48 } D_CO_602BC18: { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 } - -D_CO_602BE64: + +D_CO_602BE64: { type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 } D_CO_602C0D0: { type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 } -D_CO_602D31C: +D_CO_602D31C: { type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C } D_CO_602D400: { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 } - + D_CO_602D5AC: { type: SF64:SKELETON, offset: 0x602D5AC, symbol: D_CO_602D5AC } - + D_CO_602D5F0: { type: GFX, offset: 0x602D5F0, symbol: D_CO_602D5F0 } - + D_CO_602DA20: { type: GFX, offset: 0x602DA20, symbol: 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 } - + D_CO_602E570: { type: GFX, offset: 0x602E570, symbol: D_CO_602E570 } - + D_CO_602E7A0: { type: GFX, offset: 0x602E7A0, symbol: D_CO_602E7A0 } - + D_CO_602E9E0: { type: GFX, offset: 0x602E9E0, symbol: D_CO_602E9E0 } - + D_CO_602ECB0: { type: GFX, offset: 0x602ECB0, symbol: D_CO_602ECB0 } - -D_CO_602ED50: + +D_CO_602ED50: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x0602ED50, symbol: D_CO_602ED50 } D_CO_602F7C0: @@ -371,74 +371,74 @@ D_CO_6031280: D_CO_60329C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060329C0, symbol: D_CO_60329C0 } - + D_CO_6032BC0: { type: GFX, offset: 0x6032BC0, symbol: D_CO_6032BC0 } - + D_CO_6033000: { type: GFX, offset: 0x6033000, symbol: 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: +D_CO_6034388: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034388, symbol: D_CO_6034388 } - -D_CO_6034B90: + +D_CO_6034B90: { type: GFX, offset: 0x6034B90, symbol: D_CO_6034B90 } -D_CO_6034C28: +D_CO_6034C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034C28, symbol: D_CO_6034C28 } - -D_CO_6035430: + +D_CO_6035430: { type: GFX, offset: 0x6035430, symbol: D_CO_6035430 } - -D_CO_60354F0: + +D_CO_60354F0: { type: GFX, offset: 0x60354F0, symbol: D_CO_60354F0 } -D_CO_60355A0: +D_CO_60355A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060355A0, symbol: D_CO_60355A0 } - -D_CO_6035DA0: + +D_CO_6035DA0: { type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 } - -D_CO_6035F10: + +D_CO_6035F10: { type: GFX, offset: 0x6035F10, symbol: D_CO_6035F10 } - -D_CO_60361F0: + +D_CO_60361F0: { type: GFX, offset: 0x60361F0, symbol: D_CO_60361F0 } -D_CO_60363B0: +D_CO_60363B0: { type: GFX, offset: 0x60363B0, symbol: D_CO_60363B0 } D_CO_6036438: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x06036438, symbol: D_CO_6036438 } -D_CO_6036840: +D_CO_6036840: { type: GFX, offset: 0x6036840, symbol: D_CO_6036840 } -D_CO_60368C8: +D_CO_60368C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x060368C8, symbol: D_CO_60368C8 } -D_CO_6036CD0: +D_CO_6036CD0: { type: GFX, offset: 0x6036CD0, symbol: D_CO_6036CD0 } -D_CO_6036D58: +D_CO_6036D58: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x06036D58, symbol: D_CO_6036D58 } D_CO_6037160: { type: SF64:ENVIRONMENT, offset: 0x6037160, symbol: D_CO_6037160 } -D_CO_60371A4: +D_CO_60371A4: { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: D_CO_60371A4 } -D_CO_603B074: +D_CO_603B074: { type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: D_CO_603B074 } D_CO_603D9E8: diff --git a/assets/yaml/jp/rev0/ast_ending.yaml b/assets/yaml/jp/rev0/ast_ending.yaml index 4bd1b0b2..a7b2657e 100644 --- a/assets/yaml/jp/rev0/ast_ending.yaml +++ b/assets/yaml/jp/rev0/ast_ending.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x07, 0xD27600] + - [0x07, 0xCEB3C0] header: code: - '#include "assets/ast_ending.h"' diff --git a/assets/yaml/jp/rev0/ast_ending_award_back.yaml b/assets/yaml/jp/rev0/ast_ending_award_back.yaml index 4cc3746f..ceb8fe30 100644 --- a/assets/yaml/jp/rev0/ast_ending_award_back.yaml +++ b/assets/yaml/jp/rev0/ast_ending_award_back.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x08, 0xD68480] + - [0x08, 0xD2C240] header: code: - '#include "assets/ast_ending_award_back.h"' @@ -10,4 +10,3 @@ ending_award_back: { type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 270, offset: 0x8000000, symbol: gEndingAwardBack } - diff --git a/assets/yaml/jp/rev0/ast_ending_award_front.yaml b/assets/yaml/jp/rev0/ast_ending_award_front.yaml index 81908bf9..1a2829c0 100644 --- a/assets/yaml/jp/rev0/ast_ending_award_front.yaml +++ b/assets/yaml/jp/rev0/ast_ending_award_front.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x08, 0xD43400] + - [0x08, 0xD071C0] header: code: - '#include "assets/ast_ending_award_front.h"' diff --git a/assets/yaml/jp/rev0/ast_ending_expert.yaml b/assets/yaml/jp/rev0/ast_ending_expert.yaml index 7963c318..78ae5476 100644 --- a/assets/yaml/jp/rev0/ast_ending_expert.yaml +++ b/assets/yaml/jp/rev0/ast_ending_expert.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x08, 0xD91F10] + - [0x08, 0xD55CD0] header: code: - '#include "assets/ast_ending_expert.h"' diff --git a/assets/yaml/jp/rev0/ast_enmy_planet.yaml b/assets/yaml/jp/rev0/ast_enmy_planet.yaml index 9ea49f50..87e949c1 100644 --- a/assets/yaml/jp/rev0/ast_enmy_planet.yaml +++ b/assets/yaml/jp/rev0/ast_enmy_planet.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x04, 0x918430] + - [0x04, 0x8E8AE0] header: code: - '#include "assets/ast_enmy_planet.h"' @@ -18,7 +18,7 @@ ast_enmy_planet_seg4_vtx_8F8: D_ENMY_PLANET_40001A4: { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 } -D_ENMY_PLANET_4000270: +D_ENMY_PLANET_4000270: { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 } D_ENMY_PLANET_4000710: @@ -63,7 +63,7 @@ D_ENMY_PLANET_4004D38: D_ENMY_PLANET_40057AC: { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC } -D_ENMY_PLANET_40058B8: +D_ENMY_PLANET_40058B8: { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 } D_ENMY_PLANET_4005E78: diff --git a/assets/yaml/jp/rev0/ast_enmy_space.yaml b/assets/yaml/jp/rev0/ast_enmy_space.yaml index 9bfb991f..3ad506ea 100644 --- a/assets/yaml/jp/rev0/ast_enmy_space.yaml +++ b/assets/yaml/jp/rev0/ast_enmy_space.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x04, 0x922730] + - [0x04, 0x8F2DE0] header: code: - '#include "assets/ast_enmy_space.h"' @@ -11,7 +11,7 @@ D_ENMY_SPACE_4000080: { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 } -D_ENMY_SPACE_400014C: +D_ENMY_SPACE_400014C: { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } D_ENMY_SPACE_4000170: @@ -119,15 +119,15 @@ D_ENMY_SPACE_400A398: D_ENMY_SPACE_400A630: { type: GFX, offset: 0x400A630, symbol: D_ENMY_SPACE_400A630 } - + D_ENMY_SPACE_400AAE0: { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 } - + D_ENMY_SPACE_400B390: { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 } - - + + D_ENMY_SPACE_400BD20: { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 } diff --git a/assets/yaml/jp/rev0/ast_font_3d.yaml b/assets/yaml/jp/rev0/ast_font_3d.yaml index 745d6518..56c601e3 100644 --- a/assets/yaml/jp/rev0/ast_font_3d.yaml +++ b/assets/yaml/jp/rev0/ast_font_3d.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x09, 0xCDDCA0] + - [0x09, 0xCA2860] header: code: - '#include "assets/ast_font_3d.h"' diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml index 2c33e207..a6d15d0f 100644 --- a/assets/yaml/jp/rev0/ast_fortuna.yaml +++ b/assets/yaml/jp/rev0/ast_fortuna.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x6, 0xB1CA50] + - [0x6, 0xAE9DC0] header: code: - '#include "assets/ast_fortuna.h"' diff --git a/assets/yaml/jp/rev0/ast_great_fox.yaml b/assets/yaml/jp/rev0/ast_great_fox.yaml index 03ad5207..eecfe756 100644 --- a/assets/yaml/jp/rev0/ast_great_fox.yaml +++ b/assets/yaml/jp/rev0/ast_great_fox.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0xE, 0x92EC40] + - [0xE, 0x8FF2F0] header: code: - '#include "assets/ast_great_fox.h"' diff --git a/assets/yaml/jp/rev0/ast_katina.yaml b/assets/yaml/jp/rev0/ast_katina.yaml index 09fe56ed..30d5e698 100644 --- a/assets/yaml/jp/rev0/ast_katina.yaml +++ b/assets/yaml/jp/rev0/ast_katina.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x6, 0xBB11D0] + - [0x6, 0xB7E0B0] header: code: - '#include "assets/ast_katina.h"' diff --git a/assets/yaml/jp/rev0/ast_landmaster.yaml b/assets/yaml/jp/rev0/ast_landmaster.yaml index ff5ebaa7..2d126597 100644 --- a/assets/yaml/jp/rev0/ast_landmaster.yaml +++ b/assets/yaml/jp/rev0/ast_landmaster.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x3, 0x8D99F0] + - [0x3, 0x8A9520] header: code: - '#include "assets/ast_landmaster.h"' diff --git a/assets/yaml/jp/rev0/ast_logo.yml b/assets/yaml/jp/rev0/ast_logo.yml index 7cfee369..67da0dc1 100644 --- a/assets/yaml/jp/rev0/ast_logo.yml +++ b/assets/yaml/jp/rev0/ast_logo.yml @@ -1,6 +1,6 @@ :config: segments: - - [0x0F, 0xD25100] + - [0x0F, 0xCE8EC0] header: code: - '#include "assets/ast_logo.h"' diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml index 20650095..289d4ccd 100644 --- a/assets/yaml/jp/rev0/ast_macbeth.yaml +++ b/assets/yaml/jp/rev0/ast_macbeth.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xBC23D0] + - [0x06, 0xB8F2B0] header: code: - '#include "assets/ast_macbeth.h"' @@ -309,19 +309,19 @@ D_MA_600F028: D_MA_600F128: { type: TEXTURE, format: TLUT, ctype: u16, colors: 24, offset: 0x600F128, symbol: D_MA_600F128} - + D_MA_600F160: {type: GFX, offset: 0x600F160, symbol: D_MA_600F160} - + D_MA_600F2F0: {type: GFX, offset: 0x600F2F0, symbol: D_MA_600F2F0} - + D_MA_600F3D0: {type: GFX, offset: 0x600F3D0, symbol: D_MA_600F3D0} - + D_MA_600F6C0: {type: GFX, offset: 0x600F6C0, symbol: D_MA_600F6C0} - + D_MA_600F9B0: {type: GFX, offset: 0x600F9B0, symbol: D_MA_600F9B0} @@ -360,19 +360,19 @@ 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} diff --git a/assets/yaml/jp/rev0/ast_map.yaml b/assets/yaml/jp/rev0/ast_map.yaml index 44747cae..6f4f4692 100644 --- a/assets/yaml/jp/rev0/ast_map.yaml +++ b/assets/yaml/jp/rev0/ast_map.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xC48F40] + - [0x06, 0xC12690] header: code: - '#include "assets/ast_map.h"' @@ -141,25 +141,25 @@ D_MAP_6016760: # Zones # Toxic Waste Area -D_MAP_6017640: +D_MAP_6017640: { type: TEXTURE, format: IA8, offset: 0x6017640, width: 112, height: 28, ctype: u8, symbol: D_MAP_6017640 } # Invasion Aftermath -D_MAP_6018280: +D_MAP_6018280: { type: TEXTURE, format: IA8, offset: 0x6018280, width: 184, height: 19, ctype: u8, symbol: D_MAP_6018280 } -D_MAP_6019030: +D_MAP_6019030: { type: TEXTURE, format: IA8, offset: 0x6019030, width: 8, height: 16, ctype: u8, symbol: D_MAP_6019030 } # Clouds ? -D_MAP_60190B0: +D_MAP_60190B0: { type: TEXTURE, format: IA8, offset: 0x60190B0, width: 96, height: 96, ctype: u8, symbol: D_MAP_60190B0 } -D_MAP_601B4B0: +D_MAP_601B4B0: { type: TEXTURE, format: IA8, offset: 0x601B4B0, width: 32, height: 32, ctype: u8, symbol: D_MAP_601B4B0 } # Some text in japanese -D_MAP_601B8B0: +D_MAP_601B8B0: { type: TEXTURE, format: IA8, offset: 0x601B8B0, width: 80, height: 26, ctype: u8, symbol: D_MAP_1B8B0 } D_MAP_601C0D0: @@ -418,7 +418,7 @@ ast_map_seg6_vtx_4AD50: D_MAP_604B510: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0604B510, symbol: D_MAP_604B510, tlut: 0x0604B590 } -D_MAP_604B590: +D_MAP_604B590: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604B590, symbol: D_MAP_604B590 } D_MAP_604B5B0: @@ -437,25 +437,25 @@ D_MAP_604B750: D_MAP_604BC48: { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604BC48, symbol: D_MAP_604BC48, tlut: 0x0604BC48 } -D_MAP_604BE48: +D_MAP_604BE48: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604BE48, symbol: D_MAP_604BE48 } D_MAP_604BE68: { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604BE68, symbol: D_MAP_604BE68, tlut: 0x0604C068 } -D_MAP_604C068: +D_MAP_604C068: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C068, symbol: D_MAP_604C068 } D_MAP_604C088: { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604C088, symbol: D_MAP_604C088, tlut: 0x0604C288 } -D_MAP_604C288: +D_MAP_604C288: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C288, symbol: D_MAP_604C288 } D_MAP_604C2A8: { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0604C2A8, symbol: D_MAP_604C2A8, tlut: 0x0604C328 } -D_MAP_604C328: +D_MAP_604C328: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C328, symbol: D_MAP_604C328 } # Television outcoming light Model, used during briefing. diff --git a/assets/yaml/jp/rev0/ast_meteo.yaml b/assets/yaml/jp/rev0/ast_meteo.yaml index 16a3ac8b..242222db 100644 --- a/assets/yaml/jp/rev0/ast_meteo.yaml +++ b/assets/yaml/jp/rev0/ast_meteo.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0x9A1460] + - [0x06, 0x971980] header: code: - '#include "assets/ast_meteo.h"' @@ -16,7 +16,7 @@ # Asteroid Field D_ME_6000000: { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 28, offset: 0x6000000, symbol: D_ME_6000000 } - + D_ME_6000A80: { type: GFX, offset: 0x6000A80, symbol: D_ME_6000A80 } @@ -55,86 +55,86 @@ D_ME_6007838: D_ME_60078B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060078B8, symbol: D_ME_60078B8 } - -D_ME_60080C0: + +D_ME_60080C0: { type: GFX, offset: 0x60080C0, symbol: D_ME_60080C0 } D_ME_6008A18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06008A18, symbol: D_ME_6008A18 } - -D_ME_6008AA0: + +D_ME_6008AA0: { type: GFX, offset: 0x6008AA0, symbol: D_ME_6008AA0 } -D_ME_6009228: +D_ME_6009228: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009228, symbol: D_ME_6009228 } -D_ME_6009A28: +D_ME_6009A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009A28, symbol: D_ME_6009A28 } -D_ME_6009C28: +D_ME_6009C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009C28, symbol: D_ME_6009C28 } - -D_ME_6009E30: + +D_ME_6009E30: { type: GFX, offset: 0x6009E30, symbol: D_ME_6009E30 } - -D_ME_6009F50: + +D_ME_6009F50: { type: GFX, offset: 0x6009F50, symbol: D_ME_6009F50 } - -D_ME_600AC70: + +D_ME_600AC70: { type: GFX, offset: 0x600AC70, symbol: D_ME_600AC70 } -D_ME_600B540: +D_ME_600B540: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B540, symbol: D_ME_600B540 } -D_ME_600BD40: +D_ME_600BD40: { type: GFX, offset: 0x600BD40, symbol: D_ME_600BD40 } D_ME_600BF30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600BF30, symbol: D_ME_600BF30 } - + D_ME_600C130: { type: GFX, offset: 0x600C130, symbol: D_ME_600C130 } - + D_ME_600C2A0: { type: GFX, offset: 0x600C2A0, symbol: D_ME_600C2A0 } - + D_ME_600C740: { type: GFX, offset: 0x600C740, symbol: D_ME_600C740 } - + D_ME_600CAA0: { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 } - + D_ME_600CD60: { type: GFX, offset: 0x600CD60, symbol: D_ME_600CD60 } D_ME_600CDE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CDE8, symbol: D_ME_600CDE8 } - -D_ME_600DDF0: + +D_ME_600DDF0: { type: GFX, offset: 0x600DDF0, symbol: D_ME_600DDF0 } -D_ME_600E238: +D_ME_600E238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600E238, symbol: D_ME_600E238 } -D_ME_600F238: +D_ME_600F238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600F238, symbol: D_ME_600F238 } -D_ME_6010238: +D_ME_6010238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06010238, symbol: D_ME_6010238 } -D_ME_6011238: +D_ME_6011238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06011238, symbol: D_ME_6011238 } -D_ME_6012238: +D_ME_6012238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06012238, symbol: D_ME_6012238 } -D_ME_6013238: +D_ME_6013238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06013238, symbol: D_ME_6013238 } -D_ME_6014238: +D_ME_6014238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06014238, symbol: D_ME_6014238 } -D_ME_6015238: +D_ME_6015238: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06015238, symbol: D_ME_6015238 } D_ME_6016240: @@ -142,7 +142,7 @@ D_ME_6016240: D_ME_60162C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x060162C8, symbol: D_ME_60162C8 } - + D_ME_60172C8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060172C8, symbol: D_ME_60172C8 } @@ -167,7 +167,7 @@ D_ME_6019430: D_ME_6019880: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019880, symbol: D_ME_6019880 } -D_ME_601A080: +D_ME_601A080: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A080, symbol: D_ME_601A080 } D_ME_601A880: @@ -176,44 +176,44 @@ D_ME_601A880: D_ME_601AE40: { type: GFX, offset: 0x0601AE40, symbol: D_ME_601AE40 } -D_ME_601C8E0: +D_ME_601C8E0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601C8E0, symbol: D_ME_601C8E0 } -D_ME_601D800: +D_ME_601D800: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601D800, symbol: D_ME_601D800 } -D_ME_601E8C4: +D_ME_601E8C4: { type: SF64:ANIM, offset: 0x601E8C4, symbol: D_ME_601E8C4 } -D_ME_601E9D0: +D_ME_601E9D0: { type: SF64:SKELETON, offset: 0x601E9D0, symbol: D_ME_601E9D0 } # Beta Meteo background, unused -D_ME_601EA00: +D_ME_601EA00: { type: GFX, offset: 0x0601EA00, symbol: D_ME_601EA00 } -D_ME_601EA98: +D_ME_601EA98: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601EA98, symbol: D_ME_601EA98 } -D_ME_601F2A0: +D_ME_601F2A0: { type: GFX, offset: 0x0601F2A0, symbol: D_ME_601F2A0 } -D_ME_601F778: +D_ME_601F778: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601F778, symbol: D_ME_601F778 } D_ME_601FF80: { type: GFX, offset: 0x0601FF80, symbol: D_ME_601FF80 } -D_ME_6020008: +D_ME_6020008: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06020008, symbol: D_ME_6020008 } D_ME_6020810: { type: GFX, offset: 0x06020810, symbol: D_ME_6020810 } -D_ME_6020920: +D_ME_6020920: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020920, symbol: D_ME_6020920 } -D_ME_6021920: +D_ME_6021920: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021920, symbol: D_ME_6021920 } D_ME_6022920: @@ -256,25 +256,25 @@ D_ME_6024B60: D_ME_6025B50: { type: GFX, offset: 0x06025B50, symbol: D_ME_6025B50 } -D_ME_6025350: +D_ME_6025350: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025350, symbol: D_ME_6025350 } -D_ME_6025BE8: +D_ME_6025BE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06025BE8, symbol: D_ME_6025BE8 } D_ME_60263F0: { type: GFX, offset: 0x060263F0, symbol: D_ME_60263F0 } -D_ME_6026478: +D_ME_6026478: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06026478, symbol: D_ME_6026478 } -D_ME_6026CC4: +D_ME_6026CC4: { type: SF64:OBJECT_INIT, offset: 0x6026CC4, symbol: D_ME_6026CC4 } D_ME_6026C80: { type: SF64:ENVIRONMENT, offset: 0x6026C80, symbol: D_ME_6026C80 } -D_ME_602B148: +D_ME_602B148: { type: SF64:OBJECT_INIT, offset: 0x602B148, symbol: D_ME_602B148 } D_ME_602F3AC: diff --git a/assets/yaml/jp/rev0/ast_option.yaml b/assets/yaml/jp/rev0/ast_option.yaml index b3f3637a..cb92e731 100644 --- a/assets/yaml/jp/rev0/ast_option.yaml +++ b/assets/yaml/jp/rev0/ast_option.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x08, 0xCA9DE0] + - [0x08, 0xC6FA00] header: code: - '#include "assets/ast_option.h"' diff --git a/assets/yaml/jp/rev0/ast_radio.yaml b/assets/yaml/jp/rev0/ast_radio.yaml deleted file mode 100644 index bb2bb02b..00000000 --- a/assets/yaml/jp/rev0/ast_radio.yaml +++ /dev/null @@ -1,101 +0,0 @@ -:config: - segments: - - [0x8, 0xDE5D50] - tables: - gTextCharTextures: - range: [0x0, 0x958] - mode: APPEND - header: - code: - - '#include "sf64mesg.h"' - - '' - - '// clang-format off' - - 'typedef enum {' - - ' END, NWL, NP2, NP3, NP4, NP5, NP6, NP7,' - - ' PRI0, PRI1, PRI2, PRI3, SPC, HSP, QSP, NXT,' - - ' CLF, CUP, CRT, CDN, AUP, ALF, ADN, ART,' - - ' _A, _B, _C, _D, _E, _F, _G, _H,' - - ' _I, _J, _K, _L, _M, _N, _O, _P,' - - ' _Q, _R, _S, _T, _U, _V, _W, _X,' - - ' _Y, _Z, _a, _b, _c, _d, _e, _f,' - - ' _g, _h, _i, _j, _k, _l, _m, _n,' - - ' _o, _p, _q, _r, _s, _t, _u, _v,' - - ' _w, _x, _y, _z, EXM, QST, DSH, CMA,' - - ' PRD, _0, _1, _2, _3, _4, _5, _6,' - - ' _7, _8, _9, APS, LPR, RPR, CLN, PIP,' - - '} CharCode;' - -text_char_special_0: - { type: TEXTURE, offset: 0x0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial0 } - -text_char_special_4: - { type: TEXTURE, offset: 0x68, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial4 } - -text_char_special_8: - { type: TEXTURE, offset: 0xD0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial8 } - -text_char_special_12: - { type: TEXTURE, offset: 0x138, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial12 } - -text_char_cdir: - { type: TEXTURE, offset: 0x1A0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharCDIR } - -text_char_adir: - { type: TEXTURE, offset: 0x208, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharADIR } - -text_char_abcd_upper: - { type: TEXTURE, offset: 0x270, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharABCD } - -text_char_efgh_upper: - { type: TEXTURE, offset: 0x2D8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharEFGH } - -text_char_ijkl_upper: - { type: TEXTURE, offset: 0x340, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharIJKL } - -text_char_mnop_upper: - { type: TEXTURE, offset: 0x3A8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharMNOP } - -text_char_qrst_upper: - { type: TEXTURE, offset: 0x410, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharQRST } - -text_char_uvwx_upper: - { type: TEXTURE, offset: 0x478, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharUVWX } - -text_char_yzab_both: - { type: TEXTURE, offset: 0x4E0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharYZABBoth } - -text_char_cdef_lower: - { type: TEXTURE, offset: 0x548, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharCDEFLower } - -text_char_ghij_lower: - { type: TEXTURE, offset: 0x5B0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharGHIJLower } - -text_char_klmn_lower: - { type: TEXTURE, offset: 0x618, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharKLMNLower } - -text_char_opqr_lower: - { type: TEXTURE, offset: 0x680, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharOPQRLower } - -text_char_stuv_lower: - { type: TEXTURE, offset: 0x6E8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSTUVLower } - -text_char_wxyz_lower: - { type: TEXTURE, offset: 0x750, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharWXYZLower } - -text_char_pidc: - { type: TEXTURE, offset: 0x7B8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharPIDC } - -text_char_p012: - { type: TEXTURE, offset: 0x820, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharP012 } - -text_char_3456: - { type: TEXTURE, offset: 0x888, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextChar3456 } - -text_char_789a: - { type: TEXTURE, offset: 0x8F0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextChar789A } - -text_char_ppdp: - { type: TEXTURE, offset: 0x958, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharPPDP } - -message_table: - { type: SF64:MSG_TABLE, offset: 0xCCAC, vram: 0x80179010, ctype: u8, symbol: gMsgLookup }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_sector_x.yaml b/assets/yaml/jp/rev0/ast_sector_x.yaml index 2f2d2754..44423c6f 100644 --- a/assets/yaml/jp/rev0/ast_sector_x.yaml +++ b/assets/yaml/jp/rev0/ast_sector_x.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xA1D0F0] + - [0x06, 0x9ED490] header: code: - '#include "assets/ast_sector_x.h"' diff --git a/assets/yaml/jp/rev0/ast_sector_y.yaml b/assets/yaml/jp/rev0/ast_sector_y.yaml index 8ca9f1ef..8384bd9b 100644 --- a/assets/yaml/jp/rev0/ast_sector_y.yaml +++ b/assets/yaml/jp/rev0/ast_sector_y.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xB2CA50] + - [0x06, 0xAF9DC0] header: code: - '#include "assets/ast_sector_y.h"' @@ -170,34 +170,34 @@ D_SY_6018F30: D_SY_6019E50: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06019E50, symbol: D_SY_6019E50 } -D_SY_601AD70: +D_SY_601AD70: { type: GFX, offset: 0x601AD70, symbol: D_SY_601AD70 } D_SY_601AE08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 } -D_SY_601B610: +D_SY_601B610: { type: GFX, offset: 0x601B610, symbol: D_SY_601B610 } -D_SY_601B6A0: +D_SY_601B6A0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601B6A0, symbol: D_SY_601B6A0 } -D_SY_601C6A0: +D_SY_601C6A0: { type: GFX, offset: 0x601C6A0, symbol: D_SY_601C6A0 } -D_SY_601C730: +D_SY_601C730: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601C730, symbol: D_SY_601C730 } -D_SY_601D730: +D_SY_601D730: { type: GFX, offset: 0x601D730, symbol: D_SY_601D730 } D_SY_601F3B8: { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 } -D_SY_60205D0: +D_SY_60205D0: { type: GFX, offset: 0x60205D0, symbol: D_SY_60205D0 } -D_SY_60209F0: +D_SY_60209F0: { type: GFX, offset: 0x60209F0, symbol: D_SY_60209F0 } D_SY_6020B08: @@ -284,7 +284,7 @@ D_SY_602DE70: D_SY_602E0A0: { type: GFX, offset: 0x602E0A0, symbol: D_SY_602E0A0 } -D_SY_602D140: +D_SY_602D140: { type: SF64:SKELETON, offset: 0x602D140, symbol: D_SY_602D140 } D_SY_602D194: diff --git a/assets/yaml/jp/rev0/ast_sector_z.yaml b/assets/yaml/jp/rev0/ast_sector_z.yaml index bd532e3f..4fb35bc7 100644 --- a/assets/yaml/jp/rev0/ast_sector_z.yaml +++ b/assets/yaml/jp/rev0/ast_sector_z.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xA4FBB0] + - [0x06, 0xA1FCD0] header: code: - '#include "assets/ast_sector_z.h"' @@ -145,7 +145,7 @@ D_SZ_6006CD8: D_SZ_6006D64: { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 } -D_SZ_6006E50: +D_SZ_6006E50: { type: SF64:SKELETON, offset: 0x6006E50, symbol: D_SZ_6006E50 } D_SZ_6006E70: diff --git a/assets/yaml/jp/rev0/ast_solar.yaml b/assets/yaml/jp/rev0/ast_solar.yaml index 3e2cee43..610b9598 100644 --- a/assets/yaml/jp/rev0/ast_solar.yaml +++ b/assets/yaml/jp/rev0/ast_solar.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xB612E0] + - [0x06, 0xB2E3F0] header: code: - '#include "assets/ast_solar.h"' @@ -135,7 +135,7 @@ D_SO_6016F08: D_SO_6017008: { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017008, symbol: D_SO_6017008} - + D_SO_6017090: { type: GFX, offset: 0x6017090, symbol: D_SO_6017090} diff --git a/assets/yaml/jp/rev0/ast_star_wolf.yaml b/assets/yaml/jp/rev0/ast_star_wolf.yaml index 3bdb8ae4..d7225ceb 100644 --- a/assets/yaml/jp/rev0/ast_star_wolf.yaml +++ b/assets/yaml/jp/rev0/ast_star_wolf.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x0F, 0x940AD0] + - [0x0F, 0x911000] header: code: - '#include "assets/ast_star_wolf.h"' @@ -65,7 +65,7 @@ D_STAR_WOLF_F0101D0: D_STAR_WOLF_F011E80: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0F011E80, symbol: D_STAR_WOLF_F011E80 } -D_STAR_WOLF_F011680: +D_STAR_WOLF_F011680: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 } D_STAR_WOLF_F0103D0: diff --git a/assets/yaml/jp/rev0/ast_text.yaml b/assets/yaml/jp/rev0/ast_text.yaml index faaadd71..5177eab1 100644 --- a/assets/yaml/jp/rev0/ast_text.yaml +++ b/assets/yaml/jp/rev0/ast_text.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x05, 0xCD2410] + - [0x05, 0xC98590] header: code: - '#include "assets/ast_text.h"' diff --git a/assets/yaml/jp/rev0/ast_titania.yaml b/assets/yaml/jp/rev0/ast_titania.yaml index 63bf8435..1e1210f4 100644 --- a/assets/yaml/jp/rev0/ast_titania.yaml +++ b/assets/yaml/jp/rev0/ast_titania.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0x9D2FD0] + - [0x06, 0x9A3370] header: code: - '#include "assets/ast_titania.h"' diff --git a/assets/yaml/jp/rev0/ast_title.yaml b/assets/yaml/jp/rev0/ast_title.yaml index a369b62e..34b389fa 100644 --- a/assets/yaml/jp/rev0/ast_title.yaml +++ b/assets/yaml/jp/rev0/ast_title.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xBFC510] + - [0x06, 0xBC9230] header: code: - '#include "assets/ast_title.h"' diff --git a/assets/yaml/jp/rev0/ast_training.yaml b/assets/yaml/jp/rev0/ast_training.yaml index 3a064e81..8b141c42 100644 --- a/assets/yaml/jp/rev0/ast_training.yaml +++ b/assets/yaml/jp/rev0/ast_training.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x6, 0xDDC010] + - [0x6, 0xD9FDD0] header: code: - '#include "assets/ast_training.h"' diff --git a/assets/yaml/jp/rev0/ast_ve1_boss.yaml b/assets/yaml/jp/rev0/ast_ve1_boss.yaml index 14a29c08..4fd6bcc5 100644 --- a/assets/yaml/jp/rev0/ast_ve1_boss.yaml +++ b/assets/yaml/jp/rev0/ast_ve1_boss.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x09, 0xAE60A0] + - [0x09, 0xAB36F0] header: code: - '#include "assets/ast_ve1_boss.h"' diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml index 96722e97..a533e8fb 100644 --- a/assets/yaml/jp/rev0/ast_venom_1.yaml +++ b/assets/yaml/jp/rev0/ast_venom_1.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x6, 0xAB4000] + - [0x6, 0xA84390] header: code: - '#include "assets/ast_venom_1.h"' diff --git a/assets/yaml/jp/rev0/ast_venom_2.yaml b/assets/yaml/jp/rev0/ast_venom_2.yaml index 26d37d60..fd597c94 100644 --- a/assets/yaml/jp/rev0/ast_venom_2.yaml +++ b/assets/yaml/jp/rev0/ast_venom_2.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x6, 0xACF960] + - [0x6, 0xA9E570] header: code: - '#include "assets/ast_venom_2.h"' diff --git a/assets/yaml/jp/rev0/ast_versus.yaml b/assets/yaml/jp/rev0/ast_versus.yaml index f5961866..1e778a7f 100644 --- a/assets/yaml/jp/rev0/ast_versus.yaml +++ b/assets/yaml/jp/rev0/ast_versus.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x03, 0x8E92D0] + - [0x03, 0x8B8E00] header: code: - '#include "assets/ast_versus.h"' @@ -739,25 +739,24 @@ D_versus_302F044: D_versus_302E56C: {type: VEC3F, count: 20, offset: 0x302E56C, symbol: D_versus_302E56C} - + D_versus_302E65C: {type: VEC3F, count: 20, offset: 0x302E65C, symbol: D_versus_302E65C} - + D_versus_302E74C: {type: VEC3F, count: 19, offset: 0x302E74C, symbol: D_versus_302E74C} - + D_versus_302E830: {type: VEC3F, count: 25, offset: 0x302E830, symbol: D_versus_302E830} - + D_versus_302E95C: {type: VEC3F, count: 20, offset: 0x302E95C, symbol: D_versus_302E95C} - + D_versus_302EA4C: {type: VEC3F, count: 20, offset: 0x302EA4C, symbol: D_versus_302EA4C} - + D_versus_302EB3C: {type: VEC3F, count: 19, offset: 0x302EB3C, symbol: D_versus_302EB3C} - + D_versus_302EC20: {type: VEC3F, count: 25, offset: 0x302EC20, symbol: D_versus_302EC20} -
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_vs_menu.yaml b/assets/yaml/jp/rev0/ast_vs_menu.yaml index 28cd189e..a736b7c6 100644 --- a/assets/yaml/jp/rev0/ast_vs_menu.yaml +++ b/assets/yaml/jp/rev0/ast_vs_menu.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x07, 0xCBFE70] + - [0x07, 0xC83960] header: code: - '#include "assets/ast_vs_menu.h"' diff --git a/assets/yaml/jp/rev0/ast_warp_zone.yaml b/assets/yaml/jp/rev0/ast_warp_zone.yaml index 67dc362d..87af0cb6 100644 --- a/assets/yaml/jp/rev0/ast_warp_zone.yaml +++ b/assets/yaml/jp/rev0/ast_warp_zone.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x07, 0xBFA740] + - [0x07, 0xBC7460] header: code: - '#include "assets/ast_warp_zone.h"' diff --git a/assets/yaml/jp/rev0/ast_zoness.yaml b/assets/yaml/jp/rev0/ast_zoness.yaml index 9a7e21ee..3961d8fb 100644 --- a/assets/yaml/jp/rev0/ast_zoness.yaml +++ b/assets/yaml/jp/rev0/ast_zoness.yaml @@ -1,6 +1,6 @@ :config: segments: - - [0x06, 0xB84560] + - [0x06, 0xB51670] header: code: - '#include "assets/ast_zoness.h"' @@ -552,7 +552,7 @@ D_ZO_602C250: D_ZO_602C294: { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294} - + D_ZO_602C2B0: { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0} @@ -561,6 +561,3 @@ D_ZO_602C2CC: D_ZO_602CACC: {type: SF64:TRIANGLE, count: 30, offset: 0x602CACC, symbol: D_ZO_602CACC, mesh_symbol: D_ZO_OFFSET} - - - @@ -26,7 +26,6 @@ d064229a32cc05ab85e2381ce07744eb3ffaf530: config: gbi: F3DEX sort: OFFSET - logging: ERROR output: binary: starship.otr code: src/assets |