summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/graphics.s26
-rw-r--r--data/hall_of_fame.s46
3 files changed, 26 insertions, 48 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ad1216b91..bd6210c38 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1029,7 +1029,7 @@ gUnknown_082C8845:: @ 82C8845
gUnknown_082C892A:: @ 82C892A
.incbin "baserom.gba", 0x2c892a, 0x2f
-gUnknown_082C8959:: @ 82C8959
+gText_SavingDontTurnOffPower:: @ 82C8959
.incbin "baserom.gba", 0x2c8959, 0x22
gUnknown_082C897B:: @ 82C897B
diff --git a/data/graphics.s b/data/graphics.s
index 4586e18af..87b983a80 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -156,7 +156,31 @@ gSubstituteDollGfx:: @ 8C2CEE0
.incbin "baserom.gba", 0xc2cee0, 0x240
gSubstituteDollTilemap:: @ 8C2D120
- .incbin "baserom.gba", 0xc2d120, 0x600
+ .incbin "baserom.gba", 0xc2d120, 552
+
+gUnknown_08C2D348:: @ 8C2D348
+ .incbin "baserom.gba", 0xC2D348, 196
+
+gUnknown_08C2D40C:: @ 8C2D40C
+ .incbin "baserom.gba", 0xC2D40C, 28
+
+gContestConfetti_Gfx:: @ 8C2D428
+ .incbin "baserom.gba", 0xC2D428, 288
+
+gContestConfetti_Pal:: @ 8C2D548
+ .incbin "baserom.gba", 0xC2D548, 40
+
+gUnknown_08C2D570:: @ 8C2D570
+ .incbin "baserom.gba", 0xC2D570, 316
+
+gUnknown_08C2D6AC:: @ 8C2D6AC
+ .incbin "baserom.gba", 0xC2D6AC, 36
+
+gUnknown_08C2D6D0:: @ 8C2D6D0
+ .incbin "baserom.gba", 0xC2D6D0, 40
+
+gUnknown_08C2D6F8:: @ 8C2D6F8
+ .incbin "baserom.gba", 0xC2D6F8, 40
gUnknown_08C2D720:: @ 8C2D720
.incbin "baserom.gba", 0xc2d720, 0x210
diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s
deleted file mode 100644
index 2678d96a6..000000000
--- a/data/hall_of_fame.s
+++ /dev/null
@@ -1,46 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_085E5374:: @ 85E5374
- .incbin "baserom.gba", 0x5e5374, 0xc
-
-gUnknown_085E5380:: @ 85E5380
- .incbin "baserom.gba", 0x5e5380, 0x8
-
-gUnknown_085E5388:: @ 85E5388
- .incbin "baserom.gba", 0x5e5388, 0x4
-
-gUnknown_085E538C:: @ 85E538C
- .incbin "baserom.gba", 0x5e538c, 0x8
-
-gUnknown_085E5394:: @ 85E5394
- .incbin "baserom.gba", 0x5e5394, 0x10
-
-gUnknown_085E53A4:: @ 85E53A4
- .incbin "baserom.gba", 0x5e53a4, 0x10
-
-gUnknown_085E53B4:: @ 85E53B4
- .incbin "baserom.gba", 0x5e53b4, 0x6
-
-gUnknown_085E53BA:: @ 85E53BA
- .incbin "baserom.gba", 0x5e53ba, 0x2a
-
-gUnknown_085E53E4:: @ 85E53E4
- .incbin "baserom.gba", 0x5e53e4, 0x18
-
-gUnknown_085E53FC:: @ 85E53FC
- .incbin "baserom.gba", 0x5e53fc, 0xd4
-
-gUnknown_085E54D0:: @ 85E54D0
- .incbin "baserom.gba", 0x5e54d0, 0x18
-
-gUnknown_085E54E8:: @ 85E54E8
- .incbin "baserom.gba", 0x5e54e8, 0x20
-
-gUnknown_085E5508:: @ 85E5508
- .incbin "baserom.gba", 0x5e5508, 0x1cc
-
-gUnknown_085E56D4:: @ 85E56D4
- .incbin "baserom.gba", 0x5e56d4, 0x1c