party_menu data

3 files changed, 73 insertions, 742 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 9810abf91..a6b9db097 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13904,23 +13904,23 @@ gPartyMenuBg_Tilemap:: @ 8E82AB0
 	.incbin "graphics/interface/party_menu_misc.bin.lz"
 
 	.align 2
-gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8
+gPartyMenuPokeball_Gfx:: @ 8E82BE8
 	.incbin "graphics/interface/party_menu_pokeball.4bpp.lz"
 
 	.align 2
-gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68
+gPartyMenuPokeballSmall_Gfx:: @ 8E82D68
 	.incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz"
 
 	.align 2
-gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C
+gPartyMenuPokeball_Pal:: @ 8E82E7C
 	.incbin "graphics/interface/party_menu_pokeball.gbapal.lz"
 
 	.align 2
-gUnknown_8E82EA0:: @ 8E82EA0
+gStatusGfx_Icons:: @ 8E82EA0
 	.incbin "baserom.gba", 0xE82EA0, 0x204
 
 	.align 2
-gFile_graphics_interface_status_icons_palette:: @ 8E830A4
+gStatusPal_Icons:: @ 8E830A4
 	.incbin "graphics/interface/status_icons.gbapal.lz"
 
 	.align 2
diff --git a/data/party_menu.s b/data/party_menu.s
deleted file mode 100644
index 1f10d0ea5..000000000
--- a/data/party_menu.s
+++ /dev/null
@@ -1,669 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/flags.h"
-#include "constants/moves.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gMoveTutorMoves:: @ 8459B60
-	.2byte MOVE_MEGA_PUNCH
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_MEGA_KICK
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SEISMIC_TOSS
-	.2byte MOVE_MIMIC
-	.2byte MOVE_METRONOME
-	.2byte MOVE_SOFT_BOILED
-	.2byte MOVE_DREAM_EATER
-	.2byte MOVE_THUNDER_WAVE
-	.2byte MOVE_EXPLOSION
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_SUBSTITUTE
-
-sTutorLearnsets:: @ 8459B7E
-	.2byte 0x0000
-	.2byte 0x409a
-	.2byte 0x409a
-	.2byte 0x409a
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x40fd
-	.2byte 0x40fd
-	.2byte 0x40fd
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x4490
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x4092
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x48b8
-	.2byte 0x48b8
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x48fd
-	.2byte 0x48fd
-	.2byte 0x60fa
-	.2byte 0x60fa
-	.2byte 0x40b8
-	.2byte 0x40b8
-	.2byte 0x60fd
-	.2byte 0x40b8
-	.2byte 0x40b8
-	.2byte 0x60fd
-	.2byte 0x4ffd
-	.2byte 0x4ffd
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4cfd
-	.2byte 0x4cfd
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x409a
-	.2byte 0x40ba
-	.2byte 0x40ba
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x4498
-	.2byte 0x4498
-	.2byte 0x40fd
-	.2byte 0x40fd
-	.2byte 0x61fd
-	.2byte 0x61fd
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x41fd
-	.2byte 0x41fd
-	.2byte 0x4dfd
-	.2byte 0x4dfd
-	.2byte 0x4dfd
-	.2byte 0x61fd
-	.2byte 0x61fd
-	.2byte 0x61fd
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x409a
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x71f9
-	.2byte 0x71f9
-	.2byte 0x71fd
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4c98
-	.2byte 0x4cfd
-	.2byte 0x4890
-	.2byte 0x4890
-	.2byte 0x409a
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x5088
-	.2byte 0x5088
-	.2byte 0x5090
-	.2byte 0x5090
-	.2byte 0x5480
-	.2byte 0x5480
-	.2byte 0x55fd
-	.2byte 0x7098
-	.2byte 0x4dfd
-	.2byte 0x4dfd
-	.2byte 0x409a
-	.2byte 0x409a
-	.2byte 0x5880
-	.2byte 0x5880
-	.2byte 0x5490
-	.2byte 0x5490
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x61fd
-	.2byte 0x61fd
-	.2byte 0x64ff
-	.2byte 0x5080
-	.2byte 0x5080
-	.2byte 0x60ba
-	.2byte 0x60ff
-	.2byte 0x4ffd
-	.2byte 0x409a
-	.2byte 0x60fd
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4890
-	.2byte 0x4c90
-	.2byte 0x4dfd
-	.2byte 0x40b2
-	.2byte 0x45fd
-	.2byte 0x48fd
-	.2byte 0x40fd
-	.2byte 0x60da
-	.2byte 0x4098
-	.2byte 0x0000
-	.2byte 0x4898
-	.2byte 0x4498
-	.2byte 0x0000
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4898
-	.2byte 0x4098
-	.2byte 0x4c90
-	.2byte 0x6098
-	.2byte 0x60d8
-	.2byte 0x6098
-	.2byte 0x60de
-	.2byte 0x6090
-	.2byte 0x61fd
-	.2byte 0x4090
-	.2byte 0x4890
-	.2byte 0x4090
-	.2byte 0x4898
-	.2byte 0x4898
-	.2byte 0x4898
-	.2byte 0x4dfd
-	.2byte 0x7fff
-	.2byte 0x40ba
-	.2byte 0x40ba
-	.2byte 0x40ba
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x60fd
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4490
-	.2byte 0x4490
-	.2byte 0x4093
-	.2byte 0x4093
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4090
-	.2byte 0x4890
-	.2byte 0x4890
-	.2byte 0x48fd
-	.2byte 0x4ffd
-	.2byte 0x4cfd
-	.2byte 0x4ffd
-	.2byte 0x4ffd
-	.2byte 0x4c90
-	.2byte 0x4c90
-	.2byte 0x4898
-	.2byte 0x48fd
-	.2byte 0x48fd
-	.2byte 0x4092
-	.2byte 0x40dd
-	.2byte 0x40dd
-	.2byte 0x70fd
-	.2byte 0x41fd
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x4dfd
-	.2byte 0x4092
-	.2byte 0x4092
-	.2byte 0x4490
-	.2byte 0x4098
-	.2byte 0x40fd
-	.2byte 0x4498
-	.2byte 0x4498
-	.2byte 0x4c90
-	.2byte 0x4cfd
-	.2byte 0x4c90
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x4c98
-	.2byte 0x70b8
-	.2byte 0x70b8
-	.2byte 0x6cb8
-	.2byte 0x64b2
-	.2byte 0x7098
-	.2byte 0x49fd
-	.2byte 0x69fd
-	.2byte 0x4892
-	.2byte 0x40b2
-	.2byte 0x6098
-	.2byte 0x60fa
-	.2byte 0x44b2
-	.2byte 0x41ff
-	.2byte 0x61ff
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x7098
-	.2byte 0x4890
-	.2byte 0x48d0
-	.2byte 0x40fd
-	.2byte 0x4098
-	.2byte 0x60b0
-	.2byte 0x44b8
-	.2byte 0x44b8
-	.2byte 0x4098
-	.2byte 0x40b8
-	.2byte 0x60b8
-	.2byte 0x4c90
-	.2byte 0x4c98
-	.2byte 0x0000
-	.2byte 0x60fc
-	.2byte 0x60fc
-	.2byte 0x45fd
-	.2byte 0x48fd
-	.2byte 0x40fd
-	.2byte 0x69fd
-	.2byte 0x4ffd
-	.2byte 0x4898
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x68fd
-	.2byte 0x4c98
-	.2byte 0x4c90
-	.2byte 0x4592
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x40ff
-	.2byte 0x40ff
-	.2byte 0x40ff
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x60ff
-	.2byte 0x4098
-	.2byte 0x60fd
-	.2byte 0x60fd
-	.2byte 0x40b8
-	.2byte 0x40b8
-	.2byte 0x4898
-	.2byte 0x4898
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x4090
-	.2byte 0x0000
-	.2byte 0x4090
-	.2byte 0x409a
-	.2byte 0x409a
-	.2byte 0x41ff
-	.2byte 0x509a
-	.2byte 0x509e
-	.2byte 0x509e
-	.2byte 0x4090
-	.2byte 0x4092
-	.2byte 0x4490
-	.2byte 0x40b0
-	.2byte 0x40b0
-	.2byte 0x409a
-	.2byte 0x40ff
-	.2byte 0x65fd
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4c98
-	.2byte 0x4c98
-	.2byte 0x69fd
-	.2byte 0x7490
-	.2byte 0x7490
-	.2byte 0x7898
-	.2byte 0x7098
-	.2byte 0x45fd
-	.2byte 0x4090
-	.2byte 0x6090
-	.2byte 0x4090
-	.2byte 0x40ba
-	.2byte 0x40ba
-	.2byte 0x4090
-	.2byte 0x4098
-	.2byte 0x4090
-	.2byte 0x4090
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x61fd
-	.2byte 0x61fd
-	.2byte 0x4898
-	.2byte 0x4898
-	.2byte 0x6098
-	.2byte 0x7098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x40fb
-	.2byte 0x40ff
-	.2byte 0x4098
-	.2byte 0x5098
-	.2byte 0x7498
-	.2byte 0x7498
-	.2byte 0x4098
-	.2byte 0x4498
-	.2byte 0x44fd
-	.2byte 0x49fd
-	.2byte 0x49fd
-	.2byte 0x60ff
-	.2byte 0x45fd
-	.2byte 0x65fd
-	.2byte 0x4498
-	.2byte 0x4498
-	.2byte 0x0000
-	.2byte 0x4498
-	.2byte 0x65fd
-	.2byte 0x409a
-	.2byte 0x60fd
-	.2byte 0x60fd
-	.2byte 0x60fd
-	.2byte 0x54b8
-	.2byte 0x54b8
-	.2byte 0x409a
-	.2byte 0x40fd
-	.2byte 0x60fd
-	.2byte 0x60fd
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x4098
-	.2byte 0x6cba
-	.2byte 0x4c98
-	.2byte 0x4d98
-	.2byte 0x4098
-	.2byte 0x68ff
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x68fd
-	.2byte 0x4898
-	.2byte 0x49fd
-	.2byte 0x49fd
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x609a
-	.2byte 0x60da
-	.2byte 0x4c98
-	.2byte 0x4c98
-	.2byte 0x4c98
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x6098
-	.2byte 0x0000
-	.2byte 0x7098
-	.2byte 0x7098
-	.2byte 0x78fd
-	.2byte 0x78fd
-	.2byte 0x78fd
-	.2byte 0x6898
-	.2byte 0x68ff
-	.2byte 0x6898
-	.2byte 0x4c98
-	.2byte 0x4c98
-	.2byte 0x4d98
-	.2byte 0x6cfd
-	.2byte 0x4490
-
-	.align 2
-sPartyMenuBgTemplates:: @ 8459EB8
-	.incbin "baserom.gba", 0x459EB8, 0xC
-
-sPartyBoxInfoRects:: @ 8459EC4
-	.incbin "baserom.gba", 0x459EC4, 0x40
-
-sPartyMenuSpriteCoords:: @ 8459F04
-	.incbin "baserom.gba", 0x459F04, 0xC0
-
-gUnknown_8459FC4:: @ 8459FC4
-	.incbin "baserom.gba", 0x459FC4, 0x1C
-
-gUnknown_8459FE0:: @ 8459FE0
-	.incbin "baserom.gba", 0x459FE0, 0x1C
-
-sFontColorTable:: @ 8459FFC
-	.incbin "baserom.gba", 0x459FFC, 0xF
-
-gUnknown_845A00B:: @ 845A00B
-	.incbin "baserom.gba", 0x45A00B, 0x5
-
-sSinglePartyMenuWindowTemplate:: @ 845A010
-	.incbin "baserom.gba", 0x45A010, 0x40
-
-sDoublePartyMenuWindowTemplate:: @ 845A050
-	.incbin "baserom.gba", 0x45A050, 0x40
-
-sMultiPartyMenuWindowTemplate:: @ 845A090
-	.incbin "baserom.gba", 0x45A090, 0x40
-
-sShowcaseMultiPartyMenuWindowTemplate:: @ 845A0D0
-	.incbin "baserom.gba", 0x45A0D0, 0x38
-
-sCancelButtonWindowTemplate:: @ 845A108
-	.incbin "baserom.gba", 0x45A108, 0x8
-
-sMultiCancelButtonWindowTemplate:: @ 845A110
-	.incbin "baserom.gba", 0x45A110, 0x8
-
-sConfirmButtonWindowTemplate:: @ 845A118
-	.incbin "baserom.gba", 0x45A118, 0x8
-
-gUnknown_845A120:: @ 845A120
-	.incbin "baserom.gba", 0x45A120, 0x8
-
-gUnknown_845A128:: @ 845A128
-	.incbin "baserom.gba", 0x45A128, 0x8
-
-gUnknown_845A130:: @ 845A130
-	.incbin "baserom.gba", 0x45A130, 0x8
-
-gUnknown_845A138:: @ 845A138
-	.incbin "baserom.gba", 0x45A138, 0x8
-
-gUnknown_845A140:: @ 845A140
-	.incbin "baserom.gba", 0x45A140, 0x8
-
-sItemGiveTakeWindowTemplate:: @ 845A148
-	.incbin "baserom.gba", 0x45A148, 0x8
-
-sMailReadTakeWindowTemplate:: @ 845A150
-	.incbin "baserom.gba", 0x45A150, 0x8
-
-sMoveSelectWindowTemplate:: @ 845A158
-	.incbin "baserom.gba", 0x45A158, 0x8
-
-sPartyMenuYesNoWindowTemplate:: @ 845A160
-	.incbin "baserom.gba", 0x45A160, 0x8
-
-sLevelUpStatsWindowTemplate:: @ 845A168
-	.incbin "baserom.gba", 0x45A168, 0x8
-
-gUnknown_845A170:: @ 845A170
-	.incbin "baserom.gba", 0x45A170, 0x8
-
-gUnknown_845A178:: @ 845A178
-	.incbin "baserom.gba", 0x45A178, 0x8
-
-sMainSlotTileNums:: @ 845A180
-	.incbin "baserom.gba", 0x45A180, 0x46
-
-sMainSlotTileNums_Egg:: @ 845A1C6
-	.incbin "baserom.gba", 0x45A1C6, 0x46
-
-sOtherSlotTileNums:: @ 845A20C
-	.incbin "baserom.gba", 0x45A20C, 0x36
-
-sOtherSlotTileNums_Egg:: @ 845A242
-	.incbin "baserom.gba", 0x45A242, 0x36
-
-gUnknown_845A278:: @ 845A278
-	.incbin "baserom.gba", 0x45A278, 0x36
-
-sGenderPalOffsets:: @ 845A2AE
-	.incbin "baserom.gba", 0x45A2AE, 0x2
-
-gUnknown_845A2B0:: @ 845A2B0
-	.incbin "baserom.gba", 0x45A2B0, 0x2
-
-gUnknown_845A2B2:: @ 845A2B2
-	.incbin "baserom.gba", 0x45A2B2, 0x3
-
-gUnknown_845A2B5:: @ 845A2B5
-	.incbin "baserom.gba", 0x45A2B5, 0x3
-
-sGenderMalePalIds:: @ 845A2B8
-	.incbin "baserom.gba", 0x45A2B8, 0x2
-
-sGenderFemalePalIds:: @ 845A2BA
-	.incbin "baserom.gba", 0x45A2BA, 0x2
-
-gUnknown_845A2BC:: @ 845A2BC
-	.incbin "baserom.gba", 0x45A2BC, 0x2
-
-gUnknown_845A2BE:: @ 845A2BE
-	.incbin "baserom.gba", 0x45A2BE, 0x2
-
-gUnknown_845A2C0:: @ 845A2C0
-	.incbin "baserom.gba", 0x45A2C0, 0x2
-
-gUnknown_845A2C2:: @ 845A2C2
-	.incbin "baserom.gba", 0x45A2C2, 0x3
-
-gUnknown_845A2C5:: @ 845A2C5
-	.incbin "baserom.gba", 0x45A2C5, 0x3
-
-gUnknown_845A2C8:: @ 845A2C8
-	.incbin "baserom.gba", 0x45A2C8, 0x3
-
-gUnknown_845A2CB:: @ 845A2CB
-	.incbin "baserom.gba", 0x45A2CB, 0x3
-
-gUnknown_845A2CE:: @ 845A2CE
-	.incbin "baserom.gba", 0x45A2CE, 0x3
-
-gUnknown_845A2D1:: @ 845A2D1
-	.incbin "baserom.gba", 0x45A2D1, 0x3
-
-gUnknown_845A2D4:: @ 845A2D4
-	.incbin "baserom.gba", 0x45A2D4, 0x3
-
-gUnknown_845A2D7:: @ 845A2D7
-	.incbin "baserom.gba", 0x45A2D7, 0x3
-
-gUnknown_845A2DA:: @ 845A2DA
-	.incbin "baserom.gba", 0x45A2DA, 0x3
-
-gUnknown_845A2DD:: @ 845A2DD
-	.incbin "baserom.gba", 0x45A2DD, 0x3
-
-gUnknown_845A2E0:: @ 845A2E0
-	.incbin "baserom.gba", 0x45A2E0, 0x3
-
-gUnknown_845A2E3:: @ 845A2E3
-	.incbin "baserom.gba", 0x45A2E3, 0x5
-
-sActionStringTable:: @ 845A2E8
-	.incbin "baserom.gba", 0x45A2E8, 0x6C
-
-sDescriptionStringTable:: @ 845A354
-	.incbin "baserom.gba", 0x45A354, 0x28
-
-gUnknown_845A37C:: @ 845A37C
-	.incbin "baserom.gba", 0x45A37C, 0xB0
-
-sSpriteSheet_HeldItem:: @ 845A42C
-	.incbin "baserom.gba", 0x45A42C, 0x8
-
-sSpritePalette_HeldItem:: @ 845A434
-	.incbin "baserom.gba", 0x45A434, 0x8
-
-sSpriteTemplate_HeldItem:: @ 845A43C
-	.incbin "baserom.gba", 0x45A43C, 0x38
-
-sSpriteSheet_MenuPokeball:: @ 845A474
-	.incbin "baserom.gba", 0x45A474, 0x8
-
-sSpritePalette_MenuPokeball:: @ 845A47C
-	.incbin "baserom.gba", 0x45A47C, 0x8
-
-sSpriteTemplate_MenuPokeball:: @ 845A484
-	.incbin "baserom.gba", 0x45A484, 0x68
-
-sSpriteSheet_MenuPokeballSmall:: @ 845A4EC
-	.incbin "baserom.gba", 0x45A4EC, 0x8
-
-sSpriteTemplate_MenuPokeballSmall:: @ 845A4F4
-	.incbin "baserom.gba", 0x45A4F4, 0x80
-
-sSpriteSheet_StatusIcons:: @ 845A574
-	.incbin "baserom.gba", 0x45A574, 0x8
-
-sSpritePalette_StatusIcons:: @ 845A57C
-	.incbin "baserom.gba", 0x45A57C, 0x8
-
-sSpriteTemplate_StatusIcons:: @ 845A584
-	.incbin "baserom.gba", 0x45A584, 0x18
-
-sMultiBattlePartnersPartyMask:: @ 845A59C
-	.incbin "baserom.gba", 0x45A59C, 0x7C
-
-sCursorOptions:: @ 845A618
-	.incbin "baserom.gba", 0x45A618, 0x114
-
-sPartyMenuActions:: @ 845A72C
-	.incbin "baserom.gba", 0x45A72C, 0x34
-
-sPartyMenuActionCounts:: @ 845A760
-	.incbin "baserom.gba", 0x45A760, 0xE
-
-sFieldMoves:: @ 845A76E
-	.incbin "baserom.gba", 0x45A76E, 0x1A
-
-sFieldMoveCursorCallbacks:: @ 845A788
-	.incbin "baserom.gba", 0x45A788, 0x60
-
-sUnionRoomTradeMessages:: @ 845A7E8
-	.4byte gUnknown_841718C @ Not what other player wants
-	.4byte gUnknown_84171CC @ Not an egg
-	.4byte gUnknown_84170BC @ Mon can't be traded
-	.4byte gUnknown_84170BC @ Mon can't be traded
-	.4byte gUnknown_84170FC @ Other trainer's mon can't be traded
-	.4byte gUnknown_84170E0 @ Egg can't be traded
-	.4byte gUnknown_8417130 @ Other trainer can't accept
-	.4byte gUnknown_8417164 @ Can't trade with trainer now
-	.4byte gUnknown_8417164 @ Can't trade with trainer now
-
-sTMHMMoves:: @ 845A80C
-	.incbin "baserom.gba", 0x45A80C, 0x74
diff --git a/data/strings.s b/data/strings.s
index 3cd263df9..a0454c12b 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -433,16 +433,16 @@ gString_Dummy:: @ 84161CD
 gUnknown_84161CE::
 	.string "キャンセル$"
 
