Merge remote-tracking branch 'origin/master'

2 files changed, 362 insertions, 78 deletions

diff --git a/data/data2.s b/data/data2.s
index 88a7b26e4..ef75f3141 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2779,23 +2779,144 @@ gUnknown_0820C14C:: @ 820C14C
 	.4byte TradeText_CancelTradePrompt
 	.4byte TradeText_PressBToExit
 
-gUnknown_0820C164:: @ 820C164
-	.incbin "baserom.gba", 0x0020c164, 0x138
-
-gUnknown_0820C29C:: @ 820C29C
-	.incbin "baserom.gba", 0x0020c29c, 0x1a
-
-gUnknown_0820C2B6:: @ 820C2B6
-	.incbin "baserom.gba", 0x0020c2b6, 0x18
-
-gUnknown_0820C2CE:: @ 820C2CE
-	.incbin "baserom.gba", 0x0020c2ce, 0x18
-
-gUnknown_0820C2E6:: @ 820C2E6
-	.incbin "baserom.gba", 0x0020c2e6, 0x3
-
-gUnknown_0820C2E9:: @ 820C2E9
-	.incbin "baserom.gba", 0x0020c2e9, 0x7
+@ This is used to determine the next mon to select when the D-Pad is
+@ pressed in a given direction.
+@ Note that the mons are laid out like this.
+@ 0-5 are the player's party and 6-11 are the trading partner's party.
+@ 12 is the cancel button.
+@  0  1  6  7
+@  2  3  8  9
+@  4  5 10 11
+@          12
+gTradeNextSelectedMonTable:: @ 820C164
+	@ 0
+	.byte  4,  2, 12, 12,  0,  0 @ up
+	.byte  2,  4, 12, 12,  0,  0 @ down
+	.byte  7,  6,  1,  0,  0,  0 @ left
+	.byte  1,  6,  7,  0,  0,  0 @ right
+	@ 1
+	.byte  5,  3, 12, 12,  0,  0 @ up
+	.byte  3,  5, 12, 12,  0,  0 @ down
+	.byte  0,  7,  6,  1,  0,  0 @ left
+	.byte  6,  7,  0,  1,  0,  0 @ right
+	@ 2
+	.byte  0,  0,  0,  0,  0,  0 @ up
+	.byte  4,  0,  0,  0,  0,  0 @ down
+	.byte  9,  8,  7,  6,  0,  0 @ left
+	.byte  3,  1,  0,  0,  0,  0 @ right
+	@ 3
+	.byte  1,  1,  1,  1,  0,  0 @ up
+	.byte  5,  1,  1,  1,  0,  0 @ down
+	.byte  2,  9,  8,  7,  0,  0 @ left
+	.byte  8,  9,  6,  6,  0,  0 @ right
+	@ 4
+	.byte  2,  2,  2,  2,  0,  0 @ up
+	.byte  0,  0,  0,  0,  0,  0 @ down
+	.byte 11, 10,  9,  8,  7,  6 @ left
+	.byte  5,  3,  1,  0,  0,  0 @ right
+	@ 5
+	.byte  3,  3,  3,  3,  0,  0 @ up
+	.byte  1,  1,  1,  1,  0,  0 @ down
+	.byte  4,  4,  4,  4,  0,  0 @ left
+	.byte 10,  8,  6,  0,  0,  0 @ right
+	@ 6
+	.byte 10,  8, 12,  0,  0,  0 @ up
+	.byte  8, 10, 12,  0,  0,  0 @ down
+	.byte  1,  0,  0,  0,  0,  0 @ left
+	.byte  7,  0,  1,  0,  0,  0 @ right
+	@ 7
+	.byte 12,  0,  0,  0,  0,  0 @ up
+	.byte  9, 12,  0,  0,  0,  0 @ down
+	.byte  6,  0,  0,  0,  0,  0 @ left
+	.byte  0,  0,  0,  0,  0,  0 @ right
+	@ 8
+	.byte  6,  0,  0,  0,  0,  0 @ up
+	.byte 10,  6,  0,  0,  0,  0 @ down
+	.byte  3,  2,  1,  0,  0,  0 @ left
+	.byte  9,  7,  0,  0,  0,  0 @ right
+	@ 9
+	.byte  7,  0,  0,  0,  0,  0 @ up
+	.byte 11, 12,  0,  0,  0,  0 @ down
+	.byte  8,  0,  0,  0,  0,  0 @ left
+	.byte  2,  1,  0,  0,  0,  0 @ right
+	@ 10
+	.byte  8,  0,  0,  0,  0,  0 @ up
+	.byte  6,  0,  0,  0,  0,  0 @ down
+	.byte  5,  4,  3,  2,  1,  0 @ left
+	.byte 11,  9,  7,  0,  0,  0 @ right
+	@ 11
+	.byte  9,  0,  0,  0,  0,  0 @ up
+	.byte 12,  0,  0,  0,  0,  0 @ down
+	.byte 10,  0,  0,  0,  0,  0 @ left
+	.byte  4,  2,  0,  0,  0,  0 @ right
+	@ 12
+	.byte 11,  9,  7,  6,  0,  0 @ up
+	.byte  7,  6,  0,  0,  0,  0 @ down
+	.byte 12,  0,  0,  0,  0,  0 @ left
+	.byte 12,  0,  0,  0,  0,  0 @ right
+
+@ The coordinates are in units of tiles.
+@ These are used for both mon icons and the selected mon cursor,
+@ but the origins of the coordinates differ.
+gTradeMonSpriteCoords:: @ 820C29C
+	@ left-side party
+	.byte  1,  5
+	.byte  8,  5
+	.byte  1, 10
+	.byte  8, 10
+	.byte  1, 15
+	.byte  8, 15
+
+	@ right-side party
+	.byte 16,  5
+	.byte 23,  5
+	.byte 16, 10
+	.byte 23, 10
+	.byte 16, 15
+	.byte 23, 15
+
+	@ cancel button
+	.byte 23, 18
+
+gTradeLevelDisplayCoords:: @ 820C2B6
+	@ left-side party
+	.byte  5,  4
+	.byte 12,  4
+	.byte  5,  9
+	.byte 12,  9
+	.byte  5, 14
+	.byte 12, 14
+
+	@ right-side party
+	.byte 20,  4
+	.byte 27,  4
+	.byte 20,  9
+	.byte 27,  9
+	.byte 20, 14
+	.byte 27, 14
+
+gTradeMonBoxCoords:: @ 820C2CE
+	@ left-side party
+	.byte  1,  3
+	.byte  8,  3
+	.byte  1,  8
+	.byte  8,  8
+	.byte  1, 13
+	.byte  8, 13
+
+	@ right-side party
+	.byte 16,  3
+	.byte 23,  3
+	.byte 16,  8
+	.byte 23,  8
+	.byte 16, 13
+	.byte 23, 13
+
+gTradeUnknownSpriteCoords:: @ 820C2E6
+	.byte  59, 10
+	.byte 179, 10
+	.byte  59, 10
+	.byte 179, 10
 
 	.align 2
 gUnknown_0820C2F0:: @ 820C2F0
