Dump numerous baseroms, begin moving data to proper files

asm/battle_tower.s

@@ -3547,11 +3547,11 @@ _08163E2C:
 	ldr r4, =gUnknown_02038BFC
 	movs r0, 0
 	strb r0, [r4]
-	ldr r0, =gUnknown_08224158
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
 	bl BattleSetup_ConfigureTrainerBattle
 	movs r0, 0x1
 	strb r0, [r4]
-	ldr r0, =gUnknown_08224167
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1
 	bl BattleSetup_ConfigureTrainerBattle
 	ldr r0, =gPartnerTrainerId
 	strh r5, [r0]

asm/field_control_avatar.s

@@ -1456,7 +1456,7 @@ _0809CAE4:
 	bl sub_81381F8
 	cmp r0, 0x1
 	bne _0809CAF8
-	ldr r0, =gUnknown_08224175
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224175
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool

asm/macros/event.inc

@@ -645,6 +645,12 @@
 	.elseif \type == 9
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
+	.elseif \type == 10
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 11
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
 	.endif
 	.endm
 

asm/macros/movement.inc

@@ -110,8 +110,9 @@
 	enum_start 0x91
 	create_movement step_91
 	create_movement step_92
-
-	enum_start 0x96
+	create_movement step_93
+	create_movement step_94
+	create_movement step_95
 	create_movement step_96
 
 	enum_start 0xfe

data/maps/scripts/AbandonedShip_Corridors_B1F.inc

@@ -86,3 +86,6 @@ AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B
 	.string "but the door opened.$"
 
 AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5
+AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5
+	.string "The door is open.$"
+

data/maps/scripts/BattleFrontier_BattleDomeBattleRoom.inc

@@ -667,3 +667,603 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
 	createvobject 34, 31, 8, 2, 3, 1
 	return
 
+BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773
+BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773
+	step_54
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
+	step_55
+	step_14
+	step_up
+	step_up
+	step_up
+	step_right
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
+	step_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
+	step_up
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
+	step_55
+	step_14
+	step_up
+	step_up
+	step_up
+	step_right
+	step_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
+	step_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
+	step_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
+	step_01
+	step_54
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
+	step_55
+	step_up
+	step_up
+	step_up
+	step_02
+	step_13
+	step_12
+	step_00
+	step_13
+	step_12
+	step_03
+	step_13
+	step_12
+	step_01
+	step_13
+	step_12
+	step_02
+	step_14
+	step_16
+	step_16
+	step_02
+	step_13
+	step_12
+	step_00
+	step_13
+	step_12
+	step_03
+	step_13
+	step_12
+	step_01
+	step_13
+	step_12
+	step_02
+	fast_step_left
+	step_41
+	step_01
+	step_40
+	fast_step_left
+	fast_step_left
+	step_41
+	step_03
+	step_40
+	fast_step_left
+	step_41
+	step_00
+	step_11
+	step_02
+	step_13
+	step_12
+	step_01
+	step_13
+	step_12
+	step_03
+	step_13
+	step_12
+	step_00
+	step_13
+	step_12
+	step_02
+	step_12
+	step_01
+	step_12
+	step_03
+	step_12
+	step_00
+	step_12
+	step_02
+	step_11
+	step_01
+	step_11
+	step_03
+	step_11
+	step_00
+	step_11
+	step_02
+	step_40
+	step_right
+	slow_step_right
+	step_right
+	slow_step_right
+	step_41
+	step_01
+	step_14
+	step_47
+	step_47
+	step_14
+	step_right
+	step_right
+	step_right
+	step_47
+	step_14
+	step_right
+	step_down
+	step_down
+	step_02
+	step_11
+	step_01
+	step_11
+	step_03
+	step_11
+	step_00
+	step_11
+	step_02
+	step_12
+	step_left
+	step_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
+	step_14
+	step_14
+	step_left
+	step_left
+	step_28
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_right
+	step_right
+	step_25
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
+	step_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
+	step_left
+	step_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
+	turnvobject 0, 4
+	turnvobject 2, 4
+	turnvobject 4, 4
+	turnvobject 6, 4
+	turnvobject 8, 4
+	turnvobject 10, 3
+	turnvobject 12, 3
+	turnvobject 14, 3
+	turnvobject 16, 3
+	turnvobject 18, 3
+	turnvobject 20, 4
+	turnvobject 22, 4
+	turnvobject 24, 4
+	turnvobject 26, 4
+	turnvobject 28, 4
+	turnvobject 30, 4
+	delay 20
+	turnvobject 0, 1
+	turnvobject 2, 1
+	turnvobject 4, 1
+	turnvobject 6, 1
+	turnvobject 8, 1
+	turnvobject 10, 1
+	turnvobject 12, 1
+	turnvobject 14, 1
+	turnvobject 16, 1
+	turnvobject 18, 1
+	turnvobject 20, 1
+	turnvobject 22, 1
+	turnvobject 24, 1
+	turnvobject 26, 1
+	turnvobject 28, 1
+	turnvobject 30, 1
+	delay 20
+	turnvobject 1, 4
+	turnvobject 3, 4
+	turnvobject 5, 4
+	turnvobject 7, 4
+	turnvobject 9, 4
+	turnvobject 11, 3
+	turnvobject 13, 3
+	turnvobject 15, 3
+	turnvobject 17, 3
+	turnvobject 19, 3
+	turnvobject 21, 4
+	turnvobject 23, 4
+	turnvobject 25, 4
+	turnvobject 27, 3
+	turnvobject 31, 3
+	delay 20
+	turnvobject 1, 1
+	turnvobject 3, 1
+	turnvobject 5, 1
+	turnvobject 7, 1
+	turnvobject 9, 1
+	turnvobject 11, 1
+	turnvobject 13, 1
+	turnvobject 15, 1
+	turnvobject 17, 1
+	turnvobject 19, 1
+	turnvobject 21, 1
+	turnvobject 23, 1
+	turnvobject 25, 1
+	turnvobject 27, 1
+	turnvobject 31, 1
+	delay 20
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
+	copyvar VAR_RESULT, VAR_0x40CE
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
+	warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
+	waitstate
+	end
+
+BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F
+	warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
+	waitstate
+	end
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
+	random 2
+	copyvar VAR_0x400D, VAR_RESULT
+	compare_var_to_value VAR_0x400D, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	setobjectxyperm 6, 2, 0
+	setobjectmovementtype 6, 10
+	return
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
+	compare_var_to_value VAR_0x400D, 0
+	goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
+	return
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_13
+	step_51
+	step_46
+	step_12
+	step_46
+	step_50
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
+	step_down
+	step_down
+	step_right
+	step_right
+	step_25
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
+	step_right
+	step_right
+	step_right
+	step_right
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
+	step_27
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970
+	.string "{PLAYER} has entered the BATTLE DOME!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990
+	.string "{STR_VAR_1}\n"
+	.string "match!\p"
+	.string "{PLAYER} versus {STR_VAR_2}!\p"
+	.string "Let the battle begin!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE
+	.string "{PLAYER} is the winner!\n"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1
+	.string "{STR_VAR_2} is the winner!\n"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04
+	.string "{PLAYER} is the Level 50\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44
+	.string "{PLAYER} is the Open Level\n"
+	.string "Battle Tournament Champion!\p"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86
+	.string "What an unbelievable finish!\n"
+	.string "We have a double knockout!\p"
+	.string "In this event, the Battle Tournament\n"
+	.string "rules call for a REFEREE’S decision.\p"
+	.string "Please wait while the judging\n"
+	.string "is under way.$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is {STR_VAR_1}!\l"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is {PLAYER}!\l"
+	.string "Congratulations!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06
+	.string "The bright new hope!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C
+	.string "The rising star!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E
+	.string "Will this TRAINER race to\n"
+	.string "the championship?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B
+	.string "Can the feat of a championship\n"
+	.string "on the first try be achieved?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99
+	.string "Can the loss of the last match\n"
+	.string "be avenged?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5
+	.string "The TRAINER is on fire for\n"
+	.string "the first championship try!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD
+	.string "A win here means this TRAINER\n"
+	.string "advances to the final!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33
+	.string "Will the long-held dream of\n"
+	.string "a championship finally come true?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72
+	.string "The invincible champion!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C
+	.string "Can anyone hope to beat this\n"
+	.string "TRAINER?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3
+	.string "Do battles exist solely for\n"
+	.string "this TRAINER?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE
+	.string "The current champion aiming to\n"
+	.string "retain the title!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10
+	.string "The former champion has returned!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33
+	.string "The former toughness has returned!\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57
+	.string "Will this TRAINER do as expected\n"
+	.string "and advance to the finals?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94
+	.string "Will the former champ regain\n"
+	.string "lost glory?\p"
+	.string "$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE
+	.string "Feel the glow of a true master!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE
+	.string "And now… The TRAINER standing in\n"
+	.string "{PLAYER}’s record-setting path…\p"
+	.string "Yes! The one and only!\n"
+	.string "The BATTLE DOME COMMISSIONER!\l"
+	.string "Our very own DOME ACE!\l"
+	.string "Make way for TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A
+	.string "Spectators: TUCKER! TUCKER!\n"
+	.string "TUCKER! TUCKER! TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE
+	.string "TUCKER: Ahahah!\p"
+	.string "Do you hear it? This crowd!\n"
+	.string "They’re all itching to see our match!\p"
+	.string "Ahahah!\p"
+	.string "I bet you’re twitching all over from\n"
+	.string "the tension of getting to battle me!\p"
+	.string "But don’t you worry about a thing!\p"
+	.string "I’m the no. 1 star of the BATTLE DOME!\n"
+	.string "I, TUCKER the DOME ACE, will bathe you\l"
+	.string "in my brilliant glow!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9
+	.string "Your strategy!\n"
+	.string "Let’s see it!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6
+	.string "Unbelievable! It’s incredible!\n"
+	.string "The victor is {PLAYER}!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127
+	.string "The winner is TUCKER!\n"
+	.string "The DOME ACE has prevailed!\p"
+	.string "Congratulations, TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172
+	.string "TUCKER: Rules are rules!\n"
+	.string "Let me see your FRONTIER PASS.$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA
+	.string "The Tactics Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0
+	.string "… … … … … …\p"
+	.string "I sorely underestimated you. I won’t\n"
+	.string "make the same mistake next time…$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232
+	.string "Can the win streak be stretched?\n"
+	.string "The confidence is there!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C
+	.string "Ladies and gentlemen!\n"
+	.string "Boys, girls, and POKéMON!\p"
+	.string "Finally!\n"
+	.string "Finally, the legend has returned!\p"
+	.string "Yes, the name of that legend!\n"
+	.string "Our very own DOME ACE!\l"
+	.string "It’s none other than TUCKER!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319
+	.string "TUCKER: Ah…\n"
+	.string "The pummeling roar of the crowd…\l"
+	.string "Their furnace-like heat of excitement…\l"
+	.string "This is a wonderful place…\p"
+	.string "To the crowd, I am the DOME ACE…\n"
+	.string "I represent their hopes and dreams…\l"
+	.string "I must never fade from their sight…\p"
+	.string "I must burn!\n"
+	.string "Brighter and more brilliant!\l"
+	.string "I must light all that gather here!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E
+	.string "I will unleash all the power that\n"
+	.string "I possess! Right here and now!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F
+	.string "TUCKER: You’re genuinely fantastic!\p"
+	.string "Never before! I haven’t ever lost in the\n"
+	.string "times I’ve had to unleash my power.\p"
+	.string "Yes, quite fantastic!\n"
+	.string "Your FRONTIER PASS, please?$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522
+	.string "The Tactics Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D
+	.string "You’re strong, but above all,\n"
+	.string "you have a unique charm!\p"
+	.string "In you, I see a definite potential for\n"
+	.string "a superstar like me.\p"
+	.string "I will very much look forward to\n"
+	.string "our next encounter!$"
+
+	.incbin "baserom.gba", 0x24d5f5, 0x82
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677
+	.string "The final match!\p"
+	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
+	.string "Let the battle begin!$"
+
+BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE
+	.string "The REFEREES have reached\n"
+	.string "a decision!\p"
+	.string "The winner is…\n"
+	.string "Oh, my goodness!\l"
+	.string "The winner is our very own DOME ACE!\l"
+	.string "It’s TUCKER!\p"
+	.string "Congratulations! And thank you!\n"
+	.string "Let’s hear it for the DOME ACE, TUCKER!$"

data/maps/scripts/BattleFrontier_BattleDomeLobby.inc

@@ -618,3 +618,157 @@ BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
 	.string "Here is your prize for your Battle\n"
 	.string "Tournament victory.$"
 
+VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554
+	.string "{PLAYER} received the prize\n"
+	.string "{STR_VAR_1}.$"
+
+	.incbin "baserom.gba", 0x24a56e, 0x51
+
+BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF
+	.string "Thank you for playing!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6
+	.string "Your record will be saved.\n"
+	.string "Please wait.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE
+	.string "We’ve been waiting for you!$"
+
+BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A
+	.string "Before I show you to the BATTLE DOME,\n"
+	.string "I must save the data. Is that okay?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664
+	.string "Where the strategies of TRAINERS\n"
+	.string "are put to the test!\p"
+	.string "Welcome to the BATTLE DOME!\p"
+	.string "I am your guide to the DOUBLE BATTLE\n"
+	.string "Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7
+	.string "Would you like to challenge\n"
+	.string "the DOUBLE BATTLE Tournament?$"
+
+BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
+	.string "The DOUBLE BATTLE Tournament\n"
+	.string "is exactly as the name suggests--\l"
+	.string "a tournament of DOUBLE BATTLES.\p"
+	.string "All participating TRAINERS must\n"
+	.string "enter three POKéMON each.\p"
+	.string "In each battle, one of the three\n"
+	.string "POKéMON must be held in reserve.\p"
+	.string "The remaining two POKéMON must take\n"
+	.string "part in a DOUBLE BATTLE.\p"
+	.string "Choose the two battling POKéMON after\n"
+	.string "examining the opponent’s trio.\p"
+	.string "You win the tournament by defeating\n"
+	.string "four TRAINERS.\p"
+	.string "Battle Points are awarded to\n"
+	.string "the tournament winner.\p"
+	.string "If you want to interrupt your\n"
+	.string "tournament, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966
+	.string "They’re the results of the last\n"
+	.string "Level 50 SINGLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9
+	.string "They’re the results of the last\n"
+	.string "Level 50 DOUBLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC
+	.string "They’re the results of the last\n"
+	.string "Open Level SINGLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31
+	.string "They’re the results of the last\n"
+	.string "Open Level DOUBLE BATTLE Tournament.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
+	.string "Did you see it?\n"
+	.string "The last Battle Tournament?\p"
+	.string "The winner, {STR_VAR_1}, was seriously\n"
+	.string "tough.\p"
+	.string "You should check out the results\n"
+	.string "on the monitor beside the PC.$"
+
+BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
+	.string "The BATTLE FRONTIER…\n"
+	.string "I’ve long dreamed about a place like it.$"
+
+BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44
+	.string "The BATTLE DOME\n"
+	.string "Become the Unbeatable Superstar!$"
+
+BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75
+	.string "The ??????\n"
+	.string "Under Construction!$"
+
+BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
+	.string "When a TRAINER chains tournament\n"
+	.string "wins at the BATTLE DOME, he or she\l"
+	.string "gains a reputation as a star.\p"
+	.string "Tough TRAINERS are drawn by that\n"
+	.string "reputation to the BATTLE DOME.\p"
+	.string "A true superstar is a TRAINER who\n"
+	.string "can keep winning tournaments.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76
+	.string "I ran into one of the tournament\n"
+	.string "favorites in the very first round.\p"
+	.string "Of course I got trashed…$"
+
+BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3
+	.string "I would’ve won if I’d kept this POKéMON\n"
+	.string "held in reserve.\p"
+	.string "You need to check your opponent’s\n"
+	.string "POKéMON carefully before choosing\l"
+	.string "your battling POKéMON.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67
+	.string "Congratulations!\p"
+	.string "You defeated the DOME ACE and won\n"
+	.string "the Battle Tournament!$"
+
+BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1
+	.string "In recognition of your strategy--\n"
+	.string "a thing of beauty it was, too--\l"
+	.string "we award you these Battle Point(s)!$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17
+	.string "Would you like to record your\n"
+	.string "last BATTLE DOME match on your\l"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63
+	.string "The Battle Tournament rules\n"
+	.string "are listed.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE
+	.string "The tournament matchups are drawn up\n"
+	.string "based on the toughness of POKéMON\l"
+	.string "held by TRAINERS.\p"
+	.string "The matchups avoid having tough\n"
+	.string "TRAINERS face each other right away.$"
+
+BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C
+	.string "The tournament chart, or as we call it,\n"
+	.string "the “Tree,” is available for viewing\l"
+	.string "in the Waiting Room from any guide.\p"
+	.string "The Tournament Tree will provide\n"
+	.string "several kinds of data.\p"
+	.string "The data on view includes the previous\n"
+	.string "tournament’s results, the POKéMON held\l"
+	.string "by TRAINERS, and the battle styles of\l"
+	.string "TRAINERS.$"
+
+BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073
+	.string "If battling POKéMON faint at the same\n"
+	.string "time--a double KO--in a tournament\l"
+	.string "match, the REFEREES will review\l"
+	.string "the match and declare the winner.$"

data/maps/scripts/BattleFrontier_BattlePalaceBattleRoom.inc

@@ -511,3 +511,140 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00
+VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00
+	.string "Excellent…\n"
+	.string "Let me restore your POKéMON.$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28
+VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28
+	.string "The 2nd opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54
+VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54
+	.string "The 3rd opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80
+	.string "The 4th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC
+	.string "The 5th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8
+	.string "The 6th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004
+	.string "The 7th opponent is next.\n"
+	.string "Are you prepared?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030
+VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030
+	.string "Would you like to save and quit\n"
+	.string "the game?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A
+VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A
+	.string "Do you wish to quit your challenge?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E
+VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E
+	.string "Saving the data.\n"
+	.string "Have patience…$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E
+	.string "Do you wish to record your latest\n"
+	.string "match on your FRONTIER PASS?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD
+	.string "And now…\p"
+	.string "By winning consistently, you have\n"
+	.string "earned the privilege of challenging\l"
+	.string "our master, the PALACE MAVEN…$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A
+	.string "I shall send for the PALACE MAVEN.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C
+	.string "Let great fanfare announce the arrival\n"
+	.string "of the PALACE MAVEN, SPENSER!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1
+	.string "SPENSER: My physical being is with\n"
+	.string "POKéMON always!\p"
+	.string "My heart beats as one with\n"
+	.string "POKéMON always!\p"
+	.string "Young one of a TRAINER!\n"
+	.string "Do you believe in your POKéMON?\p"
+	.string "Can you believe them through\n"
+	.string "and through?\p"
+	.string "If your bonds of trust are frail,\n"
+	.string "you will never beat my brethren!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4
+	.string "The bond you share with your POKéMON!\n"
+	.string "Prove it to me here!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF
+	.string "SPENSER: Gwahahah!\p"
+	.string "Hah, you never fell for my bluster!\n"
+	.string "Sorry for trying that stunt!\p"
+	.string "Here!\n"
+	.string "Bring me the thing!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D
+	.string "My, my, if only you could maintain that\n"
+	.string "facade of distinguished authority…\p"
+	.string "Here!\n"
+	.string "Let’s see your FRONTIER PASS!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC
+	.string "The Spirits Symbol was embossed on\n"
+	.string "the FRONTIER PASS!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412
+	.string "SPENSER: Your POKéMON’s eyes are \n"
+	.string "truly clear and unclouded.\p"
+	.string "I will eagerly await the next\n"
+	.string "opportunity to see you.$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485
+	.string "SPENSER: Gwahahah!\n"
+	.string "You’ve battled your way up again?\p"
+	.string "You must have developed a truly\n"
+	.string "formidable bond with your POKéMON.\p"
+	.string "So be it!\p"
+	.string "This time, I won’t bluster or hold back.\n"
+	.string "This time, there’s no fooling around.\p"
+	.string "Ready now?\n"
+	.string "Prepare to lose!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572
+	.string "… … …Kaaah!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E
+	.string "SPENSER: Well, that was some display!\n"
+	.string "Even fully unleashed, my brethren\l"
+	.string "could not overpower you.\p"
+	.string "Your team spirit is truly admirable!\p"
+	.string "Here!\n"
+	.string "Bring me that thing, will you?$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629
+	.string "My, my, if only you could maintain\n"
+	.string "a certain level of decorum…\p"
+	.string "Gaaah, here!\n"
+	.string "Hurry with that FRONTIER PASS, you!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699
+	.string "The Spirits Symbol took on\n"
+	.string "a golden shine!$"
+
+BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4
+	.string "SPENSER: Gwahahah!\p"
+	.string "Come see me time and again!\n"
+	.string "My brethren and I will be waiting!$"

data/maps/scripts/BattleFrontier_BattlePalaceLobby.inc

@@ -546,3 +546,182 @@ BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333
     .string "For the feat of your 7-win streak,\n"
     .string "we present you with Battle Point(s).$"
 
+VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B
+	.string "You seem to have no space for\n"
+	.string "our prize.\p"
+	.string "You should return when you have\n"
+	.string "organized your BAG.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8
+VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8
+	.string "We have been waiting for you…$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6
+VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6
+	.string "I must save before I show you to\n"
+	.string "the BATTLE HALL. Is that okay?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636
+VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636
+	.string "Sigh…\p"
+	.string "You failed to save before you ended\n"
+	.string "your challenge the last time.\p"
+	.string "As a result, your challenge has been\n"
+	.string "disqualified. It is most unfortunate.$"
+
+	.incbin "baserom.gba", 0x24e6c9, 0x1a
+
+BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3
+	.string "For a hardy fellow like me,\n"
+	.string "hardy POKéMON are the best.\p"
+	.string "Offense is the best defense!\n"
+	.string "A relentless attack is the ultimate!\p"
+	.string "But that’s not what I wanted to chat\n"
+	.string "about.\p"
+	.string "Every so often a really cute lady\n"
+	.string "swings by here.\p"
+	.string "She says that she can tell what\n"
+	.string "POKéMON are thinking.\p"
+	.string "I don’t know about that part,\n"
+	.string "but she is really cute.\p"
+	.string "Huh?\n"
+	.string "Why are you looking at me like that?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851
+	.string "Hmm…\p"
+	.string "It appears that the nature of POKéMON\n"
+	.string "and the moves that they have been\l"
+	.string "taught are the keys to battle here.\p"
+	.string "To be more precise, it’s how well\n"
+	.string "the moves match the nature of\l"
+	.string "the POKéMON.\p"
+	.string "If your POKéMON is in trouble and\n"
+	.string "unable to live up to its potential,\l"
+	.string "you may need to examine how well\l"
+	.string "its moves match its nature.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992
+	.string "My POKéMON is usually very docile.\p"
+	.string "But when it’s in a BATTLE HALL,\n"
+	.string "it sometimes seems to become\l"
+	.string "transformed into something wicked!\p"
+	.string "It becomes totally intimidating.\n"
+	.string "It’s shocking, even.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B
+	.string "I wonder what sort of nature a POKéMON\n"
+	.string "would have if it favored enfeebling its\l"
+	.string "opponents and chipping away slowly.\p"
+	.string "I’d be surprised if it was a LAX nature.\p"
+	.string "But, nah, that can’t be right.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06
+	.string "Where the hearts of TRAINERS\n"
+	.string "are put to the test.\p"
+	.string "I welcome you to the BATTLE PALACE.\p"
+	.string "I accept challenges to the DOUBLE\n"
+	.string "BATTLE HALLS.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C
+	.string "Do you wish to take\n"
+	.string "the DOUBLE BATTLE HALL challenge?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2
+	.string "In the BATTLE PALACE, there are\n"
+	.string "several auditoriums for DOUBLE BATTLES\l"
+	.string "that are named DOUBLE BATTLE HALLS.\p"
+	.string "The DOUBLE BATTLES are conducted in\n"
+	.string "the usual way, except with one crucial\l"
+	.string "rule that must be obeyed.\p"
+	.string "TRAINERS are permitted only to switch\n"
+	.string "their POKéMON in and out.\p"
+	.string "TRAINERS are otherwise forbidden to\n"
+	.string "command their POKéMON.\p"
+	.string "The POKéMON are to behave according\n"
+	.string "to their nature and battle on their own.\p"
+	.string "You must put your trust in your\n"
+	.string "POKéMON and watch over them.\p"
+	.string "If you achieve the honor of beating\n"
+	.string "seven TRAINERS in succession,\l"
+	.string "we will present you with Battle Points.\p"
+	.string "If you want to interrupt your\n"
+	.string "challenge, please save the game.\p"
+	.string "If you don’t save before interrupting,\n"
+	.string "you will be disqualified.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81
+	.string "To defeat the PALACE MAVEN\n"
+	.string "and seven TRAINERS in a row…$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9
+	.string "In honor of the bond you share with\n"
+	.string "your POKéMON, we present you with\l"
+	.string "these Battle Point(s).$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16
+	.string "Would you like to record your latest\n"
+	.string "BATTLE PALACE match on your\l"
+	.string "FRONTIER PASS?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66
+	.string "The BATTLE HALL rules are listed.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88
+VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88
+	.string "Which heading do you want to read?$"
+
+BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB
+VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB
+	.string "Here, POKéMON are required to think\n"
+	.string "and battle by themselves.\p"
+	.string "Unlike in the wild, POKéMON that live\n"
+	.string "with people behave differently\l"
+	.string "depending on their nature.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049
+VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049
+	.string "Depending on its nature, a POKéMON\n"
+	.string "may prefer to attack no matter what.\p"
+	.string "Another POKéMON may prefer to protect\n"
+	.string "itself from any harm.\p"
+	.string "Yet another may enjoy vexing or\n"
+	.string "confounding its foes.\p"
+	.string "Due to its nature, a POKéMON\n"
+	.string "will have favorite moves that it is good\l"
+	.string "at using.\p"
+	.string "It may also dislike certain moves that\n"
+	.string "it has trouble using.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190
+VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190
+	.string "There are offensive moves that inflict\n"
+	.string "direct damage on the foe.\p"
+	.string "There are defensive moves that are\n"
+	.string "used to prepare for enemy attacks or\l"
+	.string "used to heal HP and so on.\p"
+	.string "There are also other somewhat-odd\n"
+	.string "moves that may enfeeble the foes with\l"
+	.string "stat problems including poison and \l"
+	.string "paralysis.\p"
+	.string "POKéMON will consider using moves in\n"
+	.string "these three categories.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8
+VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8
+	.string "When not under command by its TRAINER,\n"
+	.string "a POKéMON may be unable to effectively\l"
+	.string "use certain moves.\p"
+	.string "A POKéMON is not good at using any\n"
+	.string "move that it dislikes.\p"
+	.string "If a POKéMON only knows moves that\n"
+	.string "do not match its nature, it will often\l"
+	.string "be unable to live up to its potential.$"
+
+BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4
+VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4
+	.string "Depending on its nature, a POKéMON may\n"
+	.string "start using moves that don’t match its\l"
+	.string "nature when it is in trouble.\p"
+	.string "If a POKéMON begins behaving oddly\n"
+	.string "in a pinch, watch it carefully.$"
+