-gUnknown_84161D4::
+gText_Item::
 	.string "ITEM$"
 
-gUnknown_84161D9::
+gText_Mail::
 	.string "MAIL$"
 
-gUnknown_84161DE::
+gText_Take::
 	.string "TAKE$"
 
-gUnknown_84161E3::
+gText_Store::
 	.string "STORE$"
 
 gUnknown_84161E9::
@@ -804,34 +804,34 @@ gText_TurnedOverItemsWorthYen:: @ 8416959
 gText_PokedollarVar1:: @ 841697A
 	.string "¥{STR_VAR_1}$"
 
-gUnknown_841697E:: @ 0x841697E
+gText_Shift:: @ 0x841697E
 	.string "SHIFT$"
 
-gUnknown_8416984:: @ 0x8416984
+gText_SendOut:: @ 0x8416984
 	.string "SEND OUT$"
 
-gUnknown_841698D:: @ 0x841698D
+gText_Switch2:: @ 0x841698D
 	.string "SWITCH$"
 
-gUnknown_8416994:: @ 0x8416994
+gText_Summary5:: @ 0x8416994
 	.string "SUMMARY$"
 
 gUnknown_841699C:: @ 0x841699C
 	.string "つかえるわざ$"
 
-gUnknown_84169A3:: @ 0x84169A3
+gText_Enter:: @ 0x84169A3
 	.string "ENTER$"
 