@@ -2811,10 +2932,8 @@ gUnknown_0820C308:: @ 820C308
 
 	.align 2
 gUnknown_0820C320:: @ 820C320
-	.4byte TradeText_Summary2
-	.4byte sub_804A9F4 @unknown
-	.4byte TradeText_Trade2
-	.4byte sub_804AA00
+	.4byte TradeText_Summary2, sub_804A9F4 @unknown
+	.4byte TradeText_Trade2, sub_804AA00
 
 gUnknown_0820C330:: @ 820C330
 	.byte 0, 14
@@ -3162,8 +3281,115 @@ gSpriteAffineAnimTable_8215AC0:: @ 8215AC0
 @ 8215AC4
 	.include "data/ingame_trades.s"
 
-gUnknown_08215BA0:: @ 8215BA0
-	.incbin "baserom.gba", 0x00215ba0, 0x6c
+gTradeBallVerticalVelocityTable:: @ 8215BA0
+	.byte  0
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  1
+	.byte  1
+	.byte  1
+	.byte  2
+	.byte  2
+	.byte  2
+	.byte  2
+	.byte  3
+	.byte  3
+	.byte  3
+	.byte  3
+	.byte  4
+	.byte  4
+	.byte  4
+	.byte  4
+	.byte -4
+	.byte -4
+	.byte -4
+	.byte -3
+	.byte -3
+	.byte -3
+	.byte -3
+	.byte -2
+	.byte -2
+	.byte -2
+	.byte -2
+	.byte -1
+	.byte -1
+	.byte -1
+	.byte -1
+	.byte  0
+	.byte -1
+	.byte  0
+	.byte -1
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  1
+	.byte  1
+	.byte  1
+	.byte  2
+	.byte  2
+	.byte  2
+	.byte  2
+	.byte  3
+	.byte  3
+	.byte  3
+	.byte  3
+	.byte  4
+	.byte  4
+	.byte  4
+	.byte  4
+	.byte -4
+	.byte -3
+	.byte -3
+	.byte -2
+	.byte -2
+	.byte -1
+	.byte -1
+	.byte -1
+	.byte  0
+	.byte -1
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  1
+	.byte  1
+	.byte  2
+	.byte  2
+	.byte  3
+	.byte  3
+	.byte  4
+	.byte -4
+	.byte -3
+	.byte -2
+	.byte -1
+	.byte -1
+	.byte -1
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  0
+	.byte  1
+	.byte  0
+	.byte  1
+	.byte  1
+	.byte  2
+	.byte  3
 
 	.align 2
 gUnknown_08215C0C:: @ 8215C0C