data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc

@@ -124,3 +124,39 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
 	special sub_81A8E7C
 	return
 
+gUnknown_08252BE8:: @ 8252BE8
+	.incbin "baserom.gba", 0x252be8, 0x67
+
+gUnknown_08252C4F:: @ 8252C4F
+	trainerbattle 9, TRAINER_PHILLIP, 0, BattlePyramidSquare01_Text_252C8D, BattlePyramidSquare01_Text_252C8D
+	setvar VAR_0x8004, 10
+	special sub_81A8E7C
+	waitmessage
+	waitbuttonpress
+	closemessage
+	releaseall
+	end
+
+gUnknown_08252C6A:: @ 8252C6A
+	setvar VAR_0x8004, 7
+	special sub_81A8E7C
+	callstd 1
+	compare_var_to_value VAR_0x8007, 0
+	goto_eq BattlePyramidSquare01_EventScript_252C87
+	setvar VAR_0x8004, 8
+	special sub_81A8E7C
+
+BattlePyramidSquare01_EventScript_252C87:: @ 8252C87
+	end
+
+gUnknown_08252C88:: @ 8252C88
+	.incbin "baserom.gba", 0x252c88, 0x5
+
+BattlePyramidSquare01_Text_252C8D: @ 8252C8D
+	.string "This is a sample message.$"
+
+gUnknown_08252CA7:: @ 8252CA7
+	.incbin "baserom.gba", 0x252ca7, 0x54
+
+gUnknown_08252CFB:: @ 8252CFB
+	.incbin "baserom.gba", 0x252cfb, 0x23a6

data/maps/scripts/BattleFrontier_BattleTowerBattleRoom2.inc

@@ -531,3 +531,8 @@ BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
 	.string "The 7th set of opponents is next.\n"
 	.string "Do your best!$"
 
+gText_LinkStandby3:: @ 824978D
+	.string "Link standby…$"
+
+gUnknown_0824979B:: @ 824979B
+	.incbin "baserom.gba", 0x24979b, 0x47

data/maps/scripts/BattleFrontier_BattleTowerLobby.inc

@@ -1140,7 +1140,10 @@ SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-	.incbin "baserom.gba", 0x23f6a6, 0x51
+SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6
+	.string "Oh, your BAG appears to be full.\p"
+	.string "Please make room in your BAG, then come\n"
+	.string "see me.$"
 
 BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7
 	.string "Thank you for playing!\p"
@@ -1220,7 +1223,21 @@ BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26
 	.string "You’d best be certain that you’re up\n"
 	.string "to the challenge.$"
 
-	.incbin "baserom.gba", 0x23fbce, 0x139
+BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE
+	.string "Welcome to the BATTLE TOWER\n"
+	.string "DOUBLE BATTLE CORNER!\p"
+	.string "Unfortunately, the BATTLE ROOMS\n"
+	.string "are still under construction.\p"
+	.string "Please come back when the work\n"
+	.string "is completed.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B
+	.string "Welcome to the BATTLE TOWER\n"
+	.string "MULTI BATTLE CORNER!\p"
+	.string "Unfortunately, the BATTLE ROOMS\n"
+	.string "are still under construction.\p"
+	.string "Please come back when the work\n"
+	.string "is completed.$"
 
 BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07
 	.string "We look forward to seeing you on\n"
@@ -1231,7 +1248,9 @@ BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-	.incbin "baserom.gba", 0x23fd9a, 0x2d
+BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A
+	.string "Please select the POKéMON you wish\n"
+	.string "to enter.$"
 
 BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7
 	.string "Before entering a BATTLE ROOM, your\n"
@@ -1245,7 +1264,25 @@ BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C
 	.string "Shall I record your last BATTLE TOWER\n"
 	.string "match on your FRONTIER PASS?$"
 
-	.incbin "baserom.gba", 0x23fe7f, 0x1a8
+BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F
+	.string "Excuse me!\p"
+	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
+	.string "You must have {STR_VAR_2} different POKéMON\n"
+	.string "of Level 50 or less to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
+
+BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D
+	.string "Excuse me!\p"
+	.string "You don’t have {STR_VAR_2} eligible POKéMON.\p"
+	.string "You must have {STR_VAR_2} different POKéMON\n"
+	.string "to enter.\p"
+	.string "They also must be holding different\n"
+	.string "kinds of items.\p"
+	.string "EGGS{STR_VAR_1} ineligible.\p"
+	.string "Please come see me when you are ready.$"
 
 BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027
 	.string "Excuse me!\p"
@@ -1441,7 +1478,12 @@ BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E
 	.string "Now please select the two POKéMON\n"
 	.string "that are to be entered.$"
 
-	.incbin "baserom.gba", 0x241198, 0xa8
+BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198
+	.string "You have chosen the same kind of\n"
+	.string "POKéMON as your friend.\p"
+	.string "Please choose two POKéMON different\n"
+	.string "from your friend’s, match the level\l"
+	.string "you wish to enter, and register again.$"
 
 BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240
 	.string "The LINK MULTI BATTLE ROOM challenge\n"
@@ -1459,7 +1501,17 @@ BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8
 	.string "Your friend has chosen a different\n"
 	.string "battle level.$"
 
-	.incbin "baserom.gba", 0x241319, 0xc5
+BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319
+	.string "Your friend has chosen a different\n"
+	.string "battle level.\p"
+	.string "Your friend has also selected\n"
+	.string "the POKéMON {STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378
+	.string "Your friend has chosen a different\n"
+	.string "battle level.\p"
+	.string "Your friend has also selected the\n"
+	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
 
 BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE
 	.string "Please choose two POKéMON different\n"

data/maps/scripts/BattleFrontier_Lounge1.inc

@@ -241,7 +241,10 @@ BattleFrontier_Lounge1_Text_25EE37: @ 825EE37
 	.string "You should always be eager to learn\n"
 	.string "from the experiences of your elders!$"
 
-	.incbin "baserom.gba", 0x25eea6, 0x50
+BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6
+	.string "Yes, what is it now?\p"
+	.string "I have business that needs tending!\n"
+	.string "Save it for next time!$"
 
 BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6
 	.string "Ah, youngster! Do your POKéMON’s\n"

data/maps/scripts/BattleFrontier_Lounge2.inc

@@ -131,7 +131,10 @@ BattleFrontier_Lounge2_Text_260857: @ 8260857
 	.string "Howdy! Did you swing by to grill me\n"
 	.string "about the latest word? Oh, all right!$"
 
-	.incbin "baserom.gba", 0x2608a1, 0x51
+BattleFrontier_Lounge2_Text_2608A1: @ 82608A1
+	.string "Well? Well? Well?\p"
+	.string "I’m sure my information’s been\n"
+	.string "seriously useful to you, right?$"
 
 BattleFrontier_Lounge2_Text_2608F2: @ 82608F2
 	.string "Let’s see now…\p"
@@ -143,7 +146,214 @@ BattleFrontier_Lounge2_Text_260933: @ 8260933
 	.string "It sounds like BATTLE TOWER\n"
 	.string "{STR_VAR_1} is the hottest.$"
 
-	.incbin "baserom.gba", 0x260971, 0x132b
+BattleFrontier_Lounge2_Text_260971: @ 8260971
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this mysterious TRAINER called\n"
+	.string "the SALON MAIDEN that runs the place.$"
+
+BattleFrontier_Lounge2_Text_260A1E: @ 8260A1E
+	.string "Have you battled the SALON MAIDEN?\p"
+	.string "When she’s measuring up her opponent,\n"
+	.string "she apparently uses these POKéMON:\p"
+	.string "A PSYCHIC-type PSI POKéMON,\n"
+	.string "a FIRE-type VOLCANO POKéMON,\l"
+	.string "and a NORMAL-type SLEEPING POKéMON.$"
+
+BattleFrontier_Lounge2_Text_260AE7: @ 8260AE7
+	.string "Have you battled the SALON MAIDEN\n"
+	.string "when she’s serious?\p"
+	.string "When she’s battling flat out,\n"
+	.string "she apparently uses these POKéMON:\p"
+	.string "A DRAGON & PSYCHIC EON POKéMON,\n"
+	.string "an ELECTRIC-type THUNDER POKéMON,\l"
+	.string "and a NORMAL-type SLEEPING POKéMON.$"
+
+BattleFrontier_Lounge2_Text_260BC4: @ 8260BC4
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this flamboyant TRAINER called\n"
+	.string "the DOME ACE that runs the place.$"
+
+BattleFrontier_Lounge2_Text_260C6D: @ 8260C6D
+	.string "Have you battled the DOME ACE?\p"
+	.string "When he’s treating the opponent\n"
+	.string "lightly, he uses these three POKéMON:\p"
+	.string "A DRAGON & FLYING DRAGON POKéMON,\n"
+	.string "a WATER & GROUND MUD FISH POKéMON,\l"
+	.string "and a FIRE & FLYING FLAME POKéMON.$"
+
+BattleFrontier_Lounge2_Text_260D3A: @ 8260D3A
+	.string "Have you battled the DOME ACE\n"
+	.string "when he’s serious?\p"
+	.string "When he’s demonstrating his strategy,\n"
+	.string "he uses these three POKéMON:\p"
+	.string "A DRAGON & FLYING EON POKéMON,\n"
+	.string "a WATER & GROUND MUD FISH POKéMON,\l"
+	.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
+	.string "POKéMON.$"
+
+BattleFrontier_Lounge2_Text_260E1E: @ 8260E1E
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this freaky TRAINER called\n"
+	.string "the FACTORY HEAD that runs the place.$"
+
+BattleFrontier_Lounge2_Text_260EC7: @ 8260EC7
+	.string "Have you battled the FACTORY HEAD\n"
+	.string "already?\p"
+	.string "Let me think… When he goes to battle,\n"
+	.string "he just gets three rental POKéMON.\p"
+	.string "He battles under pretty much the same\n"
+	.string "conditions as you.$"
+
+BattleFrontier_Lounge2_Text_260F74: @ 8260F74
+	.string "Have you battled the FACTORY HEAD\n"
+	.string "when he’s serious?\p"
+	.string "When he goes seriously to battle,\n"
+	.string "he still gets three rental POKéMON.\p"
+	.string "He battles under virtually the same\n"
+	.string "conditions as you.$"
+
+BattleFrontier_Lounge2_Text_261026: @ 8261026
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this scary TRAINER called\n"
+	.string "the PIKE QUEEN that runs the place.$"
+
+BattleFrontier_Lounge2_Text_2610CC: @ 82610CC
+	.string "Have you battled the PIKE QUEEN\n"
+	.string "before?\p"
+	.string "When she’s in a good mood, they say\n"
+	.string "she uses these three POKéMON:\p"
+	.string "A POISON-type FANG SNAKE POKéMON,\n"
+	.string "a BUG & ROCK MOLD POKéMON,\l"
+	.string "and a WATER-type TENDER POKéMON.$"
+
+BattleFrontier_Lounge2_Text_261194: @ 8261194
+	.string "Have you battled the PIKE QUEEN\n"
+	.string "when she’s serious?\p"
+	.string "When she’s seriously annoyed, they say\n"
+	.string "she uses these three POKéMON:\p"
+	.string "A POISON-type FANG SNAKE POKéMON,\n"
+	.string "a STEEL & GROUND IRON SNAKE POKéMON,\l"
+	.string "and a WATER- & FLYING-type ATROCIOUS\l"
+	.string "POKéMON.$"
+
+BattleFrontier_Lounge2_Text_261282: @ 8261282
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this cute TRAINER called\n"
+	.string "the ARENA TYCOON that runs the place.$"
+
+BattleFrontier_Lounge2_Text_261329: @ 8261329
+	.string "Have you battled the ARENA TYCOON\n"
+	.string "before?\p"
+	.string "When she’s assessing the foe’s ability,\n"
+	.string "she supposedly uses these POKéMON:\p"
+	.string "A BUG & FIGHTING SINGLE HORN POKéMON,\n"
+	.string "a DARK-type MOONLIGHT POKéMON,\l"
+	.string "and a BUG & GHOST SHED POKéMON.$"
+
+BattleFrontier_Lounge2_Text_261403: @ 8261403
+	.string "Have you battled the ARENA TYCOON\n"
+	.string "when she’s serious?\p"
+	.string "When she battles for keeps,\n"
+	.string "she supposedly uses these POKéMON:\p"
+	.string "A DARK-type MOONLIGHT POKéMON,\n"
+	.string "a GHOST & POISON SHADOW POKéMON\l"
+	.string "and a GRASS- & FIGHTING-type\l"
+	.string "MUSHROOM POKéMON.$"
+
+BattleFrontier_Lounge2_Text_2614E6: @ 82614E6
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this sinister TRAINER called\n"
+	.string "the PALACE MAVEN that runs the place.$"
+
+BattleFrontier_Lounge2_Text_261591: @ 8261591
+	.string "Have you battled the PALACE MAVEN\n"
+	.string "before?\p"
+	.string "When he’s testing the opponent’s\n"
+	.string "spirit, he’s said to use these POKéMON:\p"
+	.string "A POISON & FLYING-type BAT POKéMON,\n"
+	.string "a NORMAL-type LAZY POKéMON, and a\l"
+	.string "WATER- & ICE-type TRANSPORT POKéMON.$"
+
+BattleFrontier_Lounge2_Text_26166F: @ 826166F
+	.string "Have you battled the PALACE MAVEN\n"
+	.string "when he’s serious?\p"
+	.string "When he throws his entire might into\n"
+	.string "battle, he’s said to use these POKéMON:\p"
+	.string "A FIRE-type LEGENDARY POKéMON,\n"
+	.string "a NORMAL-type LAZY POKéMON,\l"
+	.string "and a WATER-type AURORA POKéMON.$"
+
+BattleFrontier_Lounge2_Text_26174D: @ 826174D
+	.string "Bet you didn’t know this!\p"
+	.string "One of those top TRAINERS that SCOTT\n"
+	.string "calls the FRONTIER BRAINS is there.\p"
+	.string "It’s this fiery-hot TRAINER called\n"
+	.string "the PYRAMID KING that runs the place.$"
+
+BattleFrontier_Lounge2_Text_2617F9: @ 82617F9
+	.string "Have you battled the PYRAMID KING\n"
+	.string "before?\p"
+	.string "When he’s checking the foe’s power,\n"
+	.string "he apparently uses these POKéMON:\p"
+	.string "A ROCK-type ROCK PEAK POKéMON,\n"
+	.string "an ICE-type ICEBERG POKéMON,\l"
+	.string "and a STEEL-type IRON POKéMON.$"
+
+BattleFrontier_Lounge2_Text_2618C4: @ 82618C4
+	.string "Have you battled the PYRAMID KING\n"
+	.string "when he’s serious?\p"
+	.string "When he’s pumped with hot power,\n"
+	.string "he apparently uses these POKéMON:\p"
+	.string "An ICE & FLYING FREEZE POKéMON, an\n"
+	.string "ELECTRIC & FLYING ELECTRIC POKéMON,\l"
+	.string "and a FIRE- & FLYING-type FLAME\l"
+	.string "POKéMON.$"
+
+BattleFrontier_Lounge2_Text_2619AC: @ 82619AC
+	.string "Sure, there are several places where\n"
+	.string "you can enter DOUBLE BATTLES.\p"
+	.string "But the DOUBLE BATTLE ROOMS of\n"
+	.string "the BATTLE TOWER are, like, basic!\p"
+	.string "They’re where you should learn about\n"
+	.string "how DOUBLE BATTLES are played here\l"
+	.string "in the BATTLE FRONTIER.$"
+
+BattleFrontier_Lounge2_Text_261A91: @ 8261A91
+	.string "Watch yourself in the battles here.\p"
+	.string "I hear there are TRAINERS that have\n"
+	.string "strategies they developed just for\l"
+	.string "DOUBLE BATTLES.$"
+
+BattleFrontier_Lounge2_Text_261B0C: @ 8261B0C
+	.string "Once you’re confident and comfortable\n"
+	.string "with DOUBLE BATTLES here, you should\l"
+	.string "think about challenging other places\l"
+	.string "offering DOUBLE BATTLES.$"
+
+BattleFrontier_Lounge2_Text_261B95: @ 8261B95
+	.string "All sorts of TRAINERS gather in\n"
+	.string "the BATTLE SALON.\p"
+	.string "Just think--you may run into your\n"
+	.string "friends or followers!\l"
+	.string "You should look carefully!$"
+
+BattleFrontier_Lounge2_Text_261C1A: @ 8261C1A
+	.string "If you’re with a friend, head for the\n"
+	.string "LINK MULTI BATTLE ROOM.\p"
+	.string "If you play with a strong friend,\n"
+	.string "you can expect to see tough foes!$"
 
 BattleFrontier_Lounge2_Text_261C9C: @ 8261C9C
 	.string "What amazing news-gathering power!\n"

data/maps/scripts/BattleFrontier_Lounge3.inc

@@ -236,7 +236,89 @@ BattleFrontier_Lounge3_Text_262061: @ 8262061
 	.string "Sounds simple, huh?\n"
 	.string "So, anyway…$"
 
-	.incbin "baserom.gba", 0x262261, 0x7ff
+BattleFrontier_Lounge3_Text_262261: @ 8262261
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be challenging the BATTLE\l"
+	.string "TOWER’s SINGLE BATTLE ROOMS.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_26230D: @ 826230D
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be challenging the BATTLE\l"
+	.string "TOWER’s DOUBLE BATTLE ROOMS.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_2623B9: @ 82623B9
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be challenging the BATTLE\l"
+	.string "TOWER’s MULTI BATTLE ROOMS.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_262464: @ 8262464
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "DOME’s SINGLE BATTLE Tourney.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_26250E: @ 826250E
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "DOME’s DOUBLE BATTLE Tourney.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_2625B8: @ 82625B8
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "FACTORY’s Battle Swap Single Tourney.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_26266A: @ 826266A
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "FACTORY’s Battle Swap Double Tourney.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_26271C: @ 826271C
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be challenging the BATTLE\l"
+	.string "PALACE’s SINGLE BATTLE HALLS.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_2627C9: @ 82627C9
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be challenging the BATTLE\l"
+	.string "PALACE’s DOUBLE BATTLE HALLS.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_262876: @ 8262876
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "ARENA’s Set KO Tourney.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_26291A: @ 826291A
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE PIKE’s\l"
+	.string "Battle Choice.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
+
+BattleFrontier_Lounge3_Text_2629BC: @ 82629BC
+	.string "What I’m looking for is a TRAINER who’s\n"
+	.string "going to be entering the BATTLE\l"
+	.string "PYRAMID’s Battle Quest.\p"
+	.string "But so far, I haven’t seen a TRAINER\n"
+	.string "that has that winning quality.$"
 
 BattleFrontier_Lounge3_Text_262A60: @ 8262A60
 	.string "I’ll see to it that you benefit, too.\n"
@@ -264,7 +346,89 @@ BattleFrontier_Lounge3_Text_262BE0: @ 8262BE0
 	.string "Heheh! Thanks much!\n"
 	.string "So, off you go!$"
 
-	.incbin "baserom.gba", 0x262c04, 0x694
+BattleFrontier_Lounge3_Text_262C04: @ 8262C04
+	.string "Get to the BATTLE TOWER’s\n"
+	.string "SINGLE BATTLE ROOMS pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262C90: @ 8262C90
+	.string "Get to the BATTLE TOWER’s\n"
+	.string "DOUBLE BATTLE ROOMS pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262D1C: @ 8262D1C
+	.string "Get to the BATTLE TOWER’s\n"
+	.string "MULTI BATTLE ROOMS pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262DA7: @ 8262DA7
+	.string "Get to the BATTLE DOME’s\n"
+	.string "SINGLE BATTLE Tourney pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262E34: @ 8262E34
+	.string "Get to the BATTLE DOME’s\n"
+	.string "DOUBLE BATTLE Tourney pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262EC1: @ 8262EC1
+	.string "Get to the BATTLE FACTORY’s\n"
+	.string "Battle Swap Single Tourney pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262F56: @ 8262F56
+	.string "Get to the BATTLE FACTORY’s\n"
+	.string "Battle Swap Double Tourney pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_262FEB: @ 8262FEB
+	.string "Get to the BATTLE PALACE’s\n"
+	.string "SINGLE BATTLE HALLS pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_263078: @ 8263078
+	.string "Get to the BATTLE PALACE’s\n"
+	.string "DOUBLE BATTLE HALLS pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_263105: @ 8263105
+	.string "Get to the BATTLE ARENA’s\n"
+	.string "Set KO Tourney pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_26318C: @ 826318C
+	.string "Get to the BATTLE PIKE’s\n"
+	.string "Battle Choice pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
+
+BattleFrontier_Lounge3_Text_263211: @ 8263211
+	.string "Get to the BATTLE PYRAMID’s\n"
+	.string "Battle Quest pronto!\p"
+	.string "It’s a must-win situation!\n"
+	.string "Don’t blow your chance!\l"
+	.string "Both of our futures depend on you!$"
 
 BattleFrontier_Lounge3_Text_263298: @ 8263298
 	.string "Oh, it’s you…\n"

data/maps/scripts/BattleFrontier_Lounge5.inc

@@ -54,7 +54,137 @@ BattleFrontier_Lounge5_Text_26467F: @ 826467F
 	.string "Boo!\n"
 	.string "Cheapie!$"
 