-gUnknown_84169A9:: @ 0x84169A9
+gText_NoEntry:: @ 0x84169A9
 	.string "NO ENTRY$"
 
-gUnknown_84169B2:: @ 0x84169B2
+gText_Take2:: @ 0x84169B2
 	.string "TAKE$"
 
-gUnknown_84169B7:: @ 0x84169B7
+gText_Read2:: @ 0x84169B7
 	.string "READ$"
 
-gUnknown_84169BC:: @ 0x84169BC
+gText_Trade4:: @ 0x84169BC
 	.string "TRADE$"
 
 gText_HP3:: @ 84169C2
@@ -1044,144 +1044,144 @@ gUnknown_8417094:: @ 0x8417094
 	.string "POKéMON for battle.$"
 
 	.align 2
-gUnknown_84170BC:: @ 84170BC
+gText_PkmnCantBeTradedNow:: @ 84170BC
 	.string "That POKéMON can't be traded\n"
 	.string "now.$"
 
 	.align 2
-gUnknown_84170E0:: @ 84170E0
+gText_EggCantBeTradedNow:: @ 84170E0
 	.string "An EGG can't be traded now.$"
 
 	.align 2
-gUnknown_84170FC:: @ 0x84170FC
+gText_OtherTrainersPkmnCantBeTraded:: @ 0x84170FC
 	.string "The other TRAINER's POKéMON\n"
 	.string "can't be traded now.$"
 
 	.align 2
