summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-09-16 03:21:09 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-09-16 03:21:09 -0500
commit448497dfbbc1157c640bc09745454b3c97dc947e (patch)
tree7b7fc528dc9af6170927eafed2a25c43516de952
parent3e1c6024a7a43192eb4a766fb0ee4e107c3e949d (diff)
Finish extracting data2.s
-rw-r--r--asm/link.s68
-rw-r--r--data/data2.s1769
-rw-r--r--data/data2b.s8
-rw-r--r--data/strings.s31
-rw-r--r--graphics/interface/berrycrush_background.binbin0 -> 2048 bytes
-rw-r--r--graphics/interface/berrycrush_btnpress.pngbin0 -> 642 bytes
-rw-r--r--graphics/interface/berrycrush_container_cap.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/berrycrush_grinder_base.pal19
-rw-r--r--graphics/interface/berrycrush_grinder_base.pngbin0 -> 626 bytes
-rw-r--r--graphics/interface/berrycrush_grinder_top.binbin0 -> 640 bytes
-rw-r--r--graphics/interface/berrycrush_misc.pal19
-rw-r--r--graphics/interface/berrycrush_sparkle.pngbin0 -> 329 bytes
-rw-r--r--graphics/interface/berrycrush_timerdigits.pal19
-rw-r--r--graphics/interface/berrycrush_timerdigits.pngbin0 -> 282 bytes
-rw-r--r--graphics/interface/dodrioberry_berrysprites.pal19
-rw-r--r--graphics/interface/dodrioberry_berrysprites.pngbin0 -> 395 bytes
-rw-r--r--graphics/interface/dodrioberry_bg1.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/dodrioberry_bg1.pal19
-rw-r--r--graphics/interface/dodrioberry_bg1.pngbin0 -> 1887 bytes
-rw-r--r--graphics/interface/dodrioberry_bg2.pal19
-rw-r--r--graphics/interface/dodrioberry_bg2.pngbin0 -> 2856 bytes
-rw-r--r--graphics/interface/dodrioberry_bg2left.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/dodrioberry_bg2right.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/dodrioberry_pkmn.pal19
-rw-r--r--graphics/interface/dodrioberry_pkmn.pngbin0 -> 3330 bytes
-rw-r--r--graphics/interface/dodrioberry_platform.pal19
-rw-r--r--graphics/interface/dodrioberry_platform.pngbin0 -> 310 bytes
-rw-r--r--graphics/interface/dodrioberry_shiny.pal19
-rw-r--r--graphics/interface/dodrioberry_status.pal19
-rw-r--r--graphics/interface/dodrioberry_status.pngbin0 -> 195 bytes
-rw-r--r--graphics/interface/pkmnjump_321start1.pal19
-rw-r--r--graphics/interface/pkmnjump_321start1.pngbin0 -> 778 bytes
-rw-r--r--graphics/interface/pkmnjump_321start2.pal19
-rw-r--r--graphics/interface/pkmnjump_321start2.pngbin0 -> 815 bytes
-rw-r--r--graphics/interface/pkmnjump_bg.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/pkmnjump_bg.pal19
-rw-r--r--graphics/interface/pkmnjump_bg.pngbin0 -> 532 bytes
-rw-r--r--graphics/interface/pkmnjump_pal1.pal19
-rw-r--r--graphics/interface/pkmnjump_pal2.pal19
-rw-r--r--graphics/interface/pkmnjump_pal3.pal19
-rw-r--r--graphics/interface/pkmnjump_results.binbin0 -> 8192 bytes
-rw-r--r--graphics/interface/pkmnjump_results.gbapal.bakbin0 -> 48 bytes
-rw-r--r--graphics/interface/pkmnjump_results.pal19
-rw-r--r--graphics/interface/pkmnjump_results.pngbin0 -> 2129 bytes
-rw-r--r--graphics/interface/pkmnjump_rope1.pngbin0 -> 318 bytes
-rw-r--r--graphics/interface/pkmnjump_rope2.pngbin0 -> 309 bytes
-rw-r--r--graphics/interface/pkmnjump_rope3.pngbin0 -> 325 bytes
-rw-r--r--graphics/interface/pkmnjump_rope4.pngbin0 -> 243 bytes
-rw-r--r--graphics/interface/pkmnjump_star.pngbin0 -> 326 bytes
-rw-r--r--graphics/interface/pkmnjump_venusaur.binbin0 -> 4096 bytes
-rw-r--r--graphics/interface/pkmnjump_venusaur.pal19
-rw-r--r--graphics/interface/pkmnjump_venusaur.pngbin0 -> 2082 bytes
-rw-r--r--graphics/interface/test.binbin0 -> 1152 bytes
-rw-r--r--graphics_file_rules.mk4
54 files changed, 2006 insertions, 216 deletions
diff --git a/asm/link.s b/asm/link.s
index c9fd1ff96..0b46c6a94 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -46151,17 +46151,17 @@ _0802121C:
lsls r2, 1
movs r1, 0
bl LoadPalette
- ldr r1, =gUnknown_082F3C8C
+ ldr r1, =gBerryCrushGrinderTopTilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
- ldr r1, =gUnknown_082F3DBC
+ ldr r1, =gBerryCrushContainerCapTilemap
movs r0, 0x2
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
- ldr r1, =gUnknown_082F3F54
+ ldr r1, =gBerryCrushBackgroundTilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@@ -46800,7 +46800,7 @@ _0802175A:
asrs r0, 24
strh r0, [r2, 0x24]
ldr r2, [r3]
- ldr r3, =gUnknown_082F41CD
+ ldr r3, =gUnknown_082F41CC+1
adds r1, r3
movs r0, 0
ldrsb r0, [r1, r0]
@@ -46860,7 +46860,7 @@ _080217E8:
ldr r0, =sub_8022B28
str r0, [r2, 0x1C]
lsls r1, r4, 1
- ldr r3, =gUnknown_082F41D2
+ ldr r3, =gUnknown_082F41CC+6
adds r0, r1, r3
movs r4, 0
ldrsb r4, [r0, r4]
@@ -46868,7 +46868,7 @@ _080217E8:
adds r0, 0x78
strh r0, [r2, 0x20]
ldr r2, [r7]
- ldr r0, =gUnknown_082F41D3
+ ldr r0, =gUnknown_082F41CC+7
adds r1, r0
movs r6, 0
ldrsb r6, [r1, r6]
@@ -48771,7 +48771,7 @@ _080227AA:
bcc _080227AA
_08022822:
movs r5, 0
- ldr r4, =gUnknown_082F41D2
+ ldr r4, =gUnknown_082F41CC+6
adds r7, r4, 0x1
_08022828:
lsls r2, r5, 1
@@ -56589,7 +56589,7 @@ _08026676:
lsrs r0, 24
cmp r0, 0x1
bhi _080266D4
- ldr r0, =gUnknown_082F45AF
+ ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@@ -56625,7 +56625,7 @@ _080266D0:
movs r0, 0x1
b _0802670C
_080266D4:
- ldr r0, =gUnknown_082F45AF
+ ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@@ -57508,7 +57508,7 @@ _08026D76:
sub_8026D8C: @ 8026D8C
lsls r0, 24
lsrs r0, 24
- ldr r3, =gUnknown_082F4648
+ ldr r3, =gUnknown_082F449C+0x1AC
ldr r1, =gUnknown_02022C98
ldr r1, [r1]
adds r1, 0x24
@@ -57539,7 +57539,7 @@ sub_8026DB0: @ 8026DB0
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, =gUnknown_082F45FA
+ ldr r3, =gUnknown_082F449C+0x15E
lsls r1, r0, 1
adds r1, r0
lsls r0, r2, 4
@@ -57556,7 +57556,7 @@ sub_8026DB0: @ 8026DB0
ldrb r1, [r1]
mov r8, r1
movs r3, 0
- ldr r1, =gUnknown_082F467F
+ ldr r1, =gUnknown_082F449C+0x1E3
lsls r0, r2, 2
adds r2, r0, r2
adds r0, r2, r1
@@ -60392,7 +60392,7 @@ sub_80283A8: @ 80283A8
ldr r0, [r0]
str r0, [sp, 0x10]
str r1, [sp, 0x14]
- ldr r0, =gUnknown_082F98BC
+ ldr r0, =gDodrioBerryPkmnGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@@ -60848,7 +60848,7 @@ sub_8028734: @ 8028734
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
- ldr r0, =gUnknown_082F96E0
+ ldr r0, =gDodrioBerryStatusGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@@ -61225,7 +61225,7 @@ sub_8028A34: @ 8028A34
ldr r0, [r0]
str r0, [sp, 0x8]
str r1, [sp, 0xC]
- ldr r0, =gUnknown_082F7EB0
+ ldr r0, =gDodrioBerrySpritesGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@@ -61611,7 +61611,7 @@ sub_8028D44: @ 8028D44
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
- ldr r0, =gUnknown_082F9774
+ ldr r0, =gDodrioBerryPlatformGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@@ -62386,17 +62386,17 @@ _0802937A:
b _0802941C
.pool
_08029394:
- ldr r1, =gUnknown_082FAAD8
+ ldr r1, =gDodrioBerryBgTilemap1
movs r0, 0x3
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
- ldr r1, =gUnknown_082FAF94
+ ldr r1, =gDodrioBerryBgTilemap2Left
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
- ldr r1, =gUnknown_082FAD44
+ ldr r1, =gDodrioBerryBgTilemap2Right
movs r0, 0x2
movs r2, 0
movs r3, 0
@@ -64749,7 +64749,7 @@ _0802A910:
.4byte _0802A964
.4byte _0802A972
_0802A928:
- ldr r0, =gUnknown_082F7DF0
+ ldr r0, =gDodrioBerryBgPal1
movs r1, 0
movs r2, 0x40
bl LoadPalette
@@ -64759,14 +64759,14 @@ _0802A938:
bl reset_temp_tile_data_buffers
b _0802A98A
_0802A93E:
- ldr r1, =gUnknown_082F8084
+ ldr r1, =gDodrioBerryBgGfx1
movs r0, 0
str r0, [sp]
movs r0, 0x3
b _0802A954
.pool
_0802A94C:
- ldr r1, =gUnknown_082F8914
+ ldr r1, =gDodrioBerryBgGfx2
movs r0, 0
str r0, [sp]
movs r0, 0x1
@@ -64995,7 +64995,7 @@ sub_802AB20: @ 802AB20
ldr r7, =gUnknown_02022CFC
movs r6, 0
movs r5, 0
- ldr r0, =gUnknown_082FB464
+ ldr r0, =gPkmnJumpSpecies
mov r8, r0
movs r4, 0x4
_0802AB32:
@@ -65091,7 +65091,7 @@ sub_802AC00: @ 802AC00
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0
- ldr r2, =gUnknown_082FB464
+ ldr r2, =gPkmnJumpSpecies
_0802AC0A:
ldrh r0, [r2]
cmp r0, r3
@@ -69939,56 +69939,56 @@ _0802D178:
ldr r0, [r6]
bl sub_802C974
bl sub_802DD08
- ldr r0, =gUnknown_082FC044
+ ldr r0, =gPkmnJumpBgPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
- ldr r1, =gUnknown_082FC064
+ ldr r1, =gPkmnJumpBgGfx
str r5, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r1, =gUnknown_082FC290
+ ldr r1, =gPkmnJumpBgTilemap
movs r4, 0x1
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_082FC440
+ ldr r0, =gPkmnJumpVenusaurPal
movs r1, 0x30
movs r2, 0x20
bl LoadPalette
- ldr r1, =gUnknown_082FC460
+ ldr r1, =gPkmnJumpVenusaurGfx
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r1, =gUnknown_082FCDB0
+ ldr r1, =gPkmnJumpVenusaurTilemap
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_082FD168
+ ldr r0, =gPkmnJumpResultsPal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
- ldr r1, =gUnknown_082FD188
+ ldr r1, =gPkmnJumpResultsGfx
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r1, =gUnknown_082FDC38
+ ldr r1, =gPkmnJumpResultsTilemap
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_082FC024
+ ldr r0, =gPkmnJumpPal3
movs r1, 0x20
movs r2, 0x20
bl LoadPalette
diff --git a/data/data2.s b/data/data2.s
index a3fcbd536..900659502 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2988,7 +2988,7 @@ gUnknown_082F322C:: @ 82F322C
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31EC
.4byte gDummySpriteAnimTable
- .4byte 0x00000000
+ .4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
@@ -2998,7 +2998,7 @@ gUnknown_082F3244:: @ 82F3244
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31F4
.4byte gUnknown_082F321C
- .4byte 0x00000000
+ .4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
@@ -3041,414 +3041,1821 @@ gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate
.4byte 0x000000F8
.align 2
-gUnknown_082F32CC:: @ 82F32CC
- .incbin "baserom.gba", 0x2f32cc, 0xc
+gUnknown_082F32CC:: @ 82F32CC struct WindowTemplate? not sure
+ .byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00
+ .byte 0xb3, 0x30, 0x00, 0x00
+ .align 2
gUnknown_082F32D8:: @ 82F32D8
- .incbin "baserom.gba", 0x2f32d8, 0x3
+ .byte 0x01, 0x02, 0x03
gUnknown_082F32DB:: @ 82F32DB
- .incbin "baserom.gba", 0x2f32db, 0x3
+ .byte 0x00, 0x01, 0x02
gUnknown_082F32DE:: @ 82F32DE
- .incbin "baserom.gba", 0x2f32de, 0x3
+ .byte 0x00, 0x03, 0x04
gUnknown_082F32E1:: @ 82F32E1
- .incbin "baserom.gba", 0x2f32e1, 0x6
+ .byte 0x01, 0x08, 0x09
+ .byte 0x01, 0x06, 0x07
gUnknown_082F32E7:: @ 82F32E7
- .incbin "baserom.gba", 0x2f32e7, 0x5
+ .byte 0x01, 0x04, 0x05
+ .align 2
gUnknown_082F32EC:: @ 82F32EC
- .incbin "baserom.gba", 0x2f32ec, 0x8
+ window_template 0x00, 0x03, 0x04, 0x18, 0x0d, 0x0f, 0x0001
+ .align 2
gUnknown_082F32F4:: @ 82F32F4
- .incbin "baserom.gba", 0x2f32f4, 0x50
+ window_template 0x00, 0x00, 0x00, 0x09, 0x02, 0x08, 0x03ed
+ window_template 0x00, 0x00, 0x03, 0x09, 0x02, 0x08, 0x03db
+ window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
+ window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
+ window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
+ window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
+ window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
+ window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
+ window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
+ window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
+ .align 2
gUnknown_082F3344:: @ 82F3344
- .incbin "baserom.gba", 0x2f3344, 0x8
+ .byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10
+ .align 2
gUnknown_082F334C:: @ 82F334C
- .incbin "baserom.gba", 0x2f334c, 0x940
+ .byte 0x80, 0xf0, 0xfa, 0x02, 0x40, 0x78, 0x7d, 0x01
+ .byte 0x20, 0xbc, 0xbe, 0x00, 0x10, 0x5e, 0x5f, 0x00
+ .byte 0x08, 0xaf, 0x2f, 0x00, 0x84, 0xd7, 0x17, 0x00
+ .byte 0xc2, 0xeb, 0x0b, 0x00, 0xe1, 0xf5, 0x05, 0x00
+
+ .align 2
+gBerryCrushGrinderBasePal:: @ 82F336C
+ .incbin "graphics/interface/berrycrush_grinder_base.gbapal"
+
+ .align 2
+gBerryCrushMiscSpritesPal:: @ 82F338C
+ .incbin "graphics/interface/berrycrush_misc.gbapal"
+
+ .align 2
+gBerryCrushTimerDigitsPal:: @ 82F33AC
+ .incbin "graphics/interface/berrycrush_timerdigits.gbapal"
+
+ .align 2
+gBerryCrushGrinderBaseGfx:: @ 82F33CC
+ .incbin "graphics/interface/berrycrush_grinder_base.4bpp.lz"
+
+ .align 2
+gBerryCrushBtnPressGfx:: @ 82F36F8
+ .incbin "graphics/interface/berrycrush_btnpress.4bpp.lz"
+
+ .align 2
+gBerryCrushSparkleGfx:: @ 82F3A74
+ .incbin "graphics/interface/berrycrush_sparkle.4bpp.lz"
+
+ .align 2
+gBerryCrushTimerDigitsGfx:: @ 82F3BC0
+ .incbin "graphics/interface/berrycrush_timerdigits.4bpp.lz"
-gUnknown_082F3C8C:: @ 82F3C8C
- .incbin "baserom.gba", 0x2f3c8c, 0x130
+ .align 2
+gBerryCrushGrinderTopTilemap:: @ 82F3C8C
+ .incbin "graphics/interface/berrycrush_grinder_top.bin.lz"
-gUnknown_082F3DBC:: @ 82F3DBC
- .incbin "baserom.gba", 0x2f3dbc, 0x198
+ .align 2
+gBerryCrushContainerCapTilemap:: @ 82F3DBC
+ .incbin "graphics/interface/berrycrush_container_cap.bin.lz"
-gUnknown_082F3F54:: @ 82F3F54
- .incbin "baserom.gba", 0x2f3f54, 0x228
+ .align 2
+gBerryCrushBackgroundTilemap:: @ 82F3F54
+ .incbin "graphics/interface/berrycrush_background.bin.lz"
+ .align 2
gUnknown_082F417C:: @ 82F417C
- .incbin "baserom.gba", 0x2f417c, 0x14
+ .byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03
+ .byte 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00
+ .byte 0x01, 0x03, 0x02, 0x04
+ .align 2
gUnknown_082F4190:: @ 82F4190
- .incbin "baserom.gba", 0x2f4190, 0x3c
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff
+ .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00
+ .byte 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
+ .byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00
+ .byte 0xf8, 0xff, 0x10, 0x00, 0x03, 0x14, 0x03, 0x00
+ .byte 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
+ .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00
+ .byte 0x10, 0x00, 0xf8, 0xff
+ .align 2
gUnknown_082F41CC:: @ 82F41CC
- .incbin "baserom.gba", 0x2f41cc, 0x1
+ .byte 0x00, 0x00, 0xff, 0x00, 0x01, 0x01, 0x00, 0x00
+ .byte 0xf0, 0xfc, 0x10, 0xfc, 0xf8, 0xfe, 0x08, 0xfe
+ .byte 0xe8, 0xf8, 0x18, 0xf8, 0xe0, 0xf4, 0x20, 0xf4
+ .byte 0xd8, 0xf0, 0x28, 0xf0
+
+ .align 2
+gUnknown_082F41E8:: @ 82F41E8
+ .2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000
-gUnknown_082F41CD:: @ 82F41CD
- .incbin "baserom.gba", 0x2f41cd, 0x5
+ .align 2
+gUnknown_082F41F4:: @ 82F41F4
+ .4byte gBerryCrushGrinderBaseGfx
+ .2byte 0x0800, 0x0001
-gUnknown_082F41D2:: @ 82F41D2
- .incbin "baserom.gba", 0x2f41d2, 0x1
+ .4byte gBerryCrushBtnPressGfx
+ .2byte 0x0e00, 0x0002
-gUnknown_082F41D3:: @ 82F41D3
- .incbin "baserom.gba", 0x2f41d3, 0x15
+ .4byte gBerryCrushSparkleGfx
+ .2byte 0x0700, 0x0003
-gUnknown_082F41E8:: @ 82F41E8
- .incbin "baserom.gba", 0x2f41e8, 0xc
+ .align 2
+gUnknown_082F420C:: @ 82F420C
+ .4byte gBerryCrushTimerDigitsGfx
+ .2byte 0x02c0, 0x0004
-gUnknown_082F41F4:: @ 82F41F4
- .incbin "baserom.gba", 0x2f41f4, 0x28
+ .4byte NULL
+ .2byte 0x0000, 0x0000
+ .align 2
gUnknown_082F421C:: @ 82F421C
- .incbin "baserom.gba", 0x2f421c, 0xf0
+ .4byte gBerryCrushGrinderBasePal
+ .2byte 0x0001
+
+ .align 2
+ .4byte gBerryCrushMiscSpritesPal
+ .2byte 0x0002
+
+ .align 2
+gUnknown_082F422C:: @ 82F422C
+ .align 2
+ .4byte gBerryCrushTimerDigitsPal
+ .2byte 0x0004
+
+ .align 2
+ .4byte NULL
+ .2byte 0x0000
+
+ .align 2
+gUnknown_082F423C:: @ 82F423C
+ .2byte 0x0000, 0x0000, 0xffff, 0x0000
+
+ .align 2
+gUnknown_082F4244:: @ 82F4244
+ .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
+
+ .align 2
+gUnknown_082F4254:: @ 82F4254
+ .2byte 0x0030, 0x0002, 0x0040, 0x0002, 0x0050, 0x0002, 0x0060, 0x0002
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082F4268:: @ 82F4268
+ .2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002
+ .2byte 0x0010, 0x0002, 0x0014, 0x0002, 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082F4284:: @ 82F4284
+ .2byte 0x0018, 0x0004, 0x001c, 0x0004, 0x0020, 0x0004, 0x0024, 0x0004
+ .2byte 0x0028, 0x0004, 0x002c, 0x0004, 0x0030, 0x0004, 0x0034, 0x0004
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082F42A8:: @ 82F42A8
+ .2byte 0x0014, 0x0000, 0xffff, 0x0000
+
+ .align 2
+gUnknown_082F42B0:: @ 82F42B0
+ .2byte 0x0000, 0x0000, 0xffff, 0x0000
+
+ .align 2
+gUnknown_082F42B8:: @ 82F42B8
+ .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0102, 0x0000
+ .2byte 0x7ffe, 0x0001, 0x0000, 0x0000
+
+ .align 2
+gUnknown_082F42D0:: @ 82F42D0
+ .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x01fe, 0x0000
+ .2byte 0x7ffe, 0x0001, 0x0000, 0x0000
+ .align 2
+gUnknown_082F42E8:: @ 82F42E8
+ .4byte gUnknown_082F423C
+
+ .align 2
+gUnknown_082F42EC:: @ 82F42EC
+ .4byte gUnknown_082F4244
+ .4byte gUnknown_082F4254
+
+ .align 2
+gUnknown_082F42F4:: @ 82F42F4
+ .4byte gUnknown_082F4268
+ .4byte gUnknown_082F4284
+
+ .align 2
+gUnknown_082F42FC:: @ 82F42FC
+ .4byte gUnknown_082F42A8
+
+ .align 2
+gUnknown_082F4300:: @ 82F4300
+ .4byte gUnknown_082F42B0
+
+ .align 2
+gUnknown_082F4304:: @ 82F4304
+ .4byte gUnknown_082F42B8
+ .4byte gUnknown_082F42D0
+
+ .align 2
gUnknown_082F430C:: @ 82F430C
- .incbin "baserom.gba", 0x2f430c, 0x18
+ .2byte 0x0001 @ tileTag
+ .2byte 0x0001 @ paletteTag
+ .4byte gUnknown_0852491C
+ .4byte gUnknown_082F42E8
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082F4324:: @ 82F4324
- .incbin "baserom.gba", 0x2f4324, 0x18
+ .2byte 0x0002 @ tileTag
+ .2byte 0x0002 @ paletteTag
+ .4byte gUnknown_08524914
+ .4byte gUnknown_082F42EC
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte sub_8022A20
+ .align 2
gUnknown_082F433C:: @ 82F433C
- .incbin "baserom.gba", 0x2f433c, 0x18
+ .2byte 0x0003 @ tileTag
+ .2byte 0x0002 @ paletteTag
+ .4byte gUnknown_0852490C
+ .4byte gUnknown_082F42F4
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082F4354:: @ 82F4354
- .incbin "baserom.gba", 0x2f4354, 0x18
+ .2byte 0x0004 @ tileTag
+ .2byte 0x0004 @ paletteTag
+ .4byte gUnknown_08524944
+ .4byte gUnknown_082F42FC
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082F436C:: @ 82F436C
- .incbin "baserom.gba", 0x2f436c, 0x18
+ .2byte 0x0005 @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_085249D4
+ .4byte gUnknown_082F4300
+ .4byte NULL
+ .4byte gUnknown_082F4304
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082F4384:: @ 82F4384
- .incbin "baserom.gba", 0x2f4384, 0x30
+ .byte 0x09, 0x02, 0x08, 0x00, 0x9c, 0x00, 0x00, 0x00
+ .4byte gUnknown_082F420C
+ .4byte gUnknown_082F422C
+
+ .byte 0x08, 0x02, 0x08, 0x00, 0xb4, 0x00, 0x00, 0x00
+ .4byte gUnknown_082F420C
+ .4byte gUnknown_082F422C
+ .byte 0x08, 0x02, 0x08, 0x00, 0xcc, 0x00, 0x00, 0x00
+ .4byte gUnknown_082F420C
+ .4byte gUnknown_082F422C
+
+ .align 2
gUnknown_082F43B4:: @ 82F43B4
- .incbin "baserom.gba", 0x2f43b4, 0x18
+ .4byte gUnknown_085ED7E8
+ .4byte gUnknown_085ED7F4
+ .4byte gUnknown_085ED7FC
+ .4byte gUnknown_085ED88C
+ .4byte gUnknown_085ED8A0
+ .4byte gUnknown_085ED8B8
+ .align 2
gUnknown_082F43CC:: @ 82F43CC
- .incbin "baserom.gba", 0x2f43cc, 0x68
+ .4byte NULL
+ .4byte sub_8022C58
+ .4byte sub_8022CB0
+ .4byte sub_8022D14
+ .4byte sub_8022E1C
+ .4byte sub_8022E3C
+ .4byte sub_8022E5C
+ .4byte sub_8022EAC
+ .4byte sub_8022F04
+ .4byte sub_8022F1C
+ .4byte sub_8023070
+ .4byte sub_80231B8
+ .4byte sub_80232EC
+ .4byte sub_80238F0
+ .4byte sub_8023998
+ .4byte sub_8023A30
+ .4byte sub_8023BC0
+ .4byte sub_8023CAC
+ .4byte sub_8024048
+ .4byte sub_8024134
+ .4byte sub_8024228
+ .4byte sub_80242E0
+ .4byte sub_80243BC
+ .4byte sub_8024444
+ .4byte sub_8024508
+ .4byte sub_8024568
+ .align 2
gUnknown_082F4434:: @ 82F4434
- .incbin "baserom.gba", 0x2f4434, 0x10
+ .byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b
+ .byte 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11
gUnknown_082F4444:: @ 82F4444
- .incbin "baserom.gba", 0x2f4444, 0x4
+ .byte 0x05, 0x07, 0x09, 0x0c
gUnknown_082F4448:: @ 82F4448
- .incbin "baserom.gba", 0x2f4448, 0x54
+ .byte 0x03, 0x07, 0x0f, 0x1f
+
+ .align 2
+gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate
+ .4byte 0x000001e0
+ .4byte 0x000012c9
+ .4byte 0x000012ea
+ .4byte 0x000021ff
+ .4byte 0x000000ff
+ .4byte 0x00000000
+
+ .align 2
+gUnknown_082F7BBC_UnrefDupe:: @ 82F4464
+ window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
+ window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
+
+ .align 2
+gUnknown_082F7BCC_UnrefDupe:: @ 82F4474
+ window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
+
+ .align 2
+gUnknown_082F7BD4_UnrefDupe:: @ 82F447C
+ window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
+ window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
+
+ .align 2
+gUnknown_082F7BE4_UnrefDupe:: @ 82F448C
+ window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
+
+ .align 2
+gUnknown_082F7BEC_UnrefDupe:: @ 82F4494
+ window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
+ .align 2
gUnknown_082F449C:: @ 82F449C
- .incbin "baserom.gba", 0x2f449c, 0x113
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
+ .byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
+ .byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
+ .byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+ .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
+ .byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
+ .byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
+ .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
+ .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
+ .byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
+ .byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
+ .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
+ .byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
+ .byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
+ .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
+ .byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
+ .byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
+ .byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
+ .byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
+ .byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
+ .byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
+ .byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
+ .byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
+ .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
+ .byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
+ .byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
+ .byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
+ .byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
+ .byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
+ .byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
+ .byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
+ .byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
+ .byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
+ .byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
+ .byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
+ .byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
+ .byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
+ .byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
+ .byte 0x03, 0x05, 0x06, 0x09
+
+ .align 2
+gUnknown_082F7DF0_UnrefDupe:: @ 82F4698
+ .incbin "graphics/interface/dodrioberry_bg1.gbapal"
-gUnknown_082F45AF:: @ 82F45AF
- .incbin "baserom.gba", 0x2f45af, 0x4b
+ .align 2
+ .incbin "graphics/interface/dodrioberry_bg2.gbapal"
+
+ .align 2
+gUnknown_082F7E30_UnrefDupe:: @ 82F46B8
+ .incbin "graphics/interface/dodrioberry_pkmn.gbapal"
+
+ .align 2
+gUnknown_082F7E50_UnrefDupe:: @ 82F46D8
+ .incbin "graphics/interface/dodrioberry_shiny.gbapal"
+
+ .align 2
+gUnknown_082F7E70_UnrefDupe:: @ 82F46F8
+ .incbin "graphics/interface/dodrioberry_status.gbapal"
+
+ .align 2
+gUnknown_082F7E90_UnrefDupe:: @ 82F4718
+ .incbin "graphics/interface/dodrioberry_berrysprites.gbapal"
+
+ .align 2
+gUnknown_082F7EB0_UnrefDupe:: @ 82F4738
+ .incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz"
+
+ .align 2
+gUnknown_082F8064_UnrefDupe:: @ 82F490C
+ .incbin "graphics/interface/dodrioberry_platform.gbapal"
+
+ .align 2
+gUnknown_082F8084_UnrefDupe:: @ 82F492C
+ .incbin "graphics/interface/dodrioberry_bg1.4bpp.lz"
+
+ .align 2
+gUnknown_082F8914_UnrefDupe:: @ 82F51BC
+ .incbin "graphics/interface/dodrioberry_bg2.4bpp.lz"
+
+ .align 2
+gUnknown_082F96E0_UnrefDupe:: @ 82F5F88
+ .incbin "graphics/interface/dodrioberry_status.4bpp.lz"
-gUnknown_082F45FA:: @ 82F45FA
- .incbin "baserom.gba", 0x2f45fa, 0x4e
+ .align 2
+gUnknown_082F9774_UnrefDupe:: @ 82F601C
+ .incbin "graphics/interface/dodrioberry_platform.4bpp.lz"
-gUnknown_082F4648:: @ 82F4648
- .incbin "baserom.gba", 0x2f4648, 0x37
+ .align 2
+gUnknown_082F98BC_UnrefDupe:: @ 82F6164
+ .incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz"
-gUnknown_082F467F:: @ 82F467F
- .incbin "baserom.gba", 0x2f467f, 0x3409
+ .align 2
+gUnknown_082FAAD8_UnrefDupe:: @ 82F7380
+ .incbin "graphics/interface/dodrioberry_bg1.bin.lz"
+ .align 2
+gUnknown_082FAD44_UnrefDupe:: @ 82F75EC
+ .incbin "graphics/interface/dodrioberry_bg2right.bin.lz"
+
+ .align 2
+gUnknown_082FAF94_UnrefDupe:: @ 82F783C
+ .incbin "graphics/interface/dodrioberry_bg2left.bin.lz"
+
+ .align 2
gUnknown_082F7A88:: @ 82F7A88
- .incbin "baserom.gba", 0x2f7a88, 0xc
+ .byte 0x28, 0x18, 0x0d, 0x20, 0x13, 0x0a, 0x16, 0x0d
+ .byte 0x07, 0x00, 0x00, 0x00
+ .align 2
gUnknown_082F7A94:: @ 82F7A94
- .incbin "baserom.gba", 0x2f7a94, 0x8
+ .byte 0x08, 0x05, 0x08, 0x0b, 0x0f, 0x00, 0x00, 0x00
+ .align 2
gUnknown_082F7A9C:: @ 82F7A9C
- .incbin "baserom.gba", 0x2f7a9c, 0x8
+ .byte 0x05, 0x0a, 0x14, 0x1e, 0x32, 0x46, 0x64, 0x00
+ .align 2
gUnknown_082F7AA4:: @ 82F7AA4
- .incbin "baserom.gba", 0x2f7aa4, 0x20
+ .byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x13, 0x12, 0x11
+ .byte 0x10, 0x0f, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
+ .byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21
+ .byte 0x22, 0x22, 0x21, 0x20, 0x1f, 0x1e, 0x00, 0x00
+ .align 2
gUnknown_082F7AC4:: @ 82F7AC4
- .incbin "baserom.gba", 0x2f7ac4, 0x30
+ .4byte sub_8024DBC
+ .4byte sub_8024E00
+ .4byte sub_8024E38
+ .4byte sub_8024F10
+ .4byte sub_8024F38
+ .4byte sub_8025198
+ .4byte sub_8025324
+ .4byte sub_8025470
+ .4byte sub_8025644
+ .4byte sub_80256AC
+ .4byte sub_8025758
+ .4byte sub_80250D4
+ .align 2
gUnknown_082F7AF4:: @ 82F7AF4
- .incbin "baserom.gba", 0x2f7af4, 0x30
+ .4byte sub_8024DBC
+ .4byte sub_8024E00
+ .4byte sub_8024E38
+ .4byte sub_8024F10
+ .4byte sub_8024FFC
+ .4byte sub_8025230
+ .4byte sub_8025324
+ .4byte sub_8025470
+ .4byte sub_8025644
+ .4byte sub_80256AC
+ .4byte sub_8025758
+ .4byte sub_8025158
+ .align 2
gUnknown_082F7B24:: @ 82F7B24
- .incbin "baserom.gba", 0x2f7b24, 0x8
+ .2byte 0x000a, 0x001e, 0x0032, 0x0032
+ .align 2
gUnknown_082F7B2C:: @ 82F7B2C
- .incbin "baserom.gba", 0x2f7b2c, 0x8
+ .byte 0x00, 0x05, 0x01, 0x14, 0x0b, 0x0f, 0x01, 0x00
+ .align 2
gUnknown_082F7B34:: @ 82F7B34
- .incbin "baserom.gba", 0x2f7b34, 0xc
+ .4byte gUnknown_085EDD02
+ .4byte gUnknown_085EDD12
+ .4byte gUnknown_085EDD1E
+ .align 2
gUnknown_082F7B40:: @ 82F7B40
- .incbin "baserom.gba", 0x2f7b40, 0x4
+ .byte 0x04, 0x07, 0x04, 0x00
+ .align 2
gUnknown_082F7B44:: @ 82F7B44
- .incbin "baserom.gba", 0x2f7b44, 0x6
+ .2byte 0x0019, 0x0029, 0x0039
gUnknown_082F7B4A:: @ 82F7B4A
- .incbin "baserom.gba", 0x2f7b4a, 0x6
+ .2byte 0x0019, 0x0029, 0x0049
+ .align 2
gUnknown_082F7B50:: @ 82F7B50
- .incbin "baserom.gba", 0x2f7b50, 0x40
+ .2byte 0x270f, 0x0000, 0x005a, 0x270f, 0x270f, 0x270f, 0x0046, 0x270f
+ .2byte 0x270f, 0x0000, 0x270f, 0x0000, 0x270f, 0x270f, 0x003c, 0x0000
+ .2byte 0x270f, 0x270f, 0x270f, 0x0000
-gUnknown_082F7B90:: @ 82F7B90
- .incbin "baserom.gba", 0x2f7b90, 0x14
+ .align 2
+gUnknown_082F7B78:: @ 82F7B78
+ .string "ÀÁÂÇÈÉÊ$"
-gUnknown_082F7BA4:: @ 82F7BA4
- .incbin "baserom.gba", 0x2f7ba4, 0x18
+ .align 2
+gUnknown_082F7B80:: @ 82F7B80
+ .string "ABCDEFG$"
+
+ .align 2
+gUnknown_082F7B88:: @ 82F7B88
+ .string "0123456$"
+
+ .align 2
+gUnknown_082F7B90:: @ 82F7B90
+ .4byte gUnknown_082F7B78
+ .4byte gUnknown_082F7B78
+ .4byte gUnknown_082F7B78
+ .4byte gUnknown_082F7B80
+ .4byte gUnknown_082F7B88
+
+ .align 2
+gUnknown_082F7BA4:: @ 82F7BA4 struct BgTemplate
+ .4byte 0x000001e0
+ .4byte 0x000012c9
+ .4byte 0x000012ea
+ .4byte 0x000021ff
+ .4byte 0x000000ff
+ .4byte 0x00000000
+ .align 2
gUnknown_082F7BBC:: @ 82F7BBC
- .incbin "baserom.gba", 0x2f7bbc, 0x10
+ window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
+ window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
+ .align 2
gUnknown_082F7BCC:: @ 82F7BCC
- .incbin "baserom.gba", 0x2f7bcc, 0x8
+ window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
+ .align 2
gUnknown_082F7BD4:: @ 82F7BD4
- .incbin "baserom.gba", 0x2f7bd4, 0x10
+ window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
+ window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
+ .align 2
gUnknown_082F7BE4:: @ 82F7BE4
- .incbin "baserom.gba", 0x2f7be4, 0x8
+ window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
+ .align 2
gUnknown_082F7BEC:: @ 82F7BEC
- .incbin "baserom.gba", 0x2f7bec, 0x204
+ window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
-gUnknown_082F7DF0:: @ 82F7DF0
- .incbin "baserom.gba", 0x2f7df0, 0xc0
+ .align 2
+gUnknown_082F449C_UnrefDupe:: @ 82F7BF4
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
+ .byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
+ .byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
+ .byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+ .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
+ .byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
+ .byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
+ .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
+ .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
+ .byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
+ .byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
+ .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
+ .byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
+ .byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
+ .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
+ .byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
+ .byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
+ .byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
+ .byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
+ .byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
+ .byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
+ .byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
+ .byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
+ .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
+ .byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
+ .byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
+ .byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
+ .byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
+ .byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
+ .byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
+ .byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
+ .byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
+ .byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
+ .byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
+ .byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
+ .byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
+ .byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
+ .byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
+ .byte 0x03, 0x05, 0x06, 0x09
-gUnknown_082F7EB0:: @ 82F7EB0
- .incbin "baserom.gba", 0x2f7eb0, 0x1d4
+ .align 2
+gDodrioBerryBgPal1:: @ 82F7DF0
+ .incbin "graphics/interface/dodrioberry_bg1.gbapal"
-gUnknown_082F8084:: @ 82F8084
- .incbin "baserom.gba", 0x2f8084, 0x890
+ .align 2
+ .incbin "graphics/interface/dodrioberry_bg2.gbapal"
-gUnknown_082F8914:: @ 82F8914
- .incbin "baserom.gba", 0x2f8914, 0xdcc
+ .align 2
+gDodrioBerryPkmnPal:: @ 82F7E30
+ .incbin "graphics/interface/dodrioberry_pkmn.gbapal"
-gUnknown_082F96E0:: @ 82F96E0
- .incbin "baserom.gba", 0x2f96e0, 0x94
+ .align 2
+gDodrioBerryShinyPal:: @ 82F7E50
+ .incbin "graphics/interface/dodrioberry_shiny.gbapal"
-gUnknown_082F9774:: @ 82F9774
- .incbin "baserom.gba", 0x2f9774, 0x148
+ .align 2
+gDodrioBerryStatusPal:: @ 82F7E70
+ .incbin "graphics/interface/dodrioberry_status.gbapal"
-gUnknown_082F98BC:: @ 82F98BC
- .incbin "baserom.gba", 0x2f98bc, 0x121c
+ .align 2
+gDodrioBerrySpritesPal:: @ 82F7E90
+ .incbin "graphics/interface/dodrioberry_berrysprites.gbapal"
+
+ .align 2
+gDodrioBerrySpritesGfx:: @ 82F7EB0
+ .incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz"
+
+ .align 2
+gDodrioBerryPlatformPal:: @ 82F8064
+ .incbin "graphics/interface/dodrioberry_platform.gbapal"
+
+ .align 2
+gDodrioBerryBgGfx1:: @ 82F8084
+ .incbin "graphics/interface/dodrioberry_bg1.4bpp.lz"
+
+ .align 2
+gDodrioBerryBgGfx2:: @ 82F8914
+ .incbin "graphics/interface/dodrioberry_bg2.4bpp.lz"
-gUnknown_082FAAD8:: @ 82FAAD8
- .incbin "baserom.gba", 0x2faad8, 0x26c
+ .align 2
+gDodrioBerryStatusGfx:: @ 82F96E0
+ .incbin "graphics/interface/dodrioberry_status.4bpp.lz"
-gUnknown_082FAD44:: @ 82FAD44
- .incbin "baserom.gba", 0x2fad44, 0x250
+ .align 2
+gDodrioBerryPlatformGfx:: @ 82F9774
+ .incbin "graphics/interface/dodrioberry_platform.4bpp.lz"
-gUnknown_082FAF94:: @ 82FAF94
- .incbin "baserom.gba", 0x2faf94, 0x24c
+ .align 2
+gDodrioBerryPkmnGfx:: @ 82F98BC
+ .incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz"
+
+ .align 2
+gDodrioBerryBgTilemap1:: @ 82FAAD8
+ .incbin "graphics/interface/dodrioberry_bg1.bin.lz"
+
+ .align 2
+gDodrioBerryBgTilemap2Right:: @ 82FAD44
+ .incbin "graphics/interface/dodrioberry_bg2right.bin.lz"
+
+ .align 2
+gDodrioBerryBgTilemap2Left:: @ 82FAF94
+ .incbin "graphics/interface/dodrioberry_bg2left.bin.lz"
+ .align 2
gUnknown_082FB1E0:: @ 82FB1E0
- .incbin "baserom.gba", 0x2fb1e0, 0x48
+ .byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB1E8:: @ 82FB1E8
+ .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB1F0:: @ 82FB1F0
+ .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB1F8:: @ 82FB1F8
+ .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB200:: @ 82FB200
+ .2byte 0x0000, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB208:: @ 82FB208
+ .2byte 0x0040, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB210:: @ 82FB210
+ .2byte 0x0080, 0x0014
+ .2byte 0xfffe, 0x0000
+ .align 2
+gUnknown_082FB218:: @ 82FB218
+ .2byte 0x00c0, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB220:: @ 82FB220
+ .2byte 0x0100, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
gUnknown_082FB228:: @ 82FB228
- .incbin "baserom.gba", 0x2fb228, 0xb0
+ .4byte gUnknown_082FB200
+ .4byte gUnknown_082FB208
+ .4byte gUnknown_082FB210
+ .4byte gUnknown_082FB218
+ .4byte gUnknown_082FB220
+
+ .align 2
+gUnknown_082FB23C:: @ 82FB23C
+ .2byte 0x0000, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB244:: @ 82FB244
+ .2byte 0x0004, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB24C:: @ 82FB24C
+ .2byte 0x0008, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB254:: @ 82FB254
+ .4byte gUnknown_082FB23C
+ .4byte gUnknown_082FB244
+ .4byte gUnknown_082FB24C
+
+ .align 2
+gUnknown_082FB260:: @ 82FB260
+ .2byte 0x0000, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB268:: @ 82FB268
+ .2byte 0x0004, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB270:: @ 82FB270
+ .2byte 0x0008, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB278:: @ 82FB278
+ .2byte 0x000c, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB280:: @ 82FB280
+ .2byte 0x0010, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB288:: @ 82FB288
+ .2byte 0x0014, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB290:: @ 82FB290
+ .2byte 0x0018, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB298:: @ 82FB298
+ .2byte 0x001c, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB2A0:: @ 82FB2A0
+ .2byte 0x0020, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB2A8:: @ 82FB2A8
+ .4byte gUnknown_082FB260
+ .4byte gUnknown_082FB268
+ .4byte gUnknown_082FB270
+ .4byte gUnknown_082FB278
+ .4byte gUnknown_082FB280
+ .4byte gUnknown_082FB288
+ .4byte gUnknown_082FB290
+ .4byte gUnknown_082FB298
+ .4byte gUnknown_082FB2A0
+ .align 2
+gUnknown_082FB2CC:: @ 82FB2CC
+ .2byte 0x0000, 0x0014
+ .2byte 0xfffe, 0x0000
+
+ .align 2
+gUnknown_082FB2D4:: @ 82FB2D4
+ .4byte gUnknown_082FB2CC
+
+ .align 2
gUnknown_082FB2D8:: @ 82FB2D8
- .incbin "baserom.gba", 0x2fb2d8, 0x8
+ .4byte gDodrioBerryPkmnPal
+ .2byte 0x0000
+ .align 2
gUnknown_082FB2E0:: @ 82FB2E0
- .incbin "baserom.gba", 0x2fb2e0, 0x8
+ .4byte gDodrioBerryShinyPal
+ .2byte 0x0001
+ .align 2
gUnknown_082FB2E8:: @ 82FB2E8
- .incbin "baserom.gba", 0x2fb2e8, 0x8
+ .4byte gDodrioBerryStatusPal
+ .2byte 0x0002
+
+ .align 2
+gUnknown_082FB2F0:: @ 82FB2F0 struct SpriteTemplate
+ .2byte 0x0001 @ tileTag
+ .2byte 0x0002 @ paletteTag
+ .4byte gUnknown_082FB1E8
+ .4byte gUnknown_082FB254
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte nullsub_15
-gUnknown_082FB2F0:: @ 82FB2F0
- .incbin "baserom.gba", 0x2fb2f0, 0x24
+ .align 2
+ .byte 0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44
+ .byte 0x45, 0xFB, 0x00, 0x00
+ .align 2
gUnknown_082FB314:: @ 82FB314
- .incbin "baserom.gba", 0x2fb314, 0x8
+ .4byte gDodrioBerrySpritesPal
+ .2byte 0x0003
+ .align 2
gUnknown_082FB31C:: @ 82FB31C
- .incbin "baserom.gba", 0x2fb31c, 0x8
+ .2byte 0x0058, 0x0080, 0x00a8, 0x00d0
-gUnknown_082FB324:: @ 82FB324
- .incbin "baserom.gba", 0x2fb324, 0x18
+ .align 2
+gUnknown_082FB324:: @ 82FB324 struct SpriteTemplate
+ .2byte 0x0002 @ tileTag
+ .2byte 0x0003 @ paletteTag
+ .4byte gUnknown_082FB1F0
+ .4byte gUnknown_082FB2A8
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
-gUnknown_082FB33C:: @ 82FB33C
- .incbin "baserom.gba", 0x2fb33c, 0x18
+ .align 2
+gUnknown_082FB33C:: @ 82FB33C struct SpriteTemplate
+ .2byte 0x0002 @ tileTag
+ .2byte 0x0003 @ paletteTag
+ .4byte gUnknown_082FB1E8
+ .4byte gUnknown_082FB2A8
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082FB354:: @ 82FB354
- .incbin "baserom.gba", 0x2fb354, 0x2
+ .byte 0x1E, 0x14
gUnknown_082FB356:: @ 82FB356
- .incbin "baserom.gba", 0x2fb356, 0xa
+ .byte 0xE6, 0x00
+ .align 2
+gUnknown_082FB358:: @ 82FB358
+ .2byte 0x0037, 0x001e, 0x004a, 0x0000
+
+ .align 2
gUnknown_082FB360:: @ 82FB360
- .incbin "baserom.gba", 0x2fb360, 0x8
+ .4byte gDodrioBerryPlatformPal
+ .2byte 0x0006
-gUnknown_082FB368:: @ 82FB368
- .incbin "baserom.gba", 0x2fb368, 0x18
+ .align 2
+gUnknown_082FB368:: @ 82FB368 struct SpriteTemplate
+ .2byte 0x0005 @ tileTag
+ .2byte 0x0006 @ paletteTag
+ .4byte gUnknown_082FB1F8
+ .4byte gUnknown_082FB2D4
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte sub_8028CF4
+ .align 2
gUnknown_082FB380:: @ 82FB380
- .incbin "baserom.gba", 0x2fb380, 0x3
+ .byte 0x01, 0x02, 0x03
gUnknown_082FB383:: @ 82FB383
- .incbin "baserom.gba", 0x2fb383, 0x45
+ .byte 0x01, 0x04, 0x05
+ .byte 0x01, 0x08, 0x09
+ .byte 0x01, 0x06, 0x07
+
+ .align 2
+gUnknown_082FB38C:: @ 82FB38C
+ .byte 0x0c, 0x06, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB390:: @ 82FB390
+ .byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB398:: @ 82FB398
+ .byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
+ .byte 0x06, 0x0a, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB3A4:: @ 82FB3A4
+ .byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
+ .byte 0x15, 0x0a, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00
+
+ .align 2
+gUnknown_082FB3B4:: @ 82FB3B4
+ .byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
+ .byte 0x17, 0x06, 0x00, 0x00, 0x01, 0x06, 0x00, 0x00
+ .byte 0x06, 0x0a, 0x00, 0x00
+ .align 2
gUnknown_082FB3C8:: @ 82FB3C8
- .incbin "baserom.gba", 0x2fb3c8, 0x14
+ .4byte gUnknown_082FB38C
+ .4byte gUnknown_082FB390
+ .4byte gUnknown_082FB398
+ .4byte gUnknown_082FB3A4
+ .4byte gUnknown_082FB3B4
+ .align 2
gUnknown_082FB3DC:: @ 82FB3DC
- .incbin "baserom.gba", 0x2fb3dc, 0x14
+ .4byte gUnknown_085EDDAE
+ .4byte gUnknown_085EDDB1
+ .4byte gUnknown_085EDDB4
+ .4byte gUnknown_085EDDB7
+ .4byte gUnknown_085EDDBA
+ .align 2
gUnknown_082FB3F0:: @ 82FB3F0
- .incbin "baserom.gba", 0x2fb3f0, 0x8
+ .2byte 0x005c, 0x0084, 0x00ac, 0x00d4
gUnknown_082FB3F8:: @ 82FB3F8
- .incbin "baserom.gba", 0x2fb3f8, 0xa
+ .2byte 0x0021, 0x0031, 0x0041, 0x0051, 0x0061
gUnknown_082FB402:: @ 82FB402
- .incbin "baserom.gba", 0x2fb402, 0xa
+ .2byte 0x0011, 0x0021, 0x0031, 0x0041, 0x0051
+ .align 2
gUnknown_082FB40C:: @ 82FB40C
- .incbin "baserom.gba", 0x2fb40c, 0x50
+ .4byte 0x00000000, sub_8029338
+ .4byte 0x00000001, sub_8029440
+ .4byte 0x00000002, sub_802988C
+ .4byte 0x00000003, sub_802A010
+ .4byte 0x00000004, sub_802A380
+ .4byte 0x00000005, sub_802A454
+ .4byte 0x00000006, sub_802A534
+ .4byte 0x00000007, sub_802A588
+ .4byte 0x00000008, unused_0
+ .4byte 0x00000009, nullsub_16
+ .align 2
gUnknown_082FB45C:: @ 82FB45C
- .incbin "baserom.gba", 0x2fb45c, 0x8
-
-gUnknown_082FB464:: @ 82FB464
- .incbin "baserom.gba", 0x2fb464, 0x190
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00
+
+ .align 2
+gPkmnJumpSpecies:: @ 82FB464
+ .2byte SPECIES_BULBASAUR, 0x0002
+ .2byte SPECIES_CHARMANDER, 0x0001
+ .2byte SPECIES_SQUIRTLE, 0x0000
+ .2byte SPECIES_CATERPIE, 0x0001
+ .2byte SPECIES_METAPOD, 0x0001
+ .2byte SPECIES_WEEDLE, 0x0001
+ .2byte SPECIES_KAKUNA, 0x0001
+ .2byte SPECIES_RATTATA, 0x0001
+ .2byte SPECIES_RATICATE, 0x0001
+ .2byte SPECIES_PIKACHU, 0x0000
+ .2byte SPECIES_SANDSHREW, 0x0000
+ .2byte SPECIES_NIDORAN_F, 0x0000
+ .2byte SPECIES_NIDORAN_M, 0x0000
+ .2byte SPECIES_CLEFAIRY, 0x0000
+ .2byte SPECIES_VULPIX, 0x0000
+ .2byte SPECIES_JIGGLYPUFF, 0x0002
+ .2byte SPECIES_ODDISH, 0x0002
+ .2byte SPECIES_PARAS, 0x0001
+ .2byte SPECIES_MEOWTH, 0x0000
+ .2byte SPECIES_PSYDUCK, 0x0002
+ .2byte SPECIES_MANKEY, 0x0001
+ .2byte SPECIES_GROWLITHE, 0x0001
+ .2byte SPECIES_POLIWAG, 0x0002
+ .2byte SPECIES_BELLSPROUT, 0x0002
+ .2byte SPECIES_SHELLDER, 0x0001
+ .2byte SPECIES_KRABBY, 0x0001
+ .2byte SPECIES_EXEGGCUTE, 0x0002
+ .2byte SPECIES_CUBONE, 0x0000
+ .2byte SPECIES_DITTO, 0x0002
+ .2byte SPECIES_EEVEE, 0x0000
+ .2byte SPECIES_OMANYTE, 0x0001
+ .2byte SPECIES_KABUTO, 0x0001
+ .2byte SPECIES_CHIKORITA, 0x0002
+ .2byte SPECIES_CYNDAQUIL, 0x0001
+ .2byte SPECIES_TOTODILE, 0x0000
+ .2byte SPECIES_SPINARAK, 0x0001
+ .2byte SPECIES_PICHU, 0x0000
+ .2byte SPECIES_CLEFFA, 0x0000
+ .2byte SPECIES_IGGLYBUFF, 0x0002
+ .2byte SPECIES_TOGEPI, 0x0002
+ .2byte SPECIES_MAREEP, 0x0000
+ .2byte SPECIES_BELLOSSOM, 0x0002
+ .2byte SPECIES_MARILL, 0x0002
+ .2byte SPECIES_SUNKERN, 0x0002
+ .2byte SPECIES_WOOPER, 0x0002
+ .2byte SPECIES_PINECO, 0x0002
+ .2byte SPECIES_SNUBBULL, 0x0000
+ .2byte SPECIES_SHUCKLE, 0x0002
+ .2byte SPECIES_TEDDIURSA, 0x0000
+ .2byte SPECIES_SLUGMA, 0x0002
+ .2byte SPECIES_SWINUB, 0x0000
+ .2byte SPECIES_HOUNDOUR, 0x0001
+ .2byte SPECIES_PHANPY, 0x0000
+ .2byte SPECIES_PORYGON2, 0x0000
+ .2byte SPECIES_TYROGUE, 0x0001
+ .2byte SPECIES_SMOOCHUM, 0x0002
+ .2byte SPECIES_ELEKID, 0x0001
+ .2byte SPECIES_MAGBY, 0x0001
+ .2byte SPECIES_LARVITAR, 0x0001
+ .2byte SPECIES_TREECKO, 0x0001
+ .2byte SPECIES_TORCHIC, 0x0002
+ .2byte SPECIES_MUDKIP, 0x0000
+ .2byte SPECIES_MARSHTOMP, 0x0000
+ .2byte SPECIES_POOCHYENA, 0x0001
+ .2byte SPECIES_ZIGZAGOON, 0x0000
+ .2byte SPECIES_LINOONE, 0x0000
+ .2byte SPECIES_WURMPLE, 0x0001
+ .2byte SPECIES_SILCOON, 0x0002
+ .2byte SPECIES_CASCOON, 0x0002
+ .2byte SPECIES_LOTAD, 0x0002
+ .2byte SPECIES_SEEDOT, 0x0001
+ .2byte SPECIES_RALTS, 0x0000
+ .2byte SPECIES_KIRLIA, 0x0000
+ .2byte SPECIES_SURSKIT, 0x0002
+ .2byte SPECIES_SHROOMISH, 0x0002
+ .2byte SPECIES_NINCADA, 0x0001
+ .2byte SPECIES_WHISMUR, 0x0000
+ .2byte SPECIES_AZURILL, 0x0002
+ .2byte SPECIES_SKITTY, 0x0000
+ .2byte SPECIES_SABLEYE, 0x0000
+ .2byte SPECIES_MAWILE, 0x0000
+ .2byte SPECIES_ARON, 0x0001
+ .2byte SPECIES_MEDITITE, 0x0002
+ .2byte SPECIES_ELECTRIKE, 0x0001
+ .2byte SPECIES_PLUSLE, 0x0001
+ .2byte SPECIES_MINUN, 0x0001
+ .2byte SPECIES_VOLBEAT, 0x0000
+ .2byte SPECIES_ILLUMISE, 0x0000
+ .2byte SPECIES_ROSELIA, 0x0002
+ .2byte SPECIES_GULPIN, 0x0002
+ .2byte SPECIES_NUMEL, 0x0002
+ .2byte SPECIES_TORKOAL, 0x0002
+ .2byte SPECIES_SPOINK, 0x0000
+ .2byte SPECIES_TRAPINCH, 0x0002
+ .2byte SPECIES_CACNEA, 0x0002
+ .2byte SPECIES_ANORITH, 0x0001
+ .2byte SPECIES_WYNAUT, 0x0000
+ .2byte SPECIES_SNORUNT, 0x0000
+ .2byte SPECIES_CLAMPERL, 0x0001
+ .2byte SPECIES_BAGON, 0x0001
+ .align 2
gUnknown_082FB5F4:: @ 82FB5F4
- .incbin "baserom.gba", 0x2fb5f4, 0x24
+ .4byte sub_802B248
+ .4byte sub_802B2D4
+ .4byte sub_802B368
+ .4byte sub_802B3D4
+ .4byte sub_802B4CC
+ .4byte sub_802B5C8
+ .4byte sub_802B664
+ .4byte sub_802B6B8
+ .4byte sub_802B720
+ .align 2
gUnknown_082FB618:: @ 82FB618
- .incbin "baserom.gba", 0x2fb618, 0x24
+ .4byte sub_802B29C
+ .4byte sub_802B31C
+ .4byte sub_802B3B4
+ .4byte sub_802B470
+ .4byte sub_802B568
+ .4byte sub_802B628
+ .4byte sub_802B664
+ .4byte sub_802B704
+ .4byte sub_802B720
+ .align 2
gUnknown_082FB63C:: @ 82FB63C
- .incbin "baserom.gba", 0x2fb63c, 0x10
+ .2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d
+ .align 2
gUnknown_082FB64C:: @ 82FB64C
- .incbin "baserom.gba", 0x2fb64c, 0x8
+ .2byte 0x0000, 0x0001, 0x0001, 0x0002
+ .align 2
gUnknown_082FB654:: @ 82FB654
- .incbin "baserom.gba", 0x2fb654, 0x8
+ .2byte 0x005f, 0x0066, 0x00e4, 0x0105
+ .align 2
gUnknown_082FB65C:: @ 82FB65C
- .incbin "baserom.gba", 0x2fb65c, 0x90
+ .byte 0xfd, 0xfa, 0xf8, 0xf6, 0xf3, 0xf1, 0xef, 0xed
+ .byte 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2
+ .byte 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe9, 0xea, 0xec
+ .byte 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc
+ .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec
+ .byte 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4
+ .byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5
+ .byte 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed
+ .byte 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2
+ .byte 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5
+ .byte 0xe6, 0xe7, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2
+ .byte 0xf4, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .align 2
gUnknown_082FB6EC:: @ 82FB6EC
- .incbin "baserom.gba", 0x2fb6ec, 0x18
+ .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000064
+ .4byte 0x000000c8, 0x000001f4
+ .align 2
gUnknown_082FB704:: @ 82FB704
- .incbin "baserom.gba", 0x2fb704, 0x10
+ .2byte 0x008a, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092, 0x0093
+ .align 2
gUnknown_082FB714:: @ 82FB714
- .incbin "baserom.gba", 0x2fb714, 0x6f4
+ .4byte 0x00001388, 0x00000001, 0x00001f40, 0x00000002
+ .4byte 0x00002ee0, 0x00000003, 0x00003e80, 0x00000004
+ .4byte 0x00004e20, 0x00000005
+
+ .align 2
+gPkmnJumpPal1:: @ 82FB73C
+ .incbin "graphics/interface/pkmnjump_pal1.gbapal"
+
+ .align 2
+gPkmnJumpPal2:: @ 82FB75C
+ .incbin "graphics/interface/pkmnjump_pal2.gbapal"
+
+ .align 2
+gPkmnJumpRopeGfx1:: @ 82FB77C
+ .incbin "graphics/interface/pkmnjump_rope1.4bpp.lz"
+
+ .align 2
+gPkmnJumpRopeGfx2:: @ 82FB89C
+ .incbin "graphics/interface/pkmnjump_rope2.4bpp.lz"
+
+ .align 2
+gPkmnJumpRopeGfx3:: @ 82FBA70
+ .incbin "graphics/interface/pkmnjump_rope3.4bpp.lz"
+
+ .align 2
+gPkmnJumpRopeGfx4:: @ 82FBBA0
+ .incbin "graphics/interface/pkmnjump_rope4.4bpp.lz"
+ .align 2
+gPkmnJumpStarGfx:: @ 82FBC9C
+ .incbin "graphics/interface/pkmnjump_star.4bpp.lz"
+
+ .align 2
gUnknown_082FBE08:: @ 82FBE08
- .incbin "baserom.gba", 0x2fbe08, 0x28
+ .4byte gPkmnJumpRopeGfx1
+ .2byte 0x0600, 0x0005
+
+ .align 2
+ .4byte gPkmnJumpRopeGfx2
+ .2byte 0x0c00, 0x0006
+
+ .align 2
+ .4byte gPkmnJumpRopeGfx3
+ .2byte 0x0600, 0x0007
+
+ .align 2
+ .4byte gPkmnJumpRopeGfx4
+ .2byte 0x0600, 0x0008
+ .align 2
+ .4byte gPkmnJumpStarGfx
+ .2byte 0x0200, 0x000a
+
+ .align 2
gUnknown_082FBE30:: @ 82FBE30
- .incbin "baserom.gba", 0x2fbe30, 0x10
+ .4byte gPkmnJumpPal1
+ .2byte 0x0005
+
+ .align 2
+ .4byte gPkmnJumpPal2
+ .2byte 0x0006
+ .align 2
gUnknown_082FBE40:: @ 82FBE40
- .incbin "baserom.gba", 0x2fbe40, 0x18
+ .2byte 0x0000 @ tileTag
+ .2byte 0x0000 @ paletteTag
+ .4byte gUnknown_082FBEC8
+ .4byte gDummySpriteAnimTable
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
gUnknown_082FBE58:: @ 82FBE58
- .incbin "baserom.gba", 0x2fbe58, 0x50
+ .2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072
+ .2byte 0x0060, 0x0060, 0x0046, 0x0050, 0x0060, 0x0072, 0x0078, 0x0080
+ .2byte 0x0078, 0x0072, 0x0060, 0x0050, 0x0032, 0x0048, 0x0060, 0x0072
+ .2byte 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048, 0x002a, 0x0048
+ .2byte 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048
gUnknown_082FBEA8:: @ 82FBEA8
- .incbin "baserom.gba", 0x2fbea8, 0x10
+ .2byte 0x0010, 0x0028, 0x0048, 0x0068, 0x0088, 0x00a8, 0x00c8, 0x00e0
+ .align 2
gUnknown_082FBEB8:: @ 82FBEB8
- .incbin "baserom.gba", 0x2fbeb8, 0x154
+ .4byte gUnknown_082FBF78
+ .4byte gUnknown_082FBF90
+ .4byte gUnknown_082FBFA8
+ .4byte gUnknown_082FBFC0
+
+ .align 2
+gUnknown_082FBEC8:: @ 82FBED0
+ .byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FBED0:: @ 82FBED0
+ .byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FBED8:: @ 82FBED8
+ .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FBEE0:: @ 82FBEE0
+ .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FBEE8:: @ 82FBEE8
+ .2byte 0x0000, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBEF0:: @ 82FBEF0
+ .2byte 0x0008, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBEF8:: @ 82FBEF8
+ .2byte 0x0010, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF00:: @ 82FBF00
+ .2byte 0x0018, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF08:: @ 82FBF08
+ .2byte 0x0020, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF10:: @ 82FBF10
+ .2byte 0x0028, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF18:: @ 82FBF18
+ .2byte 0x0000, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF20:: @ 82FBF20
+ .2byte 0x0010, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF28:: @ 82FBF28
+ .2byte 0x0020, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF30:: @ 82FBF30
+ .2byte 0x0030, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF38:: @ 82FBF38
+ .2byte 0x0040, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF40:: @ 82FBF40
+ .2byte 0x0050, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBF48:: @ 82FBF48
+ .4byte gUnknown_082FBEE8
+ .4byte gUnknown_082FBEF0
+ .4byte gUnknown_082FBEF8
+ .4byte gUnknown_082FBF00
+ .4byte gUnknown_082FBF08
+ .4byte gUnknown_082FBF10
+
+ .align 2
+gUnknown_082FBF60:: @ 82FBF60
+ .4byte gUnknown_082FBF18
+ .4byte gUnknown_082FBF20
+ .4byte gUnknown_082FBF28
+ .4byte gUnknown_082FBF30
+ .4byte gUnknown_082FBF38
+ .4byte gUnknown_082FBF40
+
+ .align 2
+gUnknown_082FBF78:: @ 82FBF78
+ .2byte 0x0005 @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_082FBED0
+ .4byte gUnknown_082FBF48
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+
+ .align 2
+gUnknown_082FBF90:: @ 82FBF90
+ .2byte 0x0006 @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_082FBED8
+ .4byte gUnknown_082FBF60
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+
+ .align 2
+gUnknown_082FBFA8:: @ 82FBFA8
+ .2byte 0x0007 @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_082FBEE0
+ .4byte gUnknown_082FBF48
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+
+ .align 2
+gUnknown_082FBFC0:: @ 82FBFC0
+ .2byte 0x0008 @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_082FBEE0
+ .4byte gUnknown_082FBF48
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
+gUnknown_082FBFD8:: @ 82FBFD8
+ .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
+
+ .align 2
+gUnknown_082FBFE0:: @ 82FBFE0
+ .2byte 0x0000, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FBFE8:: @ 82FBFE8
+ .2byte 0x0000, 0x0004
+ .2byte 0x0004, 0x0004
+ .2byte 0x0008, 0x0004
+ .2byte 0x000c, 0x0004
+ .2byte 0xfffd, 0x0001
+ .2byte 0x0000, 0x0004
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FC004:: @ 82FC004
+ .4byte gUnknown_082FBFE0
+ .4byte gUnknown_082FBFE8
+
+ .align 2
gUnknown_082FC00C:: @ 82FC00C
- .incbin "baserom.gba", 0x2fc00c, 0x18
+ .2byte 0x000a @ tileTag
+ .2byte 0x0005 @ paletteTag
+ .4byte gUnknown_082FBFD8
+ .4byte gUnknown_082FC004
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
-gUnknown_082FC024:: @ 82FC024
- .incbin "baserom.gba", 0x2fc024, 0x20
+ .align 2
+gPkmnJumpPal3:: @ 82FC024
+ .incbin "graphics/interface/pkmnjump_pal3.gbapal"
-gUnknown_082FC044:: @ 82FC044
- .incbin "baserom.gba", 0x2fc044, 0x20
+ .align 2
+gPkmnJumpBgPal:: @ 82FC044
+ .incbin "graphics/interface/pkmnjump_bg.gbapal"
-gUnknown_082FC064:: @ 82FC064
- .incbin "baserom.gba", 0x2fc064, 0x22c
+ .align 2
+gPkmnJumpBgGfx:: @ 82FC064
+ .incbin "graphics/interface/pkmnjump_bg.4bpp.lz"
-gUnknown_082FC290:: @ 82FC290
- .incbin "baserom.gba", 0x2fc290, 0x1b0
+ .align 2
+gPkmnJumpBgTilemap:: @ 82FC290
+ .incbin "graphics/interface/pkmnjump_bg.bin.lz"
-gUnknown_082FC440:: @ 82FC440
- .incbin "baserom.gba", 0x2fc440, 0x20
+ .align 2
+gPkmnJumpVenusaurPal:: @ 82FC440
+ .incbin "graphics/interface/pkmnjump_venusaur.gbapal"
-gUnknown_082FC460:: @ 82FC460
- .incbin "baserom.gba", 0x2fc460, 0x950
+ .align 2
+gPkmnJumpVenusaurGfx:: @ 82FC460
+ .incbin "graphics/interface/pkmnjump_venusaur.4bpp.lz"
-gUnknown_082FCDB0:: @ 82FCDB0
- .incbin "baserom.gba", 0x2fcdb0, 0x3b8
+ .align 2
+gPkmnJumpVenusaurTilemap:: @ 82FCDB0
+ .incbin "graphics/interface/pkmnjump_venusaur.bin.lz"
-gUnknown_082FD168:: @ 82FD168
- .incbin "baserom.gba", 0x2fd168, 0x20
+ .align 2
+gPkmnJumpResultsPal:: @ 82FD168
+ .incbin "graphics/interface/pkmnjump_results.gbapal"
-gUnknown_082FD188:: @ 82FD188
- .incbin "baserom.gba", 0x2fd188, 0xab0
+ .align 2
+gPkmnJumpResultsGfx:: @ 82FD188
+ .incbin "graphics/interface/pkmnjump_results.4bpp.lz"
-gUnknown_082FDC38:: @ 82FDC38
- .incbin "baserom.gba", 0x2fdc38, 0x52c
+ .align 2
+gPkmnJumpResultsTilemap:: @ 82FDC38
+ .incbin "graphics/interface/pkmnjump_results.bin.lz"
-gUnknown_082FE164:: @ 82FE164
- .incbin "baserom.gba", 0x2fe164, 0x10
+ .align 2
+gUnknown_082FE164:: @ 82FE164 struct BgTemplate
+ .4byte 0x000001b0, 0x000025e6, 0x000016c9, 0x000031df
+ .align 2
gUnknown_082FE174:: @ 82FE174
- .incbin "baserom.gba", 0x2fe174, 0x18
+ window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013
+ window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f
+ window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
+ .align 2
gUnknown_082FE18C:: @ 82FE18C
- .incbin "baserom.gba", 0x2fe18c, 0x50
+ .4byte 0x00000000, sub_802D150
+ .4byte 0x00000001, sub_802D2E4
+ .4byte 0x00000002, sub_802D350
+ .4byte 0x00000003, sub_802D3BC
+ .4byte 0x00000004, sub_802D448
+ .4byte 0x00000005, sub_802D4F4
+ .4byte 0x00000006, sub_802D598
+ .4byte 0x00000007, sub_802D5E4
+ .4byte 0x00000009, sub_802D72C
+ .4byte 0x00000008, sub_802D688
+ .align 2
gUnknown_082FE1DC:: @ 82FE1DC
- .incbin "baserom.gba", 0x2fe1dc, 0x3
+ .byte 0x00, 0x02, 0x03
gUnknown_082FE1DF:: @ 82FE1DF
- .incbin "baserom.gba", 0x2fe1df, 0xd
+ .byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00
+ .byte 0x00, 0x02, 0x00, 0x00, 0x00
+ .align 2
gUnknown_082FE1EC:: @ 82FE1EC
- .incbin "baserom.gba", 0x2fe1ec, 0x8
+ .4byte gUnknown_082FF1F8
+ .2byte 0x0000, 0x0320
+ .align 2
gUnknown_082FE1F4:: @ 82FE1F4
- .incbin "baserom.gba", 0x2fe1f4, 0x40
+ .4byte gUnknown_082FF1D8
+ .2byte 0x0320, 0x0000
+
+ .align 2
+gUnknown_082FE1FC:: @ 82FE1FC
+ .2byte 0x0006, 0x0008, 0x0010, 0x0008
+
+ .align 2
+gUnknown_082FE204:: @ 82FE204
+ .2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008
+
+ .align 2
+gUnknown_082FE210:: @ 82FE210
+ .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006
+
+ .align 2
+gUnknown_082FE220:: @ 82FE220
+ .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006
+ .2byte 0x0010, 0x0008, 0x0014, 0x0006
+ .align 2
gUnknown_082FE234:: @ 82FE234
- .incbin "baserom.gba", 0x2fe234, 0x2c
+ .4byte gUnknown_082FE1FC
+ .4byte gUnknown_082FE204
+ .4byte gUnknown_082FE210
+ .4byte gUnknown_082FE220
+
+ .align 2
+gUnknown_082FE244:: @ 82FE244
+ .2byte 0x0058, 0x0098
+
+gUnknown_082FE248:: @ 82FE248
+ .2byte 0x0058, 0x0078, 0x0098
+gUnknown_082FE24E:: @ 82FE24E
+ .2byte 0x0038, 0x0058, 0x0098, 0x00b8
+
+gUnknown_082FE256:: @ 82FE256
+ .2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8
+
+ .align 2
gUnknown_082FE260:: @ 82FE260
- .incbin "baserom.gba", 0x2fe260, 0x10
+ .4byte gUnknown_082FE244
+ .4byte gUnknown_082FE248
+ .4byte gUnknown_082FE24E
+ .4byte gUnknown_082FE256
+ .align 2
gUnknown_082FE270:: @ 82FE270
- .incbin "baserom.gba", 0x2fe270, 0x8
+ .4byte 0x1c010100, 0x00010f09
+ .align 2
gUnknown_082FE278:: @ 82FE278
- .incbin "baserom.gba", 0x2fe278, 0x450
+ .4byte gUnknown_085EDEA2
+ .4byte gUnknown_085EDEB2
+ .4byte gUnknown_085EDEBE
+
+ .align 2
+gPkmnJump321StartPal1:: @ 82FE284
+ .incbin "graphics/interface/pkmnjump_321start1.gbapal"
+
+ .align 2
+gPkmnJump321StartGfx1:: @ 82FE2A4
+ .incbin "graphics/interface/pkmnjump_321start1.4bpp.lz"
+ .align 2
gUnknown_082FE6C8:: @ 82FE6C8
- .incbin "baserom.gba", 0x2fe6c8, 0x10
+ .4byte gPkmnJump321StartGfx1
+ .2byte 0x0c00, 0x2000
+
+ .4byte 0x00000000, 0x00000000
+ .align 2
gUnknown_082FE6D8:: @ 82FE6D8
- .incbin "baserom.gba", 0x2fe6d8, 0x58
+ .4byte gPkmnJump321StartPal1
+ .2byte 0x2000, 0x0000
+
+ .4byte 0x00000000, 0x00000000
+
+ .align 2
+gUnknown_082FE6E8:: @ 82FE6E8
+ .2byte 0x0000, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE6F0:: @ 82FE6F0
+ .2byte 0x0010, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE6F8:: @ 82FE6F8
+ .2byte 0x0020, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE700:: @ 82FE700
+ .2byte 0x0040, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE708:: @ 82FE708
+ .2byte 0x0030, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE710:: @ 82FE710
+ .2byte 0x0050, 0x0000
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FE718:: @ 82FE718
+ .4byte gUnknown_082FE6E8
+ .4byte gUnknown_082FE6F0
+ .4byte gUnknown_082FE6F8
+ .4byte gUnknown_082FE700
+ .4byte gUnknown_082FE708
+ .4byte gUnknown_082FE710
+ .align 2
gUnknown_082FE730:: @ 82FE730
- .incbin "baserom.gba", 0x2fe730, 0x18
+ .2byte 0x2000 @ tileTag
+ .2byte 0x2000 @ paletteTag
+ .4byte gUnknown_08524914
+ .4byte gUnknown_082FE718
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
+ .align 2
gUnknown_082FE748:: @ 82FE748
- .incbin "baserom.gba", 0x2fe748, 0x484
+ .4byte sub_802E83C
+ .4byte sub_802E8C8
+ .4byte sub_802EA50
+ .4byte sub_802EAB0
+
+ .align 2
+gPkmnJump321StartPal2:: @ 82FE758
+ .incbin "graphics/interface/pkmnjump_321start2.gbapal"
+
+ .align 2
+gPkmnJump321StartGfx2:: @ 82FE778
+ .incbin "graphics/interface/pkmnjump_321start2.4bpp.lz"
+ .align 2
gUnknown_082FEBCC:: @ 82FEBCC
- .incbin "baserom.gba", 0x2febcc, 0x8
+ .4byte gPkmnJump321StartGfx2
+ .2byte 0x0e00
+ .align 2
gUnknown_082FEBD4:: @ 82FEBD4
- .incbin "baserom.gba", 0x2febd4, 0xbc
+ .4byte gPkmnJump321StartPal2
+ .2byte 0x0000, 0x0000
+
+ .align 2
+gUnknown_082FEBDC:: @ 82FEBDC
+ .byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
+
+ .align 2
+gUnknown_082FEBE4:: @ 82FEBE4
+ .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
+
+ .align 2
+gUnknown_082FEBEC:: @ 82FEBEC
+ .2byte 0x0000, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FEBF4:: @ 82FEBF4
+ .2byte 0x0010, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FEBFC:: @ 82FEBFC
+ .2byte 0x0020, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FEC04:: @ 82FEC04
+ .4byte gUnknown_082FEBEC
+ .4byte gUnknown_082FEBF4
+ .4byte gUnknown_082FEBFC
+
+ .align 2
+gUnknown_082FEC10:: @ 82FEC10
+ .2byte 0x0030, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FEC18:: @ 82FEC18
+ .2byte 0x0050, 0x0001
+ .2byte 0xffff, 0x0000
+
+ .align 2
+gUnknown_082FEC20:: @ 82FEC20
+ .4byte gUnknown_082FEC10
+ .4byte gUnknown_082FEC18
+
+ .align 2
+gUnknown_082FEC28:: @ 82FEC28
+ .2byte 0x0100, 0x0100
+ .2byte 0x0000, 0x0000
+ .2byte 0x7fff, 0x0000
+ .2byte 0x0000, 0x0000
+
+ .align 2
+gUnknown_082FEC38:: @ 82FEC38
+ .2byte 0x0100, 0x0100
+ .2byte 0x0000, 0x0000
+ .2byte 0x0010, 0xfff0
+ .2byte 0x0800, 0x0000
+ .2byte 0x7fff, 0x0000
+ .2byte 0x0000, 0x0000
+
+ .align 2
+gUnknown_082FEC50:: @ 82FEC50
+ .2byte 0xffee, 0x0012
+ .2byte 0x0800, 0x0000
+ .2byte 0x7fff, 0x0000
+ .2byte 0x0000, 0x0000
+
+ .align 2
+gUnknown_082FEC60:: @ 82FEC60
+ .2byte 0x0006, 0xfffa
+ .2byte 0x0800, 0x0000
+ .2byte 0xfffc, 0x0004
+ .2byte 0x0800, 0x0000
+ .2byte 0x0100, 0x0100
+ .2byte 0x0000, 0x0000
+ .2byte 0x7fff, 0x0000
+ .2byte 0x0000, 0x0000
+
+ .align 2
+gUnknown_082FEC80:: @ 82FEC80
+ .4byte gUnknown_082FEC28
+ .4byte gUnknown_082FEC38
+ .4byte gUnknown_082FEC50
+ .4byte gUnknown_082FEC60
gUnknown_082FEC90:: @ 82FEC90
- .incbin "baserom.gba", 0x2fec90, 0x18
+ .2byte 0x0000 @ tileTag
+ .2byte 0x0000 @ paletteTag
+ .4byte gUnknown_082FEBDC
+ .4byte gUnknown_082FEC04
+ .4byte NULL
+ .4byte gUnknown_082FEC80
+ .4byte SpriteCallbackDummy
gUnknown_082FECA8:: @ 82FECA8
- .incbin "baserom.gba", 0x2feca8, 0x18
+ .2byte 0x0000 @ tileTag
+ .2byte 0x0000 @ paletteTag
+ .4byte gUnknown_082FEBE4
+ .4byte gUnknown_082FEC20
+ .4byte NULL
+ .4byte gDummySpriteAffineAnimTable
+ .4byte SpriteCallbackDummy
diff --git a/data/data2b.s b/data/data2b.s
index 19bab9c20..28d34f79b 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -75,7 +75,13 @@ gUnknown_082FF178:: @ 82FF178
.incbin "baserom.gba", 0x2ff178, 0x50
gUnknown_082FF1C8:: @ 82FF1C8
- .incbin "baserom.gba", 0x2ff1c8, 0x450
+ .incbin "baserom.gba", 0x2ff1c8, 0x10
+
+gUnknown_082FF1D8:: @ 82FF1D8
+ .incbin "baserom.gba", 0x2ff1d8, 0x20
+
+gUnknown_082FF1F8:: @ 82FF1F8
+ .incbin "baserom.gba", 0x2ff1f8, 0x420
gUnknown_082FF618:: @ 82FF618
.incbin "baserom.gba", 0x2ff618, 0x7c
diff --git a/data/strings.s b/data/strings.s
index 2f74c5566..7ab4e7540 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -2328,12 +2328,15 @@ gUnknown_085ED7E0:: @ 85ED7E0
.string "1. {SPECIAL_F7 0x00}$"
.align 2
+gUnknown_085ED7E8:: @ 85ED7E8
.string " time(s)$"
.align 2
+gUnknown_085ED7F4:: @ 85ED7F4
.string "{STR_VAR_1}.{STR_VAR_2}$"
.align 2
+gUnknown_085ED7FC:: @ 85ED7FC
.string "{STR_VAR_1} BERRY$"
.align 2
@@ -2372,22 +2375,28 @@ gUnknown_085ED848:: @ 85ED848
gUnknown_085ED850:: @ 85ED850
.string " Times/sec.$"
+ .align 2
gUnknown_085ED85C:: @ 85ED85C
.string "{STR_VAR_1}%$"
+ .align 2
gUnknown_085ED860:: @ 85ED860
.string "No. of Presses Rankings$"
+ .align 2
gUnknown_085ED878:: @ 85ED878
.string "Crushing Results$"
.align 2
+gUnknown_085ED88C:: @ 85ED88C
.string "Neatness Rankings$"
.align 2
+gUnknown_085ED8A0:: @ 85ED8A0
.string "Cooperative Rankings$"
.align 2
+gUnknown_085ED8B8:: @ 85ED8B8
.string "Pressing-Power Rankings$"
gUnknown_085ED8D0:: @ 85ED8D0
@@ -2455,8 +2464,14 @@ gUnknown_085EDCDE:: @ 85EDCDE
gUnknown_085EDCE5:: @ 85EDCE5
.string "DODRIO BERRY-PICKING RECORDS$"
+
+gUnknown_085EDD02:: @ 85EDD02
.string "BERRIES picked:$"
+
+gUnknown_085EDD12:: @ 85EDD12
.string "Best score:$"
+
+gUnknown_085EDD1E:: @ 85EDD1E
.string "BERRIES picked in a row with\nfive players:$"
gUnknown_085EDD49:: @ 85EDD49
@@ -2470,10 +2485,20 @@ gUnknown_085EDD86:: @ 85EDD86
gUnknown_085EDD9B:: @ 85EDD9B
.string "Announcing prizes!$"
+
+gUnknown_085EDDAE:: @ 85EDDAE
.string "1:$"
+
+gUnknown_085EDDB1:: @ 85EDDB1
.string "2:$"
+
+gUnknown_085EDDB4:: @ 85EDDB4
.string "3:$"
+
+gUnknown_085EDDB7:: @ 85EDDB7
.string "4:$"
+
+gUnknown_085EDDBA:: @ 85EDDBA
.string "5:$"
gUnknown_085EDDBD:: @ 85EDDBD
@@ -2505,8 +2530,14 @@ gUnknown_085EDE84:: @ 85EDE84
gUnknown_085EDE8D:: @ 85EDE8D
.string "POKéMON JUMP RECORDS$"
+
+gUnknown_085EDEA2:: @ 85EDEA2
.string "Jumps in a row:$"
+
+gUnknown_085EDEB2:: @ 85EDEB2
.string "Best score:$"
+
+gUnknown_085EDEBE:: @ 85EDEBE
.string "EXCELLENTS in a row:$"
gUnknown_085EDED3:: @ 85EDED3
diff --git a/graphics/interface/berrycrush_background.bin b/graphics/interface/berrycrush_background.bin
new file mode 100644
index 000000000..1967c9f45
--- /dev/null
+++ b/graphics/interface/berrycrush_background.bin
Binary files differ
diff --git a/graphics/interface/berrycrush_btnpress.png b/graphics/interface/berrycrush_btnpress.png
new file mode 100644
index 000000000..8e3b33074
--- /dev/null
+++ b/graphics/interface/berrycrush_btnpress.png
Binary files differ
diff --git a/graphics/interface/berrycrush_container_cap.bin b/graphics/interface/berrycrush_container_cap.bin
new file mode 100644
index 000000000..934d95779
--- /dev/null
+++ b/graphics/interface/berrycrush_container_cap.bin
Binary files differ
diff --git a/graphics/interface/berrycrush_grinder_base.pal b/graphics/interface/berrycrush_grinder_base.pal
new file mode 100644
index 000000000..23b7036da
--- /dev/null
+++ b/graphics/interface/berrycrush_grinder_base.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 189 189
+148 131 82
+180 164 115
+205 189 148
+213 205 172
+230 222 189
+246 238 205
+255 255 238
+98 106 115
+115 123 131
+0 0 0
+0 90 16
+255 0 0
+49 82 205
+172 164 131
+65 74 90
diff --git a/graphics/interface/berrycrush_grinder_base.png b/graphics/interface/berrycrush_grinder_base.png
new file mode 100644
index 000000000..ee448d15c
--- /dev/null
+++ b/graphics/interface/berrycrush_grinder_base.png
Binary files differ
diff --git a/graphics/interface/berrycrush_grinder_top.bin b/graphics/interface/berrycrush_grinder_top.bin
new file mode 100644
index 000000000..79713a661
--- /dev/null
+++ b/graphics/interface/berrycrush_grinder_top.bin
Binary files differ
diff --git a/graphics/interface/berrycrush_misc.pal b/graphics/interface/berrycrush_misc.pal
new file mode 100644
index 000000000..e3c607926
--- /dev/null
+++ b/graphics/interface/berrycrush_misc.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 189 189
+255 238 172
+255 255 0
+255 230 74
+255 139 0
+197 255 255
+139 213 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+197 255 205
+255 213 131
+255 255 156
+255 255 255
diff --git a/graphics/interface/berrycrush_sparkle.png b/graphics/interface/berrycrush_sparkle.png
new file mode 100644
index 000000000..be2030bc4
--- /dev/null
+++ b/graphics/interface/berrycrush_sparkle.png
Binary files differ
diff --git a/graphics/interface/berrycrush_timerdigits.pal b/graphics/interface/berrycrush_timerdigits.pal
new file mode 100644
index 000000000..956db48b1
--- /dev/null
+++ b/graphics/interface/berrycrush_timerdigits.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+148 222 164
+164 230 172
+180 238 189
+197 246 205
+213 255 222
+238 255 238
+205 106 255
+172 82 222
+148 148 148
+123 123 123
+255 0 255
+255 0 255
+255 0 255
+180 189 189
+255 255 255
diff --git a/graphics/interface/berrycrush_timerdigits.png b/graphics/interface/berrycrush_timerdigits.png
new file mode 100644
index 000000000..a6566f058
--- /dev/null
+++ b/graphics/interface/berrycrush_timerdigits.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_berrysprites.pal b/graphics/interface/dodrioberry_berrysprites.pal
new file mode 100644
index 000000000..98266fb46
--- /dev/null
+++ b/graphics/interface/dodrioberry_berrysprites.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 255 255
+65 65 65
+156 156 230
+115 115 189
+139 246 213
+98 213 172
+255 213 57
+246 172 57
+238 238 238
+0 148 213
+230 131 49
+0 156 189
+255 148 139
+0 230 255
+213 98 90
+0 238 255
diff --git a/graphics/interface/dodrioberry_berrysprites.png b/graphics/interface/dodrioberry_berrysprites.png
new file mode 100644
index 000000000..81d3a6f97
--- /dev/null
+++ b/graphics/interface/dodrioberry_berrysprites.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_bg1.bin b/graphics/interface/dodrioberry_bg1.bin
new file mode 100644
index 000000000..8547f63fb
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg1.bin
Binary files differ
diff --git a/graphics/interface/dodrioberry_bg1.pal b/graphics/interface/dodrioberry_bg1.pal
new file mode 100644
index 000000000..c06550002
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 246 255
+82 180 172
+82 205 189
+156 156 131
+106 156 148
+123 123 98
+189 172 98
+189 189 139
+74 172 156
+172 172 131
+74 156 123
+115 115 82
+139 139 106
+164 164 115
+197 197 148
+230 246 255
diff --git a/graphics/interface/dodrioberry_bg1.png b/graphics/interface/dodrioberry_bg1.png
new file mode 100644
index 000000000..7079e8094
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg1.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_bg2.pal b/graphics/interface/dodrioberry_bg2.pal
new file mode 100644
index 000000000..be2b62cc9
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 246 255
+246 246 222
+230 230 180
+139 238 139
+246 246 189
+197 246 164
+246 230 197
+230 246 255
+230 213 180
+205 197 164
+148 222 148
+222 238 255
+139 205 139
+213 238 246
+222 246 255
+213 205 164
diff --git a/graphics/interface/dodrioberry_bg2.png b/graphics/interface/dodrioberry_bg2.png
new file mode 100644
index 000000000..ee343dd13
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg2.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_bg2left.bin b/graphics/interface/dodrioberry_bg2left.bin
new file mode 100644
index 000000000..73e83c6dd
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg2left.bin
Binary files differ
diff --git a/graphics/interface/dodrioberry_bg2right.bin b/graphics/interface/dodrioberry_bg2right.bin
new file mode 100644
index 000000000..a93db06df
--- /dev/null
+++ b/graphics/interface/dodrioberry_bg2right.bin
Binary files differ
diff --git a/graphics/interface/dodrioberry_pkmn.pal b/graphics/interface/dodrioberry_pkmn.pal
new file mode 100644
index 000000000..ed27897b7
--- /dev/null
+++ b/graphics/interface/dodrioberry_pkmn.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 255 238
+41 41 41
+255 197 115
+230 164 74
+115 90 65
+246 131 164
+172 74 74
+255 238 189
+213 197 148
+115 106 82
+148 148 148
+106 98 90
+255 205 230
+180 139 90
+0 0 0
+255 255 255
diff --git a/graphics/interface/dodrioberry_pkmn.png b/graphics/interface/dodrioberry_pkmn.png
new file mode 100644
index 000000000..41ecd921d
--- /dev/null
+++ b/graphics/interface/dodrioberry_pkmn.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_platform.pal b/graphics/interface/dodrioberry_platform.pal
new file mode 100644
index 000000000..fc1f6a7e8
--- /dev/null
+++ b/graphics/interface/dodrioberry_platform.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 246 255
+255 255 255
+238 255 255
+246 255 255
+230 230 246
+222 238 246
+222 246 246
+238 238 255
+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/interface/dodrioberry_platform.png b/graphics/interface/dodrioberry_platform.png
new file mode 100644
index 000000000..9074ec740
--- /dev/null
+++ b/graphics/interface/dodrioberry_platform.png
Binary files differ
diff --git a/graphics/interface/dodrioberry_shiny.pal b/graphics/interface/dodrioberry_shiny.pal
new file mode 100644
index 000000000..5d8b5b7a5
--- /dev/null
+++ b/graphics/interface/dodrioberry_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 255 238
+41 41 41
+213 222 90
+172 180 49
+90 98 16
+246 131 164
+197 82 82
+255 255 156
+255 205 98
+139 106 16
+148 148 148
+82 82 82
+255 205 230
+131 139 16
+0 0 0
+255 255 255
diff --git a/graphics/interface/dodrioberry_status.pal b/graphics/interface/dodrioberry_status.pal
new file mode 100644
index 000000000..028e4e20a
--- /dev/null
+++ b/graphics/interface/dodrioberry_status.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 255 255
+65 65 65
+255 255 189
+255 238 115
+255 197 0
+197 197 213
+164 164 180
+131 131 148
+255 197 197
+255 139 139
+255 49 49
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 49 0
diff --git a/graphics/interface/dodrioberry_status.png b/graphics/interface/dodrioberry_status.png
new file mode 100644
index 000000000..e48d499f0
--- /dev/null
+++ b/graphics/interface/dodrioberry_status.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_321start1.pal b/graphics/interface/pkmnjump_321start1.pal
new file mode 100644
index 000000000..9fa1875d3
--- /dev/null
+++ b/graphics/interface/pkmnjump_321start1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 230
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+32 32 32
+131 49 49
+230 65 41
+156 65 65
+255 90 74
+172 115 57
+255 189 74
+255 255 255
diff --git a/graphics/interface/pkmnjump_321start1.png b/graphics/interface/pkmnjump_321start1.png
new file mode 100644
index 000000000..343fd3e7d
--- /dev/null
+++ b/graphics/interface/pkmnjump_321start1.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_321start2.pal b/graphics/interface/pkmnjump_321start2.pal
new file mode 100644
index 000000000..9fa1875d3
--- /dev/null
+++ b/graphics/interface/pkmnjump_321start2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 230
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+32 32 32
+131 49 49
+230 65 41
+156 65 65
+255 90 74
+172 115 57
+255 189 74
+255 255 255
diff --git a/graphics/interface/pkmnjump_321start2.png b/graphics/interface/pkmnjump_321start2.png
new file mode 100644
index 000000000..2823feb81
--- /dev/null
+++ b/graphics/interface/pkmnjump_321start2.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_bg.bin b/graphics/interface/pkmnjump_bg.bin
new file mode 100644
index 000000000..68303ba7e
--- /dev/null
+++ b/graphics/interface/pkmnjump_bg.bin
Binary files differ
diff --git a/graphics/interface/pkmnjump_bg.pal b/graphics/interface/pkmnjump_bg.pal
new file mode 100644
index 000000000..aed4bcc8b
--- /dev/null
+++ b/graphics/interface/pkmnjump_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+106 222 156
+106 230 230
+139 230 255
+156 238 255
+197 246 255
+189 213 131
+230 213 115
+238 230 131
+246 246 156
+222 222 172
+106 230 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/interface/pkmnjump_bg.png b/graphics/interface/pkmnjump_bg.png
new file mode 100644
index 000000000..449bbf627
--- /dev/null
+++ b/graphics/interface/pkmnjump_bg.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_pal1.pal b/graphics/interface/pkmnjump_pal1.pal
new file mode 100644
index 000000000..936a2b39f
--- /dev/null
+++ b/graphics/interface/pkmnjump_pal1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+65 148 74
+82 180 74
+106 205 74
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+98 98 82
+205 189 82
+255 246 82
+255 255 255
+238 172 131
+238 230 131
diff --git a/graphics/interface/pkmnjump_pal2.pal b/graphics/interface/pkmnjump_pal2.pal
new file mode 100644
index 000000000..d7fc1394b
--- /dev/null
+++ b/graphics/interface/pkmnjump_pal2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 123 57
+65 139 57
+82 164 57
+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
+0 0 0
diff --git a/graphics/interface/pkmnjump_pal3.pal b/graphics/interface/pkmnjump_pal3.pal
new file mode 100644
index 000000000..6b73be372
--- /dev/null
+++ b/graphics/interface/pkmnjump_pal3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+0 0 0
+222 222 213
+255 156 24
+255 222 189
+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/interface/pkmnjump_results.bin b/graphics/interface/pkmnjump_results.bin
new file mode 100644
index 000000000..b17c5052c
--- /dev/null
+++ b/graphics/interface/pkmnjump_results.bin
Binary files differ
diff --git a/graphics/interface/pkmnjump_results.gbapal.bak b/graphics/interface/pkmnjump_results.gbapal.bak
new file mode 100644
index 000000000..8b89d2870
--- /dev/null
+++ b/graphics/interface/pkmnjump_results.gbapal.bak
Binary files differ
diff --git a/graphics/interface/pkmnjump_results.pal b/graphics/interface/pkmnjump_results.pal
new file mode 100644
index 000000000..aca961de3
--- /dev/null
+++ b/graphics/interface/pkmnjump_results.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+148 197 115
+172 222 123
+213 180 57
+238 205 65
+230 164 131
+246 189 172
+98 98 82
+164 148 90
+205 189 82
+255 238 74
+156 164 230
+90 90 106
+172 148 106
+230 205 123
+180 189 246
diff --git a/graphics/interface/pkmnjump_results.png b/graphics/interface/pkmnjump_results.png
new file mode 100644
index 000000000..fe1cb2609
--- /dev/null
+++ b/graphics/interface/pkmnjump_results.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_rope1.png b/graphics/interface/pkmnjump_rope1.png
new file mode 100644
index 000000000..cdf6075d0
--- /dev/null
+++ b/graphics/interface/pkmnjump_rope1.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_rope2.png b/graphics/interface/pkmnjump_rope2.png
new file mode 100644
index 000000000..09a4b1dfc
--- /dev/null
+++ b/graphics/interface/pkmnjump_rope2.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_rope3.png b/graphics/interface/pkmnjump_rope3.png
new file mode 100644
index 000000000..1ed94125c
--- /dev/null
+++ b/graphics/interface/pkmnjump_rope3.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_rope4.png b/graphics/interface/pkmnjump_rope4.png
new file mode 100644
index 000000000..3937e006d
--- /dev/null
+++ b/graphics/interface/pkmnjump_rope4.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_star.png b/graphics/interface/pkmnjump_star.png
new file mode 100644
index 000000000..6faef11f8
--- /dev/null
+++ b/graphics/interface/pkmnjump_star.png
Binary files differ
diff --git a/graphics/interface/pkmnjump_venusaur.bin b/graphics/interface/pkmnjump_venusaur.bin
new file mode 100644
index 000000000..093c0a5a5
--- /dev/null
+++ b/graphics/interface/pkmnjump_venusaur.bin
Binary files differ
diff --git a/graphics/interface/pkmnjump_venusaur.pal b/graphics/interface/pkmnjump_venusaur.pal
new file mode 100644
index 000000000..a3514b004
--- /dev/null
+++ b/graphics/interface/pkmnjump_venusaur.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 213
+32 98 49
+98 156 115
+90 205 148
+139 238 189
+139 57 0
+189 106 49
+16 16 16
+230 74 65
+255 131 115
+156 246 139
+222 205 49
+255 238 82
+65 164 24
+106 205 65
+255 255 255
diff --git a/graphics/interface/pkmnjump_venusaur.png b/graphics/interface/pkmnjump_venusaur.png
new file mode 100644
index 000000000..d555d324d
--- /dev/null
+++ b/graphics/interface/pkmnjump_venusaur.png
Binary files differ
diff --git a/graphics/interface/test.bin b/graphics/interface/test.bin
new file mode 100644
index 000000000..34b783c76
--- /dev/null
+++ b/graphics/interface/test.bin
Binary files differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index a2021549b..def35bc4e 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -3,6 +3,7 @@ monbackdir := graphics/pokemon/back_pics
monfrontdir := graphics/pokemon/anim_front_pics
monpaldir := graphics/pokemon/palettes
INTROGFXDIR := graphics/intro
+interfacedir := graphics/interface
$(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \
$(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \
@@ -286,3 +287,6 @@ graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pa
$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
$(GFX) $< $@ -num_tiles 39
+
+$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png
+ $(GFX) $< $@ -num_tiles 63