-	.incbin "baserom.gba", 0x26468d, 0x861
+BattleFrontier_Lounge5_Text_26468D: @ 826468D
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "It will battle even if it has a lot\l"
+	.string "of ouchies!$"
+
+BattleFrontier_Lounge5_Text_2646E5: @ 82646E5
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will hit back!$"
+
+BattleFrontier_Lounge5_Text_264741: @ 8264741
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will worry about itself!$"
+
+BattleFrontier_Lounge5_Text_2647A4: @ 82647A4
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "It will battle even if it has a lot\l"
+	.string "of ouchies!$"
+
+BattleFrontier_Lounge5_Text_2647FC: @ 82647FC
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will hit back!$"
+
+BattleFrontier_Lounge5_Text_264858: @ 8264858
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will worry about itself!$"
+
+BattleFrontier_Lounge5_Text_2648BE: @ 82648BE
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "It will battle even if it has a lot\l"
+	.string "of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264916: @ 8264916
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will hit back!$"
+
+BattleFrontier_Lounge5_Text_264972: @ 8264972
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will worry about itself!$"
+
+BattleFrontier_Lounge5_Text_2649D5: @ 82649D5
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "It says it likes to be sneaky even\l"
+	.string "if it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264A3F: @ 8264A3F
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will turn sneaky!$"
+
+BattleFrontier_Lounge5_Text_264A9B: @ 8264A9B
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "It will battle even if it has a lot\l"
+	.string "of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264AF3: @ 8264AF3
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "It says it likes to be sneaky even\l"
+	.string "if it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264B5D: @ 8264B5D
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will worry about itself!$"
+
+BattleFrontier_Lounge5_Text_264BC3: @ 8264BC3
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "It says it worries about itself whether\l"
+	.string "or not it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264C36: @ 8264C36
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will turn sneaky!$"
+
+BattleFrontier_Lounge5_Text_264C95: @ 8264C95
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "It says it worries about itself even\l"
+	.string "if it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264D01: @ 8264D01
+	.string "Hmhm…\p"
+	.string "This one says it likes to be sneaky!\n"
+	.string "It says it likes to be sneaky even\l"
+	.string "if it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264D6B: @ 8264D6B
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "It says it worries about itself even\l"
+	.string "if it has a lot of ouchies!$"
+
+BattleFrontier_Lounge5_Text_264DD7: @ 8264DD7
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will hit back!$"
+
+BattleFrontier_Lounge5_Text_264E33: @ 8264E33
+	.string "Hmhm…\p"
+	.string "This one says it likes to battle!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will turn sneaky!$"
+
+BattleFrontier_Lounge5_Text_264E8F: @ 8264E8F
+	.string "Hmhm…\p"
+	.string "This one says it looks after itself!\n"
+	.string "But if it gets enough ouchies,\l"
+	.string "it will turn sneaky!$"
 
 BattleFrontier_Lounge5_Text_264EEE: @ 8264EEE
 	.string "That’s silly! An EGG is asleep!\n"

data/maps/scripts/BattleFrontier_Lounge7.inc

@@ -380,5 +380,103 @@ BattleFrontier_Lounge7_Text_265D17: @ 8265D17
 	.string "but feel this…\p"
 	.string "Time is so cruel…$"
 
-	.incbin "baserom.gba", 0x265e30, 0x3aa
+BattleFrontier_Lounge7_Text_265E30: @ 8265E30
+	.string "Recovers up to\n"
+	.string "half the user’s\n"
+	.string "maximum HP.$"
+
+BattleFrontier_Lounge7_Text_265E5B: @ 8265E5B
+	.string "Inflicts damage\n"
+	.string "identical to the\n"
+	.string "user’s level.$"
+
+BattleFrontier_Lounge7_Text_265E8A: @ 8265E8A
+	.string "Recovers half the\n"
+	.string "damage inflicted\n"
+	.string "on a sleeping foe.$"
+
+BattleFrontier_Lounge7_Text_265EC0: @ 8265EC0
+	.string "A strong punch\n"
+	.string "thrown with\n"
+	.string "incredible power.$"
+
+BattleFrontier_Lounge7_Text_265EED: @ 8265EED
+	.string "An extremely\n"
+	.string "powerful kick with\n"
+	.string "intense force.$"
+
+BattleFrontier_Lounge7_Text_265F1C: @ 8265F1C
+	.string "A full-body slam\n"
+	.string "that may cause\n"
+	.string "paralysis.$"
+
+BattleFrontier_Lounge7_Text_265F47: @ 8265F47
+	.string "Large boulders\n"
+	.string "are hurled. May\n"
+	.string "cause flinching.$"
+
+BattleFrontier_Lounge7_Text_265F77: @ 8265F77
+	.string "Retaliates any\n"
+	.string "physical hit with\n"
+	.string "double the power.$"
+
+BattleFrontier_Lounge7_Text_265FAA: @ 8265FAA
+	.string "A weak jolt of\n"
+	.string "electricity that\n"
+	.string "paralyzes the foe.$"
+
+BattleFrontier_Lounge7_Text_265FDD: @ 8265FDD
+	.string "A fighting dance\n"
+	.string "that sharply\n"
+	.string "raises ATTACK.$"
+
+BattleFrontier_Lounge7_Text_26600A: @ 826600A
+	.string "Curls up to con-\n"
+	.string "ceal weak spots\n"
+	.string "and raise DEFENSE.$"
+
+BattleFrontier_Lounge7_Text_26603E: @ 826603E
+	.string "A loud attack\n"
+	.string "that can be used\n"
+	.string "only while asleep.$"
+
+BattleFrontier_Lounge7_Text_266070: @ 8266070
+	.string "Hurls mud in the\n"
+	.string "foe’s face to re-\n"
+	.string "duce its accuracy.$"
+
+BattleFrontier_Lounge7_Text_2660A6: @ 82660A6
+	.string "Sprays star-\n"
+	.string "shaped rays\n"
+	.string "that never miss.$"
+
+BattleFrontier_Lounge7_Text_2660D0: @ 82660D0
+	.string "A chilling attack\n"
+	.string "that lowers the\n"
+	.string "foe’s SPEED.$"
+
+BattleFrontier_Lounge7_Text_2660FF: @ 82660FF
+	.string "Endures any at-\n"
+	.string "tack for 1 turn,\n"
+	.string "leaving 1HP.$"
+
+BattleFrontier_Lounge7_Text_26612D: @ 826612D
+	.string "Copies the foe’s\n"
+	.string "effect(s) and\n"
+	.string "gives to the user.$"
+
+BattleFrontier_Lounge7_Text_26615F: @ 826615F
+	.string "An icy punch\n"
+	.string "that may\n"
+	.string "freeze the foe.$"
+
+BattleFrontier_Lounge7_Text_266185: @ 8266185
+	.string "An electrified\n"
+	.string "punch that may\n"
+	.string "paralyze the foe.$"
+
+BattleFrontier_Lounge7_Text_2661B5: @ 82661B5
+	.string "A fiery punch\n"
+	.string "that may burn\n"
+	.string "the foe.$"
 

data/maps/scripts/BattleFrontier_Mart.inc

@@ -11,8 +11,7 @@ BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC
 	release
 	end
 
-	.incbin "baserom.gba", 0x267ae3, 0x1
-
+	.align 2
 BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION

data/maps/scripts/BattleFrontier_OutsideEast.inc

@@ -114,3 +114,298 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
 	release
 	end
 
+gUnknown_08242CFC:: @ 8242CFC
+	.incbin "baserom.gba", 0x242cfc, 0x6d
+
+BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
+	step_03
+	step_13
+	step_00
+	step_13
+	step_02
+	step_13
+	step_00
+	step_13
+	step_03
+	step_13
+	step_00
+	step_13
+	step_02
+	step_13
+	step_00
+	step_end
+
+BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
+	msgbox BattleFrontier_OutsideEast_Text_243598, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82
+	msgbox BattleFrontier_OutsideEast_Text_243668, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B
+	msgbox BattleFrontier_OutsideEast_Text_2436F2, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94
+	msgbox BattleFrontier_OutsideEast_Text_243809, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D
+	msgbox BattleFrontier_OutsideEast_Text_243895, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6
+	msgbox BattleFrontier_OutsideEast_Text_243943, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF
+	msgbox BattleFrontier_OutsideEast_Text_2439A0, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_243A2B, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_243A53, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE
+	msgbox BattleFrontier_OutsideEast_Text_242F0D, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7
+	msgbox BattleFrontier_OutsideEast_Text_242F4A, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
+	msgbox BattleFrontier_OutsideEast_Text_243B68, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
+	lock
+	faceplayer
+	checkflag FLAG_0x1C6
+	goto_eq BattleFrontier_OutsideEast_EventScript_242DFE
+	msgbox BattleFrontier_OutsideEast_Text_243C2C, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE
+	msgbox BattleFrontier_OutsideEast_Text_243CA3, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08
+	msgbox BattleFrontier_OutsideEast_Text_243D0B, 2
+	end
+
+BattleFrontier_OutsideEast_Text_242E11: @ 8242E11
+	.string "This is the BATTLE TOWER!\n"
+	.string "Keep the win streak as the toughest\l"
+	.string "TRAINER!$"
+
+BattleFrontier_OutsideEast_Text_242E58: @ 8242E58
+	.string "This is the BATTLE PALACE!\n"
+	.string "Keep your eyes on POKéMON battles!$"
+
+BattleFrontier_OutsideEast_Text_242E96: @ 8242E96
+	.string "This is the BATTLE ARENA!\n"
+	.string "Let the toughest teams gather!$"
+
+BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF
+	.string "This is the BATTLE PYRAMID!\n"
+	.string "Advance through the Battle Quest!$"
+
+BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D
+	.string "BATTLE FRONTIER RANKING HALL\n"
+	.string "Set your sights on new records!$"
+
+BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A
+	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
+	.string "Exchange your Battle Points!$"
+
+BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C
+	.string "Wow!\n"
+	.string "It’s huge!\p"
+	.string "The BATTLE TOWER feels special.\n"
+	.string "It’s different from the others.$"
+
+BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
+	.string "My grand ambition is to conquer both\n"
+	.string "the BATTLE FRONTIER and the POKéMON\l"
+	.string "LEAGUE.\p"
+	.string "And if my dream comes true…\p"
+	.string "I… I’m going to ask MIMI next door\n"
+	.string "if she will be friends with me!$"
+
+BattleFrontier_OutsideEast_Text_24308C: @ 824308C
+	.string "The BATTLE PYRAMID’s too harsh!\n"
+	.string "I just can’t make it to the top!\p"
+	.string "Since I’m out of options, maybe I can\n"
+	.string "climb the outside…$"
+
+BattleFrontier_OutsideEast_Text_243106: @ 8243106
+	.string "I thrive in darkness…\n"
+	.string "Yes… What is worthy of me?\l"
+	.string "None other than the BATTLE PYRAMID…\p"
+	.string "What say you to wandering in darkness\n"
+	.string "and in utter and total desperation?$"
+
+BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5
+	.string "I didn’t sleep for a week, but then\n"
+	.string "I put together the ultimate team!\p"
+	.string "I can’t see myself losing, no joke.\n"
+	.string "We’re storming the BATTLE ARENA!$"
+
+BattleFrontier_OutsideEast_Text_243230: @ 8243230
+	.string "Did SCOTT bring you here, too?\n"
+	.string "What is it with that guy?\p"
+	.string "It sounds like he really does know\n"
+	.string "how to spot talented TRAINERS, but…\p"
+	.string "I’ve never seen him battling in person\n"
+	.string "ever.$"
+
+BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD
+	.string "ZIGG!\n"
+	.string "I believe in you, little buddy!\p"
+	.string "I’ll make my little ZIGG any favorite\n"
+	.string "tasty treats you like if you win!$"
+
+BattleFrontier_OutsideEast_Text_24334B: @ 824334B
+	.string "ZIGZAGOON looks vacant…$"
+
+BattleFrontier_OutsideEast_Text_243363: @ 8243363
+	.string "People call me a busybody,\n"
+	.string "but I can’t help it.\p"
+	.string "Your hat’s on crooked!\n"
+	.string "Oh, no, trash on the ground!\l"
+	.string "Oops, it’s almost dinnertime!\p"
+	.string "I don’t know if I can stand to just\n"
+	.string "watch at the BATTLE PALACE…$"
+
+BattleFrontier_OutsideEast_Text_243425: @ 8243425
+	.string "I may not look that impressive now,\n"
+	.string "but I once beat a GYM LEADER.\p"
+	.string "Who knows, maybe I should give it\n"
+	.string "another shot at glory.$"
+
+BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0
+	.string "I’m fast on my BIKE, and that goes for\n"
+	.string "the way I battle, too.\p"
+	.string "I win matches in the blink of\n"
+	.string "an eye!$"
+
+BattleFrontier_OutsideEast_Text_243504: @ 8243504
+	.string "I’m better than my daddy\n"
+	.string "at POKéMON.$"
+
+BattleFrontier_OutsideEast_Text_243529: @ 8243529
+	.string "Go on, my baby sweetie!\n"
+	.string "Go rack up some wins for Daddy!\p"
+	.string "You’re just like your mother,\n"
+	.string "so you’ll be dominating!$"
+
+BattleFrontier_OutsideEast_Text_243598: @ 8243598
+	.string "It wasn’t easy getting here,\n"
+	.string "but I’d heard about this knockout\l"
+	.string "pretty girl at the BATTLE ARENA.\p"
+	.string "Instead of her, do you know what\n"
+	.string "I found?\p"
+	.string "A whole teeming mob of sweaty,\n"
+	.string "stinky, and primitive martial artists!$"
+
+BattleFrontier_OutsideEast_Text_243668: @ 8243668
+	.string "I sometimes see this really important-\n"
+	.string "looking old man going in there.\p"
+	.string "He has these really awesome POKéMON.\n"
+	.string "He seems really nice, though.$"
+
+BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
+	.string "Do you know it?\n"
+	.string "The legend of the BATTLE PYRAMID?\p"
+	.string "When there comes a confident TRAINER\n"
+	.string "reaching for the golden pinnacle,\l"
+	.string "there shall appear a man among men.\p"
+	.string "Don’t know that legend?\n"
+	.string "Well, of course not!\l"
+	.string "I just made it up!\p"
+	.string "What’s it supposed to mean?\n"
+	.string "That, my friend, I can’t say!$"
+
+BattleFrontier_OutsideEast_Text_243809: @ 8243809
+	.string "Man! Oh man!\n"
+	.string "I’ve never lost once before!\p"
+	.string "But I got wiped out with no saving\n"
+	.string "grace at all!\p"
+	.string "And then I’m told I don’t have any\n"
+	.string "talent?! Man!$"
+
+BattleFrontier_OutsideEast_Text_243895: @ 8243895
+	.string "This guy ran into a horribly tough\n"
+	.string "TRAINER while he was on the BATTLE\l"
+	.string "TOWER challenge.\p"
+	.string "Now look at him…\p"
+	.string "You need to be cautious if you ever\n"
+	.string "decide to go to the BATTLE TOWER.$"
+
+BattleFrontier_OutsideEast_Text_243943: @ 8243943
+	.string "Yes!\n"
+	.string "I’ve finally got enough Battle Points!\p"
+	.string "I guess I’ll trade for another giant\n"
+	.string "plush DOLL!$"
+
+BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0
+	.string "Oh, yeah, okay!\n"
+	.string "So this is the RANKING HALL!\p"
+	.string "I’d like to go down in history as\n"
+	.string "a super champ and have my name\l"
+	.string "recorded here for posterity.$"
+
+BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B
+	.string "With you by my side, I can do anything.$"
+
+BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
+	.string "Ooh, darling, you are so wonderful!\p"
+	.string "Ooh, I just can’t wait anymore!\p"
+	.string "Let’s go to a MULTI BATTLE ROOM\n"
+	.string "right this instant!\p"
+	.string "If we get together in the BATTLE SALON,\n"
+	.string "the power of our love will overcome\l"
+	.string "everyone we meet.\p"
+	.string "Why, before us, darling, everything\n"
+	.string "will topple like dominoes!$"
+
+BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
+	.string "The BATTLE FRONTIER isn’t exclusively\n"
+	.string "for tough TRAINERS.\p"
+	.string "Many people with special abilities\n"
+	.string "have been invited, it seems.\p"
+	.string "That man SCOTT…\p"
+	.string "He may have built this place to serve\n"
+	.string "a bigger objective…$"
+
+BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C
+	.string "Excuse me, young one.\n"
+	.string "Have you good eyesight?\p"
+	.string "There is an odd tree past here, and to\n"
+	.string "my tired eyes it seems to wiggle.$"
+
+BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3
+	.string "Excuse me, young one.\n"
+	.string "Have you a good memory?\p"
+	.string "I have this feeling there once was\n"
+	.string "an odd tree past here.$"
+
+BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B
+	.string "I…\n"
+	.string "I saw it!\p"
+	.string "There was a sticky sort of a POKéMON\n"
+	.string "with a long tail up ahead!\p"
+	.string "It was hiding under a boulder, and\n"
+	.string "it kept staring at me!$"

data/maps/scripts/BattleFrontier_OutsideWest.inc

@@ -88,7 +88,13 @@ BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4
 	msgbox BattleFrontier_OutsideWest_Text_23D772, 3
 	end
 
-	.incbin "baserom.gba", 0x23d4fd, 0x12
+BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2
+	end
+
+BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2
+	end
 
 BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F
 	msgbox BattleFrontier_OutsideWest_Text_23D99C, 2
@@ -239,7 +245,9 @@ BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667
 	msgbox BattleFrontier_OutsideWest_Text_23DE15, 2
 	end
 
-	.incbin "baserom.gba", 0x23d670, 0x9
+BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670
+	msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2
+	end
 
 BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679
 	msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2
@@ -311,7 +319,10 @@ BattleFrontier_OutsideWest_Text_23D772: @ 823D772
 	.string "This is the BATTLE PIKE!\n"
 	.string "Choose one of three paths!$"
 
-	.incbin "baserom.gba", 0x23d7a6, 0x62
+BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6
+	.string "This is the BATTLE TOWER.\p"
+	.string "TRAINERS bring their best-raised\n"
+	.string "POKéMON for elimination-style matches.$"
 
 BattleFrontier_OutsideWest_Text_23D808: @ 823D808
 	.string "Hello, are you here for the ferry?\n"
@@ -349,7 +360,11 @@ BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C
 	.string "But here…\l"
 	.string "I’ve been useless!$"
 
-	.incbin "baserom.gba", 0x23d9dd, 0x83
+BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD
+	.string "I want to go to the BATTLE TOWER,\n"
+	.string "but I can’t find it even though I have\l"
+	.string "a map of the BATTLE FRONTIER.\p"
+	.string "This place is just too big!$"
 
 BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60
 	.string "I wanted to take a challenge as soon\n"
@@ -424,7 +439,10 @@ BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD
 	.string "Let us both win our way up and meet\l"
 	.string "in challenges.$"
 
-	.incbin "baserom.gba", 0x23df7d, 0x42
+BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D
+	.string "Grandpa, over here!\n"
+	.string "The BATTLE DOME is here!\l"
+	.string "Go get ’em, Grandpa!$"
 
 BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF
 	.string "Ah, so this here is the BATTLE DOME?\n"

data/maps/scripts/BattleFrontier_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
 	map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x267ab9, 0x12
+BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/BattleFrontier_ReceptionGate.inc

@@ -77,7 +77,10 @@ BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
 	step_28
 	step_end
 
-	.incbin "baserom.gba", 0x2662dd, 0x3
+BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
+	step_down
+	step_down
+	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
 	step_down

data/maps/scripts/DesertUnderpass.inc

@@ -28,5 +28,9 @@ DesertUnderpass_EventScript_23AF68:: @ 823AF68
 	release
 	end
 
-	.incbin "baserom.gba", 0x23af79, 0x34
+DesertUnderpass_Text_23AF79:: @ 823AF79
+	.string "{PLAYER} found the ROOT FOSSIL.$"
+
+DesertUnderpass_Text_23AF93:: @ 823AF93
+	.string "{PLAYER} found the CLAW FOSSIL.$"
 

data/maps/scripts/DewfordTown.inc

@@ -658,3 +658,148 @@ DewfordTown_Text_1E9A7F: @ 81E9A7F
 	.string "DEWFORD HALL\n"
 	.string "“Everyone’s information exchange!”$"
 
+Route104_Text_1E9AAF: @ 81E9AAF
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve hit land in DEWFORD.\p"
+	.string "I suppose you’re off to deliver that\n"
+	.string "LETTER to, who was it now, STEVEN!$"
+
+DewfordTown_Text_1E9B24: @ 81E9B24
+	.string "MR. BRINEY: Have you delivered your\n"
+	.string "LETTER?\p"
+	.string "Or were you meaning to sail back to\n"
+	.string "PETALBURG?$"
+
+DewfordTown_Text_1E9B7F: @ 81E9B7F
+	.string "MR. BRINEY: PETALBURG it is, then!\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9BD9: @ 81E9BD9
+	.string "MR. BRINEY: Then you go on and deliver\n"
+	.string "the LETTER. I’ll be waiting.$"
+
+Route104_Text_1E9C1D: @ 81E9C1D
+Route109_Text_1E9C1D: @ 81E9C1D
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve hit land in DEWFORD!\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail again!$"
+
+DewfordTown_Text_1E9C8A: @ 81E9C8A
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "For you, I’ll go out to sea anytime!\p"
+	.string "Now, my friend, where are we bound?$"
+
+DewfordTown_Text_1E9CE5: @ 81E9CE5
+	.string "MR. BRINEY: PETALBURG, is it?\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9D3A: @ 81E9D3A
+	.string "MR. BRINEY: SLATEPORT, is it?\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+DewfordTown_Text_1E9D8F: @ 81E9D8F
+	.string "MR. BRINEY: You just tell me whenever\n"
+	.string "you need to set sail again!$"
+
+DewfordTown_Text_1E9DD1: @ 81E9DD1
+	.string "This is a renowned fishing spot.\n"
+	.string "Are you getting the itch to fish?$"
+
+DewfordTown_Text_1E9E14: @ 81E9E14
+	.string "I hear you, and I like what\n"
+	.string "you’re saying!\p"
+	.string "I’ll give you one of my fishing RODS.$"
+
+DewfordTown_Text_1E9E65: @ 81E9E65
+	.string "And, as an added bonus, I’ll even throw\n"
+	.string "in a little fishing advice!\p"
+	.string "First, you want to face the water,\n"
+	.string "then use the ROD.\p"
+	.string "Focus your mind…\n"
+	.string "If you get a bite, pull on the ROD.\p"
+	.string "Sometimes you can snag something\n"
+	.string "immediately, but with bigger catches,\l"
+	.string "you need to time the pulls on your ROD\l"
+	.string "to haul them in.$"
+
+DewfordTown_Text_1E9F92: @ 81E9F92
+	.string "Oh, is that so?\n"
+	.string "That’s too bad, then.$"
+
+DewfordTown_Text_1E9FB8: @ 81E9FB8
+	.string "Yo!\n"
+	.string "How’s your fishing?$"
+
+DewfordTown_Text_1E9FD0: @ 81E9FD0
+	.string "Is that right! That’s great!\n"
+	.string "Haul in some big ones!$"
+
+DewfordTown_Text_1EA004: @ 81EA004
+	.string "Oh, hey, don’t get down on yourself!\n"
+	.string "I’ll give you a little fishing advice.\p"
+	.string "First, you want to face the water,\n"
+	.string "then use the ROD.\p"
+	.string "Focus your mind…\n"
+	.string "If you get a bite, pull the ROD.\p"
+	.string "Sometimes you can snag something\n"
+	.string "immediately, but with bigger catches,\l"
+	.string "you need to time the pulls on your ROD\l"
+	.string "to haul them in.$"
+
+DewfordTown_Text_1EA136: @ 81EA136
+	.string "I like what’s hip, happening, and trendy.\n"
+	.string "I’m always checking it out.\p"
+	.string "Listen, have you heard about this new\n"
+	.string "“{STR_VAR_1}”?\p"
+	.string "That’s right!\n"
+	.string "Of course you know!\p"
+	.string "I mean, sheesh,\n"
+	.string "“{STR_VAR_1}”…\l"
+	.string "It’s the hottest thing in cool!\p"
+	.string "Wherever you’re from,\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "is the biggest happening thing, right?$"
+
+DewfordTown_Text_1EA242: @ 81EA242
+	.string "Hunh?\n"
+	.string "It’s not the hip and happening thing?\p"
+	.string "Well, hey, you have to tell me,\n"
+	.string "what’s new and what’s “in”?$"
+
+DewfordTown_Text_1EA2AA: @ 81EA2AA
+	.string "Hunh?\n"
+	.string "“{STR_VAR_2}”?\p"
+	.string "… …\p"
+	.string "…Uh… Yeah! That’s right!\n"
+	.string "Yeah, I knew that! Knew it all along!\p"
+	.string "Of course I know about that!\n"
+	.string "“{STR_VAR_2},” right?\p"
+	.string "Yeah, that’s it, it’s there!\n"
+	.string "Isn’t “{STR_VAR_2}”\l"
+	.string "the coolest, or what?\p"
+	.string "It’s the hippest thing in hip.\n"
+	.string "You think I’d not know about it?\p"
+	.string "“{STR_VAR_1}”…\n"
+	.string "It’s, like, so five minutes ago.\p"
+	.string "Now, “{STR_VAR_2}” is\n"
+	.string "what’s vital and in tune with the times!$"
+
+DewfordTown_Text_1EA3FE: @ 81EA3FE
+	.string "Hmm…\n"
+	.string "“{STR_VAR_2},” huh?\p"
+	.string "But personally, I think\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "is what’s real in cool.$"
+
+DewfordTown_Text_1EA443: @ 81EA443
+	.string "Well, if you hear of any happening new\n"
+	.string "trends, come share them with me, okay?$"
+
+DewfordTown_Text_1EA491: @ 81EA491
+	.string "Yeah, absolutely right!\p"
+	.string "“{STR_VAR_1}” is the\n"
+	.string "definition of “in” right now.$"