-gUnknown_8417130:: @ 0x8417130
+gText_OtherTrainerCantAcceptPkmn:: @ 0x8417130
 	.string "The other TRAINER can't accept\n"
 	.string "that POKéMON now.$"
 
 	.align 2
-gUnknown_8417164:: @ 0x8417164
+gText_CantTradeWithTrainer:: @ 0x8417164
 	.string "You can't trade with that\n"
 	.string "TRAINER now.$"
 
 	.align 2
-gUnknown_841718C:: @ 0x841718C
+gText_NotPkmnOtherTrainerWants:: @ 0x841718C
 	.string "That isn't the type of POKéMON\n"
 	.string "that the other TRAINER wants.$"
 
 	.align 2
-gUnknown_84171CC:: @ 0x84171CC
+gText_ThatIsntAnEgg:: @ 0x84171CC
 	.string "That isn't an EGG.$"
 
-gUnknown_84171DF:: @ 0x84171DF
+gText_ChoosePokemon:: @ 0x84171DF
 	.string "Choose a POKéMON.$"
 
-gUnknown_84171F1:: @ 0x84171F1
+gText_MoveToWhere:: @ 0x84171F1
 	.string "Move to where?$"
 
-gUnknown_8417200:: @ 0x8417200
+gText_TeachWhichPokemon:: @ 0x8417200
 	.string "Teach which POKéMON?$"
 