@@ -12921,38 +13147,84 @@ gUnknown_083BBCA0:: @ 83BBCA0
 @ 83BC5B8
 	.include "data/graphics/pokemon/icon_palette_table.s"
 
-gUnknown_083BC5E8:: @ 83BC5E8
-	.incbin "baserom.gba", 0x003BC5E8, 0x8
-Unknown_83BC5F0:
-	.incbin "baserom.gba", 0x003BC5F0, 0xC
-Unknown_83BC5FC:
-	.incbin "baserom.gba", 0x003BC5FC, 0xC
-Unknown_83BC608:
-	.incbin "baserom.gba", 0x003BC608, 0xC
-Unknown_83BC614:
-	.incbin "baserom.gba", 0x003BC614, 0xC
-Unknown_83BC620:
-	.incbin "baserom.gba", 0x003BC620, 0xC
-
-	.align 2
-gUnknown_083BC62C:: @ 83BC62C
-	.4byte Unknown_83BC5F0
-	.4byte Unknown_83BC5FC
-	.4byte Unknown_83BC608
-	.4byte Unknown_83BC614
-	.4byte Unknown_83BC620
-Unknown_83BC640:
-	.incbin "baserom.gba", 0x003bc640, 0x10
-Unknown_83BC650:
-	.incbin "baserom.gba", 0x003bc650, 0x10
-
-	.align 2
-gUnknown_083BC660:: @ 83BC660
-	.4byte Unknown_83BC640
-	.4byte Unknown_83BC650
-
-gUnknown_083BC668:: @ 83BC668
-	.incbin "baserom.gba", 0x003bc668, 0x18
+	.align 2
+gOamData_83BC5E8:: @ 83BC5E8
+	.2byte 0x0000
+	.2byte 0x8000
+	.2byte 0x0400
+
+	.align 2
+gSpriteAnim_83BC5F0:: @ 83BC5F0
+	obj_image_anim_frame 0, 6
+	obj_image_anim_frame 1, 6
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_83BC5FC:: @ 83BC5FC
+	obj_image_anim_frame 0, 8
+	obj_image_anim_frame 1, 8
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_83BC608:: @ 83BC608
+	obj_image_anim_frame 0, 14
+	obj_image_anim_frame 1, 14
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_83BC614:: @ 83BC614
+	obj_image_anim_frame 0, 22
+	obj_image_anim_frame 1, 22
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_83BC620:: @ 83BC620
+	obj_image_anim_frame 0, 29
+	obj_image_anim_frame 0, 29
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_83BC62C:: @ 83BC62C
+	.4byte gSpriteAnim_83BC5F0
+	.4byte gSpriteAnim_83BC5FC
+	.4byte gSpriteAnim_83BC608
+	.4byte gSpriteAnim_83BC614
+	.4byte gSpriteAnim_83BC620
+
+	.align 2
+gSpriteAffineAnim_83BC640:: @ 83BC640
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 10
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_83BC650:: @ 83BC650
+	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 122
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnimTable_83BC660:: @ 83BC660
+	.4byte gSpriteAffineAnim_83BC640
+	.4byte gSpriteAffineAnim_83BC650
+
+	.align 1
+gSpriteImageSizes:: @ 83BC668
+	@ square
+	.2byte  0x20 @ 1×1
+	.2byte  0x80 @ 2×2
+	.2byte 0x200 @ 4×4
+	.2byte 0x800 @ 8×8
+
+	@ horizontal rectangle
+	.2byte  0x40 @ 2×1
+	.2byte  0x80 @ 4×1
+	.2byte 0x100 @ 4×2
+	.2byte 0x400 @ 8×4
+
+	@ vertical rectangle
+	.2byte  0x40 @ 1×2
+	.2byte  0x80 @ 1×4
+	.2byte 0x100 @ 2×4
+	.2byte 0x400 @ 4×8
 
 @ 83BC680
 	.include "data/text/move_descriptions.s"
@@ -20902,12 +21174,12 @@ gUnknown_083E3D00:: @ 83E3D00
 	.incbin "graphics/misc/ribbons_full.4bpp.lz"
 
 	.align 2