data/maps/scripts/DewfordTown_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
 	map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x1fc62a, 0x12
+DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/EverGrandeCity_ChampionsRoom.inc

@@ -29,8 +29,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
 	waitmovement 0
 	setvar VAR_0x4001, 1
 	goto EverGrandeCity_ChampionsRoom_EventScript_228A45
-
-	.incbin "baserom.gba", 0x228a40, 0x2
+    releaseall
+    end
 
 EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
 	step_up

data/maps/scripts/EverGrandeCity_DrakesRoom.inc

@@ -4,7 +4,13 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
 	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E
 	.byte 0
 
-	.incbin "baserom.gba", 0x2286ac, 0xf
+EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
+	map_script_2 VAR_0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
+	turnobject 255, 2
+	end
 
 EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
 	map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5

data/maps/scripts/EverGrandeCity_PokemonCenter_2F.inc

@@ -5,5 +5,16 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
 	map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x229cf5, 0x12
+EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
+
 

data/maps/scripts/EverGrandeCity_PokemonLeague_1F.inc

@@ -33,8 +33,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
 	release
 	end
 
-	.incbin "baserom.gba", 0x229621, 0x3
-
+	.align 2
 EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION

data/maps/scripts/EverGrandeCity_PokemonLeague_2F.inc

@@ -5,5 +5,15 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
 	map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x229d1c, 0x12
+EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/FallarborTown_BattleTentBattleRoom.inc

@@ -225,7 +225,9 @@ FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
 	step_27
 	step_end
 
-	.incbin "baserom.gba", 0x200b9c, 0x2
+FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
+	step_left
+	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
 	step_up

data/maps/scripts/FallarborTown_BattleTentCorridor.inc

@@ -40,5 +40,25 @@ FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
 	step_54
 	step_end
 
-	.incbin "baserom.gba", 0x200704, 0x195
+FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
+	.string "We do all right in the preliminary round,\n"
+	.string "but we can never win the appeals…\p"
+	.string "Maybe it means I have to watch what\n"
+	.string "other contestants are doing…$"
+
+FallarborTown_BattleTentCorridor_Text_200791: @ 8200791
+	.string "See!\n"
+	.string "My POKéMON won all these RIBBONS!\p"
+	.string "Have your POKéMON earned any RIBBONS?\n"
+	.string "You can check them on your POKéNAV.$"
+
+FallarborTown_BattleTentCorridor_Text_200802: @ 8200802
+	.string "I can’t beat GYM LEADERS…\p"
+	.string "I can’t win any CONTESTS…\p"
+	.string "I’ve been here, there, and everywhere,\n"
+	.string "and it’s all for naught…$"
+
+FallarborTown_BattleTentCorridor_Text_200876: @ 8200876
+	.string "POKéMON CONTESTS\n"
+	.string "SUPER RANK STAGE!$"
 

data/maps/scripts/FallarborTown_Mart.inc

@@ -11,8 +11,7 @@ FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF
 	release
 	end
 
-	.incbin "baserom.gba", 0x1ffcd6, 0x2
-
+	.align 2
 FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION

data/maps/scripts/FallarborTown_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
 	map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x200f00, 0x12
+FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/FarawayIsland_Interior.inc

@@ -192,3 +192,5 @@ FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
 	waitmovement 0
 	return
 
+gUnknown_08267EDB:: @ 8267EDB
+	.incbin "baserom.gba", 0x267edb, 0x3a

data/maps/scripts/FortreeCity_DecorationShop.inc

@@ -19,8 +19,7 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
 	release
 	end
 
-	.incbin "baserom.gba", 0x218037, 0x1
-
+    .align 2
 FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038
 	.2byte 1
 	.2byte 2
@@ -44,8 +43,7 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
 	release
 	end
 
-	.incbin "baserom.gba", 0x218063, 0x1
-
+	.align 2
 FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064
 	.2byte 10
 	.2byte 11

data/maps/scripts/FortreeCity_Mart.inc

@@ -11,8 +11,7 @@ FortreeCity_Mart_EventScript_217666:: @ 8217666
 	release
 	end
 
-	.incbin "baserom.gba", 0x21767d, 0x3
-
+	.align 2
 FortreeCity_Mart_Pokemart_217680: @ 8217680
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL

data/maps/scripts/FortreeCity_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
 	map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x217653, 0x12
+FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/IslandCave.inc

@@ -41,3 +41,80 @@ IslandCave_EventScript_238EAB:: @ 8238EAB
 	clearflag FLAG_0x3A8
 	return
 
+gUnknown_08238EAF:: @ 8238EAF
+	.incbin "baserom.gba", 0x238eaf, 0x40
+
+IslandCave_EventScript_238EEF:: @ 8238EEF
+	lockall
+	checkflag FLAG_0x003
+	call_if 1, IslandCave_EventScript_238F45
+	checkflag FLAG_SYS_BRAILLE_WAIT
+	goto_eq IslandCave_EventScript_238F13
+	braillemessage IslandCave_Braille_2A6CD4
+	setflag FLAG_0x002
+	special ShouldDoBrailleRegicePuzzle
+	goto IslandCave_EventScript_238F41
+	end
+
+IslandCave_EventScript_238F13:: @ 8238F13
+	msgbox gUnknown_0827304E, 4
+	releaseall
+	end
+
+IslandCave_EventScript_238F1D:: @ 8238F1D
+	lockall
+	checkflag FLAG_0x003
+	call_if 1, IslandCave_EventScript_238F45
+	braillemessage IslandCave_Braille_2A6CD4
+	checkflag FLAG_SYS_BRAILLE_WAIT
+	goto_eq IslandCave_EventScript_238F41
+	setflag FLAG_0x002
+	special ShouldDoBrailleRegicePuzzle
+	goto IslandCave_EventScript_238F41
+	end
+
+IslandCave_EventScript_238F41:: @ 8238F41
+	waitbuttonpress
+	hidebox2
+	releaseall
+	end
+
+IslandCave_EventScript_238F45:: @ 8238F45
+	setvar VAR_0x403B, 0
+	setvar VAR_0x403C, 0
+	setvar VAR_0x403D, 0
+	clearflag FLAG_0x003
+	return
+
+IslandCave_EventScript_238F58:: @ 8238F58
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_REGICE, 2
+	delay 40
+	waitmoncry
+	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special sub_80B0A74
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq IslandCave_EventScript_238F9F
+	compare_var_to_value VAR_RESULT, 4
+	goto_eq IslandCave_EventScript_238FA8
+	compare_var_to_value VAR_RESULT, 5
+	goto_eq IslandCave_EventScript_238FA8
+	setflag FLAG_0x1BC
+	release
+	end
+
+IslandCave_EventScript_238F9F:: @ 8238F9F
+	setflag FLAG_0x1BC
+	goto IslandCave_EventScript_27376D
+	end
+
+IslandCave_EventScript_238FA8:: @ 8238FA8
+	setvar VAR_0x8004, 402
+	goto IslandCave_EventScript_273776
+	end

data/maps/scripts/LavaridgeTown_Gym_1F.inc

@@ -244,3 +244,181 @@ LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1
 	.string "If you spend too much time buried in\n"
 	.string "hot sand, it tuckers you out…$"
 
+LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31
+	.string "You must be getting tired by now.\n"
+	.string "You’d like to rest in the hot sand,\l"
+	.string "wouldn’t you?\p"
+	.string "But you should know that maintaining\n"
+	.string "your willpower is an important ability\l"
+	.string "for all TRAINERS.$"
+
+LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3
+	.string "Play with fire, and be burned…$"
+
+LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02
+	.string "Your skill is real…\n"
+	.string "But our LEADER FLANNERY is strong.\p"
+	.string "If you don’t watch yourself, you’ll be\n"
+	.string "burned seriously.$"
+
+LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72
+	.string "Can your POKéMON withstand\n"
+	.string "392-degree heat?$"
+
+LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E
+	.string "It didn’t burn hotly enough…$"
+
+LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB
+	.string "The temperature of magma is\n"
+	.string "392 degrees.\p"
+	.string "Your POKéMON beat me, so they should\n"
+	.string "easily survive in magma.$"
+
+LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22
+	.string "Um…\n"
+	.string "Okay, I’ll battle with you.$"
+
+LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42
+	.string "Oh, but you’re too strong.$"
+
+LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D
+	.string "I’m going to be a pretty and strong\n"
+	.string "TRAINER just like FLANNERY.$"
+
+LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D
+	.string "Come on, get with it!\n"
+	.string "Let’s go before my feelings cool!$"
+
+LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5
+	.string "It’s so hot, and yet my heart is\n"
+	.string "clutched by ice…$"
+
+LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07
+	.string "The way the battling spirit burns\n"
+	.string "within you, you may stand a chance\l"
+	.string "against our LEADER.$"
+
+LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60
+	.string "See how the flames blaze wildly?\n"
+	.string "They flare in anticipation of my win!$"
+
+LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7
+	.string "Something didn’t go right.$"
+
+LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2
+	.string "Well, so what? I say so what?\n"
+	.string "I can walk on hot coals barefoot!\p"
+	.string "…Don’t even think about trying it!$"
+
+LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025
+	.string "As much as I love mountains,\n"
+	.string "I especially love volcanoes.$"
+
+LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F
+	.string "Well, it seems to me I lost without\n"
+	.string "ever being in control.$"
+
+LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A
+	.string "I stay here because I became a fan\n"
+	.string "of FLANNERY’s power.\p"
+	.string "Hehehehe.$"
+
+LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC
+	.string "Welcome… No, wait.\p"
+	.string "Puny TRAINER, how good to see you’ve\n"
+	.string "made it here!\p"
+	.string "I have been entrusted with the…\n"
+	.string "No, wait.\p"
+	.string "I am FLANNERY, and I’m the GYM\n"
+	.string "LEADER here!\p"
+	.string "Uh…\n"
+	.string "Dare not underestimate me, though\l"
+	.string "I have been LEADER only a short time!\p"
+	.string "With skills inherited from my grand-\n"
+	.string "father, I shall, uh…demonstrate the\l"
+	.string "hot moves we have honed on this land!$"
+
+LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233
+	.string "Oh…\n"
+	.string "I guess I was trying too hard…\p"
+	.string "I… I’ve only recently become\n"
+	.string "a GYM LEADER.\p"
+	.string "I tried too hard to be someone\n"
+	.string "I’m not.\p"
+	.string "I have to do things my natural way. If\n"
+	.string "I don’t, my POKéMON will be confused.\p"
+	.string "Thanks for teaching me that.\n"
+	.string "For that, you deserve this.$"
+
+LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F
+	.string "{PLAYER} received the HEAT BADGE\n"
+	.string "from FLANNERY.$"
+
+LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359
+	.string "If you have a HEAT BADGE, all POKéMON\n"
+	.string "up to Level 50, even those you get in\l"
+	.string "trades from other people, will obey\l"
+	.string "you completely.\p"
+	.string "And, it lets POKéMON use the HM move\n"
+	.string "STRENGTH outside of battle.\p"
+	.string "This is a token of my appreciation.\n"
+	.string "Don’t be shy about taking it!$"
+
+LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C
+	.string "That TM50 contains OVERHEAT.\p"
+	.string "That move inflicts serious damage on\n"
+	.string "the opponent.\p"
+	.string "But it also sharply cuts the SP. ATK\n"
+	.string "of the POKéMON using it. It might not\l"
+	.string "be suitable for longer battles.$"
+
+LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517
+	.string "Registered GYM LEADER FLANNERY\n"
+	.string "in the POKéNAV.$"
+
+LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546
+	.string "Your power reminds me of someone…\p"
+	.string "Oh! I know! You battle like NORMAN,\n"
+	.string "the GYM LEADER of PETALBURG.$"
+
+LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9
+	.string "LAVARIDGE TOWN POKéMON GYM$"
+
+LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4
+	.string "LAVARIDGE TOWN POKéMON GYM\p"
+	.string "FLANNERY’S CERTIFIED TRAINERS:\n"
+	.string "{PLAYER}$"
+
+LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601
+	.string "FLANNERY: Losing a battle isn’t going\n"
+	.string "to deflate me.\p"
+	.string "I love POKéMON.\n"
+	.string "I love to battle.\l"
+	.string "And… I love this GYM!\p"
+	.string "Let’s exchange superhot moves\n"
+	.string "in another battle!$"
+
+LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F
+	.string "Whew!\n"
+	.string "On the verge of eruption!$"
+
+LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF
+	.string "FLANNERY: I lost the match,\n"
+	.string "but I’m completely satisfied.\p"
+	.string "It’s not often I get to enjoy a battle\n"
+	.string "this heated.\p"
+	.string "Let’s have another one like this\n"
+	.string "again sometime!$"
+
+LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E
+	.string "FLANNERY: Losing a battle isn’t going\n"
+	.string "to deflate me.\p"
+	.string "I love POKéMON.\n"
+	.string "I love to battle.\l"
+	.string "And… I love this GYM!\p"
+	.string "Let’s exchange superhot moves\n"
+	.string "in another battle!\p"
+	.string "Oh, wait. Do you only have one POKéMON\n"
+	.string "that can battle?\p"
+	.string "I hate to say this, but when you come\n"
+	.string "see me, bring at least two POKéMON.$"

data/maps/scripts/LavaridgeTown_HerbShop.inc

@@ -11,8 +11,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7
 	release
 	end
 
-	.incbin "baserom.gba", 0x1fe4ee, 0x2
-
+	.align 2
 LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0
 	.2byte ITEM_ENERGY_POWDER
 	.2byte ITEM_ENERGY_ROOT

data/maps/scripts/LavaridgeTown_Mart.inc

@@ -11,8 +11,7 @@ LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE
 	release
 	end
 
-	.incbin "baserom.gba", 0x1ff9e5, 0x3
-
+	.align 2
 LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION

data/maps/scripts/LavaridgeTown_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
 	map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x1ffcac, 0x12
+LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.inc

@@ -28,8 +28,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
 	release
 	end
 
-	.incbin "baserom.gba", 0x220246, 0x2
-
+	.align 2
 LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
 	.2byte 39
 	.2byte 35

data/maps/scripts/LilycoveCity_DepartmentStore_1F.inc

@@ -178,5 +178,16 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A
 	.string "5F: POKé DOLL FLOOR\p"
 	.string "ROOFTOP: ROOFTOP PLAZA$"
 
-	.incbin "baserom.gba", 0x21fa13, 0x119
+LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13
+	.string "Wireless Communication is a\n"
+	.string "lot of fun, isn’t it?\p"
+	.string "I think it lets you do things that\n"
+	.string "weren’t possible before.\p"
+	.string "For instance, you can now trade\n"
+	.string "with people you couldn’t before.\p"
+	.string "I think it’s going to be exciting!$"
+
+LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5
+	.string "I want to spread the word about how\n"
+	.string "fun Wireless Communication can be.$"
 

data/maps/scripts/LilycoveCity_DepartmentStore_2F.inc

@@ -23,8 +23,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fb5f, 0x1
-
+	.align 2
 LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
@@ -51,8 +50,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fb91, 0x3
-
+	.align 2
 LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION

data/maps/scripts/LilycoveCity_DepartmentStore_3F.inc

@@ -32,8 +32,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fca3, 0x1
-
+	.align 2
 LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_SPECIAL

data/maps/scripts/LilycoveCity_DepartmentStore_4F.inc

@@ -23,8 +23,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fe1d, 0x3
-
+	.align 2
 LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20
 	.2byte ITEM_TM38
 	.2byte ITEM_TM25
@@ -44,8 +43,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fe43, 0x1
-
+	.align 2
 LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44
 	.2byte ITEM_TM17
 	.2byte ITEM_TM20

data/maps/scripts/LilycoveCity_DepartmentStore_5F.inc

@@ -23,8 +23,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
 	release
 	end
 
-	.incbin "baserom.gba", 0x21ffbd, 0x3
-
+	.align 2
 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_X_SPEED
@@ -52,8 +51,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
 	release
 	end
 
-	.incbin "baserom.gba", 0x21fff3, 0x1
-
+	.align 2
 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4
 	.2byte 101
 	.2byte 102
@@ -78,8 +76,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
 	release
 	end
 
-	.incbin "baserom.gba", 0x220021, 0x3
-
+	.align 2
 LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024
 	.2byte ITEM_CARBOS
 	.2byte ITEM_CALCIUM
@@ -104,8 +101,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
 	release
 	end
 
-	.incbin "baserom.gba", 0x220051, 0x3
-
+	.align 2
 LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054
 	.2byte 59
 	.2byte 60

data/maps/scripts/LilycoveCity_Harbor.inc

@@ -389,7 +389,31 @@ LilycoveCity_Harbor_EventScript_21E557:: @ 821E557
 	goto LilycoveCity_Harbor_EventScript_21E09F
 	end
 
-	.incbin "baserom.gba", 0x21e56b, 0x55
+LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B
+	msgbox LilycoveCity_Harbor_Text_21E792, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
+	msgbox LilycoveCity_Harbor_Text_21E864, 5
+	compare_var_to_value VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	setvar VAR_PORTHOLE, 5
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D
+	msgbox LilycoveCity_Harbor_Text_21E880, 5
+	compare_var_to_value VAR_RESULT, 0
+	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
+	call LilycoveCity_Harbor_EventScript_21E5CC
+	warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
+	waitstate
+	release
+	end
 
 LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
 	message LilycoveCity_Harbor_Text_21E8CC
@@ -438,7 +462,9 @@ LilycoveCity_Harbor_Movement_21E633: @ 821E633
 	step_up
 	step_end
 
-	.incbin "baserom.gba", 0x21e635, 0x2
+LilycoveCity_Harbor_Movement_21E635: @ 821E635
+	step_up
+	step_end
 
 LilycoveCity_Harbor_EventScript_21E637:: @ 821E637
 	lock
@@ -561,7 +587,12 @@ LilycoveCity_Harbor_Text_21E758: @ 821E758
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-	.incbin "baserom.gba", 0x21e792, 0x5b
+
+LilycoveCity_Harbor_Text_21E792: @ 821E792
+	.string "{PLAYER} doesn’t have the TICKET…\p"
+	.string "I’m terribly sorry.\p"
+	.string "You must have a TICKET to board\n"
+	.string "the ferry.$"
 
 LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED
 	.string "{PLAYER} flashed the TICKET.\p"

data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.inc

@@ -242,7 +242,9 @@ LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311
 	.string "small characters of an ancient,\l"
 	.string "unreadable language.$"
 
-	.incbin "baserom.gba", 0x21938c, 0x28
+LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C
+	.string "Hmmm…\n"
+	.string "What works of great magnificence…$"
 
 LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4
 	.string "Battling with POKéMON is fun,\n"

data/maps/scripts/LilycoveCity_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
 	map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x21c772, 0x12
+LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/LittlerootTown_BrendansHouse_1F.inc

@@ -314,3 +314,126 @@ LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24
 	.string "very own room?$"
 
 LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67
+LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67
+	.string "MOM: {PLAYER}.\p"
+	.string "Go set the clock in your room, honey.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96
+	.string "MOM: Oh! {PLAYER}, {PLAYER}!\n"
+	.string "Quick! Come quickly!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC
+LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC
+	.string "MOM: Look! It’s PETALBURG GYM!\n"
+	.string "Maybe DAD will be on!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1
+LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1
+	.string "MOM: Oh… It’s over.\p"
+	.string "I think DAD was on, but we missed him.\n"
+	.string "Too bad.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35
+LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35
+	.string "Oh, yes.\n"
+	.string "One of DAD’s friends lives in town.\p"
+	.string "PROF. BIRCH is his name.\p"
+	.string "He lives right next door, so you should\n"
+	.string "go over and introduce yourself.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3
+	.string "MOM: See you, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8
+	.string "MOM: Did you introduce yourself to\n"
+	.string "PROF. BIRCH?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08
+	.string "MOM: How are you doing, {PLAYER}?\n"
+	.string "You look a little tired.\p"
+	.string "I think you should rest a bit.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C
+	.string "MOM: Take care, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73
+	.string "MOM: Oh? Did DAD give you that BADGE?\p"
+	.string "Then here’s something from your MOM!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE
+	.string "Don’t push yourself too hard, dear.\n"
+	.string "You can always come home.\p"
+	.string "Go for it, honey!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E
+	.string "MOM: What is that, honey? A POKéNAV?\n"
+	.string "Someone from DEVON gave it to you?\p"
+	.string "Well, honey, how about registering\n"
+	.string "your mom?\p"
+	.string "… … …$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89
+	.string "Registered MOM\n"
+	.string "in the POKéNAV.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8
+	.string "Fugiiiiih!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3
+	.string "Huggoh, uggo uggo…$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6
+	.string "INTERVIEWER: …We brought you this\n"
+	.string "report from in front of PETALBURG GYM.$"
+
+	.incbin "baserom.gba", 0x1f7f0f, 0xff
+
+LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E
+	.string "DAD: Hm?\p"
+	.string "Hey, it’s {PLAYER}!\p"
+	.string "It’s been a while since I saw you,\n"
+	.string "but you look…stronger, somehow.\p"
+	.string "That’s the impression I get.\n"
+	.string "But your old man hasn’t given up yet!\p"
+	.string "Oh, yes, I have something for you.\n"
+	.string "This came to you from someone named\l"
+	.string "MR. BRINEY.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE
+	.string "DAD: Hm, a TICKET for a ferry?\p"
+	.string "If I recall, there are ferry ports in\n"
+	.string "SLATEPORT and LILYCOVE.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B
+	.string "I’d better get back to PETALBURG GYM.\p"
+	.string "MOM, thanks for looking after the house\n"
+	.string "while I’m away.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9
+	.string "MOM: That DAD of yours…\p"
+	.string "He comes home for the first time in a\n"
+	.string "while, but all he talks about is POKéMON.\p"
+	.string "He should relax and stay a little longer.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B
+	.string "MOM: Is that a breaking news story?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F
+	.string "We bring you this emergency\n"
+	.string "news flash!\p"
+	.string "In various HOENN locales, there have\n"
+	.string "been reports of a BZZT…colored\l"
+	.string "POKéMON in flight.\p"
+	.string "The identity of this POKéMON is\n"
+	.string "currently unknown.\p"
+	.string "We now return you to the regular\n"
+	.string "movie program.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351
+	.string "MOM: {PLAYER}, did you catch that?\p"
+	.string "What color did the announcer say\n"
+	.string "that POKéMON was?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1
+	.string "MOM: Well, isn’t that something!\n"
+	.string "There are still unknown POKéMON.$"

data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc

@@ -239,5 +239,74 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604
 	step_26
 	step_end
 
-	.incbin "baserom.gba", 0x1f8609, 0x4
+LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
+	step_14
+	step_14
+	step_27
+	step_end
 
+gUnknown_081F860D:: @ 81F860D
+	lockall
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
+	setvar VAR_0x8004, 1
+	special sp0D9_ComputerRelated
+	playse SE_PC_ON
+	msgbox gUnknown_08272D87, 4
+	special sub_816AE58
+	waitstate
+	releaseall
+	end
+
+gUnknown_081F863F:: @ 81F863F
+	.incbin "baserom.gba", 0x1f863f, 0xd
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C
+	msgbox gUnknown_08272CD5, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656
+LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F
+LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3
+	end
+
+LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668
+	.string "The clock is stopped…\p"
+	.string "Better set it and start it!$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A
+	.string "MOM: {PLAYER}, how do you like your\n"
+	.string "new room?\p"
+	.string "Good! Everything’s put away neatly!\p"
+	.string "They finished moving everything in\n"
+	.string "downstairs, too.\p"
+	.string "POKéMON movers are so convenient!\p"
+	.string "Oh, you should make sure that\n"
+	.string "everything’s all there on your desk.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
+	.string "{PLAYER} flipped open the notebook.\p"
+	.string "ADVENTURE RULE NO. 1\n"
+	.string "Open the MENU with START.\p"
+	.string "ADVENTURE RULE NO. 2\n"
+	.string "Record your progress with SAVE.\p"
+	.string "The remaining pages are blank…$"
+
+	.incbin "baserom.gba", 0x1f8820, 0x2f
+
+LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F
+	.string "It’s a Nintendo GameCube.\p"
+	.string "A Game Boy Advance is connected to\n"
+	.string "serve as the Controller.$"