-gUnknown_8417215:: @ 0x8417215
+gText_UseOnWhichPokemon:: @ 0x8417215
 	.string "Use on which POKéMON?$"
 
-gUnknown_841722B:: @ 0x841722B
+gText_GiveToWhichPokemon:: @ 0x841722B
 	.string "Give to which POKéMON?$"
 
-gUnknown_8417242:: @ 0x8417242
+gText_DoWhatWithPokemon:: @ 0x8417242
 	.string "Do what with this {PKMN}?$"
 
-gUnknown_8417258:: @ 0x8417258
+gText_NothingToCut:: @ 0x8417258
 	.string "There's nothing to CUT.$"
 
-gUnknown_8417270:: @ 0x8417270
+gText_CantSurfHere:: @ 0x8417270
 	.string "No SURFING here!$"
 
-gUnknown_8417281:: @ 0x8417281
+gText_AlreadySurfing:: @ 0x8417281
 	.string "You're already SURFING.$"
 
-gUnknown_8417299:: @ 0x8417299
+gText_CantUseHere:: @ 0x8417299
 	.string "Can't use that here.$"
 
-gUnknown_84172AE:: @ 0x84172AE
+gText_RestoreWhichMove:: @ 0x84172AE
 	.string "Restore which move?$"
 
-gUnknown_84172C2:: @ 0x84172C2
+gText_BoostPp:: @ 0x84172C2
 	.string "Boost PP of which?$"
 