-gUnknownPal_083E41D8::
-	.incbin "graphics/unknown/unknown_3E41D8.gbapal"
+PokenavBlueLightPalette:
+	.incbin "graphics/pokenav/blue_light.gbapal"
 
 	.align 2
-gUnknownGfx_083E41D8::
-	.incbin "graphics/unknown/unknown_3E41D8.4bpp"
+PokenavBlueLightTiles:
+	.incbin "graphics/pokenav/blue_light.4bpp"
 
 Palette_3E42D8: @ 83E42D8
 	.incbin "baserom.gba", 0x3e42d8, 0x20
@@ -21079,12 +21351,12 @@ gSpriteTemplate_83E4454:: @ 83E4454
 	spr_template 0, 0, gOamData_83E4318, gSpriteAnimTable_83E43E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 2
-gUnknown_083E446C:: @ 83E446C
-	obj_tiles gUnknownGfx_083E41D8, 256, 0x0019
+gSpriteSheet_PokenavBlueLight:: @ 83E446C
+	obj_tiles PokenavBlueLightTiles, 0x100, 25
 
 	.align 2
-gUnknown_083E4474:: @ 83E4474
-	obj_pal gUnknownPal_083E41D8, 0x0011
+gSpritePalette_PokenavBlueLight:: @ 83E4474
+	obj_pal PokenavBlueLightPalette, 17
 
 	.align 2
 gOamData_83E447C:: @ 83E447C
@@ -23753,11 +24025,13 @@ gBirchBallarrow_Pal::
 gBirchCircle_Pal::
 	.incbin "graphics/misc/birch_circle.gbapal"
 
-gUnknown_083F636C:: @ 83F636C
-	.incbin "baserom.gba", 0x003f636c, 0x18c
+	.align 2
+gBirchBagTilemap:: @ 83F636C
+	.incbin "graphics/misc/birch_bag_map.bin.lz"
 
-gUnknown_083F64F8:: @ 83F64F8
-	.incbin "baserom.gba", 0x003f64f8, 0x1f8
+	.align 2
+gBirchGrassTilemap:: @ 83F64F8
+	.incbin "graphics/misc/birch_grass_map.bin.lz"
 
 gUnknown_083F66F0:: @ 83F66F0
 	.incbin "graphics/misc/birch_help.4bpp.lz"
@@ -25599,17 +25873,26 @@ gSpriteTemplate_8401D58:: @ 8401D58
 gSpriteTemplate_8401D70:: @ 8401D70
 	spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76
 
-gUnknown_08401D88:: @ 8401D88
-	.incbin "baserom.gba", 0x00401d88, 0x2
-
-gUnknown_08401D8A:: @ 8401D8A
-	.incbin "baserom.gba", 0x00401d8a, 0x4
+gCableCarPlayerGraphicsIDs:: @ 8401D88
+	.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
 
-gUnknown_08401D8E:: @ 8401D8E
-	.incbin "baserom.gba", 0x00401d8e, 0x8
+gMtChimneyHikerGraphicsIDs:: @ 8401D8A
+	.byte MAP_OBJ_GFX_HIKER
+	.byte MAP_OBJ_GFX_CAMPER
+	.byte MAP_OBJ_GFX_PICNICKER
+	.byte MAP_OBJ_GFX_POOCHYENA @ not used
 
-gUnknown_08401D96:: @ 8401D96
-	.incbin "baserom.gba", 0x00401d96, 0x4
+	.align 1
+gMtChimneyHikerCoords:: @ 8401D8E
+	.2byte   0,  80
+	.2byte 240, 146
+
+gMtChimneyHikerMovementDelayTable:: @ 8401D96
+	.byte   0
+	.byte  60
+	.byte 120
+	.byte 170
 
 	.align 2
 gUnknown_08401D9C:: @ 8401D9C
diff --git a/data/graphics.s b/data/graphics.s
index 7c9e16275..a89b6e0c8 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4439,8 +4439,9 @@ gUnknown_08EA0348:: @ 8EA0348
 gUnknown_08EA15C8:: @ 8EA15C8
 	.incbin "graphics/trade/menu_map.bin"
 
-gUnknown_08EA1DC8:: @ 8EA1DC8
-	.incbin "baserom.gba", 0x00ea1dc8, 0x24
+	.align 2
+gTradeMonBoxTilemap:: @ 8EA1DC8
+	.incbin "graphics/trade/mon_box_map.bin"
 
 	.align 2
 gUnknown_08EA1DEC:: @ 8EA1DEC