summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/rom4.s2
-rw-r--r--data/data2.s17
2 files changed, 15 insertions, 4 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index b571f1a26..940d3e641 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -427,7 +427,7 @@ _0805329C: .4byte gUnknown_020297F0
_080532A0: .4byte gSaveBlock1
_080532A4: .4byte gUnknown_020297F8
_080532A8: .4byte gUnknown_02029800
-_080532AC: .4byte gUnknown_08216624
+_080532AC: .4byte gDummyWarpData
_080532B0: .4byte gUnknown_02029808
thumb_func_end warp_shift
diff --git a/data/data2.s b/data/data2.s
index 2cc0fecd5..66e0a47d2 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -3861,8 +3861,16 @@ gUnknown_08216604:: @ 8216604
.byte 0xFF
.space 9
-gUnknown_08216624:: @ 8216624
- .incbin "baserom.gba", 0x00216624, 0x28
+ .align 2
+gDummyWarpData:: @ 8216624
+ .byte -1
+ .byte -1
+ .byte -1
+ .space 1
+ .2byte -1
+ .2byte -1
+
+ .incbin "baserom.gba", 0x0021662C, 0x20
gUnknown_0821664C:: @ 821664C
.incbin "baserom.gba", 0x0021664c, 0x48
@@ -8578,7 +8586,10 @@ gTilesetAnimTable_BikeShop:: @ 837DEDC
.align 2
gDummyPaletteStructTemplate:: @ 837DEE4
- .incbin "baserom.gba", 0x0037dee4, 0x10
+ .2byte 0xFFFF
+ .space 9
+ .byte 0x20
+ .space 4
.align 2
gFanfares:: @ 837DEF4