summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-12-30 01:09:06 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-12-30 01:09:06 -0500
commit48378f791c5cf0ee10931626ef5b01aed26238bb (patch)
tree29f89e7a315631363ac4d16815edad82d75f6515
parent06aa07306e36e5674eeb0114120829e9ae114c25 (diff)
last wave of graphics.s dumps
-rw-r--r--asm/trade.s10
-rw-r--r--data/graphics.s235
-rwxr-xr-xgraphics/berry_crusher/tiles.bin1
-rwxr-xr-xgraphics/berry_crusher/tiles.pal147
-rwxr-xr-xgraphics/berry_crusher/tiles.pngbin0 -> 2151 bytes
-rwxr-xr-xgraphics/berry_fix/gba_small.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/gba_small.pal35
-rwxr-xr-xgraphics/berry_fix/gba_small.pngbin0 -> 982 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer.pal35
-rwxr-xr-xgraphics/berry_fix/gba_transfer.pngbin0 -> 900 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer_error.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer_error.pal35
-rwxr-xr-xgraphics/berry_fix/gba_transfer_error.pngbin0 -> 1014 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer_highlight.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/gba_transfer_highlight.pal35
-rwxr-xr-xgraphics/berry_fix/gba_transfer_highlight.pngbin0 -> 1060 bytes
-rwxr-xr-xgraphics/berry_fix/logo.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/logo.pal51
-rwxr-xr-xgraphics/berry_fix/logo.pngbin0 -> 811 bytes
-rwxr-xr-xgraphics/berry_fix/window.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/berry_fix/window.pal35
-rwxr-xr-xgraphics/berry_fix/window.pngbin0 -> 211 bytes
-rwxr-xr-xgraphics/frontier_pass/tilemap1.binbin0 -> 36 bytes
-rwxr-xr-xgraphics/frontier_pass/tilemap2.binbin0 -> 36 bytes
-rwxr-xr-xgraphics/frontier_pass/tiles.binbin0 -> 1280 bytes
-rwxr-xr-xgraphics/frontier_pass/tiles.pal131
-rwxr-xr-xgraphics/frontier_pass/tiles.pngbin0 -> 4011 bytes
-rwxr-xr-xgraphics/frontier_pass/tiles2.pngbin0 -> 2765 bytes
-rwxr-xr-xgraphics/interface/textbox.pngbin0 -> 198 bytes
-rwxr-xr-xgraphics/link/gba.pngbin0 -> 1253 bytes
-rwxr-xr-xgraphics/link/gba_pal2.pal51
-rwxr-xr-xgraphics/pokemon_storage/pss_window.pal35
-rwxr-xr-xgraphics/pokemon_storage/pss_window.pngbin0 -> 381 bytes
-rwxr-xr-xgraphics/pokemon_storage/pss_window2.binbin0 -> 720 bytes
-rwxr-xr-xgraphics/pokemon_storage/pss_window2.pal35
-rwxr-xr-xgraphics/pokemon_storage/pss_window2.pngbin0 -> 392 bytes
-rwxr-xr-xgraphics/pokenav/ribbons.binbin0 -> 1280 bytes
-rwxr-xr-xgraphics/pokenav/ribbons.pngbin0 -> 291 bytes
-rwxr-xr-xgraphics/title_screen/title_screen1.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/title_screen/title_screen2.binbin0 -> 1024 bytes
-rwxr-xr-xgraphics/trade/buttons.pngbin0 -> 227 bytes
-rwxr-xr-xgraphics/trade/menu.pal51
-rwxr-xr-xgraphics/trade/menu.pngbin0 -> 608 bytes
-rwxr-xr-xgraphics/unknown/unknown_DDB444.pal19
-rwxr-xr-xgraphics/unknown/unknown_DDCF04.binbin0 -> 2048 bytes
-rwxr-xr-xgraphics/unknown/unknown_DDD704.binbin0 -> 36 bytes
-rwxr-xr-xgraphics/unknown/unknown_DDD908.bin1
-rwxr-xr-xgraphics/unknown/unknown_DDD920.bin1
-rwxr-xr-xgraphics/unknown/unknown_DDD938.bin1
-rwxr-xr-xgraphics/unknown/unknown_DDDB80.binbin0 -> 720 bytes
-rwxr-xr-xgraphics/unused/unused_DDCEE4.binbin0 -> 32 bytes
-rw-r--r--include/graphics.h36
-rw-r--r--src/berry_fix_program.c72
-rw-r--r--src/egg_hatch.c8
-rw-r--r--src/unk_81BAD84.c36
56 files changed, 953 insertions, 143 deletions
diff --git a/asm/trade.s b/asm/trade.s
index f576be122..bfca20a70 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -8105,11 +8105,11 @@ _0807B668:
ldr r1, =0x00005206
movs r0, 0xC
bl SetGpuReg
- ldr r0, =gUnknown_08DD7300
+ ldr r0, =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
- ldr r3, =gUnknown_08DD7360
+ ldr r3, =gTradeGba_Gfx
ldr r4, =0x06004000
movs r5, 0xA1
lsls r5, 5
@@ -8168,7 +8168,7 @@ _0807B726:
ldr r1, =0x80000800
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- ldr r3, =gUnknown_08DD7360
+ ldr r3, =gTradeGba_Gfx
movs r4, 0xC0
lsls r4, 19
movs r5, 0xA1
@@ -8446,11 +8446,11 @@ _0807B9FC:
ldr r1, =0x00005206
movs r0, 0xC
bl SetGpuReg
- ldr r0, =gUnknown_08DD7300
+ ldr r0, =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
- ldr r3, =gUnknown_08DD7360
+ ldr r3, =gTradeGba_Gfx
ldr r4, =0x06004000
movs r5, 0xA1
lsls r5, 5
diff --git a/data/graphics.s b/data/graphics.s
index 9e15903f8..7cb4b0e54 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4920,95 +4920,183 @@ gTilesetPalettes_General:: @ 8DD4E10
gTilesetTiles_General:: @ 8DD5010
.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
-@ 8DD72E0
- .incbin "baserom.gba", 0xdd72e0, 0x20
+ @ trade/egg hatch
-gUnknown_08DD7300:: @ 8DD7300
- .incbin "baserom.gba", 0xdd7300, 0x60
+ .align 2
+gTradeGba_Pal:: @ 8DD72E0
+ .incbin "graphics/link/gba.gbapal"
+
+ .align 2
+gTradeGba2_Pal:: @ 8DD7300
+ .incbin "graphics/link/gba_pal2.gbapal" @ used for in-game trade GBA?
+
+ .align 2
+gTradeGba_Gfx:: @ 8DD7360
+ .incbin "graphics/link/gba.4bpp"
-gUnknown_08DD7360:: @ 8DD7360
- .incbin "baserom.gba", 0xdd7360, 0x1420
+ @ 8DD8760
+ .space 0x20 @ blank palette??
-gUnknown_08DD8780:: @ 8DD8780
- .incbin "baserom.gba", 0xdd8780, 0x40
+ @ berry fix program
+
+ .align 2
+gBerryFixGameboy_Pal:: @ 8DD8780
+ .incbin "graphics/berry_fix/gba_small.gbapal"
+
+ .align 2
+gBerryFixGameboy_Gfx:: @ 8DD87C0
+ .incbin "graphics/berry_fix/gba_small.4bpp.lz"
-gUnknown_08DD87C0:: @ 8DD87C0
- .incbin "baserom.gba", 0xdd87c0, 0x720
+ .align 2
+gBerryFixGameboy_Tilemap:: @ 8DD8EE0
+ .incbin "graphics/berry_fix/gba_small.bin.lz"
-gUnknown_08DD8EE0:: @ 8DD8EE0
- .incbin "baserom.gba", 0xdd8ee0, 0x1a0
+ .align 2
+gBerryFixGameboyLogo_Pal:: @ 8DD9080
+ .incbin "graphics/berry_fix/logo.gbapal"
-gUnknown_08DD9080:: @ 8DD9080
- .incbin "baserom.gba", 0xdd9080, 0x60
+ .align 2
+gBerryFixGameboyLogo_Gfx:: @ 8DD90E0
+ .incbin "graphics/berry_fix/logo.4bpp.lz"
-gUnknown_08DD90E0:: @ 8DD90E0
- .incbin "baserom.gba", 0xdd90e0, 0x638
+ .align 2
+gBerryFixGameboyLogo_Tilemap:: @ 8DD9718
+ .incbin "graphics/berry_fix/logo.bin.lz"
-gUnknown_08DD9718:: @ 8DD9718
- .incbin "baserom.gba", 0xdd9718, 0x15c
+ .align 2
+gBerryFixGbaTransfer_Pal:: @ 8DD9874
+ .incbin "graphics/berry_fix/gba_transfer.gbapal"
-gUnknown_08DD9874:: @ 8DD9874
- .incbin "baserom.gba", 0xdd9874, 0x40
+ .align 2
+gBerryFixGbaTransfer_Gfx:: @ 8DD98B4
+ .incbin "graphics/berry_fix/gba_transfer.4bpp.lz"
-gUnknown_08DD98B4:: @ 8DD98B4
- .incbin "baserom.gba", 0xdd98b4, 0x5a4
+ .align 2
+gBerryFixGbaTransfer_Tilemap:: @ 8DD9E58
+ .incbin "graphics/berry_fix/gba_transfer.bin.lz"
-gUnknown_08DD9E58:: @ 8DD9E58
- .incbin "baserom.gba", 0xdd9e58, 0x194
+ .align 2
+gBerryFixGbaTransferHighlight_Pal:: @ 8DD9FEC
+ .incbin "graphics/berry_fix/gba_transfer_highlight.gbapal"
-gUnknown_08DD9FEC:: @ 8DD9FEC
- .incbin "baserom.gba", 0xdd9fec, 0x40
+ .align 2
+gBerryFixGbaTransferHighlight_Gfx:: @ 8DDA02C
+ .incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz"
-gUnknown_08DDA02C:: @ 8DDA02C
- .incbin "baserom.gba", 0xdda02c, 0x610
+ .align 2
+gBerryFixGbaTransferHighlight_Tilemap:: @ 8DDA63C
+ .incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz"
-gUnknown_08DDA63C:: @ 8DDA63C
- .incbin "baserom.gba", 0xdda63c, 0x1c4
+ .align 2
+gBerryFixGbaTransferError_Pal:: @ 8DDA800
+ .incbin "graphics/berry_fix/gba_transfer_error.gbapal"
-gUnknown_08DDA800:: @ 8DDA800
- .incbin "baserom.gba", 0xdda800, 0x40
+ .align 2
+gBerryFixGbaTransferError_Gfx:: @ 8DDA840
+ .incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz"
-gUnknown_08DDA840:: @ 8DDA840
- .incbin "baserom.gba", 0xdda840, 0x600
+ .align 2
+gBerryFixGbaTransferError_Tilemap:: @ 8DDAE40
+ .incbin "graphics/berry_fix/gba_transfer_error.bin.lz"
-gUnknown_08DDAE40:: @ 8DDAE40
- .incbin "baserom.gba", 0xddae40, 0x1a0
+ .align 2
+gBerryFixWindow_Pal:: @ 8DDAFE0
+ .incbin "graphics/berry_fix/window.gbapal"
-gUnknown_08DDAFE0:: @ 8DDAFE0
- .incbin "baserom.gba", 0xddafe0, 0x40
+ .align 2
+gBerryFixWindow_Gfx:: @ 8DDB020
+ .incbin "graphics/berry_fix/window.4bpp.lz" @ why the absurd length?
-gUnknown_08DDB020:: @ 8DDB020
- .incbin "baserom.gba", 0xddb020, 0x2a4
+ .align 2
+gBerryFixWindow_Tilemap:: @ 8DDB2C4
+ .incbin "graphics/berry_fix/window.bin.lz"
-gUnknown_08DDB2C4:: @ 8DDB2C4
- .incbin "baserom.gba", 0xddb2c4, 0x120
+ @ more trade stuff?
+ .align 2
gUnknown_08DDB3E4:: @ 8DDB3E4
- .incbin "baserom.gba", 0xddb3e4, 0x80
+ .incbin "graphics/trade/menu.gbapal"
+
+ .align 2
+gUnknown_08DDB444:: @ 8DDB444
+ .incbin "graphics/unknown/unknown_DDB444.gbapal"
+ .align 2
gUnknown_08DDB464:: @ 8DDB464
- .incbin "baserom.gba", 0xddb464, 0x1aa0
+ .incbin "graphics/trade/menu.4bpp"
+ .align 2
+gUnknown_08DDC6E4:: @ 8DDC6E4
+ .incbin "graphics/trade/buttons.4bpp"
+
+ .align 2
+ .incbin "graphics/unused/unused_DDCEE4.bin" @ unused
+
+ .align 2
gUnknown_08DDCF04:: @ 8DDCF04
- .incbin "baserom.gba", 0xddcf04, 0x800
+ .incbin "graphics/unknown/unknown_DDCF04.bin" @ tilemap
+ .align 2
gUnknown_08DDD704:: @ 8DDD704
- .incbin "baserom.gba", 0xddd704, 0x24
+ .incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap??
+ .align 2
gUnknown_08DDD728:: @ 8DDD728
- .incbin "baserom.gba", 0xddd728, 0x20
+ .incbin "graphics/interface/textbox.gbapal" @ textbox palette?
+ .align 2
gUnknown_08DDD748:: @ 8DDD748
- .incbin "baserom.gba", 0xddd748, 0x8c8
+ .incbin "graphics/interface/textbox.4bpp"
+
+ .align 2
+gUnknown_08DDD908::
+ .incbin "graphics/unknown/unknown_DDD908.bin.lz"
+
+ .align 2
+gUnknown_08DDD920::
+ .incbin "graphics/unknown/unknown_DDD920.bin.lz"
+
+ .align 2
+gUnknown_08DDD938::
+ .incbin "graphics/unknown/unknown_DDD938.bin.lz"
+
+ .align 2
+gUnknown_08DDD950::
+ .incbin "graphics/pokemon_storage/pss_window.gbapal"
+ .align 2
+gUnknown_08DDD990::
+ .incbin "graphics/pokemon_storage/pss_window.4bpp.lz"
+
+ .align 2
+gUnknown_08DDDB80:: @ 8DDDB80
+ .incbin "graphics/unknown/unknown_DDDB80.bin.lz"
+
+ .align 2
+gUnknown_08DDDC8C::
+ .incbin "graphics/pokemon_storage/pss_window2.gbapal"
+
+ .align 2
+gUnknown_08DDDCCC::
+ .incbin "graphics/pokemon_storage/pss_window2.4bpp.lz"
+
+ .align 2
+gUnknown_08DDDEDC::
+ .incbin "graphics/pokemon_storage/pss_window2.bin.lz"
+
+ @ pokenav
+
+ .align 2
gUnknown_08DDE010:: @ 8DDE010
- .incbin "baserom.gba", 0xdde010, 0x20
+ .incbin "graphics/pokenav/ribbons.gbapal"
+ .align 2
gUnknown_08DDE030:: @ 8DDE030
- .incbin "baserom.gba", 0xdde030, 0xfc
+ .incbin "graphics/pokenav/ribbons.4bpp.lz"
+ .align 2
gUnknown_08DDE12C:: @ 8DDE12C
- .incbin "baserom.gba", 0xdde12c, 0xcc
+ .incbin "graphics/pokenav/ribbons.bin.lz"
.align 2
gMonIconPalettes:: @ 8DDE1F8
@@ -5027,7 +5115,7 @@ gTitleScreenEmeraldVersionPal:: @ 8DDE438
.align 2
gUnknown_08DDE458:: @ 8DDE458
- .incbin "baserom.gba", 0xdde458, 0x238
+ .incbin "graphics/title_screen/title_screen1.bin.lz"
gTitleScreenPokemonLogoGfx:: @ 8DDE690
.incbin "graphics/title_screen/pokemon_logo.8bpp.lz"
@@ -5046,31 +5134,54 @@ gTitleScreenPressStartGfx:: @ 8DE03E8
.align 2
gUnknown_08DE0644:: @ 8DE0644
- .incbin "baserom.gba", 0xde0644, 0x184
+ .incbin "graphics/title_screen/title_screen2.bin.lz"
+
+ @ more trainer card stuff
+ .align 2
gUnknown_08DE07C8:: @ 8DE07C8
- .incbin "baserom.gba", 0xde07c8, 0x100
+ .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal)
+ .align 2
gUnknown_08DE08C8:: @ 8DE08C8
- .incbin "baserom.gba", 0xde08c8, 0x17bc
+ .incbin "graphics/frontier_pass/tiles.4bpp.lz"
+ .align 2
gUnknown_08DE2084:: @ 8DE2084
- .incbin "baserom.gba", 0xde2084, 0xfdc
+ .incbin "graphics/frontier_pass/tiles2.8bpp.lz"
+ .align 2
gUnknown_08DE3060:: @ 8DE3060
- .incbin "baserom.gba", 0xde3060, 0x2f0
+ .incbin "graphics/frontier_pass/tiles.bin.lz"
+ .align 2
gUnknown_08DE3350:: @ 8DE3350
- .incbin "baserom.gba", 0xde3350, 0x24
+ .incbin "graphics/frontier_pass/tilemap1.bin"
+ .align 2
gUnknown_08DE3374:: @ 8DE3374
- .incbin "baserom.gba", 0xde3374, 0x24
+ .incbin "graphics/frontier_pass/tilemap2.bin"
+ @ berry crusher
+
+ .align 2
gUnknown_08DE3398:: @ 8DE3398
- .incbin "baserom.gba", 0xde3398, 0x120
+ .incbin "graphics/berry_crusher/tiles.gbapal"
+ .align 2
gUnknown_08DE34B8:: @ 8DE34B8
- .incbin "baserom.gba", 0xde34b8, 0xb1c
+ .incbin "graphics/berry_crusher/tiles.4bpp.lz"
+ .align 2
gUnknown_08DE3FD4:: @ 8DE3FD4
- .incbin "baserom.gba", 0xde3fd4
+ .incbin "graphics/berry_crusher/tiles.bin.lz"
+
+ @ random garbage at the end. why, game freak?
+ .space 0x54BAC
+ .byte 0x0D, 0x00, 0x58, 0x02 @ why?
+ @ E38BC8
+ .space 0x1145
+ .byte 0x02 @ whyyyyy?
+ .space 0x3242
+ .byte 0x40 @ WHYYYYYYYY
+ .space 0x13
diff --git a/graphics/berry_crusher/tiles.bin b/graphics/berry_crusher/tiles.bin
new file mode 100755
index 000000000..c6cc0edb1
--- /dev/null
+++ b/graphics/berry_crusher/tiles.bin
@@ -0,0 +1 @@
+L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ú`é`é`é`é`é`é`é`é`é`ê`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@ÜdÛ`Û`Û`Û`Û`Û`Û`Û`Û`ìdë`ë`ë`ë`ë`ë`ë`ë`ë` \ No newline at end of file
diff --git a/graphics/berry_crusher/tiles.pal b/graphics/berry_crusher/tiles.pal
new file mode 100755
index 000000000..13ea34e59
--- /dev/null
+++ b/graphics/berry_crusher/tiles.pal
@@ -0,0 +1,147 @@
+JASC-PAL
+0100
+144
+98 172 180
+255 213 156
+255 197 139
+255 164 106
+238 131 82
+222 123 74
+213 98 49
+197 82 41
+156 213 189
+123 180 156
+222 156 255
+172 123 222
+255 0 255
+255 0 255
+230 230 255
+65 74 90
+156 148 172
+255 213 156
+255 197 139
+255 164 106
+238 131 82
+222 123 74
+213 98 49
+197 82 41
+255 238 0
+230 189 0
+180 180 180
+139 139 139
+255 0 255
+255 0 255
+230 230 255
+65 74 90
+156 148 172
+255 213 156
+255 197 139
+255 164 106
+238 131 82
+222 123 74
+213 98 49
+197 82 41
+197 213 246
+255 255 255
+238 238 246
+205 205 213
+255 0 255
+255 0 255
+230 230 255
+65 74 90
+255 180 255
+164 172 172
+98 106 115
+123 131 139
+139 148 156
+148 222 164
+156 189 222
+197 213 246
+180 164 115
+205 189 148
+213 205 172
+230 222 189
+246 238 205
+139 123 74
+74 131 189
+65 74 90
+0 0 0
+148 222 164
+164 230 172
+180 238 189
+197 246 205
+213 255 222
+238 255 238
+255 255 255
+65 180 238
+255 255 255
+0 197 57
+255 255 255
+246 213 0
+255 0 255
+246 238 205
+139 123 74
+255 164 106
+164 172 172
+98 106 115
+123 131 139
+139 148 156
+115 156 189
+156 189 222
+197 213 246
+180 164 115
+205 189 148
+213 205 172
+230 222 189
+246 238 205
+139 123 74
+74 131 189
+65 74 90
+0 0 0
+148 222 164
+164 230 172
+180 238 189
+197 246 205
+213 255 222
+238 255 238
+255 255 255
+189 65 255
+255 255 255
+123 123 123
+255 0 255
+246 238 205
+139 123 74
+180 189 189
+255 255 255
+0 0 255
+164 172 172
+98 106 115
+123 131 139
+139 148 156
+115 156 189
+156 189 222
+148 222 164
+180 164 115
+205 189 148
+213 205 172
+230 222 189
+246 238 205
+139 123 74
+74 131 189
+65 74 90
+98 172 180
+41 41 57
+213 213 222
+205 205 205
+238 238 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/berry_crusher/tiles.png b/graphics/berry_crusher/tiles.png
new file mode 100755
index 000000000..6e43adb27
--- /dev/null
+++ b/graphics/berry_crusher/tiles.png
Binary files differ
diff --git a/graphics/berry_fix/gba_small.bin b/graphics/berry_fix/gba_small.bin
new file mode 100755
index 000000000..96e956d95
--- /dev/null
+++ b/graphics/berry_fix/gba_small.bin
Binary files differ
diff --git a/graphics/berry_fix/gba_small.pal b/graphics/berry_fix/gba_small.pal
new file mode 100755
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_small.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png
new file mode 100755
index 000000000..3bf1f3e36
--- /dev/null
+++ b/graphics/berry_fix/gba_small.png
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer.bin b/graphics/berry_fix/gba_transfer.bin
new file mode 100755
index 000000000..987356047
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer.bin
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer.pal b/graphics/berry_fix/gba_transfer.pal
new file mode 100755
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png
new file mode 100755
index 000000000..9b7eb5571
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer.png
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer_error.bin b/graphics/berry_fix/gba_transfer_error.bin
new file mode 100755
index 000000000..3ee81549b
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_error.bin
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer_error.pal b/graphics/berry_fix/gba_transfer_error.pal
new file mode 100755
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_error.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png
new file mode 100755
index 000000000..d8db4bfb9
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_error.png
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer_highlight.bin b/graphics/berry_fix/gba_transfer_highlight.bin
new file mode 100755
index 000000000..df4470061
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_highlight.bin
Binary files differ
diff --git a/graphics/berry_fix/gba_transfer_highlight.pal b/graphics/berry_fix/gba_transfer_highlight.pal
new file mode 100755
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_highlight.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png
new file mode 100755
index 000000000..9fb9b6a48
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_highlight.png
Binary files differ
diff --git a/graphics/berry_fix/logo.bin b/graphics/berry_fix/logo.bin
new file mode 100755
index 000000000..3abafb27f
--- /dev/null
+++ b/graphics/berry_fix/logo.bin
Binary files differ
diff --git a/graphics/berry_fix/logo.pal b/graphics/berry_fix/logo.pal
new file mode 100755
index 000000000..4c76f3f9a
--- /dev/null
+++ b/graphics/berry_fix/logo.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+238 238 238
+222 222 230
+205 205 222
+197 197 205
+180 180 197
+164 164 189
+156 156 172
+139 139 164
+123 123 156
+115 115 139
+98 98 131
+82 82 123
+74 74 115
+32 32 32
diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png
new file mode 100755
index 000000000..29cda79b0
--- /dev/null
+++ b/graphics/berry_fix/logo.png
Binary files differ
diff --git a/graphics/berry_fix/window.bin b/graphics/berry_fix/window.bin
new file mode 100755
index 000000000..cbbfd7ebc
--- /dev/null
+++ b/graphics/berry_fix/window.bin
Binary files differ
diff --git a/graphics/berry_fix/window.pal b/graphics/berry_fix/window.pal
new file mode 100755
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/window.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png
new file mode 100755
index 000000000..7b57701e3
--- /dev/null
+++ b/graphics/berry_fix/window.png
Binary files differ
diff --git a/graphics/frontier_pass/tilemap1.bin b/graphics/frontier_pass/tilemap1.bin
new file mode 100755
index 000000000..c2aa0dc9a
--- /dev/null
+++ b/graphics/frontier_pass/tilemap1.bin
Binary files differ
diff --git a/graphics/frontier_pass/tilemap2.bin b/graphics/frontier_pass/tilemap2.bin
new file mode 100755
index 000000000..63c2f9b14
--- /dev/null
+++ b/graphics/frontier_pass/tilemap2.bin
Binary files differ
diff --git a/graphics/frontier_pass/tiles.bin b/graphics/frontier_pass/tiles.bin
new file mode 100755
index 000000000..e4e066ebe
--- /dev/null
+++ b/graphics/frontier_pass/tiles.bin
Binary files differ
diff --git a/graphics/frontier_pass/tiles.pal b/graphics/frontier_pass/tiles.pal
new file mode 100755
index 000000000..2bfcff098
--- /dev/null
+++ b/graphics/frontier_pass/tiles.pal
@@ -0,0 +1,131 @@
+JASC-PAL
+0100
+128
+57 74 74
+255 255 255
+205 205 205
+164 164 164
+123 123 123
+98 98 115
+57 74 74
+230 246 255
+98 41 65
+255 255 230
+230 230 197
+255 32 32
+98 164 222
+82 139 197
+74 115 172
+74 98 106
+139 98 115
+255 255 255
+230 255 222
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+180 230 156
+148 238 131
+131 222 115
+82 172 74
+106 189 255
+205 205 205
+0 0 0
+139 98 115
+238 255 246
+213 238 230
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+189 213 205
+148 180 164
+106 148 123
+65 115 90
+106 189 255
+205 205 205
+0 0 0
+139 98 115
+255 246 230
+246 230 213
+205 156 90
+180 131 65
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+230 189 139
+205 156 115
+180 131 82
+156 106 41
+106 189 255
+205 205 205
+0 0 0
+139 98 115
+246 246 255
+230 230 238
+189 189 197
+156 156 156
+156 106 41
+41 57 65
+57 106 139
+65 139 197
+230 230 238
+189 189 197
+156 156 156
+123 123 123
+106 189 255
+205 205 205
+0 0 0
+139 98 115
+246 246 222
+246 238 172
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+246 230 139
+230 213 49
+213 197 57
+156 115 57
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+106 131 238
+139 164 213
+189 205 205
+213 197 131
+246 222 164
+172 131 131
+148 98 106
+115 106 148
+106 123 197
+197 230 230
+139 189 131
+106 156 74
+148 222 189
+238 156 131
+238 246 255
+0 0 0
+123 148 189
+65 74 106
+106 98 115
+82 90 180
+139 123 139
+164 172 189
+106 148 131
+180 205 213
+156 156 156
+213 238 230
+255 255 255
+213 180 172
+222 230 238
+213 205 156
+0 0 0
diff --git a/graphics/frontier_pass/tiles.png b/graphics/frontier_pass/tiles.png
new file mode 100755
index 000000000..520c34b3d
--- /dev/null
+++ b/graphics/frontier_pass/tiles.png
Binary files differ
diff --git a/graphics/frontier_pass/tiles2.png b/graphics/frontier_pass/tiles2.png
new file mode 100755
index 000000000..6bd420a8d
--- /dev/null
+++ b/graphics/frontier_pass/tiles2.png
Binary files differ
diff --git a/graphics/interface/textbox.png b/graphics/interface/textbox.png
new file mode 100755
index 000000000..ed8cd92ee
--- /dev/null
+++ b/graphics/interface/textbox.png
Binary files differ
diff --git a/graphics/link/gba.png b/graphics/link/gba.png
new file mode 100755
index 000000000..1a0909468
--- /dev/null
+++ b/graphics/link/gba.png
Binary files differ
diff --git a/graphics/link/gba_pal2.pal b/graphics/link/gba_pal2.pal
new file mode 100755
index 000000000..e2fb95b4a
--- /dev/null
+++ b/graphics/link/gba_pal2.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 57 8
+255 90 8
+255 131 8
+255 172 8
+255 213 8
+255 255 8
+255 255 131
+255 255 255
+255 255 0
+65 0 0
+115 16 0
+172 32 0
+230 57 8
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+230 230 230
+205 205 205
+180 180 180
+156 156 156
+213 180 106
+205 156 82
+49 255 106
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+0 16 172
+32 32 106
+16 16 90
+0 0 74
+255 255 189
+230 230 164
+205 205 148
+189 180 115
+139 139 90
+74 74 57
+8 32 32
diff --git a/graphics/pokemon_storage/pss_window.pal b/graphics/pokemon_storage/pss_window.pal
new file mode 100755
index 000000000..bfd913069
--- /dev/null
+++ b/graphics/pokemon_storage/pss_window.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+255 255 255
+74 205 139
+172 106 148
+49 0 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+213 213 213
+156 156 156
+255 255 255
+164 164 164
+82 82 82
+255 255 255
+57 164 148
+230 180 148
+49 0 148
+0 0 0
+255 148 148
+255 230 131
+255 189 115
+0 0 0
+0 0 0
+0 0 0
+213 213 213
+156 156 156
+255 255 255
+164 164 164
+82 82 82
diff --git a/graphics/pokemon_storage/pss_window.png b/graphics/pokemon_storage/pss_window.png
new file mode 100755
index 000000000..59cc0b5d2
--- /dev/null
+++ b/graphics/pokemon_storage/pss_window.png
Binary files differ
diff --git a/graphics/pokemon_storage/pss_window2.bin b/graphics/pokemon_storage/pss_window2.bin
new file mode 100755
index 000000000..f348e6e1e
--- /dev/null
+++ b/graphics/pokemon_storage/pss_window2.bin
Binary files differ
diff --git a/graphics/pokemon_storage/pss_window2.pal b/graphics/pokemon_storage/pss_window2.pal
new file mode 100755
index 000000000..9696184a2
--- /dev/null
+++ b/graphics/pokemon_storage/pss_window2.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+255 255 255
+139 180 255
+222 238 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+213 213 213
+156 156 156
+255 255 255
+164 164 164
+82 82 82
+255 255 255
+197 222 255
+90 164 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+213 213 213
+156 156 156
+255 255 255
+164 164 164
+82 82 82
diff --git a/graphics/pokemon_storage/pss_window2.png b/graphics/pokemon_storage/pss_window2.png
new file mode 100755
index 000000000..ae2d3b969
--- /dev/null
+++ b/graphics/pokemon_storage/pss_window2.png
Binary files differ
diff --git a/graphics/pokenav/ribbons.bin b/graphics/pokenav/ribbons.bin
new file mode 100755
index 000000000..ce0b74f60
--- /dev/null
+++ b/graphics/pokenav/ribbons.bin
Binary files differ
diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png
new file mode 100755
index 000000000..a87bc7356
--- /dev/null
+++ b/graphics/pokenav/ribbons.png
Binary files differ
diff --git a/graphics/title_screen/title_screen1.bin b/graphics/title_screen/title_screen1.bin
new file mode 100755
index 000000000..161f23cc1
--- /dev/null
+++ b/graphics/title_screen/title_screen1.bin
Binary files differ
diff --git a/graphics/title_screen/title_screen2.bin b/graphics/title_screen/title_screen2.bin
new file mode 100755
index 000000000..0e6b7e775
--- /dev/null
+++ b/graphics/title_screen/title_screen2.bin
Binary files differ
diff --git a/graphics/trade/buttons.png b/graphics/trade/buttons.png
new file mode 100755
index 000000000..568f40a42
--- /dev/null
+++ b/graphics/trade/buttons.png
Binary files differ
diff --git a/graphics/trade/menu.pal b/graphics/trade/menu.pal
new file mode 100755
index 000000000..98377bbb3
--- /dev/null
+++ b/graphics/trade/menu.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+57 57 172
+98 98 180
+123 106 222
+82 90 213
+82 148 205
+131 115 230
+148 156 189
+205 106 0
+246 148 0
+49 49 90
+255 213 115
+205 74 90
+255 98 32
+205 205 222
+255 255 213
+0 0 0
+0 8 16
+0 16 32
+0 24 49
+0 41 65
+0 49 82
+0 57 98
+0 65 115
+0 82 131
+0 90 148
+0 98 164
+0 106 180
+0 123 197
+0 131 213
+0 139 230
+0 156 255
+0 0 0
+0 8 16
+0 16 32
+0 24 49
+0 41 65
+0 49 82
+0 57 98
+0 65 115
+0 82 131
+0 90 148
+0 98 164
+0 106 180
+0 123 197
+0 131 213
+0 139 230
+0 156 255
diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png
new file mode 100755
index 000000000..91bc0f7eb
--- /dev/null
+++ b/graphics/trade/menu.png
Binary files differ
diff --git a/graphics/unknown/unknown_DDB444.pal b/graphics/unknown/unknown_DDB444.pal
new file mode 100755
index 000000000..bb74b34a2
--- /dev/null
+++ b/graphics/unknown/unknown_DDB444.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 131 222
+98 98 180
+123 106 222
+106 172 238
+82 148 205
+180 189 230
+148 156 189
+205 106 0
+255 189 49
+246 148 0
+255 213 115
+205 74 90
+255 98 32
+205 205 222
+255 98 32
diff --git a/graphics/unknown/unknown_DDCF04.bin b/graphics/unknown/unknown_DDCF04.bin
new file mode 100755
index 000000000..46218245f
--- /dev/null
+++ b/graphics/unknown/unknown_DDCF04.bin
Binary files differ
diff --git a/graphics/unknown/unknown_DDD704.bin b/graphics/unknown/unknown_DDD704.bin
new file mode 100755
index 000000000..354866137
--- /dev/null
+++ b/graphics/unknown/unknown_DDD704.bin
Binary files differ
diff --git a/graphics/unknown/unknown_DDD908.bin b/graphics/unknown/unknown_DDD908.bin
new file mode 100755
index 000000000..cb0a2fda1
--- /dev/null
+++ b/graphics/unknown/unknown_DDD908.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/graphics/unknown/unknown_DDD920.bin b/graphics/unknown/unknown_DDD920.bin
new file mode 100755
index 000000000..cb0a2fda1
--- /dev/null
+++ b/graphics/unknown/unknown_DDD920.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/graphics/unknown/unknown_DDD938.bin b/graphics/unknown/unknown_DDD938.bin
new file mode 100755
index 000000000..cb0a2fda1
--- /dev/null
+++ b/graphics/unknown/unknown_DDD938.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/graphics/unknown/unknown_DDDB80.bin b/graphics/unknown/unknown_DDDB80.bin
new file mode 100755
index 000000000..d538583f6
--- /dev/null
+++ b/graphics/unknown/unknown_DDDB80.bin
Binary files differ
diff --git a/graphics/unused/unused_DDCEE4.bin b/graphics/unused/unused_DDCEE4.bin
new file mode 100755
index 000000000..481183cbd
--- /dev/null
+++ b/graphics/unused/unused_DDCEE4.bin
Binary files differ
diff --git a/include/graphics.h b/include/graphics.h
index 81aa43b82..85e31aec9 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2550,24 +2550,24 @@ extern const u16 gWallclockMale_Pal[];
extern const u16 gWallclockFemale_Pal[];
extern const u8 gUnknown_08DCC648[];
extern const u8 gUnknown_08DCC908[];
-extern const u8 gUnknown_08DD87C0[];
-extern const u8 gUnknown_08DD8EE0[];
-extern const u16 gUnknown_08DD8780[];
-extern const u8 gUnknown_08DD90E0[];
-extern const u8 gUnknown_08DD9718[];
-extern const u16 gUnknown_08DD9080[];
-extern const u8 gUnknown_08DD98B4[];
-extern const u8 gUnknown_08DD9E58[];
-extern const u16 gUnknown_08DD9874[];
-extern const u8 gUnknown_08DDA02C[];
-extern const u8 gUnknown_08DDA63C[];
-extern const u16 gUnknown_08DD9FEC[];
-extern const u8 gUnknown_08DDA840[];
-extern const u8 gUnknown_08DDAE40[];
-extern const u16 gUnknown_08DDA800[];
-extern const u8 gUnknown_08DDB020[];
-extern const u8 gUnknown_08DDB2C4[];
-extern const u16 gUnknown_08DDAFE0[];
+extern const u8 gBerryFixGameboy_Gfx[];
+extern const u8 gBerryFixGameboy_Tilemap[];
+extern const u16 gBerryFixGameboy_Pal[];
+extern const u8 gBerryFixGameboyLogo_Gfx[];
+extern const u8 gBerryFixGameboyLogo_Tilemap[];
+extern const u16 gBerryFixGameboyLogo_Pal[];
+extern const u8 gBerryFixGbaTransfer_Gfx[];
+extern const u8 gBerryFixGbaTransfer_Tilemap[];
+extern const u16 gBerryFixGbaTransfer_Pal[];
+extern const u8 gBerryFixGbaTransferHighlight_Gfx[];
+extern const u8 gBerryFixGbaTransferHighlight_Tilemap[];
+extern const u16 gBerryFixGbaTransferHighlight_Pal[];
+extern const u8 gBerryFixGbaTransferError_Gfx[];
+extern const u8 gBerryFixGbaTransferError_Tilemap[];
+extern const u16 gBerryFixGbaTransferError_Pal[];
+extern const u8 gBerryFixWindow_Gfx[];
+extern const u8 gBerryFixWindow_Tilemap[];
+extern const u16 gBerryFixWindow_Pal[];
extern const u8 gBattleTextboxTiles[];
extern const u8 gBattleTextboxTilemap[];
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 195490543..3b2bfb5f7 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -81,50 +81,50 @@ static const u8 *const gUnknown_08618160[] = {
Unknown_08617EA3
};
-extern const u8 gUnknown_08DD87C0[];
-extern const u8 gUnknown_08DD8EE0[];
-extern const u8 gUnknown_08DD8780[];
-extern const u8 gUnknown_08DD90E0[];
-extern const u8 gUnknown_08DD9718[];
-extern const u8 gUnknown_08DD9080[];
-extern const u8 gUnknown_08DD98B4[];
-extern const u8 gUnknown_08DD9E58[];
-extern const u8 gUnknown_08DD9874[];
-extern const u8 gUnknown_08DDA02C[];
-extern const u8 gUnknown_08DDA63C[];
-extern const u8 gUnknown_08DD9FEC[];
-extern const u8 gUnknown_08DDA840[];
-extern const u8 gUnknown_08DDAE40[];
-extern const u8 gUnknown_08DDA800[];
-extern const u8 gUnknown_08DDB020[];
-extern const u8 gUnknown_08DDB2C4[];
-extern const u8 gUnknown_08DDAFE0[];
+extern const u8 gBerryFixGameboy_Gfx[];
+extern const u8 gBerryFixGameboy_Tilemap[];
+extern const u8 gBerryFixGameboy_Pal[];
+extern const u8 gBerryFixGameboyLogo_Gfx[];
+extern const u8 gBerryFixGameboyLogo_Tilemap[];
+extern const u8 gBerryFixGameboyLogo_Pal[];
+extern const u8 gBerryFixGbaTransfer_Gfx[];
+extern const u8 gBerryFixGbaTransfer_Tilemap[];
+extern const u8 gBerryFixGbaTransfer_Pal[];
+extern const u8 gBerryFixGbaTransferHighlight_Gfx[];
+extern const u8 gBerryFixGbaTransferHighlight_Tilemap[];
+extern const u8 gBerryFixGbaTransferHighlight_Pal[];
+extern const u8 gBerryFixGbaTransferError_Gfx[];
+extern const u8 gBerryFixGbaTransferError_Tilemap[];
+extern const u8 gBerryFixGbaTransferError_Pal[];
+extern const u8 gBerryFixWindow_Gfx[];
+extern const u8 gBerryFixWindow_Tilemap[];
+extern const u8 gBerryFixWindow_Pal[];
static const u8 *const gUnknown_08618178[][3] = {
{
- gUnknown_08DD87C0,
- gUnknown_08DD8EE0,
- gUnknown_08DD8780
+ gBerryFixGameboy_Gfx,
+ gBerryFixGameboy_Tilemap,
+ gBerryFixGameboy_Pal
}, {
- gUnknown_08DD90E0,
- gUnknown_08DD9718,
- gUnknown_08DD9080
+ gBerryFixGameboyLogo_Gfx,
+ gBerryFixGameboyLogo_Tilemap,
+ gBerryFixGameboyLogo_Pal
}, {
- gUnknown_08DD98B4,
- gUnknown_08DD9E58,
- gUnknown_08DD9874
+ gBerryFixGbaTransfer_Gfx,
+ gBerryFixGbaTransfer_Tilemap,
+ gBerryFixGbaTransfer_Pal
}, {
- gUnknown_08DDA02C,
- gUnknown_08DDA63C,
- gUnknown_08DD9FEC
+ gBerryFixGbaTransferHighlight_Gfx,
+ gBerryFixGbaTransferHighlight_Tilemap,
+ gBerryFixGbaTransferHighlight_Pal
}, {
- gUnknown_08DDA840,
- gUnknown_08DDAE40,
- gUnknown_08DDA800
+ gBerryFixGbaTransferError_Gfx,
+ gBerryFixGbaTransferError_Tilemap,
+ gBerryFixGbaTransferError_Pal
}, {
- gUnknown_08DDB020,
- gUnknown_08DDB2C4,
- gUnknown_08DDAFE0
+ gBerryFixWindow_Gfx,
+ gBerryFixWindow_Tilemap,
+ gBerryFixWindow_Pal
},
};
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 721ba4a4f..1aff894b9 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -51,8 +51,8 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u8 gBattleTextboxTiles[];
extern const u8 gBattleTextboxTilemap[];
extern const u8 gBattleTextboxPalette[];
-extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance
-extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance
+extern const u16 gTradeGba2_Pal[]; // palette, gameboy advance
+extern const u32 gTradeGba_Gfx[]; // tileset gameboy advance
extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
extern const u8 gText_HatchedFromEgg[];
extern const u8 gText_NickHatchPrompt[];
@@ -548,8 +548,8 @@ static void CB2_EggHatch_0(void)
break;
case 7:
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
- LoadPalette(gUnknown_08DD7300, 0x10, 0xA0);
- LoadBgTiles(1, gUnknown_08DD7360, 0x1420, 0);
+ LoadPalette(gTradeGba2_Pal, 0x10, 0xA0);
+ LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0);
CopyToBgTilemapBuffer(1, gUnknown_08331F60, 0x1000, 0);
CopyBgTilemapBufferToVram(1);
gMain.state++;
diff --git a/src/unk_81BAD84.c b/src/unk_81BAD84.c
index 9ba98dd87..c0d891c12 100644
--- a/src/unk_81BAD84.c
+++ b/src/unk_81BAD84.c
@@ -7,29 +7,29 @@ const struct {
const u16 *pltt;
} gUnknown_08617128[] = {
{
- gUnknown_08DD87C0,
- gUnknown_08DD8EE0,
- gUnknown_08DD8780
+ gBerryFixGameboy_Gfx,
+ gBerryFixGameboy_Tilemap,
+ gBerryFixGameboy_Pal
}, {
- gUnknown_08DD90E0,
- gUnknown_08DD9718,
- gUnknown_08DD9080
+ gBerryFixGameboyLogo_Gfx,
+ gBerryFixGameboyLogo_Tilemap,
+ gBerryFixGameboyLogo_Pal
}, {
- gUnknown_08DD98B4,
- gUnknown_08DD9E58,
- gUnknown_08DD9874
+ gBerryFixGbaTransfer_Gfx,
+ gBerryFixGbaTransfer_Tilemap,
+ gBerryFixGbaTransfer_Pal
}, {
- gUnknown_08DDA02C,
- gUnknown_08DDA63C,
- gUnknown_08DD9FEC
+ gBerryFixGbaTransferHighlight_Gfx,
+ gBerryFixGbaTransferHighlight_Tilemap,
+ gBerryFixGbaTransferHighlight_Pal
}, {
- gUnknown_08DDA840,
- gUnknown_08DDAE40,
- gUnknown_08DDA800
+ gBerryFixGbaTransferError_Gfx,
+ gBerryFixGbaTransferError_Tilemap,
+ gBerryFixGbaTransferError_Pal
}, {
- gUnknown_08DDB020,
- gUnknown_08DDB2C4,
- gUnknown_08DDAFE0
+ gBerryFixWindow_Gfx,
+ gBerryFixWindow_Tilemap,
+ gBerryFixWindow_Pal
}
};