Fixes multiple errors preventing asset extraction from completing on the JP rom.

This commit is contained in:
Malkierian
2024-04-15 08:53:22 -06:00
committed by Lywx
parent 335b2d48e9
commit d58b5e3d40
17 changed files with 66 additions and 1179 deletions
-10
View File
@@ -552,11 +552,6 @@ bowser_seg6_dl_0603B8D0:
offset: 0x3B8D0
symbol: bowser_seg6_dl_0603B8D0
bowser_seg6_dl_0603B948:
type: GFX
offset: 0x3B948
symbol: bowser_seg6_dl_0603B948
bowser_seg6_vertex_0603B948:
type: VTX
count: 16
@@ -1054,11 +1049,6 @@ bowser_seg6_dl_06040210:
offset: 0x40210
symbol: bowser_seg6_dl_06040210
bowser_seg6_dl_06040358:
type: GFX
offset: 0x40358
symbol: bowser_seg6_dl_06040358
bowser_seg6_vertex_060402D8:
type: VTX
count: 16
+1 -1
View File
@@ -26,7 +26,7 @@ dorrie_tongue:
size: 2048
width: 32
height: 32
offset: 0x223D0
offset: 0xADA0
format: RGBA16
symbol: dorrie_seg6_texture_0600ADA0
+3 -3
View File
@@ -1,9 +1,9 @@
:config:
autopads: false
compression:
offset: 0x139D10
offset: 0x144290
segments:
- [0x05, 0x139D10]
- [0x05, 0x144290]
eyerok_bricks:
type: TEXTURE
@@ -49,7 +49,7 @@ eyerok_eye_open:
eyerok_lights_unused:
type: LIGHTS
size: 24
offset: 0x1B5A8
offset: 0x8D28
symbol: eyerok_lights_unused
eyerok_seg5_lights_0500B540:
+5 -5
View File
@@ -97,31 +97,31 @@ king_bob-omb_right_side:
king_bobomb_lights_unused1:
type: LIGHTS
size: 24
offset: 0x2BA18
offset: 0x0
symbol: king_bobomb_lights_unused1
king_bobomb_lights_unused2:
type: LIGHTS
size: 24
offset: 0x2BA18
offset: 0x18
symbol: king_bobomb_lights_unused2
king_bobomb_lights_unused3:
type: LIGHTS
size: 24
offset: 0x2BA18
offset: 0x30
symbol: king_bobomb_lights_unused3
king_bobomb_lights_unused4:
type: LIGHTS
size: 24
offset: 0x2BA18
offset: 0x48
symbol: king_bobomb_lights_unused4
king_bobomb_lights_unused5:
type: LIGHTS
size: 24
offset: 0x2BA18
offset: 0x60
symbol: king_bobomb_lights_unused5
king_bobomb_seg5_vertex_0500A478:
+2 -2
View File
@@ -1,9 +1,9 @@
:config:
autopads: false
compression:
offset: 0x139D10
offset: 0x144290
segments:
- [0x05, 0x139D10]
- [0x05, 0x144290]
klepto_beak:
type: TEXTURE
+4 -4
View File
@@ -57,25 +57,25 @@ mad_piano_tooth:
mad_piano_lights_unused1:
type: LIGHTS
size: 24
offset: 0x2C620
offset: 0x6A90
symbol: mad_piano_lights_unused1
mad_piano_lights_unused2:
type: LIGHTS
size: 24
offset: 0x2C620
offset: 0x6AA8
symbol: mad_piano_lights_unused2
mad_piano_lights_unused3:
type: LIGHTS
size: 24
offset: 0x2C620
offset: 0x6AC0
symbol: mad_piano_lights_unused3
mad_piano_lights_unused4:
type: LIGHTS
size: 24
offset: 0x2C620
offset: 0x6AD8
symbol: mad_piano_lights_unused4
mad_piano_seg5_lights_050086F0:
+2 -2
View File
@@ -1,9 +1,9 @@
:config:
autopads: false
compression:
offset: 0x139D10
offset: 0x144290
segments:
- [0x05, 0x139D10]
- [0x05, 0x144290]
pokey_body:
type: TEXTURE
-3
View File
@@ -86,9 +86,6 @@ power_meter_two_segments:
format: RGBA16
symbol: texture_power_meter_two_segments
offset: 0x293E0
symbol: *const
vertex_power_meter_base:
type: VTX
count: 8
+4 -4
View File
@@ -49,25 +49,25 @@ mr_blizzard_right_side:
snowman_lights_unused1:
type: LIGHTS
size: 24
offset: 0x19438
offset: 0x8C10
symbol: snowman_lights_unused1
snowman_lights_unused2:
type: LIGHTS
size: 24
offset: 0x19438
offset: 0x8C28
symbol: snowman_lights_unused2
snowman_lights_unused3:
type: LIGHTS
size: 24
offset: 0x19438
offset: 0x8C40
symbol: snowman_lights_unused3
snowman_lights_unused4:
type: LIGHTS
size: 24
offset: 0x19438
offset: 0x8C58
symbol: snowman_lights_unused4
snowman_seg5_lights_0500C470:
+2 -2
View File
@@ -1,9 +1,9 @@
:config:
autopads: false
compression:
offset: 0x139D10
offset: 0x144290
segments:
- [0x05, 0x139D10]
- [0x05, 0x144290]
tornado:
type: TEXTURE
+2 -2
View File
@@ -1,9 +1,9 @@
:config:
autopads: false
compression:
offset: 0x128BE0
offset: 0x186810
segments:
- [0x06, 0x128BE0]
- [0x06, 0x186810]
yellow_sphere:
type: TEXTURE
+39
View File
@@ -3476,3 +3476,42 @@ bbh_seg7_dl_0701FD28:
offset: 0x1FD28
symbol: bbh_seg7_dl_0701FD28
bbh_seg7_collision_level:
type: SM64:COLLISION
offset: 0x207A0
symbol: bbh_seg7_collision_level
bbh_seg7_collision_staircase_step:
type: SM64:COLLISION
offset: 0x26A1C
symbol: bbh_seg7_collision_staircase_step
bbh_seg7_collision_tilt_floor_platform:
type: SM64:COLLISION
offset: 0x26A98
symbol: bbh_seg7_collision_tilt_floor_platform
bbh_seg7_collision_07026B1C:
type: SM64:COLLISION
offset: 0x26B1C
symbol: bbh_seg7_collision_07026B1C
bbh_seg7_collision_haunted_bookshelf:
type: SM64:COLLISION
offset: 0x26B4C
symbol: bbh_seg7_collision_haunted_bookshelf
bbh_seg7_collision_mesh_elevator:
type: SM64:COLLISION
offset: 0x26B94
symbol: bbh_seg7_collision_mesh_elevator
bbh_seg7_collision_merry_go_round:
type: SM64:COLLISION
offset: 0x26C1C
symbol: bbh_seg7_collision_merry_go_round
bbh_seg7_collision_coffin:
type: SM64:COLLISION
offset: 0x26D18
symbol: bbh_seg7_collision_coffin
-5
View File
@@ -1189,11 +1189,6 @@ castle_grounds_seg7_dl_070095F0:
offset: 0x95F0
symbol: castle_grounds_seg7_dl_070095F0
castle_grounds_seg7_us_dl_0700F2E8:
type: GFX
offset: 0xF2E8
symbol: castle_grounds_seg7_us_dl_0700F2E8
castle_grounds_seg7_vertex_0700A8D0:
type: VTX
count: 15
File diff suppressed because it is too large Load Diff
+1
View File
@@ -30,6 +30,7 @@
format: RGBA16
symbol: pss_seg7_texture_07001000
pss_seg7_lights_0700E348:
type: LIGHTS
size: 24
+1 -1
View File
@@ -154,7 +154,7 @@ lll_textures.09000:
size: 2048
width: 32
height: 32
offset: 0x13C58
offset: 0x9000
format: RGBA16
symbol: fire_09009000
lll_textures.09800:
-16
View File
@@ -5,22 +5,6 @@
segments:
- [0x02, 0x1076D0]
font_graphics.06410:
type: TEXTURE
size: 16
width: 16
height: 8
offset: 0x14676
format: IA1
symbol: texture_font_char_eu_colon
font_graphics.06420:
type: TEXTURE
size: 16
width: 16
height: 8
offset: 0x20B5B
format: IA1
symbol: texture_font_char_EU_slash
segment2.00000:
type: TEXTURE
size: 512