summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-06 23:08:23 -0500
committerGitHub <noreply@github.com>2017-10-06 23:08:23 -0500
commit07e29b70bc56e95d322c99cb453433d0ea911fd0 (patch)
tree80c0ff6be5c288aa46a8f4152dd015c31739c88f /data
parentdea28a0a236412f267e3da8a7c200d947a9c5fe1 (diff)
parent2ecb9fcd130af975dd85a86e8e0fb23520aa7869 (diff)
Merge pull request #63 from ProjectRevoTPP/save_failed_screen
decompile save_failed_screen.c
Diffstat (limited to 'data')
-rw-r--r--data/data4.s13
-rw-r--r--data/save_failed_screen.s28
2 files changed, 5 insertions, 36 deletions
diff --git a/data/data4.s b/data/data4.s
index 202b1ffe7..d99336e87 100644
--- a/data/data4.s
+++ b/data/data4.s
@@ -14,19 +14,16 @@ gUnknown_085B09F4:: @ 85B09F4
gUnknown_085B09F8:: @ 85B09F8
.incbin "baserom.gba", 0x5b09f8, 0x8
-gUnknown_085B0A00:: @ 85B0A00
- .incbin "baserom.gba", 0x5b0a00, 0x2
+gBirchBagGrassPal:: @ 85B0A00
+ .incbin "baserom.gba", 0x5b0a00, 0x80
-gUnknown_085B0A02:: @ 85B0A02
- .incbin "baserom.gba", 0x5b0a02, 0x7e
-
-gUnknown_085B0A80:: @ 85B0A80
+gBirchBagTilemap:: @ 85B0A80
.incbin "baserom.gba", 0x5b0a80, 0x18c
-gUnknown_085B0C0C:: @ 85B0C0C
+gBirchGrassTilemap:: @ 85B0C0C
.incbin "baserom.gba", 0x5b0c0c, 0x1f8
-gUnknown_085B0E04:: @ 85B0E04
+gBirchHelpGfx:: @ 85B0E04
.incbin "baserom.gba", 0x5b0e04, 0xfc8
gUnknown_085B1DCC:: @ 85B1DCC
diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s
deleted file mode 100644
index 446eee2d2..000000000
--- a/data/save_failed_screen.s
+++ /dev/null
@@ -1,28 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_085EFD80:: @ 85EFD80
- .incbin "baserom.gba", 0x5efd80, 0x8
-
-gUnknown_085EFD88:: @ 85EFD88
- .incbin "baserom.gba", 0x5efd88, 0xc
-
-gUnknown_085EFD94:: @ 85EFD94
- .incbin "baserom.gba", 0x5efd94, 0x8
-
-gUnknown_085EFD9C:: @ 85EFD9C
- .incbin "baserom.gba", 0x5efd9c, 0x8
-
-gUnknown_085EFDA4:: @ 85EFDA4
- .incbin "baserom.gba", 0x5efda4, 0x8
-
-gUnknown_085EFDAC:: @ 85EFDAC
- .incbin "baserom.gba", 0x5efdac, 0x18
-
-gUnknown_085EFDC4:: @ 85EFDC4
- .incbin "baserom.gba", 0x5efdc4, 0x20
-
-gUnknown_085EFDE4:: @ 85EFDE4
- .incbin "baserom.gba", 0x5efde4, 0x90