data/maps/scripts/LittlerootTown_MaysHouse_1F.inc

@@ -333,3 +333,91 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
 	step_up
 	step_end
 
+LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5
+LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5
+	.string "Oh, hello. And you are?\p"
+	.string "… … … … … … … … …\n"
+	.string "… … … … … … … … …\p"
+	.string "Oh, you’re {PLAYER}{KUN}, our new next-door\n"
+	.string "neighbor! Hi!\p"
+	.string "We have a {STR_VAR_1} about the same\n"
+	.string "age as you.\p"
+	.string "Our {STR_VAR_1} was excited about making\n"
+	.string "a new friend.\p"
+	.string "Our {STR_VAR_1} is upstairs, I think.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5
+	.string "Like child, like father.\p"
+	.string "My husband is as wild about POKéMON\n"
+	.string "as our child.\p"
+	.string "If he’s not at his LAB, he’s likely\n"
+	.string "scrabbling about in grassy places.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37
+	.string "That {RIVAL}!\p"
+	.string "I guess our child is too busy with\n"
+	.string "POKéMON to notice that you came\l"
+	.string "to visit, {PLAYER}{KUN}.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93
+	.string "Oh, {RIVAL} went out to ROUTE 103\n"
+	.string "just a little while ago.\p"
+	.string "Like father, like child.\n"
+	.string "{RIVAL} can’t stay quietly at home.$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01
+	.string "I think it’s wonderful for people to\n"
+	.string "travel with POKéMON.\p"
+	.string "But you should go home every so often\n"
+	.string "to let your mother know you’re okay.\p"
+	.string "She might not say it, but I’m sure she\n"
+	.string "worries about you, {PLAYER}{KUN}.$"
+
+LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6
+	.string "Huh?\n"
+	.string "Who… Who are you?\p"
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "Oh, you’re {PLAYER}{KUN}.\n"
+	.string "So your move was today.\p"
+	.string "Um… I’m MAY.\n"
+	.string "Glad to meet you!\p"
+	.string "I…\n"
+	.string "I have this dream of becoming friends\l"
+	.string "with POKéMON all over the world.\p"
+	.string "I… I heard about you, {PLAYER}{KUN}, from\n"
+	.string "my dad, PROF. BIRCH.\p"
+	.string "I was hoping that you would be nice,\n"
+	.string "{PLAYER}{KUN}, and that we could be friends.\p"
+	.string "Oh, this is silly, isn’t it?\n"
+	.string "I… I’ve just met you, {PLAYER}{KUN}.\p"
+	.string "Eheheh…\p"
+	.string "Oh, no! I forgot!\p"
+	.string "I was supposed to go help Dad catch\n"
+	.string "some wild POKéMON!\p"
+	.string "{PLAYER}{KUN}, I’ll catch you later!$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4
+	.string "Hey!\n"
+	.string "You…\p"
+	.string "Who are you?\p"
+	.string "Oh, you’re {PLAYER}, aren’t you?\n"
+	.string "Moved in next door, right?\p"
+	.string "I didn’t know that you’re a girl.\p"
+	.string "Dad, PROF. BIRCH, said that our new\n"
+	.string "next-door neighbor is a GYM LEADER’s\l"
+	.string "kid, so I assumed you’d be a guy.\p"
+	.string "My name’s BRENDAN.\n"
+	.string "So, hi, neighbor!\p"
+	.string "Huh? Hey, {PLAYER}, don’t you have\n"
+	.string "a POKéMON?\p"
+	.string "Do you want me to go catch you one?\p"
+	.string "Aw, darn, I forgot…\p"
+	.string "I’m supposed to go help my dad catch\n"
+	.string "some wild POKéMON.\p"
+	.string "Some other time, okay?$"
+
+LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262
+	.string "Hi, neighbor!\p"
+	.string "Do you already have your\n"
+	.string "own POKéMON?$"

data/maps/scripts/LittlerootTown_MaysHouse_2F.inc

@@ -215,7 +215,11 @@ LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4
 	step_26
 	step_end
 
-	.incbin "baserom.gba", 0x1f94a9, 0x4
+LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9
+	step_14
+	step_14
+	step_28
+	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD
 	step_right
@@ -297,3 +301,119 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4
 	return
 
+gUnknown_081F9553:: @ 81F9553
+	lockall
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
+	msgbox gUnknown_08272CD5, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
+	setvar VAR_0x8004, 2
+	special sp0D9_ComputerRelated
+	playse SE_PC_ON
+	msgbox gUnknown_08272D87, 4
+	special sub_816AE58
+	waitstate
+	releaseall
+	end
+
+gUnknown_081F958F:: @ 81F958F
+
+	.incbin "baserom.gba", 0x1f958f, 0xd
+
+LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C
+	.string "Huh?\n"
+	.string "Who… Who are you?\p"
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "Oh, you’re {PLAYER}{KUN}.\n"
+	.string "So your move was today.\p"
+	.string "Um… I’m MAY.\n"
+	.string "Glad to meet you!\p"
+	.string "I…\n"
+	.string "I have this dream of becoming friends\l"
+	.string "with POKéMON all over the world.\p"
+	.string "I… I heard about you, {PLAYER}{KUN}, from\n"
+	.string "my dad, PROF. BIRCH.\p"
+	.string "I was hoping that you would be nice,\n"
+	.string "{PLAYER}{KUN}, and that we could be friends.\p"
+	.string "Oh, this is silly, isn’t it?\n"
+	.string "I… I’ve just met you, {PLAYER}{KUN}.\p"
+	.string "Eheheh…\p"
+	.string "Oh, no! I forgot!\p"
+	.string "I was supposed to go help Dad catch\n"
+	.string "some wild POKéMON!\p"
+	.string "{PLAYER}{KUN}, I’ll catch you later!$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A
+	.string "POKéMON fully restored!\n"
+	.string "Items ready, and…$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4
+	.string "Hey!\n"
+	.string "You…\p"
+	.string "Who are you?\p"
+	.string "Oh, you’re {PLAYER}, aren’t you?\n"
+	.string "Moved in next door, right?\p"
+	.string "I didn’t know that you’re a girl.\p"
+	.string "Dad, PROF. BIRCH, said that our new\n"
+	.string "next-door neighbor is a GYM LEADER’s\l"
+	.string "kid, so I assumed you’d be a guy.\p"
+	.string "My name’s BRENDAN.\n"
+	.string "So, hi, neighbor!\p"
+	.string "Huh? Hey, {PLAYER}, don’t you have\n"
+	.string "a POKéMON?\p"
+	.string "Do you want me to go catch you one?\p"
+	.string "Aw, darn, I forgot…\p"
+	.string "I’m supposed to go help my dad catch\n"
+	.string "some wild POKéMON.\p"
+	.string "Some other time, okay?$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962
+	.string "POKéMON fully restored…\n"
+	.string "Items all packed, and…$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991
+LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991
+	.string "It’s {RIVAL}’s POKé BALL!\p"
+	.string "Better leave it right where it is.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9
+	.string "MAY: {PLAYER}{KUN}!\p"
+	.string "I was just checking my POKéDEX.\p"
+	.string "There’s still a lot of POKéMON that\n"
+	.string "I’ve seen but haven’t caught.\p"
+	.string "And there are many others that\n"
+	.string "I think will evolve.\p"
+	.string "I wonder where I should go catch\n"
+	.string "some POKéMON next?$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E
+	.string "MAY: I wonder where I should go catch\n"
+	.string "some POKéMON next?\p"
+	.string "Wouldn’t it be funny if we ran into each\n"
+	.string "other, {PLAYER}{KUN}?$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D
+	.string "BRENDAN: Hey, it’s {PLAYER}.\p"
+	.string "I was just checking out my POKéDEX.\p"
+	.string "There are still many POKéMON that\n"
+	.string "I need to catch, I know, but this\l"
+	.string "is looking pretty good.\p"
+	.string "Checking this POKéDEX out gives me\n"
+	.string "the urge to hit the road again.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7
+	.string "BRENDAN: I’m having a hard time deciding\n"
+	.string "where I should catch POKéMON next.\p"
+	.string "Hey, {PLAYER}, if I see you while I’m out\n"
+	.string "catching POKéMON, I can pitch you a\l"
+	.string "battle if you’d like.$"

data/maps/scripts/LittlerootTown_ProfessorBirchsLab.inc

@@ -687,3 +687,318 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3
 	end
 
+gUnknown_081FA4D6:: @ 81FA4D6
+	.incbin "baserom.gba", 0x1fa4d6, 0xc
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2
+	.string "Hunh? PROF. BIRCH?\p"
+	.string "The PROF’s away on fieldwork.\n"
+	.string "Ergo, he isn’t here.\p"
+	.string "Oh, let me explain what fieldwork is.\p"
+	.string "It is to study things in the natural\n"
+	.string "environment, like fields and mountains,\l"
+	.string "instead of a laboratory.\p"
+	.string "The PROF isn’t one for doing desk work.\n"
+	.string "He’s the type of person who would\l"
+	.string "rather go outside and experience\l"
+	.string "things than read about them here.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641
+	.string "The PROF isn’t one for doing desk work.\n"
+	.string "He’s the type of person who would\l"
+	.string "rather go outside and experience\l"
+	.string "things than read about them here.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE
+	.string "PROF. BIRCH is studying the habitats\n"
+	.string "and distribution of POKéMON.\p"
+	.string "The PROF enjoys {RIVAL}’s help, too.\n"
+	.string "There’s a lot of love there.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D
+	.string "PROF. BIRCH: So, {PLAYER}{KUN}.\p"
+	.string "I’ve heard so much about you from\n"
+	.string "your father.\p"
+	.string "I’ve heard that you don’t have your\n"
+	.string "own POKéMON yet.\p"
+	.string "But the way you battled earlier,\n"
+	.string "you pulled it off with aplomb!\p"
+	.string "I guess you have your father’s blood\n"
+	.string "in your veins after all!\p"
+	.string "Oh, yes. As thanks for rescuing me,\n"
+	.string "I’d like you to have the POKéMON you\l"
+	.string "used earlier.\p"
+	.string "{PLAYER} received the {STR_VAR_1}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1
+	.string "PROF. BIRCH: While you’re at it, why not\n"
+	.string "give a nickname to that {STR_VAR_1}?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6
+	.string "PROF. BIRCH: If you work at POKéMON\n"
+	.string "and gain experience, I think you’ll make\l"
+	.string "an extremely good TRAINER.\p"
+	.string "My kid, {RIVAL}, is also studying\n"
+	.string "POKéMON while helping me out.\p"
+	.string "{PLAYER}{KUN}, don’t you think it might be\n"
+	.string "a good idea to go see {RIVAL}?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5
+	.string "PROF. BIRCH: Great!\n"
+	.string "{RIVAL} should be happy, too.\p"
+	.string "Get {RIVAL} to teach you what it\n"
+	.string "means to be a TRAINER.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35
+	.string "PROF. BIRCH: Oh, don’t be that way.\n"
+	.string "You should go meet my kid.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74
+	.string "PROF. BIRCH: {RIVAL}?\n"
+	.string "Gone home, I think.\p"
+	.string "Or maybe that kid’s scrabbling around\n"
+	.string "in tall grass again somewhere…\p"
+	.string "If you or your POKéMON get tired,\n"
+	.string "you should get some rest at home.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22
+	.string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p"
+	.string "I heard you beat {RIVAL} on\n"
+	.string "your first try. That’s excellent!\p"
+	.string "{RIVAL}’s been helping with my research\n"
+	.string "for a long time.\p"
+	.string "{RIVAL} has an extensive history as\n"
+	.string "a TRAINER already.\p"
+	.string "Here, {PLAYER}{KUN}, I ordered this for my\n"
+	.string "research, but I think you should have\l"
+	.string "this POKéDEX.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32
+	.string "{PLAYER} received the POKéDEX!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B
+	.string "PROF. BIRCH: The POKéDEX is a high-tech\n"
+	.string "tool that automatically makes a record\l"
+	.string "of any POKéMON you meet or catch.\p"
+	.string "My kid, {RIVAL}, goes everywhere\n"
+	.string "with it.\p"
+	.string "Whenever my kid catches a rare POKéMON\n"
+	.string "and records its data in the POKéDEX,\l"
+	.string "why, {RIVAL} looks for me while I’m out\l"
+	.string "doing fieldwork, and shows me.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F
+	.string "PROF. BIRCH: Countless POKéMON\n"
+	.string "await you!\p"
+	.string "Argh, I’m getting the itch to get out\n"
+	.string "and do fieldwork again!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7
+	.string "MAY: Oh, wow, {PLAYER}{KUN}!\n"
+	.string "You got a POKéDEX, too!\p"
+	.string "That’s great! Just like me!\n"
+	.string "I’ve got something for you, too!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40
+	.string "MAY: It’s fun if you can get a lot of\n"
+	.string "POKéMON!\p"
+	.string "I’m going to look all over the place\n"
+	.string "because I want different POKéMON.\p"
+	.string "If I find any cute POKéMON, I’ll catch\n"
+	.string "them with POKé BALLS!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3
+	.string "Oh? Your BAG’s full.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08
+	.string "MAY: I wonder where I should go look\n"
+	.string "for POKéMON next?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F
+	.string "BRENDAN: Huh…\n"
+	.string "So you got a POKéDEX, too.\p"
+	.string "Well then, here.\n"
+	.string "I’ll give you these.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E
+	.string "BRENDAN: You know it’s more fun to\n"
+	.string "have a whole bunch of POKéMON.\p"
+	.string "I’m going to explore all over the place\n"
+	.string "to find different POKéMON.\p"
+	.string "If I find any cool POKéMON, you bet\n"
+	.string "I’ll try to get them with POKé BALLS.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D
+	.string "Hey, your BAG’s full.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073
+	.string "BRENDAN: Where should I look for\n"
+	.string "POKéMON next…$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2
+	.string "It’s a serious-looking machine.\n"
+	.string "The PROF must use this for research.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7
+	.string "It’s a PC used for research.\n"
+	.string "Better not mess around with it.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124
+	.string "It’s crammed with books on POKéMON.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148
+	.string "It’s a book that’s too hard to read.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D
+	.string "PROF. BIRCH: Now…\p"
+	.string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n"
+	.string "of you help me study POKéMON.\p"
+	.string "Thanks to your help, new facts\n"
+	.string "are coming to light.\p"
+	.string "It appears that in the HOENN region,\n"
+	.string "there are also POKéMON from other\l"
+	.string "regions.\p"
+	.string "It goes to show how rich and varied\n"
+	.string "the natural environments of HOENN\l"
+	.string "happen to be.\p"
+	.string "That’s why I think it’s necessary for\n"
+	.string "me to upgrade your POKéDEX to\l"
+	.string "the NATIONAL Mode.\p"
+	.string "Here, let me see your POKéDEX units.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F
+	.string "MAY: Eheheh!\p"
+	.string "It’s so cool that even my POKéDEX\n"
+	.string "is getting updated!\p"
+	.string "It’s because you went out and caught\n"
+	.string "so many POKéMON, {PLAYER}{KUN}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E
+	.string "BRENDAN: I went out all over HOENN\n"
+	.string "and checked out POKéMON.\p"
+	.string "You can thank me for getting\n"
+	.string "the NATIONAL Mode POKéDEX.\p"
+	.string "Yep, you’re lucky, {PLAYER}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419
+	.string "PROF. BIRCH: Okay, all done!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436
+	.string "{PLAYER}’s POKéDEX was upgraded\n"
+	.string "to the NATIONAL Mode!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466
+	.string "PROF. BIRCH: But listen.\n"
+	.string "You’ve become the CHAMPION,\l"
+	.string "but your POKéMON journey isn’t over.\p"
+	.string "There is no end to the road\n"
+	.string "that is POKéMON.\p"
+	.string "Somewhere, there is a grassy patch\n"
+	.string "that’s waiting for you!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528
+	.string "MAY: I think I’ll take a short break\n"
+	.string "from fieldwork.\p"
+	.string "I think I’ll help the PROF here for\n"
+	.string "a while.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A
+	.string "BRENDAN: For the time being,\n"
+	.string "I’m taking a break from fieldwork.\p"
+	.string "I’ll be helping out the PROF here\n"
+	.string "for a while.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9
+	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
+	.string "Let’s have a look at your POKéDEX.\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Yes, there’s no doubt about it.\p"
+	.string "You really have completed the HOENN\n"
+	.string "region’s POKéDEX.\p"
+	.string "That’s more than just impressive.\p"
+	.string "I have a gift for you.\p"
+	.string "Consider it my show of appreciation\n"
+	.string "for the fantastic work you’ve done.\p"
+	.string "My gift is a rare POKéMON only found\n"
+	.string "in another region!\p"
+	.string "You can have any one of these\n"
+	.string "three POKéMON!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787
+	.string "PROF. BIRCH: These are rare POKéMON\n"
+	.string "only found in another region!\p"
+	.string "You can have any one of these\n"
+	.string "three POKéMON!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6
+	.string "PROF. BIRCH: The FIRE POKéMON\n"
+	.string "CYNDAQUIL caught your eye!\p"
+	.string "You’re as sharp as ever!\p"
+	.string "So the CYNDAQUIL is your choice?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869
+	.string "PROF. BIRCH: The WATER POKéMON\n"
+	.string "TOTODILE is your choice!\p"
+	.string "You know how to pick a good one.\p"
+	.string "So, you’ll take the TOTODILE?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0
+	.string "PROF. BIRCH: The GRASS POKéMON\n"
+	.string "CHIKORITA is your choice!\p"
+	.string "You sure know what you’re doing.\p"
+	.string "So, you’ll take the CHIKORITA?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959
+	.string "PROF. BIRCH: Take your time before\n"
+	.string "you decide.\p"
+	.string "They’re all invaluable POKéMON.$"
+
+	.incbin "baserom.gba", 0x1fb9a8, 0x2f
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7
+	.string "{PLAYER} received the {STR_VAR_1}\n"
+	.string "from PROF. BIRCH!$"
+
+	.incbin "baserom.gba", 0x1fb9fc, 0x30
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C
+	.string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n"
+	.string "You’ve completed the HOENN POKéDEX,\l"
+	.string "but your POKéMON journey isn’t over.\p"
+	.string "There is no end to the road\n"
+	.string "that is POKéMON.\p"
+	.string "Somewhere, there is a grassy patch\n"
+	.string "that’s waiting for you!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8
+	.string "You received the promised POKéMON.\n"
+	.string "Better leave the others alone.$"
+
+	.incbin "baserom.gba", 0x1fbb3a, 0x2e
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68
+	.string "MAY: {PLAYER}{KUN}, after this…\n"
+	.string "What are you going to do?\p"
+	.string "Are you going to keep battling\n"
+	.string "and sharpening your skills?\p"
+	.string "Or are you going to try filling\n"
+	.string "the NATIONAL POKéDEX?\p"
+	.string "I’m staying here to help the PROF.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D
+	.string "BRENDAN: Rather than collecting\n"
+	.string "POKéMON, I prefer slowly and \l"
+	.string "steadily raising the one I chose.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D
+	.string "MAY: Oh, hi, {PLAYER}{KUN}!\n"
+	.string "Have you gone to that place,\l"
+	.string "the BATTLE FRONTIER?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2
+	.string "BRENDAN: Hey, {PLAYER}!\n"
+	.string "Have you gone out to that place,\l"
+	.string "the BATTLE FRONTIER?$"
+
+	.incbin "baserom.gba", 0x1fbd1a, 0x16b

data/maps/scripts/MauvilleCity.inc

@@ -457,3 +457,195 @@ MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
 	release
 	end
 
+gUnknown_081DF7BA:: @ 81DF7BA
+	.incbin "baserom.gba", 0x1df7ba, 0x22
+
+MauvilleCity_Text_1DF7DC: @ 81DF7DC
+	.string "UNCLE: It’s because of POKéMON that\n"
+	.string "this boy’s got more pep, I suppose…\l"
+	.string "But he’s become a bit too peppy…$"
+
+MauvilleCity_Text_1DF845: @ 81DF845
+	.string "WALLY: Aww, UNCLE, please?\p"
+	.string "I want to challenge this GYM and see\n"
+	.string "how much better I’ve become.\p"
+	.string "Please? May I, please?$"
+
+MauvilleCity_Text_1DF8B9: @ 81DF8B9
+	.string "UNCLE: Now hold on, WALLY.\p"
+	.string "Since you started living with POKéMON,\n"
+	.string "you have grown quite a lot stronger.\p"
+	.string "But don’t you think you’re pushing it\n"
+	.string "to suddenly challenge a GYM?$"
+
+MauvilleCity_Text_1DF963: @ 81DF963
+	.string "WALLY: I’m not pushing it.\p"
+	.string "If I combine forces with RALTS,\n"
+	.string "we can beat anyone!$"
+
+MauvilleCity_Text_1DF9B2: @ 81DF9B2
+	.string "WALLY: Oh! Hi, {PLAYER}!\p"
+	.string "I’ve gotten a lot stronger since\n"
+	.string "we met.\p"
+	.string "{PLAYER}, I want you and my UNCLE to\n"
+	.string "understand that.\p"
+	.string "{PLAYER}, please, will you have\n"
+	.string "a battle with me?$"
+
+MauvilleCity_Text_1DFA4A: @ 81DFA4A
+	.string "WALLY: Oh… If you won’t battle me,\n"
+	.string "{PLAYER}, my UNCLE won’t know that I’ve\l"
+	.string "become really strong.$"
+
+MauvilleCity_Text_1DFAA5: @ 81DFAA5
+	.string "UNCLE: {PLAYER}{KUN}, was it?\n"
+	.string "On WALLY’s behalf, can I ask you to\l"
+	.string "battle with him just this once?\p"
+	.string "I don’t think he’s going to listen to\n"
+	.string "any reason the way he is now.$"
+
+MauvilleCity_Text_1DFB42: @ 81DFB42
+	.string "WALLY: {PLAYER}, please!\n"
+	.string "Battle with me, please.$"
+
+MauvilleCity_Text_1DFB6D: @ 81DFB6D
+	.string "WALLY: {PLAYER}, thank you.\p"
+	.string "Okay… Here I come!$"
+
+MauvilleCity_Text_1DFB96: @ 81DFB96
+	.string "WALLY: … … … … … … …\p"
+	.string "… … … … … … … …\p"
+	.string "I lost…$"
+
+MauvilleCity_Text_1DFBC3: @ 81DFBC3
+	.string "WALLY: UNCLE…\n"
+	.string "I’ll go back to VERDANTURF…$"
+
+MauvilleCity_Text_1DFBED: @ 81DFBED
+	.string "{PLAYER}, thank you.\n"
+	.string "Being a TRAINER is tough, isn’t it?\p"
+	.string "It’s not enough just to have POKéMON\n"
+	.string "and make them battle. That isn’t what\l"
+	.string "being a real TRAINER is about.$"
+
+MauvilleCity_Text_1DFC8A: @ 81DFC8A
+	.string "UNCLE: WALLY, there’s no need to be so\n"
+	.string "down on yourself.\p"
+	.string "Why, what’s keeping you from becoming\n"
+	.string "stronger and stronger?\p"
+	.string "Come on, let’s go home.\n"
+	.string "Everyone’s waiting for you.$"
+
+MauvilleCity_Text_1DFD34: @ 81DFD34
+	.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
+	.string "that you must be the TRAINER who kept\l"
+	.string "an eye out for WALLY when he caught\l"
+	.string "his POKéMON.\p"
+	.string "Why don’t you visit us in VERDANTURF\n"
+	.string "sometime?\l"
+	.string "I’m sure WALLY would enjoy it.$"
+
+	.incbin "baserom.gba", 0x1dfdfb, 0xda
+
+MauvilleCity_Text_1DFED5: @ 81DFED5
+	.string "SCOTT: Hehe…\n"
+	.string "I was watching that match!\p"
+	.string "You’re friends with that boy WALLY,\n"
+	.string "aren’t you?\p"
+	.string "But you didn’t hold anything back\n"
+	.string "and beat him impressively.\p"
+	.string "Yeah! That’s what a real POKéMON\n"
+	.string "battle is all about!\p"
+	.string "I idolize TRAINERS like that!\p"
+	.string "… … … … … …\n"
+	.string "I’ll be cheering for you!$"
+
+MauvilleCity_Text_1DFFE4: @ 81DFFE4
+	.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
+	.string "You look like you have a lot of zip!\l"
+	.string "That’s a good thing, wahahahaha!\p"
+	.string "Fine! I’ve decided!\n"
+	.string "I need a favor, {PLAYER}{KUN}!\p"
+	.string "MAUVILLE CITY has an underground\n"
+	.string "sector called NEW MAUVILLE.\p"
+	.string "{PLAYER}{KUN}, I’d like you to go there and\n"
+	.string "switch off the GENERATOR.\p"
+	.string "The GENERATOR has been running a bit\n"
+	.string "haywire. It’s getting unsafe.\p"
+	.string "Here, this is the KEY to get into\n"
+	.string "NEW MAUVILLE.$"
+
+MauvilleCity_Text_1E0154: @ 81E0154
+	.string "WATTSON: Don’t you worry about it.\n"
+	.string "It won’t be a challenge to you.\p"
+	.string "The entrance to NEW MAUVILLE is just\n"
+	.string "a short SURF away from ROUTE 110.\p"
+	.string "That’s it, then, you have my trust!\n"
+	.string "Wahahahaha!$"
+
+MauvilleCity_Text_1E020E: @ 81E020E
+	.string "WATTSON: Wahahahaha!\p"
+	.string "I knew it, {PLAYER}{KUN}! I knew I’d made\n"
+	.string "the right choice asking you!\p"
+	.string "This is my thanks--a TM containing\n"
+	.string "THUNDERBOLT!\p"
+	.string "Go on, you’ve earned it!$"
+
+MauvilleCity_Text_1E02AA: @ 81E02AA
+	.string "WATTSON: Wahahahaha!\p"
+	.string "It pleases me to no end to see\n"
+	.string "the young step up and take charge!$"
+
+MauvilleCity_Text_1E0301: @ 81E0301
+	.string "You know, it’s cool to have POKéMON\n"
+	.string "battles and stuff…\p"
+	.string "But if your POKéMON gets hurt,\n"
+	.string "you have to nurse it back to health.$"
+
+MauvilleCity_Text_1E037C: @ 81E037C
+	.string "The roads of this town stretch north\n"
+	.string "and south, and east and west.\p"
+	.string "Because of that, we get all sorts of\n"
+	.string "people coming through.$"
+
+MauvilleCity_Text_1E03FB: @ 81E03FB
+	.string "Have you been to RYDEL’S CYCLES yet?\p"
+	.string "RYDEL, the owner, is a very generous\n"
+	.string "man.$"
+
+MauvilleCity_Text_1E044A: @ 81E044A
+	.string "Even if you’re riding a BIKE,\n"
+	.string "wild POKéMON could jump you.$"
+
+MauvilleCity_Text_1E0485: @ 81E0485
+	.string "MAUVILLE CITY\n"
+	.string "“The bright and shiny city of fun!”$"
+
+MauvilleCity_Text_1E04B7: @ 81E04B7
+	.string "MAUVILLE CITY POKéMON GYM\n"
+	.string "LEADER: WATTSON\l"
+	.string "“The cheerfully electrifying man!”$"
+
+MauvilleCity_Text_1E0504: @ 81E0504
+	.string "“Ride in gravel and shake up your\n"
+	.string "soul!”\l"
+	.string "RYDEL’S CYCLES$"
+
+MauvilleCity_Text_1E053C: @ 81E053C
+	.string "“The play spot for all!”\n"
+	.string "MAUVILLE GAME CORNER$"
+
+MauvilleCity_Text_1E056A: @ 81E056A
+	.string "Hi, do you check out TV at all?\p"
+	.string "They’ve added a bunch of cool new\n"
+	.string "shows recently.\p"
+	.string "TV is so cool. I’ve seen my friends on\n"
+	.string "TV just out of the blue.\p"
+	.string "And, sometimes, they even put you on TV\n"
+	.string "without telling you.\p"
+	.string "I wish I would be on TV sometime.\p"
+	.string "That’s why I think you should check\n"
+	.string "out TVs whenever you can.$"
+
+MauvilleCity_Text_1E0699: @ 81E0699
+	.string "Hi, have you been checking out TVs?$"

data/maps/scripts/MauvilleCity_GameCorner.inc

@@ -22,7 +22,13 @@ MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5
 	goto MauvilleCity_GameCorner_EventScript_20FCD1
 	end
 
-	.incbin "baserom.gba", 0x20fc0c, 0x27
+MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C
+	multichoicedefault 15, 0, 49, 1, 0
+	switch VAR_RESULT
+	case 0, MauvilleCity_GameCorner_EventScript_20FC33
+	case 1, MauvilleCity_GameCorner_EventScript_20FC75
+	goto MauvilleCity_GameCorner_EventScript_20FCD1
+	end
 
 MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
 	checkcoins VAR_0x4001
@@ -714,7 +720,9 @@ MauvilleCity_GameCorner_Text_210646: @ 8210646
 MauvilleCity_GameCorner_Text_210673: @ 8210673
 	.string "You don’t have enough COINS.$"
 
-	.incbin "baserom.gba", 0x210690, 0x2f
+MauvilleCity_GameCorner_Text_210690: @ 8210690
+	.string "There isn’t any room available for\n"
+	.string "placing {STR_VAR_1}.$"
 
 MauvilleCity_GameCorner_Text_2106BF: @ 82106BF
 	.string "Oh, is that so? \n"
@@ -727,7 +735,8 @@ MauvilleCity_GameCorner_Text_210705: @ 8210705
 MauvilleCity_GameCorner_Text_21071B: @ 821071B
 	.string "Here you go!$"
 
-	.incbin "baserom.gba", 0x210728, 0x28
+MauvilleCity_GameCorner_Text_210728: @ 8210728
+	.string "Oh, you can’t carry any more than that.$"
 
 MauvilleCity_GameCorner_Text_210750: @ 8210750
 	.string "I made a mistake and got two of\n"

data/maps/scripts/MauvilleCity_Mart.inc

@@ -11,8 +11,7 @@ MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6
 	release
 	end
 
-	.incbin "baserom.gba", 0x2110fd, 0x3
-
+	.align 2
 MauvilleCity_Mart_Pokemart_211100: @ 8211100
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL

data/maps/scripts/MauvilleCity_PokemonCenter_2F.inc

@@ -5,7 +5,17 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
 	map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x21101d, 0x12
+MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 
 MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F
 	msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2

data/maps/scripts/MossdeepCity_GameCorner_1F.inc

@@ -30,10 +30,51 @@ MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D
 	msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3
 	end
 
-	.incbin "baserom.gba", 0x224b66, 0x97
+MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66
+	.string "When I was young, I traveled the world\n"
+	.string "as a POKéMON TRAINER.\p"
+	.string "Now that I’ve become an old buzzard,\n"
+	.string "my only amusement is watching young\l"
+	.string "TRAINERS battle.$"
 
 MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD
 	.string "The door appears to be locked.$"
 
-	.incbin "baserom.gba", 0x224c1c, 0x22f
+MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C
+	.string "A TRAINER named {STR_VAR_1} is\n"
+	.string "visiting my home.\p"
+	.string "Would you like to challenge\n"
+	.string "{STR_VAR_1}?$"
+
+MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64
+	.string "You won’t battle? I’m disappointed\n"
+	.string "that I can’t see you battle…$"
+
+MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4
+	.string "Oh, good, good!\p"
+	.string "But my house isn’t all that sturdy.\p"
+	.string "Could I ask you to keep it down to\n"
+	.string "a 3-on-3 match?$"
+
+MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B
+	.string "Before you two battle, you should\n"
+	.string "save your progress.$"
+
+MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41
+	.string "I hope to see a good match!$"
+
+MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D
+	.string "So, it became a standoff.\p"
+	.string "It was a brilliant match in which\n"
+	.string "neither side conceded a step!$"
+
+MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7
+	.string "That was superlative!\p"
+	.string "Why, it was like seeing myself in\n"
+	.string "my youth again!$"
+
+MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF
+	.string "Ah, too bad for you!\p"
+	.string "But it was a good match.\n"
+	.string "I hope you can win next time.$"
 

data/maps/scripts/MossdeepCity_Gym.inc

@@ -113,7 +113,95 @@ MossdeepCity_Gym_EventScript_22097E:: @ 822097E
 	msgbox MossdeepCity_Gym_Text_221E45, 6
 	end
 
-	.incbin "baserom.gba", 0x220999, 0x158
+MossdeepCity_Gym_EventScript_220999:: @ 8220999
+	lockall
+	checkflag FLAG_0x064
+	goto_eq MossdeepCity_Gym_EventScript_2209D0
+	setflag FLAG_0x064
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
+	clearflag FLAG_0x064
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 5, 5, 524, 0
+	setmetatile 2, 7, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
+	lockall
+	checkflag FLAG_0x065
+	goto_eq MossdeepCity_Gym_EventScript_220A24
+	setflag FLAG_0x065
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
+	clearflag FLAG_0x065
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 8, 14, 517, 0
+	setmetatile 8, 10, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
+	lockall
+	checkflag FLAG_0x066
+	goto_eq MossdeepCity_Gym_EventScript_220A78
+	setflag FLAG_0x066
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
+	clearflag FLAG_0x066
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 15, 17, 516, 0
+	setmetatile 17, 15, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
+	lockall
+	checkflag FLAG_0x067
+	goto_eq MossdeepCity_Gym_EventScript_220ACC
+	setflag FLAG_0x067
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
+
+MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
+	clearflag FLAG_0x067
+	applymovement 255, MossdeepCity_Gym_Movement_220C30
+	waitmovement 0
+	setmetatile 1, 23, 516, 0
+	setmetatile 5, 24, 568, 1
+	goto MossdeepCity_Gym_EventScript_2209C8
+	end
 
 MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
 	lockall
@@ -196,7 +284,10 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
 	release
 	end
 
-	.incbin "baserom.gba", 0x220c30, 0x3
+MossdeepCity_Gym_Movement_220C30: @ 8220C30
+	step_14
+	step_14
+	step_end
 
 MossdeepCity_Gym_EventScript_220C33:: @ 8220C33
 	lockall

data/maps/scripts/MossdeepCity_Mart.inc

@@ -11,8 +11,7 @@ MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8
 	release
 	end
 
-	.incbin "baserom.gba", 0x2223df, 0x1
-
+	.align 2
 MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_NET_BALL

data/maps/scripts/MossdeepCity_PokemonCenter_2F.inc

@@ -5,7 +5,17 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
 	map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x222349, 0x12
+MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 
 MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B
 	msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2

data/maps/scripts/MossdeepCity_SpaceCenter_2F.inc

@@ -342,5 +342,183 @@ MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
 	turnobject 4, 4
 	return
 
-	.incbin "baserom.gba", 0x224157, 0x1
+MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157
+	trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
+	trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
+	lockall
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193
+	compare_var_to_value VAR_RESULT, 1
+	call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A
+	closemessage
+	clearflag FLAG_0x075
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1
+	waitmessage
+	return
+
+MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A
+	pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6
+	waitmessage
+	return
+
+MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1
+	.string "MOSSDEEP has mainly sunny weather,\n"
+	.string "and its winds are stable.\p"
+	.string "It’s an ideal location for launching\n"
+	.string "rockets.$"
+
+MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C
+	.string "Why would TEAM MAGMA want to steal\n"
+	.string "our rocket fuel in the first place?$"
+
+MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253
+	.string "If only I was a little younger, I would\n"
+	.string "have liked being an astronaut…\p"
+	.string "No… It’s not too late!\n"
+	.string "I can and will try!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5
+	.string "If TEAM MAGMA takes the rocket fuel,\n"
+	.string "I won’t be able to go to space!\p"
+	.string "They can’t be allowed to get away\n"
+	.string "with such an outrage!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342
+	.string "I wish ordinary people could go into\n"
+	.string "space one day…$"
+
+MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376
+	.string "TEAM MAGMA…\n"
+	.string "Do they want to go to space, too?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4
+	.string "What’s wrong with you?\p"
+	.string "You’re outnumbered three to one,\n"
+	.string "but you still want to take us on?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE
+	.string "Good answer!\n"
+	.string "That’s what a smart person’ll do!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D
+	.string "A reckless go-getter, are you?\n"
+	.string "Okay, I’ll go first!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461
+	.string "I lost!\n"
+	.string "But!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E
+	.string "It’s too soon to be relieved!\n"
+	.string "I’m up next!$"
+
+MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499
+	.string "I lost, too!\n"
+	.string "But!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB
+	.string "I bet you want to take a break.\n"
+	.string "But I’m not about to let you do that!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1
+	.string "We should’ve taken a break…\n"
+	.string "That’s what we should’ve done…$"
+
+MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C
+	.string "Three of us here, and look at the sorry\n"
+	.string "mess we got ourselves into.$"
+
+MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570
+	.string "We three losing like this…\n"
+	.string "We look worse than usual by triple!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF
+	.string "Are we being useful to our leader\n"
+	.string "at all?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9
+	.string "Hehehe!\p"
+	.string "We come all the way here to get some\n"
+	.string "fuel, and we’re interfered with again!\p"
+	.string "If you’re going to mess with us too,\n"
+	.string "we’ll take care of you at the same time!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B
+	.string "MAXIE: Clear out of the way!\n"
+	.string "Don’t you dare interfere!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2
+	.string "STEVEN: TEAM MAGMA…\p"
+	.string "What’s the point of stealing rocket\n"
+	.string "fuel?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0
+	.string "MAXIE: Fufufu… Since you’re so\n"
+	.string "curious, you deserve an explanation.\p"
+	.string "We’re going to jettison the entire\n"
+	.string "load into MT. CHIMNEY!\p"
+	.string "With GROUDON gone, we have no need\n"
+	.string "for that slag heap of a mountain!\p"
+	.string "So we’ll use the fuel’s power to make\n"
+	.string "the volcano erupt!\p"
+	.string "It will be savage!$"
+
+MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF
+	.string "STEVEN: {PLAYER}{KUN}!\n"
+	.string "You’re going to help me?\p"
+	.string "Let’s go into battle together!\n"
+	.string "Are you ready?$"
+
+MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854
+	.string "STEVEN: Then, hurry!\n"
+	.string "Get ready quickly!$"
+
+MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C
+	.string "All I want…\n"
+	.string "I just want to expand the land mass…$"
+
+MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD
+	.string "I’m with our leader…$"
+
+MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2
+	.string "MAXIE: We failed to make the volcano\n"
+	.string "erupt…\p"
+	.string "We failed to control GROUDON after\n"
+	.string "we had awoken it…\p"
+	.string "Is our goal to expand the land\n"
+	.string "misguided?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "If…\n"
+	.string "If we, TEAM MAGMA, are wrong…\l"
+	.string "… … … … … …\p"
+	.string "Then might TEAM AQUA’s goal to expand\n"
+	.string "the sea also be equally misguided?$"
+
+MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC
+	.string "MAXIE: All right…\n"
+	.string "We will give up on the fuel…\p"
+	.string "There appear to be more important\n"
+	.string "matters that I must examine…$"
+
+MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A
+	.string "STEVEN: Whew, that was too tense.\n"
+	.string "{PLAYER}{KUN}, thank you.\p"
+	.string "I have something to give you as\n"
+	.string "thanks for your support.\p"
+	.string "Please come see me at home\n"
+	.string "after this.\p"
+	.string "Oh, yes, I don’t live in RUSTBORO CITY.\n"
+	.string "I live right here on this island.$"
 

data/maps/scripts/MossdeepCity_StevensHouse.inc

@@ -148,7 +148,10 @@ MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
 	releaseall
 	end
 
-	.incbin "baserom.gba", 0x222926, 0x10
+MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
+	giveitem_std ITEM_HM08, 1, 1
+	setflag FLAG_0x07B
+	end
 
 MossdeepCity_StevensHouse_Text_222936: @ 8222936
 	.string "STEVEN: {PLAYER}{KUN}…\p"
@@ -186,7 +189,8 @@ MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E
 MossdeepCity_StevensHouse_Text_222BED: @ 8222BED
 	.string "{PLAYER} obtained a BELDUM.$"
 
-	.incbin "baserom.gba", 0x222c03, 0x27
+MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
+	.string "There is no space for another POKéMON.$"
 
 MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A
 	.string "{PLAYER} left the POKé BALL where\n"

data/maps/scripts/MtChimney.inc

@@ -195,7 +195,208 @@ MtChimney_Movement_22EF9C: @ 822EF9C
 	step_down
 	step_end
 
-	.incbin "baserom.gba", 0x22efa6, 0xad
+MtChimney_Movement_22EFA6: @ 822EFA6
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+MtChimney_Movement_22EFB8: @ 822EFB8
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+MtChimney_Movement_22EFC1: @ 822EFC1
+	step_right
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22EFD0: @ 822EFD0
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+MtChimney_Movement_22EFE9: @ 822EFE9
+	step_14
+	step_14
+	step_14
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+MtChimney_Movement_22EFF4: @ 822EFF4
+	step_14
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22F004: @ 822F004
+	step_14
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+MtChimney_Movement_22F015: @ 822F015
+	step_14
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_25
+	step_end
+
+MtChimney_Movement_22F01D: @ 822F01D
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22F02B: @ 822F02B
+	step_down
+	step_end
+
+MtChimney_Movement_22F02D: @ 822F02D
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22F035: @ 822F035
+	step_14
+	step_14
+	step_27
+	step_14
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22F03F: @ 822F03F
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_27
+	step_14
+	step_down
+	step_down
+	step_end
+
+MtChimney_Movement_22F04A: @ 822F04A
+	step_40
+	step_17
+	step_41
+	step_03
+	step_end
+
+MtChimney_Movement_22F04F: @ 822F04F
+	step_left
+	step_28
+	step_14
+	step_end
 
 MtChimney_EventScript_22F053:: @ 822F053
 	msgbox MtChimney_Text_22FD1F, 3

data/maps/scripts/MtPyre_4F.inc

@@ -6,3 +6,15 @@ MtPyre_5F_EventScript_231BC9:: @ 8231BC9
 	msgbox MtPyre_5F_Text_231C24, 6
 	end
 
+MtPyre_5F_Text_231BE0: @ 8231BE0
+	.string "Teacher…\n"
+	.string "Please watch over my progress!$"
+
+MtPyre_5F_Text_231C08: @ 8231C08
+	.string "Teacher…\n"
+	.string "Please forgive me!$"
+
+MtPyre_5F_Text_231C24: @ 8231C24
+	.string "Until I improve, my teacher, who rests\n"
+	.string "here, will never find true peace…$"
+

data/maps/scripts/MtPyre_5F.inc

@@ -6,3 +6,18 @@ MtPyre_4F_EventScript_231C6E:: @ 8231C6E
 	msgbox MtPyre_4F_Text_231CEE, 6
 	end
 
+MtPyre_4F_Text_231C85: @ 8231C85
+	.string "I love all things horrifying…\n"
+	.string "It’s like a disease…\p"
+	.string "When I’m here…\n"
+	.string "I shiver with fear…$"
+
+MtPyre_4F_Text_231CDB: @ 8231CDB
+	.string "Losing, I dislike…$"
+
+MtPyre_4F_Text_231CEE: @ 8231CEE
+	.string "I want to see dreadful things…\n"
+	.string "I can’t leave…\p"
+	.string "Stay…\n"
+	.string "Won’t you stay with me?$"
+

data/maps/scripts/OldaleTown.inc

@@ -130,7 +130,21 @@ OldaleTown_Movement_1E8FE2: @ 81E8FE2
 	step_25
 	step_end
 
-	.incbin "baserom.gba", 0x1e8feb, 0xe
+OldaleTown_Movement_1E8FEB: @ 81E8FEB
+	step_up
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_up
+	step_up
+	step_up
+	step_13
+	step_25
+	step_end
 
 OldaleTown_Movement_1E8FF9: @ 81E8FF9
 	step_right
@@ -164,7 +178,19 @@ OldaleTown_Movement_1E900B: @ 81E900B
 	step_up
 	step_end
 
-	.incbin "baserom.gba", 0x1e9013, 0xc
+OldaleTown_Movement_1E9013: @ 81E9013
+	step_left
+	step_up
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_up
+	step_up
+	step_end
 
 OldaleTown_EventScript_1E901F:: @ 81E901F
 	lock

data/maps/scripts/OldaleTown_Mart.inc

@@ -28,8 +28,7 @@ OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C
 	release
 	end
 
-	.incbin "baserom.gba", 0x1fc27b, 0x1
-
+	.align 2
 OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION

data/maps/scripts/OldaleTown_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
 	map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x1fc22d, 0x12
+OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/PacifidlogTown_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
 	map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x20364a, 0x12
+PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/PetalburgCity.inc

@@ -0,0 +1,767 @@
+PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
+	setflag FLAG_VISITED_PETALBURG_CITY
+	compare_var_to_value VAR_0x4057, 0
+	call_if 1, PetalburgCity_EventScript_1DC307
+	compare_var_to_value VAR_0x4057, 2
+	call_if 1, PetalburgCity_EventScript_1DC30F
+	compare_var_to_value VAR_0x4057, 4
+	call_if 1, PetalburgCity_EventScript_1DC30F
+	compare_var_to_value VAR_0x4085, 8
+	call_if 1, PetalburgCity_EventScript_1DC316
+	end
+
+PetalburgCity_EventScript_1DC307:: @ 81DC307
+	setobjectxyperm 8, 5, 11
+	return
+
+PetalburgCity_EventScript_1DC30F:: @ 81DC30F
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	savebgm BGM_TSURETEK
+	return
+
+PetalburgCity_EventScript_1DC316:: @ 81DC316
+	setvar VAR_0x4085, 7
+	return
+
+PetalburgCity_MapScript2_1DC31C: @ 81DC31C
+	map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E
+	map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390
+	.2byte 0
+
+PetalburgCity_EventScript_1DC32E:: @ 81DC32E
+	lockall
+	special copy_player_party_to_sav1
+	special sub_813946C
+	applymovement 2, PetalburgCity_Movement_1DC451
+	applymovement 255, PetalburgCity_Movement_1DC430
+	waitmovement 0
+	msgbox PetalburgCity_Text_1EC1F8, 4
+	special sub_80B086C
+	waitstate
+	msgbox PetalburgCity_Text_1EC271, 4
+	applymovementat 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY
+	waitmovementat 2, PETALBURG_CITY
+	msgbox PetalburgCity_Text_1EC297, 4
+	closemessage
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x4057, 3
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	special copy_player_party_from_sav1
+	setvar VAR_0x4085, 1
+	warp PETALBURG_CITY_GYM, 255, 4, 108
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC390:: @ 81DC390
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	applymovement 5, PetalburgCity_Movement_1DC41B
+	applymovement 255, PetalburgCity_Movement_1DC406
+	waitmovement 0
+	setvar VAR_0x8004, 7
+	setvar VAR_0x8005, 5
+	opendoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	applymovement 5, PetalburgCity_Movement_1DC42D
+	applymovement 255, PetalburgCity_Movement_1DC418
+	waitmovement 0
+	setflag FLAG_0x33E
+	hideobjectat 255, PETALBURG_CITY
+	closedoor VAR_0x8004, VAR_0x8005
+	waitdooranim
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_0x4001
+	warp PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6
+	lock
+	faceplayer
+	msgbox PetalburgCity_Text_1DC985, 4
+	closemessage
+	applymovement 3, PetalburgCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD
+	msgbox PetalburgCity_Text_1DC837, 2
+	end
+
+PetalburgCity_Movement_1DC406: @ 81DC406
+	step_13
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_up
+	step_up
+	step_up
+	step_up
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC418: @ 81DC418
+	step_up
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC41B: @ 81DC41B
+	step_13
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_up
+	step_up
+	step_up
+	step_up
+	step_up
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC42D: @ 81DC42D
+	step_up
+	step_54
+	step_end
+
+PetalburgCity_Movement_1DC430: @ 81DC430
+	step_13
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_28
+	step_end
+
+PetalburgCity_Movement_1DC451: @ 81DC451
+	step_13
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_right
+	step_14
+	step_26
+	step_14
+	step_14
+	step_28
+	step_end
+
+PetalburgCity_EventScript_1DC476:: @ 81DC476
+	msgbox PetalburgCity_Text_1DCAAA, 3
+	end
+
+PetalburgCity_EventScript_1DC47F:: @ 81DC47F
+	msgbox PetalburgCity_Text_1DCAF1, 3
+	end
+
+PetalburgCity_EventScript_1DC488:: @ 81DC488
+	msgbox PetalburgCity_Text_1DCA30, 2
+	end
+
+PetalburgCity_EventScript_1DC491:: @ 81DC491
+	msgbox PetalburgCity_Text_1DCB23, 3
+	end
+
+PetalburgCity_EventScript_1DC49A:: @ 81DC49A
+	lockall
+	setvar VAR_0x8008, 0
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6
+	lockall
+	setvar VAR_0x8008, 1
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2
+	lockall
+	setvar VAR_0x8008, 2
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE
+	lockall
+	setvar VAR_0x8008, 3
+	goto PetalburgCity_EventScript_1DC4CA
+	end
+
+PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
+	applymovement 8, PetalburgCity_Movement_27259E
+	waitmovement 0
+	playbgm BGM_TSURETEK, 0
+	playse SE_PIN
+	applymovement 8, PetalburgCity_Movement_272598
+	waitmovement 0
+	applymovement 8, PetalburgCity_Movement_27259A
+	waitmovement 0
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC57F
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC594
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC59F
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC5B4
+	msgbox PetalburgCity_Text_1DC881, 4
+	closemessage
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC5C9
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC5DB
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC5ED
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC5FF
+	msgbox PetalburgCity_Text_1DC91B, 4
+	applymovement 8, PetalburgCity_Movement_2725A8
+	applymovement 255, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	msgbox PetalburgCity_Text_1DC93E, 4
+	closemessage
+	applymovement 8, PetalburgCity_Movement_1DC658
+	waitmovement 0
+	fadedefaultbgm
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC57F:: @ 81DC57F
+	applymovement 8, PetalburgCity_Movement_1DC615
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725AA
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC594:: @ 81DC594
+	applymovement 8, PetalburgCity_Movement_1DC61A
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC59F:: @ 81DC59F
+	applymovement 8, PetalburgCity_Movement_1DC61D
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
+	applymovement 8, PetalburgCity_Movement_1DC622
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9
+	applymovement 8, PetalburgCity_Movement_1DC628
+	applymovement 255, PetalburgCity_Movement_1DC665
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB
+	applymovement 8, PetalburgCity_Movement_1DC633
+	applymovement 255, PetalburgCity_Movement_1DC66F
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED
+	applymovement 8, PetalburgCity_Movement_1DC641
+	applymovement 255, PetalburgCity_Movement_1DC67C
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF
+	applymovement 8, PetalburgCity_Movement_1DC64C
+	applymovement 255, PetalburgCity_Movement_1DC686
+	waitmovement 0
+	return
+
+	.incbin "baserom.gba", 0x1dc611, 0x4
+
+PetalburgCity_Movement_1DC615: @ 81DC615
+	step_right
+	step_right
+	step_right
+	step_26
+	step_end
+
+PetalburgCity_Movement_1DC61A: @ 81DC61A
+	step_right
+	step_right
+	step_end
+
+PetalburgCity_Movement_1DC61D: @ 81DC61D
+	step_right
+	step_right
+	step_right
+	step_25
+	step_end
+
+PetalburgCity_Movement_1DC622: @ 81DC622
+	step_down
+	step_right
+	step_right
+	step_right
+	step_25
+	step_end
+
+PetalburgCity_Movement_1DC628: @ 81DC628
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_right
+	step_26
+	step_end
+
+PetalburgCity_Movement_1DC633: @ 81DC633
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_right
+	step_26
+	step_end
+
+PetalburgCity_Movement_1DC641: @ 81DC641
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_right
+	step_26
+	step_end
+
+PetalburgCity_Movement_1DC64C: @ 81DC64C
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_right
+	step_26
+	step_end
+
+PetalburgCity_Movement_1DC658: @ 81DC658
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC665: @ 81DC665
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC66F: @ 81DC66F
+	step_14
+	step_14
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC67C: @ 81DC67C
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_end
+
+PetalburgCity_Movement_1DC686: @ 81DC686
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_end
+
+PetalburgCity_EventScript_1DC691:: @ 81DC691
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 0
+	setobjectxy 9, 13, 10
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 1
+	setobjectxy 9, 13, 11
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 2
+	setobjectxy 9, 13, 12
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3
+	lockall
+	addobject 9
+	setvar VAR_0x8008, 3
+	setobjectxy 9, 13, 13
+	goto PetalburgCity_EventScript_1DC6E9
+	end
+
+PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
+	applymovement 9, PetalburgCity_Movement_1DC7D6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, PetalburgCity_Movement_272598
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_27259A
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_1DC7DB
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	setvar VAR_0x40D1, 1
+	msgbox PetalburgCity_Text_1DCB31, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_2725A8
+	waitmovement 0
+	delay 30
+	msgbox PetalburgCity_Text_1DCB82, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_2725A4
+	waitmovement 0
+	delay 30
+	msgbox PetalburgCity_Text_1DCC09, 4
+	closemessage
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, PetalburgCity_EventScript_1DC78E
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, PetalburgCity_EventScript_1DC7A0
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, PetalburgCity_EventScript_1DC7B2
+	compare_var_to_value VAR_0x8008, 3
+	call_if 1, PetalburgCity_EventScript_1DC7C4
+	setvar VAR_0x40C9, 1
+	removeobject 9
+	releaseall
+	end
+
+PetalburgCity_EventScript_1DC78E:: @ 81DC78E
+	applymovement 255, PetalburgCity_Movement_1DC7EE
+	applymovement 9, PetalburgCity_Movement_1DC7E0
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0
+	applymovement 255, PetalburgCity_Movement_1DC802
+	applymovement 9, PetalburgCity_Movement_1DC7F5
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2
+	applymovement 255, PetalburgCity_Movement_1DC815
+	applymovement 9, PetalburgCity_Movement_1DC808
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4
+	applymovement 255, PetalburgCity_Movement_1DC828
+	applymovement 9, PetalburgCity_Movement_1DC81B
+	waitmovement 0
+	return
+
+PetalburgCity_Movement_1DC7D6: @ 81DC7D6
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC7DB: @ 81DC7DB
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC7E0: @ 81DC7E0
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC7EE: @ 81DC7EE
+	step_14
+	step_25
+	step_14
+	step_14
+	step_13
+	step_27
+	step_end
+
+PetalburgCity_Movement_1DC7F5: @ 81DC7F5
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC802: @ 81DC802
+	step_14
+	step_25
+	step_14
+	step_13
+	step_27
+	step_end
+
+PetalburgCity_Movement_1DC808: @ 81DC808
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC815: @ 81DC815
+	step_14
+	step_25
+	step_14
+	step_13
+	step_27
+	step_end
+
+PetalburgCity_Movement_1DC81B: @ 81DC81B
+	step_up
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
+
+PetalburgCity_Movement_1DC828: @ 81DC828
+	step_14
+	step_26
+	step_14
+	step_13
+	step_27
+	step_end
+
+PetalburgCity_EventScript_1DC82E:: @ 81DC82E
+	msgbox PetalburgCity_Text_1DC881, 2
+	end
+
+PetalburgCity_Text_1DC837: @ 81DC837
+	.string "Where has our WALLY gone?\p"
+	.string "We have to leave for VERDANTURF TOWN\n"
+	.string "very soon…$"
+
+PetalburgCity_Text_1DC881: @ 81DC881
+	.string "Hiya! Are you maybe…\n"
+	.string "A rookie TRAINER?\p"
+	.string "Do you know what POKéMON TRAINERS\n"
+	.string "do when they reach a new town?\p"
+	.string "They first check what kind of GYM\n"
+	.string "is in the town.$"
+
+PetalburgCity_Text_1DC91B: @ 81DC91B
+	.string "See? This is PETALBURG CITY’s GYM.$"
+
+PetalburgCity_Text_1DC93E: @ 81DC93E
+	.string "This is the GYM’s sign. Look for it\n"
+	.string "whenever you’re looking for a GYM.$"
+
+PetalburgCity_Text_1DC985: @ 81DC985
+	.string "My face is reflected in the water.\p"
+	.string "It’s a shining grin full of hope…\p"
+	.string "Or it could be a look of somber silence\n"
+	.string "struggling with fear…\p"
+	.string "What do you see reflected in your face?$"
+
+PetalburgCity_Text_1DCA30: @ 81DCA30
+	.string "Let’s say you have six POKéMON.\n"
+	.string "If you catch another one…\p"
+	.string "It is automatically sent to a STORAGE\n"
+	.string "BOX over a PC connection.$"
+
+PetalburgCity_Text_1DCAAA: @ 81DCAAA
+	.string "PETALBURG CITY POKéMON GYM\n"
+	.string "LEADER: NORMAN\l"
+	.string "“A man in pursuit of power!”$"
+
+PetalburgCity_Text_1DCAF1: @ 81DCAF1
+	.string "PETALBURG CITY\n"
+	.string "“Where people mingle with nature.”$"
+
+PetalburgCity_Text_1DCB23: @ 81DCB23
+	.string "WALLY’S HOUSE$"
+
+PetalburgCity_Text_1DCB31: @ 81DCB31
+	.string "Excuse me!\p"
+	.string "Let me guess, from the way you’re\n"
+	.string "dressed, are you a POKéMON TRAINER?$"
+
+PetalburgCity_Text_1DCB82: @ 81DCB82
+	.string "… … … … … …\p"
+	.string "Well, maybe not.\n"
+	.string "Your clothes aren’t all that dirty.\p"
+	.string "You’re either a rookie TRAINER,\n"
+	.string "or maybe you’re just an ordinary kid.$"
+
+PetalburgCity_Text_1DCC09: @ 81DCC09
+	.string "I’m roaming the land in search of\n"
+	.string "talented TRAINERS.\p"
+	.string "I’m sorry to have taken your time.$"

data/maps/scripts/PetalburgCity_Gym.inc

@@ -674,7 +674,16 @@ PetalburgCity_Gym_Movement_2050D0: @ 82050D0
 	step_up
 	step_end
 
-	.incbin "baserom.gba", 0x2050d8, 0x9
+PetalburgCity_Gym_Movement_2050D8: @ 82050D8
+	step_26
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_13
+	step_25
+	step_end
 
 PetalburgCity_Gym_Movement_2050E1: @ 82050E1
 	step_14
@@ -1613,7 +1622,9 @@ PetalburgCity_Gym_Text_20721E: @ 820721E
 	.string "“SPEED ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-	.incbin "baserom.gba", 0x207256, 0x2a
+PetalburgCity_Gym_Text_207256: @ 8207256
+	.string "This door appears to be locked\n"
+	.string "right now…$"
 
 PetalburgCity_Gym_Text_207280: @ 8207280
 	.string "“ACCURACY ROOM,” the sign says.\p"

data/maps/scripts/PetalburgCity_Mart.inc

@@ -13,8 +13,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69
 	release
 	end
 
-	.incbin "baserom.gba", 0x207d89, 0x3
-
+	.align 2
 PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
@@ -37,8 +36,7 @@ PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6
 	release
 	end
 
-	.incbin "baserom.gba", 0x207db5, 0x3
-
+	.align 2
 PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL

data/maps/scripts/PetalburgCity_PokemonCenter_2F.inc

@@ -5,5 +5,15 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
 	map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF
 	.byte 0
 
-	.incbin "baserom.gba", 0x207d56, 0x12
+PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
 

data/maps/scripts/Route101.inc

@@ -122,7 +122,8 @@ Route101_Movement_1EBDB5: @ 81EBDB5
 	step_16
 	step_end
 
-	.incbin "baserom.gba", 0x1ebdbc, 0x1
+Route101_Movement_1EBDBC: @ 81EBDBC
+	step_end
 
 Route101_Movement_1EBDBD: @ 81EBDBD
 	step_23
@@ -181,7 +182,8 @@ Route101_Movement_1EBDE7: @ 81EBDE7
 	step_16
 	step_end
 
-	.incbin "baserom.gba", 0x1ebdee, 0x1
+Route101_Movement_1EBDEE: @ 81EBDEE
+	step_end
 
 Route101_Movement_1EBDEF: @ 81EBDEF
 	step_24
@@ -190,7 +192,16 @@ Route101_Movement_1EBDEF: @ 81EBDEF
 	step_24
 	step_end
 
-	.incbin "baserom.gba", 0x1ebdf4, 0x7
+Route101_Movement_1EBDF4: @ 81EBDF4
+	step_up
+	step_up
+	step_end
+
+Route101_Movement_1EBDF7: @ 81EBDF7
+	step_up
+	step_left
+	step_up
+	step_end
 
 Route101_EventScript_1EBDFB:: @ 81EBDFB
 	msgbox Route101_Text_1EBFDD, 2

data/maps/scripts/Route102.inc

@@ -83,3 +83,37 @@ Route102_EventScript_1EC1E1:: @ 81EC1E1
 	msgbox Route102_Text_2947DB, 6
 	end
 
+PetalburgCity_Text_1EC1F8: @ 81EC1F8
+	.string "WALLY: {PLAYER}…\n"
+	.string "POKéMON hide in tall grass like this,\l"
+	.string "don’t they?\p"
+	.string "Please watch me and see if I can\n"
+	.string "catch one properly.\p"
+	.string "…Whoa!$"
+
+PetalburgCity_Text_1EC271: @ 81EC271
+	.string "WALLY: I did it… It’s my…\n"
+	.string "My POKéMON!$"
+
+PetalburgCity_Text_1EC297: @ 81EC297
+	.string "{PLAYER}, thank you!\n"
+	.string "Let’s go back to the GYM!$"
+
+Route102_Text_1EC2C0: @ 81EC2C0
+	.string "I’m…not very tall, so I sink right\n"
+	.string "into tall grass.\p"
+	.string "The grass goes up my nose and…\n"
+	.string "Fwafwafwafwafwa…\p"
+	.string "Fwatchoo!$"
+
+Route102_Text_1EC32E: @ 81EC32E
+	.string "I’m going to catch a whole bunch of\n"
+	.string "POKéMON!$"
+
+Route102_Text_1EC35B: @ 81EC35B
+	.string "ROUTE 102\n"
+	.string "{0x7C} OLDALE TOWN$"
+
+Route102_Text_1EC373: @ 81EC373
+	.string "ROUTE 102\n"
+	.string "{0x7B} PETALBURG CITY$"

data/maps/scripts/Route104.inc

@@ -74,7 +74,21 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	waitmovement 0
 	goto Route104_EventScript_1ECD33
 
-	.incbin "baserom.gba", 0x1ecd11, 0x22
+Route104_EventScript_1ECD11:: @ 81ECD11
+	checkplayergender
+	compare_var_to_value VAR_RESULT, 0
+	goto_eq Route104_EventScript_1ECD29
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route104_EventScript_1ECD2E
+	return
+
+Route104_EventScript_1ECD29:: @ 81ECD29
+	playbgm BGM_GIRL_SUP, 1
+	return
+
+Route104_EventScript_1ECD2E:: @ 81ECD2E
+	playbgm BGM_BOY_SUP, 1
+	return
 
 Route104_EventScript_1ECD33:: @ 81ECD33
 	checkplayergender

data/maps/scripts/Route104_PrettyPetalFlowerShop.inc

@@ -57,8 +57,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
 	release
 	end
 
-	.incbin "baserom.gba", 0x22a3f9, 0x3
-
+	.align 2
 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC
 	.2byte ITEM_FULL_RESTORE
 	.2byte ITEM_MAX_POTION

data/maps/scripts/Route105.inc

@@ -86,3 +86,22 @@ Route105_EventScript_1EE31F:: @ 81EE31F
 	msgbox Route105_Text_2961FE, 6
 	end
 
+Route104_Text_1EE336: @ 81EE336
+	.string "… … … … … …\n"
+	.string "… … … … … Beep!\p"
+	.string "DAD: Oh, {PLAYER}?\p"
+	.string "… … … … … …\n"
+	.string "Where are you now?\l"
+	.string "It sounds windy wherever you are.\p"
+	.string "I just heard from DEVON’s MR. STONE\n"
+	.string "about your POKéNAV, so I decided\l"
+	.string "to give you a call.\p"
+	.string "It sounds like you’re doing fine,\n"
+	.string "so that’s fine with me.\p"
+	.string "You take care now.\p"
+	.string "… … … … … …\n"
+	.string "… … … … … Click!$"
+
+Route104_Text_1EE463: @ 81EE463
+	.string "Registered DAD NORMAN\n"
+	.string "in the POKéNAV.$"

data/maps/scripts/Route109.inc

@@ -485,3 +485,89 @@ Route109_EventScript_1EEC06:: @ 81EEC06
 	msgbox Route109_Text_297AE5, 6
 	end
 
+DewfordTown_Text_1EEC1D: @ 81EEC1D
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "We’ve made land in SLATEPORT!\p"
+	.string "I suppose you’re going to visit CAPT.\n"
+	.string "STERN and deliver the DEVON GOODS?$"
+
+Route109_Text_1EEC96: @ 81EEC96
+	.string "MR. BRINEY: I thought you’re supposed\n"
+	.string "to deliver the DEVON GOODS.\p"
+	.string "Would you like to sail back to\n"
+	.string "DEWFORD, then?$"
+
+Route109_Text_1EED06: @ 81EED06
+	.string "MR. BRINEY: DEWFORD it is, then!\p"
+	.string "Anchors aweigh!\n"
+	.string "PEEKO, we’re setting sail, my darling!$"
+
+Route109_Text_1EED5E: @ 81EED5E
+	.string "MR. BRINEY: Then you go on and deliver\n"
+	.string "the DEVON GOODS. I’ll be waiting.$"
+
+DewfordTown_Text_1EEDA7: @ 81EEDA7
+	.string "MR. BRINEY: Ahoy! We’ve made land in\n"
+	.string "SLATEPORT!\p"
+	.string "You just go on and tell me whenever\n"
+	.string "you want to set sail again!$"
+
+Route109_Text_1EEE17: @ 81EEE17
+	.string "MR. BRINEY: Ahoy!\n"
+	.string "For you, I’ll go out to sea anytime!\p"
+	.string "Now, my friend, where are we bound?$"
+
+Route109_Text_1EEE72: @ 81EEE72
+	.string "MR. BRINEY: You just tell me whenever\n"
+	.string "you need to set sail again!$"
+
+Route109_Text_1EEEB4: @ 81EEEB4
+	.string "Yo, TRAINERS!\n"
+	.string "Whether you’re hot to trot,\l"
+	.string "or cool cat not,\l"
+	.string "chill at my papa’s spot!$"
+
+Route109_Text_1EEF08: @ 81EEF08
+	.string "Little kids can dart around so quickly…\p"
+	.string "You don’t dare take your eyes off them\n"
+	.string "for an instant. It’s very taxing.\p"
+	.string "Mine are with my POKéMON, so they\n"
+	.string "should be okay, but…$"
+
+Route109_Text_1EEFB0: @ 81EEFB0
+	.string "Our sand castle’s taking a long time\n"
+	.string "to make.$"
+
+Route109_Text_1EEFDE: @ 81EEFDE
+	.string "You can have this!$"
+
+Route109_Text_1EEFF1: @ 81EEFF1
+	.string "We’re going to get all the sand from\n"
+	.string "the beach and make a big castle!\p"
+	.string "And then we’re going to be a king and\n"
+	.string "queen.\p"
+	.string "We’ll let you be a servant.$"
+
+Route109_Text_1EF080: @ 81EF080
+	.string "The water around these parts is clean.\p"
+	.string "But, I get my ZIGZAGOON to pick up\n"
+	.string "litter from the shoreline at times.\p"
+	.string "Dirty water becomes rain and joins our\n"
+	.string "rivers, which we drink from…\p"
+	.string "If we pollute the sea, it all comes\n"
+	.string "back to haunt us eventually.$"
+
+Route109_Text_1EF173: @ 81EF173
+	.string "ZIGZAGOON: Guguu?$"
+
+Route109_Text_1EF185: @ 81EF185
+	.string "SEASHORE HOUSE\p"
+	.string "“May hot battles rage on hot sands!\n"
+	.string "The place for hot TRAINERS!”$"
+
+Route109_Text_1EF1D5: @ 81EF1D5
+	.string "TRAINER TIPS\p"
+	.string "POKéMON at the same level may not\n"
+	.string "always have identical stats.\p"
+	.string "POKéMON raised by TRAINERS are said\n"
+	.string "to grow stronger than wild POKéMON.$"

data/maps/scripts/Route110.inc

@@ -299,7 +299,8 @@ Route110_EventScript_1EF604:: @ 81EF604
 	msgbox Route110_Text_298579, 6
 	end
 
-	.incbin "baserom.gba", 0x1ef61b, 0x1
+Route110_EventScript_1EF61B:: @ 81EF61B
+	end
 
 Route110_EventScript_1EF61C:: @ 81EF61C
 	trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735

data/maps/scripts/Route110_TrickHouseEntrance.inc

@@ -228,7 +228,9 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
 	releaseall
 	end
 
-	.incbin "baserom.gba", 0x269d39, 0x2
+Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
+	releaseall
+	end
 
 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
 	lockall
@@ -300,3 +302,495 @@ Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
 	msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4
 	return
 
+Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
+Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
+	step_01
+	step_12
+	step_02
+	step_12
+	step_00
+	step_12
+	step_03
+	step_12
+	step_end
+
+Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
+Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
+	step_01
+	step_52
+	step_32
+	step_32
+	step_32
+	step_32
+	step_32
+	step_32
+	step_end
+
+Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
+	msgbox Route110_TrickHouseEntrance_Text_26A709, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
+	msgbox Route110_TrickHouseEntrance_Text_26A921, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEntrance_Movement_272598
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259A
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4
+	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26AA82, 4
+	compare_var_to_value VAR_0x4044, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_269EEF
+	compare_var_to_value VAR_0x4044, 2
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F1B
+	compare_var_to_value VAR_0x4044, 3
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F47
+	compare_var_to_value VAR_0x4044, 4
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F73
+	compare_var_to_value VAR_0x4044, 5
+	goto_eq Route110_TrickHouseEntrance_EventScript_269F9F
+	compare_var_to_value VAR_0x4044, 6
+	goto_eq Route110_TrickHouseEntrance_EventScript_269FCB
+	compare_var_to_value VAR_0x4044, 7
+	goto_eq Route110_TrickHouseEntrance_EventScript_269FF7
+	end
+
+Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
+	giveitem_std ITEM_RARE_CANDY
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
+	giveitem_std ITEM_TIMER_BALL
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
+	giveitem_std ITEM_HARD_STONE
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
+	giveitem_std ITEM_SMOKE_BALL
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
+	giveitem_std ITEM_TM12
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
+	giveitem_std ITEM_MAGNET
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
+	giveitem_std ITEM_PP_MAX
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A023
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_27205E
+	msgbox Route110_TrickHouseEntrance_Text_26AB00, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
+	setvar VAR_0x40C1, 0
+	setvar VAR_0x40A7, 3
+	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
+	applymovement 1, Route110_TrickHouseEntrance_Movement_27259E
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4
+	call Route110_TrickHouseEntrance_EventScript_26A070
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A09A
+	compare_var_to_value VAR_RESULT, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_272071
+	msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
+	multichoice 0, 0, 88, 1
+	switch VAR_RESULT
+	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
+	goto Route110_TrickHouseEntrance_EventScript_26A092
+
+Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
+	givedecoration_std 31
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
+	givedecoration_std 32
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
+	msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_26D632
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	waitmovement 0
+	removeobject 1
+	setvar VAR_0x40C1, 0
+	setvar VAR_0x40A7, 5
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
+	lockall
+	switch VAR_0x40A7
+	case 0, Route110_TrickHouseEntrance_EventScript_26A106
+	case 1, Route110_TrickHouseEntrance_EventScript_26A110
+	case 4, Route110_TrickHouseEntrance_EventScript_26A201
+	case 5, Route110_TrickHouseEntrance_EventScript_26A20B
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106
+	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
+	msgbox Route110_TrickHouseEntrance_Text_26A887, 5
+	closemessage
+	compare_var_to_value VAR_RESULT, 1
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A126
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
+	setmetatile 5, 1, 537, 0
+	special DrawWholeMapView
+	delay 20
+	applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7
+	waitmovement 0
+	switch VAR_0x4044
+	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
+	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
+	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
+	case 3, Route110_TrickHouseEntrance_EventScript_26A1CA
+	case 4, Route110_TrickHouseEntrance_EventScript_26A1D5
+	case 5, Route110_TrickHouseEntrance_EventScript_26A1E0
+	case 6, Route110_TrickHouseEntrance_EventScript_26A1EB
+	case 7, Route110_TrickHouseEntrance_EventScript_26A1F6
+	end
+
+Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
+	step_54
+	step_end
+
+Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_1, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_2, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_3, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_4, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_6, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6
+	warp ROUTE_110_TRICK_HOUSE_PUZZLE_8, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
+	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
+	compare_var_to_value VAR_0x4044, 8
+	goto_eq Route110_TrickHouseEntrance_EventScript_26A220
+	msgbox Route110_TrickHouseEntrance_Text_26A878, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
+	msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4
+	releaseall
+	end
+
+gUnknown_0826A22A:: @ 826A22A
+
+	.incbin "baserom.gba", 0x26a22a, 0x1b1
+
+Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB
+Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB
+	msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5
+	playfanfare BGM_FANFA4
+	message Route110_TrickHousePuzzle1_Text_26ABE8
+	waitfanfare
+	msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
+	lockall
+	msgbox Route110_TrickHouseEntrance_Text_26A474, 4
+	releaseall
+	compare_var_to_value VAR_0x4044, 0
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A429
+	compare_var_to_value VAR_0x4044, 1
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A439
+	compare_var_to_value VAR_0x4044, 2
+	call_if 1, Route110_TrickHouseEntrance_EventScript_26A449
+	setvar VAR_0x40A5, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
+	setvar VAR_0x8004, 6
+	setvar VAR_0x8005, 3
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439
+	setvar VAR_0x8004, 11
+	setvar VAR_0x8005, 5
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449
+	setvar VAR_0x8004, 9
+	setvar VAR_0x8005, 2
+	call Route110_TrickHouseEntrance_EventScript_26A459
+	return
+
+Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
+	setvar VAR_0x8006, 0
+	setfieldeffectargument 0, VAR_0x8004
+	setfieldeffectargument 1, VAR_0x8005
+	setfieldeffectargument 2, VAR_0x8006
+	dofieldeffect 54
+	waitfieldeffect 54
+	delay 10
+	return
+
+Route110_TrickHouseEntrance_Text_26A474: @ 826A474
+	.string "You’re being watched…$"
+
+Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beneath this desk? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "behind this tree? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A529: @ 826A529
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this dresser? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A577: @ 826A577
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beyond this window? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this planter? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A616: @ 826A616
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "in this cupboard? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A665: @ 826A665
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "behind this window? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6
+	.string "Hah? Grrr…\p"
+	.string "How did you know I concealed myself\n"
+	.string "beneath this cushion? You’re sharp!$"
+
+Route110_TrickHouseEntrance_Text_26A709: @ 826A709
+	.string "Behold!\p"
+	.string "For I am the greatest living mystery\n"
+	.string "of a man in all of HOENN!\l"
+	.string "They call me…\p"
+	.string "The TRICK MASTER!\n"
+	.string "Wahahaha! Glad to meet you!$"
+
+Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
+	.string "You, you’ve come to challenge\n"
+	.string "my TRICK HOUSE, haven’t you?\p"
+	.string "That’s why you’re here, isn’t it?\n"
+	.string "Yes, it is!\p"
+	.string "Consider your challenge accepted!\p"
+	.string "Enter through the scroll there,\n"
+	.string "and let your challenge commence!\p"
+	.string "I shall be waiting in the back!$"
+
+Route110_TrickHouseEntrance_Text_26A878: @ 826A878
+	.string "It’s a scroll.$"
+
+Route110_TrickHouseEntrance_Text_26A887: @ 826A887
+	.string "There is a big hole behind the scroll!\p"
+	.string "Want to go in?$"
+
+Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD
+	.string "There is a note affixed to the scroll…\p"
+	.string "“I am leaving on a journey.\n"
+	.string "Don’t look for me. TRICK MASTER”$"
+
+Route110_TrickHouseEntrance_Text_26A921: @ 826A921
+	.string "For the next time, I’ll use this trick,\n"
+	.string "and that scheme, and those ruses…\p"
+	.string "Mufufufu… If I may say so, it’s\n"
+	.string "brilliantly difficult, even for me!$"
+
+Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
+	.string "Hah? What?!\n"
+	.string "Oh, it’s you!\p"
+	.string "I’m in the midst of devising new tricky\n"
+	.string "challenges!\p"
+	.string "It’s not too much to ask for a bit more\n"
+	.string "time for me to think, is it now?\l"
+	.string "You wouldn’t begrudge me that?\l"
+	.string "Come back in a little while!$"
+
+Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82
+	.string "Ah, it’s you! You’re here to accept the\n"
+	.string "reward from before, isn’t that right?\l"
+	.string "Yes, right I am!\p"
+	.string "Here!\n"
+	.string "I’ll give it to you now!$"
+
+Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00
+	.string "Hah?\n"
+	.string "Did you not come to claim your reward?$"
+
+Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C
+	.string "MECHADOLL 5 I AM!\n"
+	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
+	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
+	.string "RED TENT OR BLUE TENT,\n"
+	.string "WHICH DO YOU PREFER?$"
+
+Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE
+	.string "THEN FAREWELL.$"
+
+Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD
+	.string "YOUR PC STATUS: FULL AGAIN.\n"
+	.string "MEAN, YOU ARE.$"
+
+Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8
+	.string "{PLAYER} found a scroll.$"
+
+Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB
+	.string "{PLAYER} memorized the secret code\n"
+	.string "written on the scroll.$"
+
+Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F
+	.string "A secret code is written on it.$"
+
+	.incbin "baserom.gba", 0x26ac4f, 0x60

data/maps/scripts/Route110_TrickHousePuzzle1.inc

@@ -38,7 +38,12 @@ Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976
 	msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6
 	end
 
-	.incbin "baserom.gba", 0x26b98d, 0x6e
+Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is fabulous.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB
 	.string "I’ll hack and slash my way to victory\n"

data/maps/scripts/Route110_TrickHousePuzzle2.inc

@@ -104,7 +104,12 @@ Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3
 	msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6
 	end
 
-	.incbin "baserom.gba", 0x26bcba, 0x6b
+Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is smart.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25
 	.string "Which switch closes which hole?$"

data/maps/scripts/Route110_TrickHousePuzzle3.inc

@@ -316,7 +316,12 @@ Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2
 	msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6
 	end
 
-	.incbin "baserom.gba", 0x26c609, 0x6d
+Route110_TrickHousePuzzle3_Text_26C609: @ 826C609
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is coveted.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle3_Text_26C676: @ 826C676
 	.string "I keep coming back to this same place!$"

data/maps/scripts/Route110_TrickHousePuzzle4.inc

@@ -28,7 +28,12 @@ Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC
 	msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6
 	end
 
-	.incbin "baserom.gba", 0x26c8c3, 0x6a
+Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is cool.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D
 	.string "It’s too much bother to think this out.\n"

data/maps/scripts/Route110_TrickHousePuzzle5.inc

@@ -199,7 +199,11 @@ Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7
 	goto Route110_TrickHousePuzzle5_EventScript_26CE73
 	end
 
-	.incbin "baserom.gba", 0x26ccd3, 0xc
+Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3
+	lockall
+	setvar VAR_0x4009, 5
+	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	end
 
 Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF
 	lockall
@@ -522,7 +526,18 @@ Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C
 	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5
 	return
 
-	.incbin "baserom.gba", 0x26d294, 0x38
+Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294
+	compare_var_to_value VAR_0x4008, 1
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0
+	compare_var_to_value VAR_0x4008, 2
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB
+	compare_var_to_value VAR_0x4008, 3
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6
+	compare_var_to_value VAR_0x4008, 4
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1
+	compare_var_to_value VAR_0x4008, 5
+	call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC
+	return
 
 Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC
 	compare_var_to_value VAR_0x4008, 1
@@ -689,7 +704,30 @@ Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5
 	waitmovement 0
 	return
 
-	.incbin "baserom.gba", 0x26d4c0, 0x37
+Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0
+	applymovement 1, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB
+	applymovement 2, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6
+	applymovement 3, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1
+	applymovement 4, Movement_26D618
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC
+	applymovement 5, Movement_26D618
+	waitmovement 0
+	return
 
 Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7
 	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E
@@ -838,7 +876,14 @@ Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
 	step_left
 	step_end
 
-	.incbin "baserom.gba", 0x26d618, 0x6
+
+Movement_26D618: @ 826D618
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
 	step_right
@@ -870,3 +915,172 @@ Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
 	step_right
 	step_end
 
+Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
+Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_02
+	step_11
+	step_03
+	step_11
+	step_00
+	step_end
+
+	.incbin "baserom.gba", 0x26d660, 0x6e
+
+Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 1 AM I!\p"
+	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
+	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
+	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
+
+Route110_TrickHousePuzzle5_Text_26D757: @ 826D757
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON is not found\n"
+	.string "on ROUTE 110. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON is not of the\n"
+	.string "WATER type. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC
+	.string "MECHADOLL 1 QUIZ.\p"
+	.string "One of these POKéMON does not use\n"
+	.string "LEECH LIFE. Which one is it?$"
+
+Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D
+	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
+	.string "GO THROUGH. PLEASE.$"
+
+Route110_TrickHousePuzzle5_Text_26D883: @ 826D883
+	.string "BZZZT. DISAPPOINTMENT.\n"
+	.string "ERROR.$"
+
+Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1
+	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
+	.string "CLICKETY-CLACK!$"
+
+Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9
+	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
+
+Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 2 AM I!\p"
+	.string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n"
+	.string "IS SET TOO LOW.$"
+
+Route110_TrickHousePuzzle5_Text_26D940: @ 826D940
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON did WALLY\n"
+	.string "borrow from your father?$"
+
+Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON was chasing\n"
+	.string "PROF. BIRCH?$"
+
+Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE
+	.string "MECHADOLL 2 QUIZ.\p"
+	.string "Which of these POKéMON did TEAM AQUA\n"
+	.string "use in PETALBURG FOREST?$"
+
+Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 3 AM I!\p"
+	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
+
+Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Which costs more?\n"
+	.string "Three HARBOR MAILS or one BURN HEAL?$"
+
+Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Sell one GREAT BALL and buy\n"
+	.string "one POTION. How much money remains?$"
+
+Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF
+	.string "MECHADOLL 3 QUIZ.\p"
+	.string "Do one REPEL and SODA POP cost\n"
+	.string "more than one SUPER POTION?$"
+
+Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 4 THAT IS ME!\p"
+	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
+
+Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In SEASHORE HOUSE, were there more men\n"
+	.string "or women?$"
+
+Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In LAVARIDGE TOWN, were there more\n"
+	.string "elderly men or elderly women?$"
+
+Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A
+	.string "MECHADOLL 4 QUIZ.\p"
+	.string "In the TRAINER’S SCHOOL, how many\n"
+	.string "girl students were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78
+	.string "CLICKETY-CLACK…\n"
+	.string "MECHADOLL 5 AM I!\p"
+	.string "THE MASTER’S BEST AND PROUDEST\n"
+	.string "ACHIEVEMENT AM I.$"
+
+Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "In SLATEPORT’s POKéMON FAN CLUB,\n"
+	.string "how many POKéMON were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "In FORTREE CITY, how many\n"
+	.string "tree houses were there?$"
+
+Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F
+	.string "MECHADOLL 5 QUIZ.\p"
+	.string "On the CYCLING ROAD, how many\n"
+	.string "TRIATHLETES were there?$"

data/maps/scripts/Route110_TrickHousePuzzle6.inc

@@ -42,7 +42,12 @@ Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F
 	msgbox Route110_TrickHousePuzzle6_Text_26E048, 6
 	end
 
-	.incbin "baserom.gba", 0x26de26, 0x6d
+Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is my life.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93
 	.string "When I heard there was a strange\n"

data/maps/scripts/Route110_TrickHousePuzzle7.inc

@@ -47,7 +47,30 @@ Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
 	setmetatile 7, 5, 575, 1
 	return
 
-	.incbin "baserom.gba", 0x26e139, 0x5f
+Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
+	setmetatile 13, 17, 611, 0
+	setmetatile 12, 16, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
+	setmetatile 12, 13, 609, 0
+	setmetatile 12, 11, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
+	setmetatile 7, 12, 611, 0
+	setmetatile 5, 10, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
+	setmetatile 6, 6, 635, 0
+	setmetatile 4, 4, 574, 1
+	return
+
+Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
+	setmetatile 8, 4, 608, 0
+	setmetatile 7, 5, 574, 1
+	return
 
 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
 	compare_var_to_value VAR_0x40B6, 1
@@ -87,7 +110,138 @@ Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
 	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
 	end
 
-	.incbin "baserom.gba", 0x26e1ed, 0x12e
+Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
+	lockall
+	setvar VAR_0x40B6, 1
+	warpteleport ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 3, 19
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
+	lockall
+	delay 32
+	checkflag FLAG_0x0C2
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA
+	checkflag FLAG_0x0C2
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C2
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9
+	checkflag FLAG_0x0C2
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
+	lockall
+	delay 32
+	checkflag FLAG_0x0C3
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED
+	checkflag FLAG_0x0C3
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C3
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3
+	checkflag FLAG_0x0C3
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
+	lockall
+	delay 32
+	checkflag FLAG_0x0C4
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100
+	checkflag FLAG_0x0C4
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C4
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD
+	checkflag FLAG_0x0C4
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E302
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
+	lockall
+	delay 32
+	checkflag FLAG_0x0C5
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113
+	checkflag FLAG_0x0C5
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C5
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307
+	checkflag FLAG_0x0C5
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
+	lockall
+	delay 32
+	checkflag FLAG_0x0C6
+	call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126
+	checkflag FLAG_0x0C6
+	call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	checkflag FLAG_0x0C6
+	goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311
+	checkflag FLAG_0x0C6
+	goto_eq Route110_TrickHousePuzzle7_EventScript_26E316
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9
+	setflag FLAG_0x0C2
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE
+	clearflag FLAG_0x0C2
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3
+	setflag FLAG_0x0C3
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8
+	clearflag FLAG_0x0C3
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD
+	setflag FLAG_0x0C4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302
+	clearflag FLAG_0x0C4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307
+	setflag FLAG_0x0C5
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C
+	clearflag FLAG_0x0C5
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311
+	setflag FLAG_0x0C6
+	releaseall
+	end
+
+Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316
+	clearflag FLAG_0x0C6
+	releaseall
+	end
 
 Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
 	playse SE_MU_PACHI
@@ -137,7 +291,17 @@ Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
 	mossdeepgym4
 	end
 
-	.incbin "baserom.gba", 0x26e373, 0x16
+Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
+	playse SE_MU_PACHI
+	waitse
+	playse SE_TU_SAA
+	mossdeepgym3 1
+	mossdeepgym1 4
+	waitmovement 0
+	mossdeepgym2
+	waitmovement 0
+	mossdeepgym4
+	end
 
 Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
 	trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
@@ -169,7 +333,12 @@ Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
 	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6
 	end
 
-	.incbin "baserom.gba", 0x26e413, 0x6e
+Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER is huggable.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle7_Text_26E481: @ 826E481
 	.string "The TRICK MASTER always vanishes\n"

data/maps/scripts/Route110_TrickHousePuzzle8.inc

@@ -28,7 +28,12 @@ Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D
 	msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6
 	end
 
-	.incbin "baserom.gba", 0x26e864, 0x69
+Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864
+	.string "{PLAYER} wrote down the secret code\n"
+	.string "on the door.\p"
+	.string "“TRICK MASTER I love.”\n"
+	.string "… … … … … … … …\p"
+	.string "The lock clicked open!$"
 
 Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD
 	.string "Not many TRAINERS have made it\n"

data/maps/scripts/Route111.inc

@@ -149,7 +149,15 @@ Route111_EventScript_1F0EA7:: @ 81F0EA7
 	releaseall
 	end
 
-	.incbin "baserom.gba", 0x1f0eb1, 0x8
+Route111_Movement_1F0EB1:: @ 81F0EB1
+	step_94
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_end
 
 Route111_EventScript_1F0EB9:: @ 81F0EB9
 	lock
@@ -172,7 +180,11 @@ Route111_EventScript_1F0EF4:: @ 81F0EF4
 	release
 	end
 
-	.incbin "baserom.gba", 0x1f0efe, 0xc
+Route111_EventScript_1F0EFE:: @ 81F0EFE
+	lockall
+	setvar VAR_0x8004, 0
+	goto Route111_EventScript_1F0F2E
+	end
 
 Route111_EventScript_1F0F0A:: @ 81F0F0A
 	lockall
@@ -186,7 +198,11 @@ Route111_EventScript_1F0F16:: @ 81F0F16
 	goto Route111_EventScript_1F0F2E
 	end
 
-	.incbin "baserom.gba", 0x1f0f22, 0xc
+Route111_EventScript_1F0F22:: @ 81F0F22
+	lockall
+	setvar VAR_0x8004, 3
+	goto Route111_EventScript_1F0F2E
+	end
 
 Route111_EventScript_1F0F2E:: @ 81F0F2E
 	checkitem ITEM_GO_GOGGLES, 1

data/maps/scripts/Route119.inc

@@ -493,3 +493,125 @@ Route119_EventScript_1F49E3:: @ 81F49E3
 	msgbox Route119_Text_1F5339, 3
 	end
 
+gUnknown_081F49EC:: @ 81F49EC
+	.incbin "baserom.gba", 0x1f49ec, 0x11
+
+Route119_Text_1F49FD: @ 81F49FD
+	.string "MAY: {PLAYER}{KUN}!\n"
+	.string "Where were you? I was looking for you!\p"
+	.string "How much stronger have you gotten?\n"
+	.string "Let me check for you!\p"
+	.string "Ready with your POKéMON?\n"
+	.string "Of course you are! Go!$"
+
+Route119_Text_1F4A98: @ 81F4A98
+	.string "Achah!\n"
+	.string "{PLAYER}{KUN}, you’re strong!\p"
+	.string "I was worried that you might be\n"
+	.string "struggling with your training.$"
+
+Route119_Text_1F4AF3: @ 81F4AF3
+	.string "MAY: But I had absolutely nothing to\n"
+	.string "worry about! Keep it up!\p"
+	.string "And, here! I have a present for you.$"
+
+Route119_Text_1F4B56: @ 81F4B56
+	.string "MAY: Use FLY, and your POKéMON will\n"
+	.string "instantly carry you to any town you’ve\l"
+	.string "already visited.\p"
+	.string "But, to use FLY, you have to get\n"
+	.string "the GYM BADGE from FORTREE CITY.\l"
+	.string "That’s important, so don’t forget.\p"
+	.string "You should FLY home and visit\n"
+	.string "LITTLEROOT for a change.\p"
+	.string "I bet your mom’s worried about you,\n"
+	.string "{PLAYER}{KUN}.\p"
+	.string "Well, let’s meet again somewhere!$"
+
+Route119_Text_1F4C9A: @ 81F4C9A
+	.string "BRENDAN: {PLAYER}! So this is where\n"
+	.string "you’ve been looking for POKéMON?\p"
+	.string "Let me see how good you got.\n"
+	.string "I’ll test you!\p"
+	.string "Now!\n"
+	.string "It’s a battle, so battle!$"
+
+Route119_Text_1F4D24: @ 81F4D24
+	.string "Hmm…\n"
+	.string "You’ve gotten pretty darn decent.$"
+
+Route119_Text_1F4D4B: @ 81F4D4B
+	.string "BRENDAN: I’d say you’re good enough\n"
+	.string "to search for POKéMON anywhere.\p"
+	.string "Here, I’ll give you this.\n"
+	.string "Try it out.$"
+
+Route119_Text_1F4DB5: @ 81F4DB5
+	.string "BRENDAN: Use FLY, and your POKéMON\n"
+	.string "instantly carries you to any town\l"
+	.string "you’ve already visited.\p"
+	.string "But you need the FORTREE GYM BADGE \n"
+	.string "to do that.\p"
+	.string "Anyway, I have to move along.$"
+
+Route119_Text_1F4E60: @ 81F4E60
+	.string "SCOTT: Hahahah!\n"
+	.string "Way to go, {PLAYER}{KUN}!\p"
+	.string "I just passed by a TRAINER riding\n"
+	.string "a BIKE.\p"
+	.string "You just beat that TRAINER, didn’t you?\n"
+	.string "It was pretty obvious that you did.\p"
+	.string "The kid looked really upset with\n"
+	.string "a face all red from anger.\p"
+	.string "I sure seem to run into you often.\n"
+	.string "Are you off to FORTREE GYM next?\p"
+	.string "I expect that you’ll do well at the GYM.\n"
+	.string "Well, I’ll be seeing you!$"
+
+	.incbin "baserom.gba", 0x1f4fba, 0x131
+
+Route119_Text_1F50EB: @ 81F50EB
+	.string "We’re standing lookout here.\p"
+	.string "Hey, you! Stay away from the WEATHER\n"
+	.string "INSTITUTE. It’s not safe.$"
+
+Route119_Text_1F5147: @ 81F5147
+	.string "Lookout duty is surprisingly boring.\p"
+	.string "Hey, you! Please don’t go near the\n"
+	.string "WEATHER INSTITUTE.$"
+
+Route119_Text_1F51A2: @ 81F51A2
+	.string "I thought you FLY by catching a whole\n"
+	.string "flock of BIRD POKéMON, and then\l"
+	.string "hanging on to them somehow.\p"
+	.string "But it turns out there’s an HM move\n"
+	.string "called FLY!\p"
+	.string "I wish I’d known about that a long\n"
+	.string "time ago…$"
+
+Route119_Text_1F5261: @ 81F5261
+	.string "Tch…\n"
+	.string "It’s a no-go…\p"
+	.string "The tall grass snares BIKE tires.\n"
+	.string "There’s no way you can cycle here.$"
+
+Route119_Text_1F52B9: @ 81F52B9
+	.string "Can your POKéMON use its SECRET POWER\n"
+	.string "on a big pile of grass and make a\l"
+	.string "SECRET BASE?$"
+
+Route119_Text_1F530E: @ 81F530E
+	.string "ROUTE 119\n"
+	.string "{0x7C} FORTREE CITY$"
+
+Route119_Text_1F5327: @ 81F5327
+	.string "WEATHER INSTITUTE$"
+
+Route119_Text_1F5339: @ 81F5339
+	.string "TRAINER TIPS\p"
+	.string "Up to sixteen decorations and\n"
+	.string "furniture items can be placed in\l"
+	.string "a SECRET BASE.\p"
+	.string "Pick your favorite items and create\n"
+	.string "your very own SECRET BASE exactly the\l"
+	.string "way you want.$"

data/maps/scripts/Route119_WeatherInstitute_2F.inc

@@ -297,7 +297,9 @@ Route119_WeatherInstitute_2F_Text_270650: @ 8270650
 	.string "It might be an odd way of thanking you,\n"
 	.string "but take this POKéMON.$"
 
-	.incbin "baserom.gba", 0x2706b2, 0x36
+Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2
+	.string "Hm? You don’t seem to have any room\n"
+	.string "for this POKéMON.$"
 
 Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8
 	.string "{PLAYER} received CASTFORM!$"

data/maps/scripts/Route120.inc

@@ -443,3 +443,24 @@ Route120_Text_1F5C7B: @ 81F5C7B
 	.string "I think you’re doing great.\p"
 	.string "Well, let’s meet again somewhere.$"
 
+Route119_Text_1F5D00: @ 81F5D00
+Route120_Text_1F5D00: @ 81F5D00
+	.string "Something unseeable is in the way.$"
+
+Route119_Text_1F5D23: @ 81F5D23
+	.string "Something unseeable is in the way.\p"
+	.string "Want to use the DEVON SCOPE?$"
+
+Route119_Text_1F5D63: @ 81F5D63
+	.string "{PLAYER} used the DEVON SCOPE.\p"
+	.string "An invisible POKéMON became completely\n"
+	.string "visible!\p"
+	.string "The startled POKéMON attacked!$"
+
+Route120_Text_1F5DCB: @ 81F5DCB
+	.string "ROUTE 120\n"
+	.string "{0x7B} FORTREE CITY$"
+
+Route120_Text_1F5DE4: @ 81F5DE4
+	.string "{0x7C} ROUTE 121\n"
+	.string "{0x7B} ROUTE 120$"

data/maps/scripts/Route124_DivingTreasureHuntersHouse.inc

@@ -348,7 +348,49 @@ Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
 	.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
 	.string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$"
 
-	.incbin "baserom.gba", 0x271315, 0x3a
+Route124_DivingTreasureHuntersHouse_Text_271315: @ 8271315
+	lock
+	faceplayer
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_271320: @ 8271320
+	lockall
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	releaseall
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_27132A: @ 827132A
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_271332: @ 8271332
+	message 0x0
+	waitmessage
+	yesnobox 20, 8
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_27133C: @ 827133C
+	message 0x0
+	playfanfare BGM_ME_BATTLE_POINTS
+	waitfanfare
+	waitmessage
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_271347: @ 8271347
+	pokenavcall 0x0
+	waitmessage
+	return
+
+Route124_DivingTreasureHuntersHouse_Text_27134E: @ 827134E
+	return
 
 BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F
 BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F