-gUnknown_84172D5:: @ 0x84172D5
+gText_DoWhatWithItem:: @ 0x84172D5
 	.string "Do what with an item?$"
 
-gUnknown_84172EB:: @ 0x84172EB
+gText_NoPokemonForBattle:: @ 0x84172EB
 	.string "No battling this way!$"
 
-gUnknown_8417301:: @ 0x8417301
+gText_ChoosePokemon2:: @ 0x8417301
 	.string "Choose a POKéMON.$"
 
-gUnknown_8417313:: @ 0x8417313
+gText_NotEnoughHp:: @ 0x8417313
 	.string "Not enough HP‥$"
 
-gUnknown_8417322:: @ 0x8417322
+gText_ThreePkmnAreNeeded:: @ 0x8417322
 	.string "Three {PKMN} are needed.$"
 
-gUnknown_8417337:: @ 0x8417337
+gText_PokemonCantBeSame:: @ 0x8417337
 	.string "{PKMN} can't be the same.$"
 
-gUnknown_841734D:: @ 0x841734D
+gText_NoIdenticalHoldItems:: @ 0x841734D
 	.string "No same hold items!$"
 
-gUnknown_8417361:: @ 0x8417361
+gText_CurrentIsTooFast:: @ 0x8417361
 	.string "The current is much too fast!$"
 
-gUnknown_841737F:: @ 0x841737F
+gText_DoWhatWithMail:: @ 0x841737F
 	.string "Do what with the MAIL?$"
 
-gUnknown_8417396:: @ 0x8417396
+gText_ChoosePokemonCancel:: @ 0x8417396
 	.string "Choose POKéMON or CANCEL.$"
 
-gUnknown_84173B0:: @ 0x84173B0
+gText_ChoosePokemonConfirm:: @ 0x84173B0
 	.string "Choose POKéMON and confirm.$"
 
-gUnknown_84173CC:: @ 0x84173CC
+gText_TwoPokemonAreNeeded:: @ 0x84173CC
 	.string "Two POKéMON are needed.$"
 
-gUnknown_84173E4:: @ 0x84173E4
+gText_EnjoyCycling:: @ 0x84173E4
 	.string "Let's enjoy cycling!$"
 
-gUnknown_84173F9:: @ 0x84173F9
+gText_InUseAlready_PM:: @ 0x84173F9
 	.string "This is in use already.$"
 
-gUnknown_8417411:: @ 0x8417411
+gText_NoUse:: @ 0x8417411
 	.string "No use.$"
 
-gUnknown_8417419:: @ 0x8417419
+gText_Able:: @ 0x8417419
 	.string "ABLE$"
 
-gUnknown_841741E:: @ 0x841741E
+gText_First_PM:: @ 0x841741E
 	.string "FIRST$"
 
-gUnknown_8417424:: @ 0x8417424
+gText_Second_PM:: @ 0x8417424
 	.string "SECOND$"
 
-gUnknown_841742B:: @ 0x841742B
+gText_Third_PM:: @ 0x841742B
 	.string "THIRD$"
 
-gUnknown_8417431:: @ 0x8417431
+gText_Able2:: @ 0x8417431
 	.string "ABLE$"
 
-gUnknown_8417436:: @ 0x8417436
+gText_NotAble:: @ 0x8417436
 	.string "NOT ABLE$"
 
-gUnknown_841743F:: @ 0x841743F
+gText_Able3:: @ 0x841743F
 	.string "ABLE!$"
 
-gUnknown_8417445:: @ 0x8417445
+gText_NotAble2:: @ 0x8417445
 	.string "NOT ABLE!$"
 
-gUnknown_841744F:: @ 0x841744F
+gText_Learned:: @ 0x841744F
 	.string "LEARNED$"
 
 gUnknown_8417457:: @ 8417457
@@ -1197,40 +1197,40 @@ gUnknown_8417494:: @ 8417494
 	.string "You also choose POKéMON here if\n"
 	.string "you want to use an item on one.{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_8417533:: @ 0x8417533
+gText_CutATreeOrGrass:: @ 0x8417533
 	.string "Cut a tree or grass.$"
 
-gUnknown_8417548:: @ 0x8417548
+gText_FlyToAKnownTown:: @ 0x8417548
 	.string "Fly to a known town.$"
 
-gUnknown_841755D:: @ 0x841755D
+gText_TravelOnWater:: @ 0x841755D
 	.string "Travel on water.$"
 
-gUnknown_841756E:: @ 0x841756E
+gText_MoveHeavyBoulders:: @ 0x841756E
 	.string "Move heavy boulders.$"
 
-gUnknown_8417583:: @ 0x8417583
+gText_LightUpDarkness:: @ 0x8417583
 	.string "Light up darkness.$"
 
-gUnknown_8417596:: @ 0x8417596
+gText_ShatterACrackedRock:: @ 0x8417596
 	.string "Shatter a cracked rock.$"
 
-gUnknown_84175AE:: @ 0x84175AE
+gText_ClimbAWaterfall:: @ 0x84175AE
 	.string "Climb a waterfall.$"
 
 gUnknown_84175C1:: @ 0x84175C1
 	.string "すいちゅうに もぐる$"
 
-gUnknown_84175CC:: @ 0x84175CC
+gText_EscapeFromHere:: @ 0x84175CC
 	.string "Escape from here.$"
 
-gUnknown_84175DE:: @ 0x84175DE
+gText_LureWildPokemon:: @ 0x84175DE
 	.string "Lure wild POKéMON.$"
 
-gUnknown_84175F1:: @ 0x84175F1
+gText_ShareHp:: @ 0x84175F1
 	.string "Share HP.$"
 
-gUnknown_84175FB:: @ 0x84175FB
+gText_ReturnToAHealingSpot:: @ 0x84175FB
 	.string "Return to a healing spot.$"
 
 gUnknown_8417615:: @ 8417615
@@ -3266,7 +3266,7 @@ gText_Badges:: @ 841B6EC
 gTextJPDummy_Ko:: @ 841B6F3
 	.string "$"
 
-gUnknown_841B6F4:: @ 0x841B6F4
+gText_Register:: @ 0x841B6F4
 	.string "REGISTER$"
 
 gText_HatchedFromEgg:: @ 841B6FD