summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/bag/bag_window_pal.pal19
-rw-r--r--data/data.s10
-rw-r--r--data/data_83FECCC.s33
3 files changed, 28 insertions, 34 deletions
diff --git a/data/bag/bag_window_pal.pal b/data/bag/bag_window_pal.pal
new file mode 100644
index 000000000..426ea279e
--- /dev/null
+++ b/data/bag/bag_window_pal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+255 156 148
+255 255 255
+189 90 82
diff --git a/data/data.s b/data/data.s
index 2d3806e4a..eb704206c 100644
--- a/data/data.s
+++ b/data/data.s
@@ -76,7 +76,7 @@ gUnknown_82349BC:: @ 82349BC
gUnknown_82349CC:: @ 82349CC
.incbin "baserom.gba", 0x2349CC, 0x6E0
-gUnknown_82350AC:: @ 82350AC
+gMonFrontPicTable:: @ 82350AC
.incbin "baserom.gba", 0x2350AC, 0xE8
gUnknown_8235194:: @ 8235194
@@ -85,7 +85,7 @@ gUnknown_8235194:: @ 8235194
gUnknown_8235E6C:: @ 8235E6C
.incbin "baserom.gba", 0x235E6C, 0x6E0
-gUnknown_823654C:: @ 823654C
+gMonBackPicTable:: @ 823654C
.incbin "baserom.gba", 0x23654C, 0xDC0
gMonPaletteTable:: @ 823730C
@@ -103,10 +103,10 @@ gTrainerFrontAnimsPtrTable:: @ 82390DC
gUnknown_823932C:: @ 823932C
.incbin "baserom.gba", 0x23932C, 0x250
-gUnknown_823957C:: @ 823957C
+gTrainerFrontPicTable:: @ 823957C
.incbin "baserom.gba", 0x23957C, 0x4A0
-gUnknown_8239A1C:: @ 8239A1C
+gTrainerFrontPicPaletteTable:: @ 8239A1C
.incbin "baserom.gba", 0x239A1C, 0x558
gTrainerBackAnimsPtrTable:: @ 8239F74
@@ -115,7 +115,7 @@ gTrainerBackAnimsPtrTable:: @ 8239F74
gUnknown_8239F8C:: @ 8239F8C
.incbin "baserom.gba", 0x239F8C, 0x18
-gUnknown_8239FA4:: @ 8239FA4
+gTrainerBackPicTable:: @ 8239FA4
.incbin "baserom.gba", 0x239FA4, 0x30
gUnknown_8239FD4:: @ 8239FD4
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index a855e5f7f..47d64e727 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -1,3 +1,5 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
.section .rodata
.align 2
@@ -881,8 +883,8 @@ gUnknown_84162BD:: @ 84162BD
gText_Coins:: @ 84162C4
.incbin "baserom.gba", 0x4162C4, 0x24
-gUnknown_84162E8:: @ 84162E8
- .incbin "baserom.gba", 0x4162E8, 0xD
+gText_DepositItem:: @ 84162E8
+ .string "DEPOSIT ITEM$"
gUnknown_84162F5:: @ 84162F5
.incbin "baserom.gba", 0x4162F5, 0xA
@@ -3079,33 +3081,6 @@ gUnknown_8453092:: @ 8453092
gUnknown_8453094:: @ 8453094
.incbin "baserom.gba", 0x453094, 0x4
-gUnknown_8453098:: @ 8453098
- .incbin "baserom.gba", 0x453098, 0x20
-
-gUnknown_84530B8:: @ 84530B8
- .incbin "baserom.gba", 0x4530B8, 0xC
-
-gUnknown_84530C4:: @ 84530C4
- .incbin "baserom.gba", 0x4530C4, 0x20
-
-gUnknown_84530E4:: @ 84530E4
- .incbin "baserom.gba", 0x4530E4, 0x20
-
-gUnknown_8453104:: @ 8453104
- .incbin "baserom.gba", 0x453104, 0x18
-
-gUnknown_845311C:: @ 845311C
- .incbin "baserom.gba", 0x45311C, 0x8
-
-gUnknown_8453124:: @ 8453124
- .incbin "baserom.gba", 0x453124, 0x54
-
-gUnknown_8453178:: @ 8453178
- .incbin "baserom.gba", 0x453178, 0xC
-
-gUnknown_8453184:: @ 8453184
- .incbin "baserom.gba", 0x453184, 0x8
-
.section .rodata.8453F6C
// item_pc.o