diff --git a/assets/ymls/jp/actors/wiggler_head.yml b/assets/ymls/jp/actors/wiggler.yml similarity index 53% rename from assets/ymls/jp/actors/wiggler_head.yml rename to assets/ymls/jp/actors/wiggler.yml index 1558ffe4..06d88170 100644 --- a/assets/ymls/jp/actors/wiggler_head.yml +++ b/assets/ymls/jp/actors/wiggler.yml @@ -1,7 +1,5 @@ :config: autopads: false - external_files: - - "assets/ymls/jp/actors/wiggler_body.yml" compression: offset: 0x17EF80 segments: @@ -9,9 +7,225 @@ header: header: - '#include "sm64.h"' + - '#include "wiggler_body/anims.h"' - '#include "wiggler_head/anims.h"' - '#include "wiggler_head/geo.h"' +wiggler_segment_left_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x5A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05005A30 + +wiggler_segment_right_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x6A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05006A30 + +wiggler_eye: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x7A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05007A30 + +wiggler_flower: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x8230 + format: RGBA16 + symbol: wiggler_seg5_texture_05008230 + +wiggler_frown: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x8A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05008A30 + +wiggler_nose_left_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x9230 + format: RGBA16 + symbol: wiggler_seg5_texture_05009230 + +wiggler_nose_right_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0xA230 + format: RGBA16 + symbol: wiggler_seg5_texture_0500A230 + +wiggler_seg5_lights_0500B230: + type: LIGHTS + size: 24 + offset: 0xB230 + symbol: wiggler_seg5_lights_0500B230 + +wiggler_seg5_lights_0500B248: + type: LIGHTS + size: 24 + offset: 0xB248 + symbol: wiggler_seg5_lights_0500B248 + +wiggler_body_lights_unused: + type: LIGHTS + size: 24 + offset: 0xB248 + symbol: wiggler_body_lights_unused + +wiggler_seg5_vertex_0500B278: + type: VTX + count: 16 + offset: 0xB278 + symbol: wiggler_seg5_vertex_0500B278 + +wiggler_seg5_vertex_0500B378: + type: VTX + count: 16 + offset: 0xB378 + symbol: wiggler_seg5_vertex_0500B378 + +wiggler_seg5_vertex_0500B478: + type: VTX + count: 16 + offset: 0xB478 + symbol: wiggler_seg5_vertex_0500B478 + +wiggler_seg5_vertex_0500B578: + type: VTX + count: 4 + offset: 0xB578 + symbol: wiggler_seg5_vertex_0500B578 + +wiggler_seg5_vertex_0500B5B8: + type: VTX + count: 15 + offset: 0xB5B8 + symbol: wiggler_seg5_vertex_0500B5B8 + +wiggler_seg5_vertex_0500B6A8: + type: VTX + count: 15 + offset: 0xB6A8 + symbol: wiggler_seg5_vertex_0500B6A8 + +wiggler_seg5_vertex_0500B798: + type: VTX + count: 16 + offset: 0xB798 + symbol: wiggler_seg5_vertex_0500B798 + +wiggler_seg5_vertex_0500B898: + type: VTX + count: 16 + offset: 0xB898 + symbol: wiggler_seg5_vertex_0500B898 + +wiggler_seg5_vertex_0500B998: + type: VTX + count: 16 + offset: 0xB998 + symbol: wiggler_seg5_vertex_0500B998 + +wiggler_seg5_vertex_0500BA98: + type: VTX + count: 4 + offset: 0xBA98 + symbol: wiggler_seg5_vertex_0500BA98 + +wiggler_seg5_vertex_0500BAD8: + type: VTX + count: 15 + offset: 0xBAD8 + symbol: wiggler_seg5_vertex_0500BAD8 + +wiggler_seg5_vertex_0500BBC8: + type: VTX + count: 15 + offset: 0xBBC8 + symbol: wiggler_seg5_vertex_0500BBC8 + +wiggler_seg5_dl_0500BCB8: + type: GFX + offset: 0xBCB8 + symbol: wiggler_seg5_dl_0500BCB8 + +wiggler_seg5_dl_0500BE10: + type: GFX + offset: 0xBE10 + symbol: wiggler_seg5_dl_0500BE10 + +wiggler_seg5_dl_0500BE98: + type: GFX + offset: 0xBE98 + symbol: wiggler_seg5_dl_0500BE98 + +wiggler_seg5_dl_0500BF20: + type: GFX + offset: 0xBF20 + symbol: wiggler_seg5_dl_0500BF20 + +wiggler_seg5_dl_0500C078: + type: GFX + offset: 0xC078 + symbol: wiggler_seg5_dl_0500C078 + +wiggler_seg5_dl_0500C100: + type: GFX + offset: 0xC100 + symbol: wiggler_seg5_dl_0500C100 + +wiggler_seg5_vertex_0500C188: + type: VTX + count: 4 + offset: 0xC188 + symbol: wiggler_seg5_vertex_0500C188 + +wiggler_seg5_vertex_0500C1C8: + type: VTX + count: 4 + offset: 0xC1C8 + symbol: wiggler_seg5_vertex_0500C1C8 + +wiggler_seg5_dl_0500C208: + type: GFX + offset: 0xC208 + symbol: wiggler_seg5_dl_0500C208 + +wiggler_seg5_dl_0500C240: + type: GFX + offset: 0xC240 + symbol: wiggler_seg5_dl_0500C240 + +wiggler_seg5_dl_0500C278: + type: GFX + offset: 0xC278 + symbol: wiggler_seg5_dl_0500C278 + +wiggler_body_geo: + type: SM64:GEO_LAYOUT + offset: 0xC778 + symbol: wiggler_body_geo + wiggler_seg5_lights_0500C878: type: LIGHTS size: 24 diff --git a/assets/ymls/jp/actors/wiggler_body.yml b/assets/ymls/jp/actors/wiggler_body.yml deleted file mode 100644 index 6b21de90..00000000 --- a/assets/ymls/jp/actors/wiggler_body.yml +++ /dev/null @@ -1,225 +0,0 @@ -:config: - autopads: false - compression: - offset: 0x17EF80 - segments: - - [ 0x5, 0x17EF80 ] - header: - header: - - '#include "sm64.h"' - - '#include "wiggler_body/anims.h"' - -wiggler_segment_left_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x5A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05005A30 - -wiggler_segment_right_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x6A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05006A30 - -wiggler_eye: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x7A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05007A30 - -wiggler_flower: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x8230 - format: RGBA16 - symbol: wiggler_seg5_texture_05008230 - -wiggler_frown: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x8A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05008A30 - -wiggler_nose_left_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x9230 - format: RGBA16 - symbol: wiggler_seg5_texture_05009230 - -wiggler_nose_right_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xA230 - format: RGBA16 - symbol: wiggler_seg5_texture_0500A230 - -wiggler_seg5_lights_0500B230: - type: LIGHTS - size: 24 - offset: 0xB230 - symbol: wiggler_seg5_lights_0500B230 - -wiggler_seg5_lights_0500B248: - type: LIGHTS - size: 24 - offset: 0xB248 - symbol: wiggler_seg5_lights_0500B248 - -wiggler_body_lights_unused: - type: LIGHTS - size: 24 - offset: 0xB248 - symbol: wiggler_body_lights_unused - -wiggler_seg5_vertex_0500B278: - type: VTX - count: 16 - offset: 0xB278 - symbol: wiggler_seg5_vertex_0500B278 - -wiggler_seg5_vertex_0500B378: - type: VTX - count: 16 - offset: 0xB378 - symbol: wiggler_seg5_vertex_0500B378 - -wiggler_seg5_vertex_0500B478: - type: VTX - count: 16 - offset: 0xB478 - symbol: wiggler_seg5_vertex_0500B478 - -wiggler_seg5_vertex_0500B578: - type: VTX - count: 4 - offset: 0xB578 - symbol: wiggler_seg5_vertex_0500B578 - -wiggler_seg5_vertex_0500B5B8: - type: VTX - count: 15 - offset: 0xB5B8 - symbol: wiggler_seg5_vertex_0500B5B8 - -wiggler_seg5_vertex_0500B6A8: - type: VTX - count: 15 - offset: 0xB6A8 - symbol: wiggler_seg5_vertex_0500B6A8 - -wiggler_seg5_vertex_0500B798: - type: VTX - count: 16 - offset: 0xB798 - symbol: wiggler_seg5_vertex_0500B798 - -wiggler_seg5_vertex_0500B898: - type: VTX - count: 16 - offset: 0xB898 - symbol: wiggler_seg5_vertex_0500B898 - -wiggler_seg5_vertex_0500B998: - type: VTX - count: 16 - offset: 0xB998 - symbol: wiggler_seg5_vertex_0500B998 - -wiggler_seg5_vertex_0500BA98: - type: VTX - count: 4 - offset: 0xBA98 - symbol: wiggler_seg5_vertex_0500BA98 - -wiggler_seg5_vertex_0500BAD8: - type: VTX - count: 15 - offset: 0xBAD8 - symbol: wiggler_seg5_vertex_0500BAD8 - -wiggler_seg5_vertex_0500BBC8: - type: VTX - count: 15 - offset: 0xBBC8 - symbol: wiggler_seg5_vertex_0500BBC8 - -wiggler_seg5_dl_0500BCB8: - type: GFX - offset: 0xBCB8 - symbol: wiggler_seg5_dl_0500BCB8 - -wiggler_seg5_dl_0500BE10: - type: GFX - offset: 0xBE10 - symbol: wiggler_seg5_dl_0500BE10 - -wiggler_seg5_dl_0500BE98: - type: GFX - offset: 0xBE98 - symbol: wiggler_seg5_dl_0500BE98 - -wiggler_seg5_dl_0500BF20: - type: GFX - offset: 0xBF20 - symbol: wiggler_seg5_dl_0500BF20 - -wiggler_seg5_dl_0500C078: - type: GFX - offset: 0xC078 - symbol: wiggler_seg5_dl_0500C078 - -wiggler_seg5_dl_0500C100: - type: GFX - offset: 0xC100 - symbol: wiggler_seg5_dl_0500C100 - -wiggler_seg5_vertex_0500C188: - type: VTX - count: 4 - offset: 0xC188 - symbol: wiggler_seg5_vertex_0500C188 - -wiggler_seg5_vertex_0500C1C8: - type: VTX - count: 4 - offset: 0xC1C8 - symbol: wiggler_seg5_vertex_0500C1C8 - -wiggler_seg5_dl_0500C208: - type: GFX - offset: 0xC208 - symbol: wiggler_seg5_dl_0500C208 - -wiggler_seg5_dl_0500C240: - type: GFX - offset: 0xC240 - symbol: wiggler_seg5_dl_0500C240 - -wiggler_seg5_dl_0500C278: - type: GFX - offset: 0xC278 - symbol: wiggler_seg5_dl_0500C278 - -wiggler_body_geo: - type: SM64:GEO_LAYOUT - offset: 0xC778 - symbol: wiggler_body_geo diff --git a/assets/ymls/jp/actors/wiggler_body/geo.yml b/assets/ymls/jp/actors/wiggler_body/geo.yml index c383cfe8..c4541261 100644 --- a/assets/ymls/jp/actors/wiggler_body/geo.yml +++ b/assets/ymls/jp/actors/wiggler_body/geo.yml @@ -1,7 +1,6 @@ :config: external_files: - - "assets/ymls/jp/actors/wiggler_head.yml" - - "assets/ymls/jp/actors/wiggler_body.yml" + - "assets/ymls/jp/actors/wiggler.yml" autopads: false segments: - [0x0C, 0x186370] diff --git a/assets/ymls/jp/actors/wiggler_head/geo.yml b/assets/ymls/jp/actors/wiggler_head/geo.yml index 9d494669..544b59ad 100644 --- a/assets/ymls/jp/actors/wiggler_head/geo.yml +++ b/assets/ymls/jp/actors/wiggler_head/geo.yml @@ -1,7 +1,6 @@ :config: external_files: - - "assets/ymls/jp/actors/wiggler_head.yml" - - "assets/ymls/jp/actors/wiggler_body.yml" + - "assets/ymls/jp/actors/wiggler.yml" autopads: false segments: - [ 0xC, 0x186370 ] diff --git a/assets/ymls/jp/levels/ending.yml b/assets/ymls/jp/levels/ending.yml index 452853d7..d37db630 100644 --- a/assets/ymls/jp/levels/ending.yml +++ b/assets/ymls/jp/levels/ending.yml @@ -10,7 +10,7 @@ - '' - 'extern const LevelScript level_ending_entry[];' -cake_end_texture_0: +cake.0: type: TEXTURE width: 80 height: 20 @@ -18,7 +18,7 @@ cake_end_texture_0: format: RGBA16 symbol: dCakeEndTexture0 -cake_end_texture_1: +cake.1: type: TEXTURE width: 80 height: 20 @@ -26,7 +26,7 @@ cake_end_texture_1: format: RGBA16 symbol: dCakeEndTexture1 -cake_end_texture_2: +cake.2: type: TEXTURE width: 80 height: 20 @@ -34,7 +34,7 @@ cake_end_texture_2: format: RGBA16 symbol: dCakeEndTexture2 -cake_end_texture_3: +cake.3: type: TEXTURE width: 80 height: 20 @@ -42,7 +42,7 @@ cake_end_texture_3: format: RGBA16 symbol: dCakeEndTexture3 -cake_end_texture_4: +cake.4: type: TEXTURE width: 80 height: 20 @@ -50,7 +50,7 @@ cake_end_texture_4: format: RGBA16 symbol: dCakeEndTexture4 -cake_end_texture_5: +cake.5: type: TEXTURE width: 80 height: 20 @@ -58,7 +58,7 @@ cake_end_texture_5: format: RGBA16 symbol: dCakeEndTexture5 -cake_end_texture_6: +cake.6: type: TEXTURE width: 80 height: 20 @@ -66,7 +66,7 @@ cake_end_texture_6: format: RGBA16 symbol: dCakeEndTexture6 -cake_end_texture_7: +cake.7: type: TEXTURE width: 80 height: 20 @@ -74,7 +74,7 @@ cake_end_texture_7: format: RGBA16 symbol: dCakeEndTexture7 -cake_end_texture_8: +cake.8: type: TEXTURE width: 80 height: 20 @@ -82,7 +82,7 @@ cake_end_texture_8: format: RGBA16 symbol: dCakeEndTexture8 -cake_end_texture_9: +cake.9: type: TEXTURE width: 80 height: 20 @@ -90,7 +90,7 @@ cake_end_texture_9: format: RGBA16 symbol: dCakeEndTexture9 -cake_end_texture_10: +cake.10: type: TEXTURE width: 80 height: 20 @@ -98,7 +98,7 @@ cake_end_texture_10: format: RGBA16 symbol: dCakeEndTexture10 -cake_end_texture_11: +cake.11: type: TEXTURE width: 80 height: 20 @@ -106,7 +106,7 @@ cake_end_texture_11: format: RGBA16 symbol: dCakeEndTexture11 -cake_end_texture_12: +cake.12: type: TEXTURE width: 80 height: 20 @@ -114,7 +114,7 @@ cake_end_texture_12: format: RGBA16 symbol: dCakeEndTexture12 -cake_end_texture_13: +cake.13: type: TEXTURE width: 80 height: 20 @@ -122,7 +122,7 @@ cake_end_texture_13: format: RGBA16 symbol: dCakeEndTexture13 -cake_end_texture_14: +cake.14: type: TEXTURE width: 80 height: 20 @@ -130,7 +130,7 @@ cake_end_texture_14: format: RGBA16 symbol: dCakeEndTexture14 -cake_end_texture_15: +cake.15: type: TEXTURE width: 80 height: 20 @@ -138,7 +138,7 @@ cake_end_texture_15: format: RGBA16 symbol: dCakeEndTexture15 -cake_end_texture_16: +cake.16: type: TEXTURE width: 80 height: 20 @@ -146,7 +146,7 @@ cake_end_texture_16: format: RGBA16 symbol: dCakeEndTexture16 -cake_end_texture_17: +cake.17: type: TEXTURE width: 80 height: 20 @@ -154,7 +154,7 @@ cake_end_texture_17: format: RGBA16 symbol: dCakeEndTexture17 -cake_end_texture_18: +cake.18: type: TEXTURE width: 80 height: 20 @@ -162,7 +162,7 @@ cake_end_texture_18: format: RGBA16 symbol: dCakeEndTexture18 -cake_end_texture_19: +cake.19: type: TEXTURE width: 80 height: 20 @@ -170,7 +170,7 @@ cake_end_texture_19: format: RGBA16 symbol: dCakeEndTexture19 -cake_end_texture_20: +cake.20: type: TEXTURE width: 80 height: 20 @@ -178,7 +178,7 @@ cake_end_texture_20: format: RGBA16 symbol: dCakeEndTexture20 -cake_end_texture_21: +cake.21: type: TEXTURE width: 80 height: 20 @@ -186,7 +186,7 @@ cake_end_texture_21: format: RGBA16 symbol: dCakeEndTexture21 -cake_end_texture_22: +cake.22: type: TEXTURE width: 80 height: 20 @@ -194,7 +194,7 @@ cake_end_texture_22: format: RGBA16 symbol: dCakeEndTexture22 -cake_end_texture_23: +cake.23: type: TEXTURE width: 80 height: 20 @@ -202,7 +202,7 @@ cake_end_texture_23: format: RGBA16 symbol: dCakeEndTexture23 -cake_end_texture_24: +cake.24: type: TEXTURE width: 80 height: 20 @@ -210,7 +210,7 @@ cake_end_texture_24: format: RGBA16 symbol: dCakeEndTexture24 -cake_end_texture_25: +cake.25: type: TEXTURE width: 80 height: 20 @@ -218,7 +218,7 @@ cake_end_texture_25: format: RGBA16 symbol: dCakeEndTexture25 -cake_end_texture_26: +cake.26: type: TEXTURE width: 80 height: 20 @@ -226,7 +226,7 @@ cake_end_texture_26: format: RGBA16 symbol: dCakeEndTexture26 -cake_end_texture_27: +cake.27: type: TEXTURE width: 80 height: 20 @@ -234,7 +234,7 @@ cake_end_texture_27: format: RGBA16 symbol: dCakeEndTexture27 -cake_end_texture_28: +cake.28: type: TEXTURE width: 80 height: 20 @@ -242,7 +242,7 @@ cake_end_texture_28: format: RGBA16 symbol: dCakeEndTexture28 -cake_end_texture_29: +cake.29: type: TEXTURE width: 80 height: 20 @@ -250,7 +250,7 @@ cake_end_texture_29: format: RGBA16 symbol: dCakeEndTexture29 -cake_end_texture_30: +cake.30: type: TEXTURE width: 80 height: 20 @@ -258,7 +258,7 @@ cake_end_texture_30: format: RGBA16 symbol: dCakeEndTexture30 -cake_end_texture_31: +cake.31: type: TEXTURE width: 80 height: 20 @@ -266,7 +266,7 @@ cake_end_texture_31: format: RGBA16 symbol: dCakeEndTexture31 -cake_end_texture_32: +cake.32: type: TEXTURE width: 80 height: 20 @@ -274,7 +274,7 @@ cake_end_texture_32: format: RGBA16 symbol: dCakeEndTexture32 -cake_end_texture_33: +cake.33: type: TEXTURE width: 80 height: 20 @@ -282,7 +282,7 @@ cake_end_texture_33: format: RGBA16 symbol: dCakeEndTexture33 -cake_end_texture_34: +cake.34: type: TEXTURE width: 80 height: 20 @@ -290,7 +290,7 @@ cake_end_texture_34: format: RGBA16 symbol: dCakeEndTexture34 -cake_end_texture_35: +cake.35: type: TEXTURE width: 80 height: 20 @@ -298,7 +298,7 @@ cake_end_texture_35: format: RGBA16 symbol: dCakeEndTexture35 -cake_end_texture_36: +cake.36: type: TEXTURE width: 80 height: 20 @@ -306,7 +306,7 @@ cake_end_texture_36: format: RGBA16 symbol: dCakeEndTexture36 -cake_end_texture_37: +cake.37: type: TEXTURE width: 80 height: 20 @@ -314,7 +314,7 @@ cake_end_texture_37: format: RGBA16 symbol: dCakeEndTexture37 -cake_end_texture_38: +cake.38: type: TEXTURE width: 80 height: 20 @@ -322,7 +322,7 @@ cake_end_texture_38: format: RGBA16 symbol: dCakeEndTexture38 -cake_end_texture_39: +cake.39: type: TEXTURE width: 80 height: 20 @@ -330,7 +330,7 @@ cake_end_texture_39: format: RGBA16 symbol: dCakeEndTexture39 -cake_end_texture_40: +cake.40: type: TEXTURE width: 80 height: 20 @@ -338,7 +338,7 @@ cake_end_texture_40: format: RGBA16 symbol: dCakeEndTexture40 -cake_end_texture_41: +cake.41: type: TEXTURE width: 80 height: 20 @@ -346,7 +346,7 @@ cake_end_texture_41: format: RGBA16 symbol: dCakeEndTexture41 -cake_end_texture_42: +cake.42: type: TEXTURE width: 80 height: 20 @@ -354,7 +354,7 @@ cake_end_texture_42: format: RGBA16 symbol: dCakeEndTexture42 -cake_end_texture_43: +cake.43: type: TEXTURE width: 80 height: 20 @@ -362,7 +362,7 @@ cake_end_texture_43: format: RGBA16 symbol: dCakeEndTexture43 -cake_end_texture_44: +cake.44: type: TEXTURE width: 80 height: 20 @@ -370,7 +370,7 @@ cake_end_texture_44: format: RGBA16 symbol: dCakeEndTexture44 -cake_end_texture_45: +cake.45: type: TEXTURE width: 80 height: 20 @@ -378,7 +378,7 @@ cake_end_texture_45: format: RGBA16 symbol: dCakeEndTexture45 -cake_end_texture_46: +cake.46: type: TEXTURE width: 80 height: 20 @@ -386,7 +386,7 @@ cake_end_texture_46: format: RGBA16 symbol: dCakeEndTexture46 -cake_end_texture_47: +cake.47: type: TEXTURE width: 80 height: 20 diff --git a/assets/ymls/us/actors/wiggler_head.yml b/assets/ymls/us/actors/wiggler.yml similarity index 53% rename from assets/ymls/us/actors/wiggler_head.yml rename to assets/ymls/us/actors/wiggler.yml index 6ad5f91e..a667e684 100644 --- a/assets/ymls/us/actors/wiggler_head.yml +++ b/assets/ymls/us/actors/wiggler.yml @@ -1,7 +1,5 @@ :config: autopads: false - external_files: - - "assets/ymls/us/actors/wiggler_body.yml" compression: offset: 0x180BB0 segments: @@ -11,6 +9,222 @@ - '#include "sm64.h"' - '#include "wiggler_head/anims.h"' - '#include "wiggler_head/geo.h"' + - '#include "wiggler_body/anims.h"' + +wiggler_segment_left_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x5A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05005A30 + +wiggler_segment_right_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x6A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05006A30 + +wiggler_eye: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x7A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05007A30 + +wiggler_flower: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x8230 + format: RGBA16 + symbol: wiggler_seg5_texture_05008230 + +wiggler_frown: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x8A30 + format: RGBA16 + symbol: wiggler_seg5_texture_05008A30 + +wiggler_nose_left_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x9230 + format: RGBA16 + symbol: wiggler_seg5_texture_05009230 + +wiggler_nose_right_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0xA230 + format: RGBA16 + symbol: wiggler_seg5_texture_0500A230 + +wiggler_seg5_lights_0500B230: + type: LIGHTS + size: 24 + offset: 0xB230 + symbol: wiggler_seg5_lights_0500B230 + +wiggler_seg5_lights_0500B248: + type: LIGHTS + size: 24 + offset: 0xB248 + symbol: wiggler_seg5_lights_0500B248 + +wiggler_body_lights_unused: + type: LIGHTS + size: 24 + offset: 0xB260 + symbol: wiggler_body_lights_unused + +wiggler_seg5_vertex_0500B278: + type: VTX + count: 16 + offset: 0xB278 + symbol: wiggler_seg5_vertex_0500B278 + +wiggler_seg5_vertex_0500B378: + type: VTX + count: 16 + offset: 0xB378 + symbol: wiggler_seg5_vertex_0500B378 + +wiggler_seg5_vertex_0500B478: + type: VTX + count: 16 + offset: 0xB478 + symbol: wiggler_seg5_vertex_0500B478 + +wiggler_seg5_vertex_0500B578: + type: VTX + count: 4 + offset: 0xB578 + symbol: wiggler_seg5_vertex_0500B578 + +wiggler_seg5_vertex_0500B5B8: + type: VTX + count: 15 + offset: 0xB5B8 + symbol: wiggler_seg5_vertex_0500B5B8 + +wiggler_seg5_vertex_0500B6A8: + type: VTX + count: 15 + offset: 0xB6A8 + symbol: wiggler_seg5_vertex_0500B6A8 + +wiggler_seg5_vertex_0500B798: + type: VTX + count: 16 + offset: 0xB798 + symbol: wiggler_seg5_vertex_0500B798 + +wiggler_seg5_vertex_0500B898: + type: VTX + count: 16 + offset: 0xB898 + symbol: wiggler_seg5_vertex_0500B898 + +wiggler_seg5_vertex_0500B998: + type: VTX + count: 16 + offset: 0xB998 + symbol: wiggler_seg5_vertex_0500B998 + +wiggler_seg5_vertex_0500BA98: + type: VTX + count: 4 + offset: 0xBA98 + symbol: wiggler_seg5_vertex_0500BA98 + +wiggler_seg5_vertex_0500BAD8: + type: VTX + count: 15 + offset: 0xBAD8 + symbol: wiggler_seg5_vertex_0500BAD8 + +wiggler_seg5_vertex_0500BBC8: + type: VTX + count: 15 + offset: 0xBBC8 + symbol: wiggler_seg5_vertex_0500BBC8 + +wiggler_seg5_dl_0500BCB8: + type: GFX + offset: 0xBCB8 + symbol: wiggler_seg5_dl_0500BCB8 + +wiggler_seg5_dl_0500BE10: + type: GFX + offset: 0xBE10 + symbol: wiggler_seg5_dl_0500BE10 + +wiggler_seg5_dl_0500BE98: + type: GFX + offset: 0xBE98 + symbol: wiggler_seg5_dl_0500BE98 + +wiggler_seg5_dl_0500BF20: + type: GFX + offset: 0xBF20 + symbol: wiggler_seg5_dl_0500BF20 + +wiggler_seg5_dl_0500C078: + type: GFX + offset: 0xC078 + symbol: wiggler_seg5_dl_0500C078 + +wiggler_seg5_dl_0500C100: + type: GFX + offset: 0xC100 + symbol: wiggler_seg5_dl_0500C100 + +wiggler_seg5_vertex_0500C188: + type: VTX + count: 4 + offset: 0xC188 + symbol: wiggler_seg5_vertex_0500C188 + +wiggler_seg5_vertex_0500C1C8: + type: VTX + count: 4 + offset: 0xC1C8 + symbol: wiggler_seg5_vertex_0500C1C8 + +wiggler_seg5_dl_0500C208: + type: GFX + offset: 0xC208 + symbol: wiggler_seg5_dl_0500C208 + +wiggler_seg5_dl_0500C240: + type: GFX + offset: 0xC240 + symbol: wiggler_seg5_dl_0500C240 + +wiggler_seg5_dl_0500C278: + type: GFX + offset: 0xC278 + symbol: wiggler_seg5_dl_0500C278 + +wiggler_body_geo: + type: SM64:GEO_LAYOUT + offset: 0xC778 + symbol: wiggler_body_geo wiggler_seg5_lights_0500C878: type: LIGHTS diff --git a/assets/ymls/us/actors/wiggler_body.yml b/assets/ymls/us/actors/wiggler_body.yml deleted file mode 100644 index 86ac7012..00000000 --- a/assets/ymls/us/actors/wiggler_body.yml +++ /dev/null @@ -1,225 +0,0 @@ -:config: - autopads: false - compression: - offset: 0x180BB0 - segments: - - [ 0x5, 0x180BB0 ] - header: - header: - - '#include "sm64.h"' - - '#include "wiggler_body/anims.h"' - -wiggler_segment_left_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x5A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05005A30 - -wiggler_segment_right_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x6A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05006A30 - -wiggler_eye: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x7A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05007A30 - -wiggler_flower: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x8230 - format: RGBA16 - symbol: wiggler_seg5_texture_05008230 - -wiggler_frown: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x8A30 - format: RGBA16 - symbol: wiggler_seg5_texture_05008A30 - -wiggler_nose_left_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x9230 - format: RGBA16 - symbol: wiggler_seg5_texture_05009230 - -wiggler_nose_right_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xA230 - format: RGBA16 - symbol: wiggler_seg5_texture_0500A230 - -wiggler_seg5_lights_0500B230: - type: LIGHTS - size: 24 - offset: 0xB230 - symbol: wiggler_seg5_lights_0500B230 - -wiggler_seg5_lights_0500B248: - type: LIGHTS - size: 24 - offset: 0xB248 - symbol: wiggler_seg5_lights_0500B248 - -wiggler_body_lights_unused: - type: LIGHTS - size: 24 - offset: 0xB260 - symbol: wiggler_body_lights_unused - -wiggler_seg5_vertex_0500B278: - type: VTX - count: 16 - offset: 0xB278 - symbol: wiggler_seg5_vertex_0500B278 - -wiggler_seg5_vertex_0500B378: - type: VTX - count: 16 - offset: 0xB378 - symbol: wiggler_seg5_vertex_0500B378 - -wiggler_seg5_vertex_0500B478: - type: VTX - count: 16 - offset: 0xB478 - symbol: wiggler_seg5_vertex_0500B478 - -wiggler_seg5_vertex_0500B578: - type: VTX - count: 4 - offset: 0xB578 - symbol: wiggler_seg5_vertex_0500B578 - -wiggler_seg5_vertex_0500B5B8: - type: VTX - count: 15 - offset: 0xB5B8 - symbol: wiggler_seg5_vertex_0500B5B8 - -wiggler_seg5_vertex_0500B6A8: - type: VTX - count: 15 - offset: 0xB6A8 - symbol: wiggler_seg5_vertex_0500B6A8 - -wiggler_seg5_vertex_0500B798: - type: VTX - count: 16 - offset: 0xB798 - symbol: wiggler_seg5_vertex_0500B798 - -wiggler_seg5_vertex_0500B898: - type: VTX - count: 16 - offset: 0xB898 - symbol: wiggler_seg5_vertex_0500B898 - -wiggler_seg5_vertex_0500B998: - type: VTX - count: 16 - offset: 0xB998 - symbol: wiggler_seg5_vertex_0500B998 - -wiggler_seg5_vertex_0500BA98: - type: VTX - count: 4 - offset: 0xBA98 - symbol: wiggler_seg5_vertex_0500BA98 - -wiggler_seg5_vertex_0500BAD8: - type: VTX - count: 15 - offset: 0xBAD8 - symbol: wiggler_seg5_vertex_0500BAD8 - -wiggler_seg5_vertex_0500BBC8: - type: VTX - count: 15 - offset: 0xBBC8 - symbol: wiggler_seg5_vertex_0500BBC8 - -wiggler_seg5_dl_0500BCB8: - type: GFX - offset: 0xBCB8 - symbol: wiggler_seg5_dl_0500BCB8 - -wiggler_seg5_dl_0500BE10: - type: GFX - offset: 0xBE10 - symbol: wiggler_seg5_dl_0500BE10 - -wiggler_seg5_dl_0500BE98: - type: GFX - offset: 0xBE98 - symbol: wiggler_seg5_dl_0500BE98 - -wiggler_seg5_dl_0500BF20: - type: GFX - offset: 0xBF20 - symbol: wiggler_seg5_dl_0500BF20 - -wiggler_seg5_dl_0500C078: - type: GFX - offset: 0xC078 - symbol: wiggler_seg5_dl_0500C078 - -wiggler_seg5_dl_0500C100: - type: GFX - offset: 0xC100 - symbol: wiggler_seg5_dl_0500C100 - -wiggler_seg5_vertex_0500C188: - type: VTX - count: 4 - offset: 0xC188 - symbol: wiggler_seg5_vertex_0500C188 - -wiggler_seg5_vertex_0500C1C8: - type: VTX - count: 4 - offset: 0xC1C8 - symbol: wiggler_seg5_vertex_0500C1C8 - -wiggler_seg5_dl_0500C208: - type: GFX - offset: 0xC208 - symbol: wiggler_seg5_dl_0500C208 - -wiggler_seg5_dl_0500C240: - type: GFX - offset: 0xC240 - symbol: wiggler_seg5_dl_0500C240 - -wiggler_seg5_dl_0500C278: - type: GFX - offset: 0xC278 - symbol: wiggler_seg5_dl_0500C278 - -wiggler_body_geo: - type: SM64:GEO_LAYOUT - offset: 0xC778 - symbol: wiggler_body_geo diff --git a/assets/ymls/us/actors/wiggler_head/geo.yml b/assets/ymls/us/actors/wiggler_head/geo.yml index d62fd96f..1237b835 100644 --- a/assets/ymls/us/actors/wiggler_head/geo.yml +++ b/assets/ymls/us/actors/wiggler_head/geo.yml @@ -1,7 +1,6 @@ :config: external_files: - - "assets/ymls/us/actors/wiggler_head.yml" - - "assets/ymls/us/actors/wiggler_body.yml" + - "assets/ymls/us/actors/wiggler.yml" autopads: false segments: - [ 0xC, 0x187FA0 ] diff --git a/assets/ymls/us/levels/ending.yml b/assets/ymls/us/levels/ending.yml index da89cece..0c517348 100644 --- a/assets/ymls/us/levels/ending.yml +++ b/assets/ymls/us/levels/ending.yml @@ -10,7 +10,7 @@ - '' - 'extern const LevelScript level_ending_entry[];' -cake_end_texture_0: +cake.0: type: TEXTURE width: 80 height: 20 @@ -18,7 +18,7 @@ cake_end_texture_0: format: RGBA16 symbol: dCakeEndTexture0 -cake_end_texture_1: +cake.1: type: TEXTURE width: 80 height: 20 @@ -26,7 +26,7 @@ cake_end_texture_1: format: RGBA16 symbol: dCakeEndTexture1 -cake_end_texture_2: +cake.2: type: TEXTURE width: 80 height: 20 @@ -34,7 +34,7 @@ cake_end_texture_2: format: RGBA16 symbol: dCakeEndTexture2 -cake_end_texture_3: +cake.3: type: TEXTURE width: 80 height: 20 @@ -42,7 +42,7 @@ cake_end_texture_3: format: RGBA16 symbol: dCakeEndTexture3 -cake_end_texture_4: +cake.4: type: TEXTURE width: 80 height: 20 @@ -50,7 +50,7 @@ cake_end_texture_4: format: RGBA16 symbol: dCakeEndTexture4 -cake_end_texture_5: +cake.5: type: TEXTURE width: 80 height: 20 @@ -58,7 +58,7 @@ cake_end_texture_5: format: RGBA16 symbol: dCakeEndTexture5 -cake_end_texture_6: +cake.6: type: TEXTURE width: 80 height: 20 @@ -66,7 +66,7 @@ cake_end_texture_6: format: RGBA16 symbol: dCakeEndTexture6 -cake_end_texture_7: +cake.7: type: TEXTURE width: 80 height: 20 @@ -74,7 +74,7 @@ cake_end_texture_7: format: RGBA16 symbol: dCakeEndTexture7 -cake_end_texture_8: +cake.8: type: TEXTURE width: 80 height: 20 @@ -82,7 +82,7 @@ cake_end_texture_8: format: RGBA16 symbol: dCakeEndTexture8 -cake_end_texture_9: +cake.9: type: TEXTURE width: 80 height: 20 @@ -90,7 +90,7 @@ cake_end_texture_9: format: RGBA16 symbol: dCakeEndTexture9 -cake_end_texture_10: +cake.10: type: TEXTURE width: 80 height: 20 @@ -98,7 +98,7 @@ cake_end_texture_10: format: RGBA16 symbol: dCakeEndTexture10 -cake_end_texture_11: +cake.11: type: TEXTURE width: 80 height: 20 @@ -106,7 +106,7 @@ cake_end_texture_11: format: RGBA16 symbol: dCakeEndTexture11 -cake_end_texture_12: +cake.12: type: TEXTURE width: 80 height: 20 @@ -114,7 +114,7 @@ cake_end_texture_12: format: RGBA16 symbol: dCakeEndTexture12 -cake_end_texture_13: +cake.13: type: TEXTURE width: 80 height: 20 @@ -122,7 +122,7 @@ cake_end_texture_13: format: RGBA16 symbol: dCakeEndTexture13 -cake_end_texture_14: +cake.14: type: TEXTURE width: 80 height: 20 @@ -130,7 +130,7 @@ cake_end_texture_14: format: RGBA16 symbol: dCakeEndTexture14 -cake_end_texture_15: +cake.15: type: TEXTURE width: 80 height: 20 @@ -138,7 +138,7 @@ cake_end_texture_15: format: RGBA16 symbol: dCakeEndTexture15 -cake_end_texture_16: +cake.16: type: TEXTURE width: 80 height: 20 @@ -146,7 +146,7 @@ cake_end_texture_16: format: RGBA16 symbol: dCakeEndTexture16 -cake_end_texture_17: +cake.17: type: TEXTURE width: 80 height: 20 @@ -154,7 +154,7 @@ cake_end_texture_17: format: RGBA16 symbol: dCakeEndTexture17 -cake_end_texture_18: +cake.18: type: TEXTURE width: 80 height: 20 @@ -162,7 +162,7 @@ cake_end_texture_18: format: RGBA16 symbol: dCakeEndTexture18 -cake_end_texture_19: +cake.19: type: TEXTURE width: 80 height: 20 @@ -170,7 +170,7 @@ cake_end_texture_19: format: RGBA16 symbol: dCakeEndTexture19 -cake_end_texture_20: +cake.20: type: TEXTURE width: 80 height: 20 @@ -178,7 +178,7 @@ cake_end_texture_20: format: RGBA16 symbol: dCakeEndTexture20 -cake_end_texture_21: +cake.21: type: TEXTURE width: 80 height: 20 @@ -186,7 +186,7 @@ cake_end_texture_21: format: RGBA16 symbol: dCakeEndTexture21 -cake_end_texture_22: +cake.22: type: TEXTURE width: 80 height: 20 @@ -194,7 +194,7 @@ cake_end_texture_22: format: RGBA16 symbol: dCakeEndTexture22 -cake_end_texture_23: +cake.23: type: TEXTURE width: 80 height: 20 @@ -202,7 +202,7 @@ cake_end_texture_23: format: RGBA16 symbol: dCakeEndTexture23 -cake_end_texture_24: +cake.24: type: TEXTURE width: 80 height: 20 @@ -210,7 +210,7 @@ cake_end_texture_24: format: RGBA16 symbol: dCakeEndTexture24 -cake_end_texture_25: +cake.25: type: TEXTURE width: 80 height: 20 @@ -218,7 +218,7 @@ cake_end_texture_25: format: RGBA16 symbol: dCakeEndTexture25 -cake_end_texture_26: +cake.26: type: TEXTURE width: 80 height: 20 @@ -226,7 +226,7 @@ cake_end_texture_26: format: RGBA16 symbol: dCakeEndTexture26 -cake_end_texture_27: +cake.27: type: TEXTURE width: 80 height: 20 @@ -234,7 +234,7 @@ cake_end_texture_27: format: RGBA16 symbol: dCakeEndTexture27 -cake_end_texture_28: +cake.28: type: TEXTURE width: 80 height: 20 @@ -242,7 +242,7 @@ cake_end_texture_28: format: RGBA16 symbol: dCakeEndTexture28 -cake_end_texture_29: +cake.29: type: TEXTURE width: 80 height: 20 @@ -250,7 +250,7 @@ cake_end_texture_29: format: RGBA16 symbol: dCakeEndTexture29 -cake_end_texture_30: +cake.30: type: TEXTURE width: 80 height: 20 @@ -258,7 +258,7 @@ cake_end_texture_30: format: RGBA16 symbol: dCakeEndTexture30 -cake_end_texture_31: +cake.31: type: TEXTURE width: 80 height: 20 @@ -266,7 +266,7 @@ cake_end_texture_31: format: RGBA16 symbol: dCakeEndTexture31 -cake_end_texture_32: +cake.32: type: TEXTURE width: 80 height: 20 @@ -274,7 +274,7 @@ cake_end_texture_32: format: RGBA16 symbol: dCakeEndTexture32 -cake_end_texture_33: +cake.33: type: TEXTURE width: 80 height: 20 @@ -282,7 +282,7 @@ cake_end_texture_33: format: RGBA16 symbol: dCakeEndTexture33 -cake_end_texture_34: +cake.34: type: TEXTURE width: 80 height: 20 @@ -290,7 +290,7 @@ cake_end_texture_34: format: RGBA16 symbol: dCakeEndTexture34 -cake_end_texture_35: +cake.35: type: TEXTURE width: 80 height: 20 @@ -298,7 +298,7 @@ cake_end_texture_35: format: RGBA16 symbol: dCakeEndTexture35 -cake_end_texture_36: +cake.36: type: TEXTURE width: 80 height: 20 @@ -306,7 +306,7 @@ cake_end_texture_36: format: RGBA16 symbol: dCakeEndTexture36 -cake_end_texture_37: +cake.37: type: TEXTURE width: 80 height: 20 @@ -314,7 +314,7 @@ cake_end_texture_37: format: RGBA16 symbol: dCakeEndTexture37 -cake_end_texture_38: +cake.38: type: TEXTURE width: 80 height: 20 @@ -322,7 +322,7 @@ cake_end_texture_38: format: RGBA16 symbol: dCakeEndTexture38 -cake_end_texture_39: +cake.39: type: TEXTURE width: 80 height: 20 @@ -330,7 +330,7 @@ cake_end_texture_39: format: RGBA16 symbol: dCakeEndTexture39 -cake_end_texture_40: +cake.40: type: TEXTURE width: 80 height: 20 @@ -338,7 +338,7 @@ cake_end_texture_40: format: RGBA16 symbol: dCakeEndTexture40 -cake_end_texture_41: +cake.41: type: TEXTURE width: 80 height: 20 @@ -346,7 +346,7 @@ cake_end_texture_41: format: RGBA16 symbol: dCakeEndTexture41 -cake_end_texture_42: +cake.42: type: TEXTURE width: 80 height: 20 @@ -354,7 +354,7 @@ cake_end_texture_42: format: RGBA16 symbol: dCakeEndTexture42 -cake_end_texture_43: +cake.43: type: TEXTURE width: 80 height: 20 @@ -362,7 +362,7 @@ cake_end_texture_43: format: RGBA16 symbol: dCakeEndTexture43 -cake_end_texture_44: +cake.44: type: TEXTURE width: 80 height: 20 @@ -370,7 +370,7 @@ cake_end_texture_44: format: RGBA16 symbol: dCakeEndTexture44 -cake_end_texture_45: +cake.45: type: TEXTURE width: 80 height: 20 @@ -378,7 +378,7 @@ cake_end_texture_45: format: RGBA16 symbol: dCakeEndTexture45 -cake_end_texture_46: +cake.46: type: TEXTURE width: 80 height: 20 @@ -386,7 +386,7 @@ cake_end_texture_46: format: RGBA16 symbol: dCakeEndTexture46 -cake_end_texture_47: +cake.47: type: TEXTURE width: 80 height: 20 diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 2587d555..5ccd6673 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -254,9 +254,9 @@ void render_generic_char(u8 c) { gDPPipeSync(gDisplayListHead++); if(ROM_JP) { - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, GameEngine_GetExactDataByName(packedTexture)); + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, (packedTexture)); } else { - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, GameEngine_GetExactDataByName(packedTexture)); + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (packedTexture)); } gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings);