Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion

.travis/calcrom/calcrom.pl

@@ -64,7 +64,7 @@ my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
 # This looks for every symbol with an address at the end of it. Some things are
 # given a name based on their type / location, but still have an unknown purpose.
 # For example, FooMap_EventScript_FFFFFFF.
-my $partial_doc_cmd = "grep '[0-9a-fA-F]\\{6,7\\}'";
+my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,6\\}'";
 
 my $count_cmd = "wc -l";
 

asm/librfu_intr.s

@@ -18,7 +18,7 @@ IntrSIO32: @ 82E3554
 	cmp r0, 0
 	ldmdbeq r11, {r11,sp,lr}
 	bxeq lr
-	bl sub_82E3EB0
+	bl Callback_Dummy_ID
 	ldmdb r11, {r11,sp,lr}
 	bx lr
 _082E3590:
@@ -33,7 +33,7 @@ _082E35A8:
 	ldmdb r11, {r11,sp,lr}
 	bx lr
 	.align 2, 0
-_082E35B4: .4byte gRfuState
+_082E35B4: .4byte gSTWIStatus
 	arm_func_end IntrSIO32
 
 	arm_func_start sio32intr_clock_master
@@ -204,10 +204,10 @@ _082E3800:
 	beq _082E3840
 	ldrh r1, [r0, 0x12]
 	ldrb r0, [r0, 0x6]
-	bl sub_82E3EA8
+	bl Callback_Dummy_M
 	b _082E3840
 	.align 2, 0
-_082E382C: .4byte gRfuState
+_082E382C: .4byte gSTWIStatus
 _082E3830:
 	add r3, r5, 0x3
 	strh r3, [r4]
@@ -423,7 +423,7 @@ _082E3AD4:
 	beq _082E3C4C
 	mov r0, 0x1EC
 	add r0, r0, 0x2
-	bl sub_82E3EAC
+	bl Callback_Dummy_S
 	b _082E3C4C
 _082E3B48:
 	mov r3, 0x120
@@ -445,7 +445,7 @@ _082E3B48:
 	ldrb r0, [r0, 0x6]
 	mov r1, r2
 	orr r0, r0, r3, lsl 8
-	bl sub_82E3EAC
+	bl Callback_Dummy_S
 	b _082E3C4C
 _082E3B9C:
 	mov r3, 0x208
@@ -472,7 +472,7 @@ _082E3BE4:
 	bhi _082E3BE4
 	b _082E3C20
 	.align 2, 0
-_082E3BF4: .4byte gRfuState
+_082E3BF4: .4byte gSTWIStatus
 _082E3BF8: .4byte 0x996601ee
 _082E3BFC:
 	mov r2, 0xFF00
@@ -532,7 +532,7 @@ _082E3CA4:
 	ldmdb r11, {r11,sp,lr}
 	bx lr
 	.align 2, 0
-_082E3CB8: .4byte gRfuState
+_082E3CB8: .4byte gSTWIStatus
 	arm_func_end handshake_wait
 
 	arm_func_start STWI_set_timer_in_RAM
@@ -588,7 +588,7 @@ _082E3D5C:
 	mov r3, 0x3
 	b _082E3D8C
 	.align 2, 0
-_082E3D74: .4byte gRfuState
+_082E3D74: .4byte gSTWIStatus
 _082E3D78:
 	mvn r3, 0x850
 	sub r3, r3, 0x2
@@ -637,7 +637,7 @@ STWI_stop_timer_in_RAM: @ 82E3DCC
 	ldmdb r11, {r11,sp,lr}
 	bx lr
 	.align 2, 0
-_082E3E18: .4byte gRfuState
+_082E3E18: .4byte gSTWIStatus
 	arm_func_end STWI_stop_timer_in_RAM
 
 	arm_func_start STWI_init_slave
@@ -677,20 +677,20 @@ STWI_init_slave: @ 82E3E1C
 	ldmdb r11, {r11,sp,lr}
 	bx lr
 	.align 2, 0
-_082E3EA4: .4byte gRfuState
+_082E3EA4: .4byte gSTWIStatus
 	arm_func_end STWI_init_slave
 
-	arm_func_start sub_82E3EA8
+	arm_func_start Callback_Dummy_M
-sub_82E3EA8: @ 82E3EA8
+Callback_Dummy_M: @ 82E3EA8
 	bx r2
-	arm_func_end sub_82E3EA8
+	arm_func_end Callback_Dummy_M
 
-	arm_func_start sub_82E3EAC
+	arm_func_start Callback_Dummy_S
-sub_82E3EAC: @ 82E3EAC
+Callback_Dummy_S: @ 82E3EAC
 	bx r1
-	arm_func_end sub_82E3EAC
+	arm_func_end Callback_Dummy_S
 
-	arm_func_start sub_82E3EB0
+	arm_func_start Callback_Dummy_ID
-sub_82E3EB0: @ 82E3EB0
+Callback_Dummy_ID: @ 82E3EB0
 	bx r0
-	arm_func_end sub_82E3EB0
+	arm_func_end Callback_Dummy_ID

asm/macros/battle_frontier/battle_dome.inc

@@ -1,5 +1,3 @@
-@ TODO: Add explanatory comments to macros
-
 	@ Initialize the Battle Dome challenge
 	.macro dome_init
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
@@ -23,64 +21,64 @@
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Buffer the name of the current round to gStringVar1
 	.macro dome_getroundtext
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Buffer the name of the opponent to gStringVar2 and the name of the round to gStringVar1
 	.macro dome_getopponentname
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Choose which of the opponents mons to use in battle and load them into the enemy party
 	.macro dome_initopponentparty
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Show the page that gives information on the next opponent
 	.macro dome_showopponentinfo
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Displays the tourney tree for the current tourney
 	.macro dome_showtourneytree
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Displays the tourney tree for the results of the previous tourney. Before the player enters their first tourney this is a random tourney generated by dome_initresultstree
-	.macro dome_showresultstree
+	.macro dome_showprevtourneytree
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_TOURNEY_TREE
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Sets gTrainerBattleOpponent_A to the trainer ID of the next opponent
 	.macro dome_setopponent
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Set the object event gfx id for the opponent
 	.macro dome_setopponentgfx
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ A non-interactive version of the tourney tree shown when a round is completed
 	.macro dome_showstatictourneytree
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Decides the winners of NPC vs NPC matches, and eliminates either the player or their opponent depending on the playerStatus (DOME_PLAYER_*)
-	.macro dome_resolvewinners arg:req
+	.macro dome_resolvewinners playerStatus:req
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
-	setvar VAR_0x8005, \arg
+	setvar VAR_0x8005, \playerStatus
 	special CallBattleDomeFunction
 	.endm
 
@@ -97,7 +95,7 @@
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Sets the facility trainer/mon set pointers
 	.macro dome_settrainers
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
 	special CallBattleDomeFunction
@@ -109,19 +107,19 @@
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Reset the held items of the mons that just battled to what they were prior to battling
 	.macro dome_restorehelditems
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Reduce the players party to the selected mons, used to reduce down to the 2 selected for battle
 	.macro dome_reduceparty
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Compares the initial tournament ranking (seed) of the player to opponent A. Returns 1 if the player's seed is better, 2 if the opponent's seed is better.
 	.macro dome_compareseeds
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS
 	special CallBattleDomeFunction
@@ -133,13 +131,13 @@
 	special CallBattleDomeFunction
 	.endm
 
-	@ TODO: Document this macro and its function
+	@ Performs a random tourney to initialize the results board before the player has entered a challenge
-	.macro dome_21
+	.macro dome_initresultstree
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_21
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_RESULTS_TREE
 	special CallBattleDomeFunction
 	.endm
 
-	@
+	@ Generates the tourney trainers and their parties, and seeds them in the tourney tree
 	.macro dome_inittrainers
 	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
 	special CallBattleDomeFunction

asm/macros/event.inc

@@ -469,14 +469,14 @@
 	.endm
 
 	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
-	.macro giveitem index:req, quantity:req
+	.macro additem index:req, quantity=1
 	.byte 0x44
 	.2byte \index
 	.2byte \quantity
 	.endm
 
 	@ Removes quantity of item index from the player's Bag.
-	.macro takeitem index:req, quantity:req
+	.macro removeitem index:req, quantity=1
 	.byte 0x45
 	.2byte \index
 	.2byte \quantity
@@ -503,7 +503,7 @@
 	.endm
 
 	@ Adds a quantity amount of item index to the player's PC. Both arguments can be variables.
-	.macro givepcitem index:req, quantity:req
+	.macro addpcitem index:req, quantity:req
 	.byte 0x49
 	.2byte \index
 	.2byte \quantity
@@ -517,13 +517,13 @@
 	.endm
 
 	@ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro givedecoration decoration:req
+	.macro adddecoration decoration:req
 	.byte 0x4b
 	.2byte \decoration
 	.endm
 
 	@ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
-	.macro takedecoration decoration:req
+	.macro removedecoration decoration:req
 	.byte 0x4c
 	.2byte \decoration
 	.endm
@@ -1050,14 +1050,14 @@
 	.endm
 
 	@ If check is 0x00, this command adds value to the player's money.
-	.macro givemoney value:req, check:req
+	.macro addmoney value:req, check:req
 	.byte 0x90
 	.4byte \value
 	.byte \check
 	.endm
 
 	@ If check is 0x00, this command subtracts value from the player's money.
-	.macro takemoney value:req, check:req
+	.macro removemoney value:req, check:req
 	.byte 0x91
 	.4byte \value
 	.byte \check
@@ -1281,12 +1281,12 @@
 	.2byte \out
 	.endm
 
-	.macro givecoins count:req
+	.macro addcoins count:req
 	.byte 0xb4
 	.2byte \count
 	.endm
 
-	.macro takecoins count:req
+	.macro removecoins count:req
 	.byte 0xb5
 	.2byte \count
 	.endm
@@ -1564,12 +1564,12 @@
 
 	.macro goto_if_unset flag:req, dest:req
 	checkflag \flag
-	goto_if 0, \dest
+	goto_if FALSE, \dest
 	.endm
 
 	.macro goto_if_set flag:req, dest:req
 	checkflag \flag
-	goto_if 1, \dest
+	goto_if TRUE, \dest
 	.endm
 
 	.macro goto_if_lt dest:req @ LESS THAN
@@ -1598,12 +1598,12 @@
 
 	.macro call_if_unset flag:req, dest:req
 	checkflag \flag
-	call_if 0, \dest
+	call_if FALSE, \dest
 	.endm
 
 	.macro call_if_set flag:req, dest:req
 	checkflag \flag
-	call_if 1, \dest
+	call_if TRUE, \dest
 	.endm
 
 	.macro call_if_lt dest:req @ LESS THAN
@@ -1631,11 +1631,41 @@
 	.endm
 
 	.macro vgoto_if_eq dest:req
-	vgoto_if 1, \dest
+	vgoto_if TRUE, \dest
 	.endm
 
 	.macro vgoto_if_ne dest:req
-	vgoto_if 0, \dest
+	vgoto_if FALSE, \dest
+	.endm
+
+	.macro vgoto_if_unset flag:req, dest:req
+	checkflag \flag
+	vgoto_if FALSE, \dest
+	.endm
+
+	.macro vgoto_if_set flag:req, dest:req
+	checkflag \flag
+	vgoto_if TRUE, \dest
+	.endm
+
+	.macro goto_if_defeated trainer:req, dest:req
+	checktrainerflag \trainer
+	goto_if TRUE, \dest
+	.endm
+
+	.macro goto_if_not_defeated trainer:req, dest:req
+	checktrainerflag \trainer
+	goto_if FALSE, \dest
+	.endm
+
+	.macro call_if_defeated trainer:req, dest:req
+	checktrainerflag \trainer
+	call_if TRUE, \dest
+	.endm
+
+	.macro call_if_not_defeated trainer:req, dest:req
+	checktrainerflag \trainer
+	call_if FALSE, \dest
 	.endm
 
 	.macro switch var:req
@@ -1663,19 +1693,19 @@
 	callstd \type
 	.endm
 
-	.macro giveitem_std item:req, amount=1
+	.macro giveitem item:req, amount=1
 	setorcopyvar VAR_0x8000, \item
 	setorcopyvar VAR_0x8001, \amount
 	callstd STD_OBTAIN_ITEM
 	.endm
 
-	.macro finditem_std item:req, amount=1
+	.macro finditem item:req, amount=1
 	setorcopyvar VAR_0x8000, \item
 	setorcopyvar VAR_0x8001, \amount
 	callstd STD_FIND_ITEM
 	.endm
 
-	.macro givedecoration_std decoration:req
+	.macro givedecoration decoration:req
 	setorcopyvar VAR_0x8000, \decoration
 	callstd STD_OBTAIN_DECORATION
 	.endm

common_syms/librfu.txt

@@ -1,6 +0,0 @@
-gUnknown_03007870
-gUnknown_03007880
-gUnknown_03007890
-gUnknown_03007894
-gUnknown_03007898
-gUnknown_030078A0

common_syms/librfu_rfu.txt

@@ -0,0 +1,5 @@
+gRfuSlotStatusUNI
+gRfuSlotStatusNI
+gRfuLinkStatus
+gRfuStatic
+gRfuFixed

common_syms/librfu_sio32id.txt

@@ -0,0 +1 @@
+gRfuSIO32Id

common_syms/librfu_stwi.txt

@@ -1 +1 @@
-gRfuState
+gSTWIStatus

common_syms/save.txt

@@ -10,4 +10,4 @@ gSaveFileStatus
 gGameContinueCallback
 gRamSaveSectionLocations
 gSaveUnusedVar2
-gUnknown_03006294
+gSaveAttemptStatus

data/battle_ai_scripts.s

@@ -2395,10 +2395,10 @@ AI_CV_Hail_ScoreDown1:
 AI_CV_Hail_End:
 	end
 
+@ BUG: Facade score is increased if the target is statused, but should be if the user is. Replace AI_TARGET with AI_USER
 AI_CV_Facade:
 	if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
 	score +1
-
 AI_CV_Facade_End:
 	end
 

data/event_scripts.s

@@ -447,10 +447,10 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/AlteringCave/scripts.inc"
 	.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
 	.include "data/scripts/shared_secret_base.inc"
-	.include "data/maps/BattleColosseum2P/scripts.inc"
+	.include "data/maps/BattleColosseum_2P/scripts.inc"
 	.include "data/maps/TradeCenter/scripts.inc"
 	.include "data/maps/RecordCorner/scripts.inc"
-	.include "data/maps/BattleColosseum4P/scripts.inc"
+	.include "data/maps/BattleColosseum_4P/scripts.inc"
 	.include "data/maps/ContestHall/scripts.inc"
 	.include "data/maps/InsideOfTruck/scripts.inc"
 	.include "data/maps/SSTidalCorridor/scripts.inc"
@@ -570,65 +570,8 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/Route119_House/scripts.inc"
 	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
 
-@ Below could be split as std_msgbox.inc but autoclose straddles trainer_battle.inc
+	.include "data/scripts/std_msgbox.inc"
-Std_MsgboxNPC: @ 8271315
-	lock
-	faceplayer
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	release
-	return
-
-Std_MsgboxSign: @ 8271320
-	lockall
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	releaseall
-	return
-
-Std_MsgboxDefault: @ 827132A
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	return
-
-Std_MsgboxYesNo: @ 8271332
-	message 0x0
-	waitmessage
-	yesnobox 20, 8
-	return
-
-Std_MsgboxGetPoints: @ 827133C
-	message 0x0
-	playfanfare MUS_ME_POINTGET
-	waitfanfare
-	waitmessage
-	return
-
-Std_10: @ 8271347
-	pokenavcall 0x0
-	waitmessage
-	return
-
-EventScript_UnusedReturn: @ 827134E
-	return
-
-Common_EventScript_SaveGame:: @ 827134F
-	special SaveGame
-	waitstate
-	return
-
 	.include "data/scripts/trainer_battle.inc"
-
-Std_MsgboxAutoclose:: @ 8271494
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	release
-	return
-
 	.include "data/scripts/new_game.inc"
 	.include "data/scripts/hall_of_fame.inc"
 
@@ -844,7 +787,7 @@ EventScript_UnusedBoardFerry:: @ 827222B
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	showobjectat 255, MAP_PETALBURG_CITY
+	showobjectat EVENT_OBJ_ID_PLAYER, 0
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry
 	waitmovement 0
@@ -861,7 +804,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
 	compare VAR_FACING, DIR_WEST
 	call_if_eq Ferry_EventScript_DepartIslandWest
 	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	call Common_EventScript_FerryDepart
 	return
 
@@ -880,7 +823,7 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
 	message gText_PlayerHandedOverTheItem
 	waitmessage
 	waitfanfare
-	takeitem VAR_0x8004, 1
+	removeitem VAR_0x8004
 	return
 
 	.include "data/scripts/elite_four.inc"

data/layouts/layouts.json

@@ -2203,13 +2203,13 @@
     },
     {
       "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
-      "name": "BattleColosseum2P_Layout",
+      "name": "BattleColosseum_2P_Layout",
       "width": 14,
       "height": 9,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_CableClub",
-      "border_filepath": "data/layouts/BattleColosseum2P/border.bin",
+      "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
-      "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
+      "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
     },
     {
       "id": "LAYOUT_TRADE_CENTER",
@@ -2233,13 +2233,13 @@
     },
     {
       "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
-      "name": "BattleColosseum4P_Layout",
+      "name": "BattleColosseum_4P_Layout",
       "width": 14,
       "height": 9,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_CableClub",
-      "border_filepath": "data/layouts/BattleColosseum4P/border.bin",
+      "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
-      "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
+      "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
     },
     {
       "id": "LAYOUT_CONTEST_HALL",

data/librfu_rodata.s

@@ -1,17 +0,0 @@
-	.section .rodata
-
-gUnknown_089A3220:: @ 89A3220
-	.byte 2, 14, 0, 10, 9, 5, 7, 2
-	.byte 0, 15, 1, 3, 3, 0, 31, 0
-	.byte 3, 22, 18, 14, 13, 9, 11, 3
-	.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
-
-	.asciz "RFU_V1026"
-
-	.align 2
-gUnknown_089A324C:: @ 89A324C
-	.asciz "RFU-MBOOT"
-
-	.align 2
-gUnknown_089A3258:: @ 89A3258
-	.asciz "NINTENDOSio32ID_030820"

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -32,7 +32,7 @@ AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
 	msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_STORAGE_KEY, 1
+	removeitem ITEM_STORAGE_KEY
 	setflag FLAG_USED_STORAGE_KEY
 	call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
 	special DrawWholeMapView

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -58,7 +58,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_1_KEY, 1
+	removeitem ITEM_ROOM_1_KEY
 	setflag FLAG_USED_ROOM_1_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
 	special DrawWholeMapView
@@ -73,7 +73,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_2_KEY, 1
+	removeitem ITEM_ROOM_2_KEY
 	setflag FLAG_USED_ROOM_2_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
 	special DrawWholeMapView
@@ -88,7 +88,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_4_KEY, 1
+	removeitem ITEM_ROOM_4_KEY
 	setflag FLAG_USED_ROOM_4_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
 	special DrawWholeMapView
@@ -103,7 +103,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_6_KEY, 1
+	removeitem ITEM_ROOM_6_KEY
 	setflag FLAG_USED_ROOM_6_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
 	special DrawWholeMapView

data/maps/BattleColosseum2P/scripts.inc

@@ -1,3 +0,0 @@
-BattleColosseum2P_MapScripts:: @ 823B77D
-	.byte 0
-

data/maps/BattleColosseum4P/scripts.inc

@@ -1,3 +0,0 @@
-BattleColosseum4P_MapScripts:: @ 823B780
-	.byte 0
-

data/maps/BattleColosseum_2P/map.json

@@ -1,6 +1,6 @@
 {
   "id": "MAP_BATTLE_COLOSSEUM_2P",
-  "name": "BattleColosseum2P",
+  "name": "BattleColosseum_2P",
   "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleColosseum2P_EventScript_Attendant",
+      "script": "BattleColosseum_2P_EventScript_Attendant",
       "flag": "0"
     }
   ],
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum2P_PlayerSpot0"
+      "script": "EventScript_BattleColosseum_2P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum2P_PlayerSpot1"
+      "script": "EventScript_BattleColosseum_2P_PlayerSpot1"
     }
   ],
   "bg_events": []

data/maps/BattleColosseum_2P/scripts.inc

@@ -0,0 +1,3 @@
+BattleColosseum_2P_MapScripts:: @ 823B77D
+	.byte 0
+

data/maps/BattleColosseum_4P/map.json

@@ -1,6 +1,6 @@
 {
   "id": "MAP_BATTLE_COLOSSEUM_4P",
-  "name": "BattleColosseum4P",
+  "name": "BattleColosseum_4P",
   "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum4P_PlayerSpot0"
+      "script": "EventScript_BattleColosseum_4P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum4P_PlayerSpot2"
+      "script": "EventScript_BattleColosseum_4P_PlayerSpot2"
     },
     {
       "type": "trigger",
@@ -70,7 +70,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum4P_PlayerSpot1"
+      "script": "EventScript_BattleColosseum_4P_PlayerSpot1"
     },
     {
       "type": "trigger",
@@ -79,7 +79,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_BattleColosseum4P_PlayerSpot3"
+      "script": "EventScript_BattleColosseum_4P_PlayerSpot3"
     }
   ],
   "bg_events": []

data/maps/BattleColosseum_4P/scripts.inc

@@ -0,0 +1,3 @@
+BattleColosseum_4P_MapScripts:: @ 823B780
+	.byte 0
+

data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc

@@ -1,48 +1,48 @@
 BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
+BattleFrontier_BattleDomeCorridor_OnFrame: @ 824B104
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
+BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
 	delay 16
 	setvar VAR_TEMP_0, 1
 	frontier_get FRONTIER_DATA_LVL_MODE
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
-	goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
+	goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
 	waitmovement 0
 	opendoor 13, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
 	waitmovement 0
 	closedoor 13, 3
 	waitdooranim
-	goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F
+	goto BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom
 
-BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
+BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
 	waitmovement 0
 	opendoor 37, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
 	waitmovement 0
 	closedoor 37, 3
 	waitdooranim
-BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
+BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: @ 824B18F
 	waitmovement 0
 	setvar VAR_0x8006, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
 	waitstate
 	end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
 	walk_up
 	walk_left
 	walk_left
@@ -57,13 +57,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: @ 824B1AE
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
 	walk_left
 	walk_left
 	walk_left
@@ -77,12 +77,12 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50: @ 824B1BE
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
 	walk_up
 	walk_right
 	walk_right
@@ -101,13 +101,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: @ 824B1D2
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
 	walk_right
 	walk_right
 	walk_right
@@ -125,12 +125,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen: @ 824B1E6
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
+@ Unused
+BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight: @ 824B1E9
 	walk_up
 	walk_right
 	walk_right

data/maps/BattleFrontier_BattleDomeLobby/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47",
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant",
       "flag": "0"
     }
   ],
@@ -117,7 +117,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D52"
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults"
     },
     {
       "type": "sign",
@@ -125,7 +125,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D84"
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree"
     },
     {
       "type": "sign",
@@ -133,7 +133,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B"
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults"
     },
     {
       "type": "sign",
@@ -141,7 +141,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34"
+      "script": "BattleFrontier_BattleDomeLobby_EventScript_RulesBoard"
     }
   ]
 }

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -1,171 +1,168 @@
 BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
+BattleFrontier_BattleDomeLobby_OnResume: @ 82497F2
-	dome_21
+	dome_initresultstree
 	end
 
 BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
+BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
+BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_249842
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_2499F9
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_24989B
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_WonChallenge
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_249940
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
+BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus:: @ 8249839
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
+BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
 	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
 	dome_set DOME_DATA_WIN_STREAK, 0
 	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
-	dome_set DOME_DATA_6, 1
+	dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
+BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
 	call BattleFrontier_EventScript_IncrementWinStreak
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
+	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
+	goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
+BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce:: @ 82498C1
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker, MSGBOX_DEFAULT
-
+BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
-BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
+	msgbox BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints, MSGBOX_DEFAULT
-	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
-	message BattleFrontier_BattleDomeLobby_Text_24A5D6
+	message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
 	waitmessage
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	dome_set DOME_DATA_6, 1
+	dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
-	dome_set DOME_DATA_7, 1
+	dome_set DOME_DATA_HAS_WON_CHALLENGE, TRUE
 	dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
-	goto BattleFrontier_BattleDomeLobby_EventScript_249991
+	goto BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle
 
-BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
+BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
 	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying, MSGBOX_DEFAULT
-	message BattleFrontier_BattleDomeLobby_Text_24A5D6
+	message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
 	waitmessage
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
 	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
-	dome_set DOME_DATA_6, 1
+	dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
-
+BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
-BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
 	dome_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
-	message BattleFrontier_BattleDomeLobby_Text_24AE17
+	message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_RecordBattle
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_2499E9
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4
+BattleFrontier_BattleDomeLobby_EventScript_RecordBattle:: @ 82499E4
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9
+BattleFrontier_BattleDomeLobby_EventScript_EndChallenge:: @ 82499E9
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
+BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
 	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou, MSGBOX_DEFAULT
-	message BattleFrontier_BattleDomeLobby_Text_24A61A
+	message BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2
 	waitmessage
 	dome_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
-	goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
+	goto BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
+	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A59
+	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
+BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome:: @ 8249A59
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
-
+BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
-BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case 2, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
+BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
-	message BattleFrontier_BattleDomeLobby_Text_24A210
+	message BattleFrontier_BattleDomeLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
+	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
@@ -173,14 +170,14 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
+	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleDomeLobby_EventScript_249C61
+	case NO, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
-	case YES, BattleFrontier_BattleDomeLobby_EventScript_249B60
+	case YES, BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C61
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
+BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	dome_init
@@ -192,137 +189,135 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
+	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
 	dome_inittrainers
-BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
+BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	dome_settrainers
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome, MSGBOX_DEFAULT
 	closemessage
-	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
+	call BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor
 	special HealPlayerParty
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
+BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge:: @ 8249BFA
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
-	goto BattleFrontier_BattleDomeLobby_EventScript_249A72
+	goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons:: @ 8249C15
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_249C30
+	case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_249C3D
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50:: @ 8249C30
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
+	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8249C3D
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C6C
+	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed:: @ 8249C4A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattleDomeLobby_EventScript_249C64
+	goto BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
+BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge:: @ 8249C61
 	special LoadPlayerParty
-
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge:: @ 8249C64
-BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64
+	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge:: @ 8249C6C
-
-BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
 	release
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
+BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor
 	waitdooranim
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor
 	waitdooranim
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor:: @ 8249CDD
-	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45
+	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor:: @ 8249CE5
-	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45
+	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor:: @ 8249CED
-	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B
+	applymovement 1, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor:: @ 8249CF5
-	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B
+	applymovement 6, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles:: @ 8249CFD
-	msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles:: @ 8249D06
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F
+BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge:: @ 8249D0F
-	message BattleFrontier_BattleDomeLobby_Text_249F3A
+	message BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15
+BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge:: @ 8249D15
-	message BattleFrontier_BattleDomeLobby_Text_24A6E7
+	message BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B
+BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge:: @ 8249D1B
-	msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24
+BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge:: @ 8249D24
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D
+BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor:: @ 8249D2D
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33
+BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor:: @ 8249D33
 	opendoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39
+BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor:: @ 8249D39
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F
+BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor:: @ 8249D3F
 	closedoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
+BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
 	walk_up
 	walk_up
 	walk_up
@@ -330,18 +325,18 @@ BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B
+BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor: @ 8249D4B
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
+BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor: @ 8249D4E
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
+BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -349,7 +344,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
+BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -357,119 +352,121 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
+BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
-	dome_get DOME_DATA_9
+	dome_get DOME_DATA_PREV_TOURNEY_TYPE
 	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50
 	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen
 	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
+	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen
 	fadescreen FADE_TO_BLACK
-	dome_showresultstree
+	dome_showprevtourneytree
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50:: @ 8249DC9
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN
+	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50:: @ 8249DD2
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN
+	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen:: @ 8249DDB
-	msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN
+	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen:: @ 8249DE4
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN
+	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
+BattleFrontier_BattleDomeLobby_EventScript_Maniac:: @ 8249DED
 	dome_getwinnersname
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
+	msgbox BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE
+BattleFrontier_BattleDomeLobby_EventScript_Lass:: @ 8249DFE
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC
+	msgbox BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07
+BattleFrontier_BattleDomeLobby_EventScript_FatMan:: @ 8249E07
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC
+	msgbox BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
+BattleFrontier_BattleDomeLobby_EventScript_Man:: @ 8249E10
-	msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC
+	msgbox BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully, MSGBOX_NPC
 	end
 
 @ A few OutsideWest event scripts are inserted here instead, two of which are unused
 BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
-	msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC
+	msgbox BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier, MSGBOX_NPC
 	end
 
+@ Unused
 BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
 	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
 	end
 
+@ Unused
 BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
 	msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
+BattleFrontier_BattleDomeLobby_EventScript_RulesBoard:: @ 8249E34
 	lockall
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43
+BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
-	message BattleFrontier_BattleDomeLobby_Text_24AE8B
+	message BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B
+	case 0, BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup
-	case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99
+	case 1, BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree
-	case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7
+	case 2, BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO
-	case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5
+	case 3, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249EB5
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B
+BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup:: @ 8249E8B
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99
+BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree:: @ 8249E99
-	msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7
+BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO:: @ 8249EA7
-	msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeLobby_EventScript_249E43
+	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5
+BattleFrontier_BattleDomeLobby_EventScript_ExitRules:: @ 8249EB5
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7
+BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle: @ 8249EB7
 	.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 SINGLE BATTLE\n"
 	.string "Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A
+BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge: @ 8249F3A
 	.string "Would you like to challenge\n"
 	.string "the SINGLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74
+BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain: @ 8249F74
 	.string "We hope to see you again.$"
 
-BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E
+BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
 	.string "The SINGLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of SINGLE BATTLES.\p"
@@ -490,20 +487,20 @@ BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge: @ 824A1C6
 	.string "Before I show you to the BATTLE DOME,\n"
 	.string "I must save the data. Is that okay?$"
 
-BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210
+BattleFrontier_BattleDomeLobby_Text_WhichLevelMode: @ 824A210
 	.string "The tournament offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E
+BattleFrontier_BattleDomeLobby_Text_SelectThreeMons: @ 824A26E
 	.string "Now select the three POKéMON that\n"
 	.string "you wish to enter, please.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "Also, the POKéMON must be holding\n"
@@ -511,7 +508,7 @@ BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "You must have three different POKéMON\n"
@@ -521,25 +518,27 @@ BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437
+BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome: @ 824A437
 	.string "I will now show you to\n"
 	.string "the BATTLE DOME.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F
+BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting: @ 824A45F
 	.string "Excuse me!\p"
 	.string "You didn't save before you quit your\n"
 	.string "challenge last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. Sorry!$"
 
-BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9
+BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney: @ 824A4E9
 	.string "Congratulations for winning\n"
 	.string "your Battle Tournament!$"
 
-BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
+@ Unused
+BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize: @ 824A51D
 	.string "Here is your prize for your Battle\n"
 	.string "Tournament victory.$"
 
+@ Used by Verdanturf Tent
 BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
@@ -550,32 +549,32 @@ BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF
+BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying: @ 824A5BF
 	.string "Thank you for playing!$"
 
-BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6
+BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved: @ 824A5D6
 	.string "Your record will be saved.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE
+BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou: @ 824A5FE
 	.string "We've been waiting for you!$"
 
-BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2: @ 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
+BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle: @ 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
+BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge: @ 824A6E7
 	.string "Would you like to challenge\n"
 	.string "the DOUBLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
+BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
 	.string "The DOUBLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of DOUBLE BATTLES.\p"
@@ -596,23 +595,23 @@ BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50: @ 824A966
 	.string "They're the results of the last\n"
 	.string "Level 50 SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50: @ 824A9A9
 	.string "They're the results of the last\n"
 	.string "Level 50 DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen: @ 824A9EC
 	.string "They're the results of the last\n"
 	.string "Open Level SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen: @ 824AA31
 	.string "They're the results of the last\n"
 	.string "Open Level DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
+BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
 	.string "Did you see it?\n"
 	.string "The last Battle Tournament?\p"
 	.string "The winner, {STR_VAR_1}, was seriously\n"
@@ -620,19 +619,21 @@ BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
 	.string "You should check out the results\n"
 	.string "on the monitor beside the PC.$"
 
-BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
+BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier: @ 824AB06
 	.string "The BATTLE FRONTIER…\n"
 	.string "I've long dreamed about a place like it.$"
 
+@ Functionally unused
 BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
 	.string "The BATTLE DOME\n"
 	.string "Become the Unbeatable Superstar!$"
 
+@ Functionally unused
 BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
 	.string "The ??????\n"
 	.string "Under Construction!$"
 
-BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
+BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 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"
@@ -641,48 +642,48 @@ BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
 	.string "A true superstar is a TRAINER who\n"
 	.string "can keep winning tournaments.$"
 
-BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76
+BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound: @ 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
+BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully: @ 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
+BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker: @ 824AD67
 	.string "Congratulations!\p"
 	.string "You defeated the DOME ACE and won\n"
 	.string "the Battle Tournament!$"
 
-BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1
+BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints: @ 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
+BattleFrontier_BattleDomeLobby_Text_RecordLastMatch: @ 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
+BattleFrontier_BattleDomeLobby_Text_RulesAreListed: @ 824AE63
 	.string "The Battle Tournament rules\n"
 	.string "are listed.$"
 
-BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B
+BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading: @ 824AE8B
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE
+BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules: @ 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
+BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 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"
@@ -693,7 +694,7 @@ BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C
 	.string "by TRAINERS, and the battle styles of\l"
 	.string "TRAINERS.$"
 
-BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073
+BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules: @ 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"

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -1,92 +1,91 @@
 BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
+BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
+BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
+BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
 	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
+	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	setvar VAR_TEMP_0, 1
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	lockall
-
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB
 	waitmessage
-	switch VAR_RESULT
+	switch VAR_RESULT  @ No case?
 	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
+	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
 	multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
+	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge
-	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
+	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:: @ 824B2C1
 	multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D
+	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349
+	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge
-	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377
+	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7
+	message BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle:: @ 824B33F
 	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge:: @ 824B349
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
-	case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB
+	case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B377
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93
+	message BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9
+	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge
-	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge:: @ 824B3A9
-	dome_resolvewinners 9
+	dome_resolvewinners DOME_PLAYER_RETIRED
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
+	message BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	dome_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
@@ -95,70 +94,70 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	frontier_reset
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo:: @ 824B3DD
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	dome_showopponentinfo
 	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree:: @ 824B3F5
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage
 	fadescreen FADE_TO_BLACK
 	dome_showtourneytree
 	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
+	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
+	case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464
+	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1:: @ 824B449
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2:: @ 824B452
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals:: @ 824B45B
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals:: @ 824B464
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C
+	message BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons
 	waitmessage
 	waitbuttonpress
 	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
-	setvar VAR_0x8005, 2  @ 2 of the 3 party mons are selected for battle
+	setvar VAR_0x8005, DOME_BATTLE_PARTY_SIZE  @ 2 of the 3 party mons are selected for battle
 	special ChoosePartyForBattleFrontier
 	waitstate
 	frontier_resetsketch
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
-	dome_set DOME_DATA_8
+	dome_set DOME_DATA_SELECTED_MONS
 	dome_reduceparty
 	dome_setopponent
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
+	applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor
 	waitmovement 0
 	opendoor 5, 1
 	waitdooranim
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 5, 1
 	waitdooranim
@@ -167,224 +166,229 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @ 824B4FB
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
+	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
+	case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C
+	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1:: @ 824B53A
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C
+	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2:: @ 824B540
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B689
+	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals:: @ 824B546
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6
+	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
 	frontier_getbrainstatus
 	switch VAR_RESULT
-	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold
-	message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3
+	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver:: @ 824B58B
-	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
+	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold:: @ 824B5A0
-	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
+	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort:: @ 824B5B5
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort:: @ 824B5BE
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
 	setvar VAR_TEMP_0, 1
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
+	call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage
 	fadescreen FADE_TO_BLACK
 	dome_showstatictourneytree
 	waitstate
-	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
+	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B600
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
+	case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete
-	case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete
-	case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646
+	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete:: @ 824B634
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete:: @ 824B63D
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646
+BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete:: @ 824B646
-	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F
+BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside: @ 824B64F
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter: @ 824B652
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor: @ 824B657
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor: @ 824B659
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1: @ 824B65C
 	.string "Your 1st-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2: @ 824B689
 	.string "Your 2nd-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals: @ 824B6B6
 	.string "Your semifinal match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals: @ 824B6E3
 	.string "Your final match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C
+BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons: @ 824B70C
 	.string "Please choose the two POKéMON\n"
 	.string "that are to appear in battle.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748
+BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay: @ 824B748
 	.string "Right this way, please.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760
+BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth: @ 824B760
 	.string "Thank you for competing!\p"
 	.string "I'll restore your POKéMON to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3
+BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete: @ 824B7A3
 	.string "All 1st-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1
+BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete: @ 824B7F1
 	.string "All 2nd-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F
+BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete: @ 824B83F
 	.string "All semifinal matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D
+@ Unused
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2: @ 824B88D
 	.string "Congratulations for getting through\n"
 	.string "the 1st round.\p"
 	.string "The 2nd round is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6
+@ Unused
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals: @ 824B8E6
 	.string "Congratulations for advancing\n"
 	.string "to the semifinals.\p"
 	.string "The best four teams meet in this round.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E
+@ Unused
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals: @ 824B94E
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "You're one win from the championship.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5
+BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer: @ 824B9B5
 	.string "{PLAYER}'s next opponent\n"
 	.string "is this TRAINER.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1: @ 824B9D9
 	.string "The tournament is in the 1st round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2: @ 824B9FD
 	.string "The tournament is in the 2nd round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals: @ 824BA21
 	.string "The tournament is in the semifinals.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals: @ 824BA46
 	.string "The tournament is up to the final.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69
+BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame: @ 824BA69
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93
+BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge: @ 824BA93
 	.string "Would you like to retire from your\n"
 	.string "Battle Tournament challenge?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3
+BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait: @ 824BAD3
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7
+BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch: @ 824BAF7
 	.string "Should I record your last match\n"
 	.string "on your FRONTIER PASS?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
 	.string "the DOME ACE TUCKER.\p"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC
+@ Identical to ReadyForTuckerSilver
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold: @ 824BBAC
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
 	.string "the DOME ACE TUCKER.\p"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort: @ 824BC2A
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63
+@ Identical again
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort: @ 824BC63
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 

data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc

@@ -1,507 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
-	.byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
-	special CallBattleTowerFunc
-	checkplayergender
-	compare VAR_RESULT, FEMALE
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
-	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
-	special SetBattleTowerLinkPlayerGfx
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
-	.2byte 0
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
-	setvar VAR_TEMP_0, 1
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
-	waitmovement 0
-	frontier_get FRONTIER_DATA_BATTLE_NUM
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	frontier_set FRONTIER_DATA_6, 1
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	tower_setopponent
-	addobject 1
-	addobject 4
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
-	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	tower_getopponentintro 0
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	tower_getopponentintro 1
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	msgbox gStringVar4, MSGBOX_DEFAULT
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	tower_getopponentintro 0
-	delay 15
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll gStringVar4
-	waitmessage
-	delay 48
-	tower_getopponentintro 1
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
-	waitmovement 0
-	messageautoscroll gStringVar4
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
-	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	tower_set TOWER_DATA_LVL_MODE
-	setvar VAR_0x8004, 3
-	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
-	call BattleFrontier_EventScript_IncrementWinStreak
-	tower_setbattlewon
-	switch VAR_RESULT
-	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
-	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
-	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
-	waitmovement 0
-	removeobject 1
-	removeobject 4
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
-	waitmovement 0
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
-	waitmovement 0
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
-	messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
-	waitmessage
-	delay 48
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
-	special LoadPlayerParty
-	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
-	frontier_get FRONTIER_DATA_BATTLE_NUM
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
-	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
-	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
-	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
-	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
-	switch VAR_RESULT
-	case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
-	closemessage
-	clearflag FLAG_TEMP_2
-	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
-	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
-	waitmovement 0
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
-	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	tower_set TOWER_DATA_LVL_MODE
-	setvar VAR_0x8004, 3
-	special Script_TryGainNewFanFromCounter
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
-	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
-	waitmessage
-	tower_save CHALLENGE_STATUS_PAUSED
-	playse SE_SAVE
-	waitse
-	fadescreen FADE_TO_BLACK
-	frontier_reset
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
-	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
-	copyvar VAR_TEMP_F, VAR_RESULT
-	switch VAR_TEMP_F
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
-	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
-	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
-	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
-	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
-	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
-	waitmessage
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
-	waitmessage
-	delay 48
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
-	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
-	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
-	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
-	multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
-	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	switch VAR_RESULT
-	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	call BattleFrontier_EventScript_SaveBattle
-	setflag FLAG_TEMP_2
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
-	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
-	waitmessage
-	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	message gText_LinkStandby3
-	waitmessage
-	special sub_813B568
-	waitstate
-	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
-	end
-
-BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
-	special sub_813B534
-	return
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
-	walk_up
-	walk_up
-	walk_up
-	set_invisible
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
-	walk_right
-	walk_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
-	walk_left
-	walk_left
-	walk_in_place_fastest_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
-	walk_in_place_left
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
-	.string "The 2nd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
-	.string "The 3rd set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
-	.string "The 4th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
-	.string "The 5th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
-	.string "The 6th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
-	.string "The 7th set of opponents is next.\n"
-	.string "Are you ready?$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
-	.string "The 2nd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
-	.string "The 3rd set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
-	.string "The 4th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
-	.string "The 5th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
-	.string "The 6th set of opponents is next.\n"
-	.string "Do your best!$"
-
-BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
-	.string "The 7th set of opponents is next.\n"
-	.string "Do your best!$"
-
-gText_LinkStandby3:: @ 824978D
-	.string "Link standby…$"
-
-gText_YourPartnerHasRetired:: @ 824979B
-	.string "Your partner has retired.\p"
-	.string "Your BATTLE ROOM challenge\n"
-	.string "will be canceled.$"

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
 	.byte 0
 
 BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
-	special sub_81653CC
+	special TryHideBattleTowerReporter
 	end
 
 BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
@@ -857,7 +857,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
 	waitstate
 	playse SE_SAVE
 	waitse
-	special sub_80B3BC4
+	special TrySetBattleTowerLinkType
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 

data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc

@@ -40,7 +40,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
-	givedecoration VAR_0x8009
+	adddecoration VAR_0x8009
 	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
@@ -61,7 +61,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
-	giveitem VAR_0x8009, 1
+	additem VAR_0x8009
 	special UpdateBattlePointsWindow
 	playse SE_REGI
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -32,7 +32,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
 	goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT
-	giveitem_std ITEM_LANSAT_BERRY
+	giveitem ITEM_LANSAT_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
 	setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
@@ -49,7 +49,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
 	goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT
-	giveitem_std ITEM_STARF_BERRY
+	giveitem ITEM_STARF_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
 	setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS
@@ -102,7 +102,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 
 BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
 	msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
-	givedecoration_std DECOR_SILVER_SHIELD
+	givedecoration DECOR_SILVER_SHIELD
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_SILVER_SHIELD
@@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 
 BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
 	msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
-	givedecoration_std DECOR_GOLD_SHIELD
+	givedecoration DECOR_GOLD_SHIELD
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_GOLD_SHIELD

data/maps/DesertUnderpass/scripts.inc

@@ -15,13 +15,13 @@ DesertUnderpass_EventScript_Fossil:: @ 823AF41
 	end
 
 DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
-	giveitem_std ITEM_CLAW_FOSSIL
+	giveitem ITEM_CLAW_FOSSIL
 	removeobject 1
 	release
 	end
 
 DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
-	giveitem_std ITEM_ROOT_FOSSIL
+	giveitem ITEM_ROOT_FOSSIL
 	removeobject 1
 	release
 	end

data/maps/DewfordTown/scripts.inc

@@ -83,7 +83,7 @@ DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5
 
 DewfordTown_EventScript_GiveOldRod:: @ 81E95FF
 	msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT
-	giveitem_std ITEM_OLD_ROD
+	giveitem ITEM_OLD_ROD
 	setflag FLAG_RECEIVED_OLD_ROD
 	msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT
 	release

data/maps/DewfordTown_Gym/scripts.inc

@@ -7,8 +7,7 @@ DewfordTown_Gym_OnTransition: @ 81FC642
 	end
 
 DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648
-	checktrainerflag TRAINER_BRAWLY_1
+	goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn
-	goto_if_eq DewfordTown_Gym_EventScript_SetLightsOn
 	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 0
@@ -124,34 +123,28 @@ DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D
 
 DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768
 	setvar VAR_0x8000, 0
-	checktrainerflag TRAINER_TAKAO
+	goto_if_not_defeated TRAINER_TAKAO, DewfordTown_Gym_EventScript_CheckJocelyn
-	goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B
-	checktrainerflag TRAINER_JOCELYN
+	goto_if_not_defeated TRAINER_JOCELYN, DewfordTown_Gym_EventScript_CheckLaura
-	goto_if_lt DewfordTown_Gym_EventScript_CheckLaura
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789
-	checktrainerflag TRAINER_LAURA
+	goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_CheckBrenden
-	goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797
-	checktrainerflag TRAINER_BRENDEN
+	goto_if_not_defeated TRAINER_BRENDEN, DewfordTown_Gym_EventScript_CheckCristian
-	goto_if_lt DewfordTown_Gym_EventScript_CheckCristian
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5
-	checktrainerflag TRAINER_CRISTIAN
+	goto_if_not_defeated TRAINER_CRISTIAN, DewfordTown_Gym_EventScript_CheckLilith
-	goto_if_lt DewfordTown_Gym_EventScript_CheckLilith
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3
-	checktrainerflag TRAINER_LILITH
+	goto_if_not_defeated TRAINER_LILITH, DewfordTown_Gym_EventScript_StopCountingTrainers
-	goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers
 	addvar VAR_0x8000, 1
 DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
 	return
 
 DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
-	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreBattle, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
+	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
@@ -188,7 +181,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
 	end
 
 DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
-	giveitem_std ITEM_TM08
+	giveitem ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
@@ -196,7 +189,7 @@ DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
 	return
 
 DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878
-	giveitem_std ITEM_TM08
+	giveitem ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
@@ -210,7 +203,7 @@ DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C
 	end
 
 DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7
-	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoPreBattle, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
+	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoIntro, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
 	msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -220,7 +213,7 @@ DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2
 	end
 
 DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9
-	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynPreBattle, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
+	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynIntro, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
 	msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -230,7 +223,7 @@ DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4
 	end
 
 DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB
-	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraPreBattle, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
+	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraIntro, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
 	msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -240,7 +233,7 @@ DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916
 	end
 
 DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D
-	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenPreBattle, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
+	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenIntro, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
 	msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -250,7 +243,7 @@ DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938
 	end
 
 DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F
-	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianPreBattle, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
+	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianIntro, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
 	msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -260,7 +253,7 @@ DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A
 	end
 
 DewfordTown_Gym_EventScript_Lilith:: @ 81FC961
-	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithPreBattle, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
+	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithIntro, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
 	msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -324,7 +317,7 @@ DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C
 	.string "Whoah! It's turned too bright in here!\p"
 	.string "Your future is bright, too!$"
 
-DewfordTown_Gym_Text_TakaoPreBattle: @ 81FCB9F
+DewfordTown_Gym_Text_TakaoIntro: @ 81FCB9F
 	.string "Might is right!\n"
 	.string "Come on!$"
 
@@ -335,7 +328,7 @@ DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA
 	.string "Your skill overcame my strength!\n"
 	.string "Your technique is commendable!$"
 
-DewfordTown_Gym_Text_JocelynPreBattle: @ 81FCC0A
+DewfordTown_Gym_Text_JocelynIntro: @ 81FCC0A
 	.string "There's no need for BRAWLY to be\n"
 	.string "involved!\p"
 	.string "I'll crush you!$"
@@ -351,7 +344,7 @@ DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B
 	.string "No, I'll become the POKéMON LEAGUE\n"
 	.string "CHAMPION!$"
 
-DewfordTown_Gym_Text_LauraPreBattle: @ 81FCD01
+DewfordTown_Gym_Text_LauraIntro: @ 81FCD01
 	.string "Don't you dare brush me off!\n"
 	.string "It's not my fault if you cry!$"
 
@@ -365,7 +358,7 @@ DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F
 	.string "But because it's so dark, I can never\n"
 	.string "see BRAWLY's face…$"
 
-DewfordTown_Gym_Text_LilithPreBattle: @ 81FCDB8
+DewfordTown_Gym_Text_LilithIntro: @ 81FCDB8
 	.string "Ufufu…\n"
 	.string "Are you stumbling around in the dark?$"
 
@@ -377,7 +370,7 @@ DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08
 	.string "You deserve to stay lost and end up\n"
 	.string "back at the entrance again!$"
 
-DewfordTown_Gym_Text_BrendenPreBattle: @ 81FCE48
+DewfordTown_Gym_Text_BrendenIntro: @ 81FCE48
 	.string "I'll show you the gumption of\n"
 	.string "a sailing man!$"
 
@@ -389,7 +382,7 @@ DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB
 	.string "Oh, aye! You're worthy of seeing\n"
 	.string "our GYM LEADER.$"
 
-DewfordTown_Gym_Text_CristianPreBattle: @ 81FCEDC
+DewfordTown_Gym_Text_CristianIntro: @ 81FCEDC
 	.string "If you mean to pass, it has to be\n"
 	.string "through me!$"
 
@@ -401,7 +394,7 @@ DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26
 	.string "You win!\n"
 	.string "Go after that BADGE!$"
 
-DewfordTown_Gym_Text_BrawlyPreBattle: @ 81FCF44
+DewfordTown_Gym_Text_BrawlyIntro: @ 81FCF44
 	.string "I'm BRAWLY!\n"
 	.string "DEWFORD's GYM LEADER!\p"
 	.string "I've been churned in the rough waves\n"

data/maps/DewfordTown_Hall/scripts.inc

@@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_Man:: @ 81FD50A
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
-	special sub_811EF6C
+	special BufferDeepLinkPhrase
 	msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink
@@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA
 	call Common_EventScript_BufferTrendyPhrase
 	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb
 	msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM36
+	giveitem ITEM_TM36
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM36

data/maps/DewfordTown_House2/scripts.inc

@@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_Man:: @ 81FE22E
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf
 	msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT
-	giveitem_std ITEM_SILK_SCARF
+	giveitem ITEM_SILK_SCARF
 	compare VAR_RESULT, FALSE
 	goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf
 	setflag FLAG_RECEIVED_SILK_SCARF

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -39,7 +39,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
 
 EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
 	playbgm MUS_DAIGO, 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
 	goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
 	end
@@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
 	walk_in_place_fastest_left
 	step_end
 
-EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C
+EverGrandeCity_ChampionsRoom_Text_IntroSpeech: @ 8228C4C
 	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
 	.string "That incident in SOOTOPOLIS CITY…\n"
 	.string "That was superb work, putting an end\l"

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat
 	goto EverGrandeCity_DrakesRoom_EventScript_Defeated
 	end
@@ -62,7 +62,7 @@ EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
 	release
 	end
 
-EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E
+EverGrandeCity_DrakesRoom_Text_IntroSpeech: @ 822873E
 	.string "I am the last of the POKéMON LEAGUE\n"
 	.string "ELITE FOUR, DRAKE the DRAGON master!\p"
 	.string "In their natural state, POKéMON are\n"

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -42,7 +42,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat
 	goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
 	end
@@ -59,7 +59,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC
+EverGrandeCity_GlaciasRoom_Text_IntroSpeech: @ 82284AC
 	.string "Welcome, my name is GLACIA\n"
 	.string "of the ELITE FOUR.\p"
 	.string "I've traveled from afar to HOENN\n"

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -42,7 +42,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat
 	goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
 	end
@@ -59,7 +59,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E
+EverGrandeCity_PhoebesRoom_Text_IntroSpeech: @ 822820E
 	.string "Ahahaha!\p"
 	.string "I'm PHOEBE of the ELITE FOUR.\n"
 	.string "I did my training on MT. PYRE.\p"

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -48,7 +48,7 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_SidneysRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat
 	goto EverGrandeCity_SidneysRoom_EventScript_Defeated
 	end
@@ -65,7 +65,7 @@ EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95
 	release
 	end
 
-EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7
+EverGrandeCity_SidneysRoom_Text_IntroSpeech: @ 8227FA7
 	.string "Welcome, challenger!\n"
 	.string "I'm SIDNEY of the ELITE FOUR.\p"
 	.string "I like that look you're giving me.\n"

data/maps/FallarborTown_CozmosHouse/scripts.inc

@@ -18,7 +18,7 @@ FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
 	compare VAR_RESULT, NO
 	goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite
 	msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM27
+	giveitem ITEM_TM27
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_0x8004, ITEM_METEORITE

data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc

@@ -42,7 +42,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
 	msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT
-	takeitem ITEM_HEART_SCALE, 1
+	removeitem ITEM_HEART_SCALE
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
 	end
 

data/maps/FortreeCity_Gym/scripts.inc

@@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
 	end
 
 FortreeCity_Gym_EventScript_Winona:: @ 82165C8
-	trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
+	trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
@@ -49,7 +49,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
 	end
 
 FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
-	giveitem_std ITEM_TM40
+	giveitem ITEM_TM40
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
@@ -58,7 +58,7 @@ FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
 	end
 
 FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
-	giveitem_std ITEM_TM40
+	giveitem ITEM_TM40
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
@@ -71,32 +71,32 @@ FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
 	end
 
 FortreeCity_Gym_EventScript_Jared:: @ 82166A8
-	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat
+	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredIntro, FortreeCity_Gym_Text_JaredDefeat
 	msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
-	trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat
+	trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoIntro, FortreeCity_Gym_Text_EdwardoDefeat
 	msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_Flint:: @ 82166D6
-	trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat
+	trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintIntro, FortreeCity_Gym_Text_FlintDefeat
 	msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
-	trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat
+	trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyIntro, FortreeCity_Gym_Text_AshleyDefeat
 	msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_Humberto:: @ 8216704
-	trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat
+	trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoIntro, FortreeCity_Gym_Text_HumbertoDefeat
 	msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_Darius:: @ 821671B
-	trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat
+	trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusIntro, FortreeCity_Gym_Text_DariusDefeat
 	msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -150,7 +150,7 @@ FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
 	.string "You did it!\n"
 	.string "You've achieved liftoff!$"
 
-FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2
+FortreeCity_Gym_Text_JaredIntro: @ 82168A2
 	.string "Behold the elegant battle style of\n"
 	.string "BIRD POKéMON!$"
 
@@ -164,7 +164,7 @@ FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7
 	.string "Do you have the smarts to get to\n"
 	.string "our LEADER?$"
 
-FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A
+FortreeCity_Gym_Text_EdwardoIntro: @ 821695A
 	.string "The lovers of BIRD POKéMON aspire\n"
 	.string "to join this GYM.\p"
 	.string "As a member of the FORTREE GYM,\n"
@@ -180,7 +180,7 @@ FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
 	.string "I'm going to keep training and make\n"
 	.string "myself even stronger.$"
 
-FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66
+FortreeCity_Gym_Text_FlintIntro: @ 8216A66
 	.string "There's no need for WINONA, our GYM\n"
 	.string "LEADER, to deal with you!\p"
 	.string "I'm plenty good enough for you!$"
@@ -194,7 +194,7 @@ FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
 	.string "She's the ultimate LEADER!\p"
 	.string "Blush…$"
 
-FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A
+FortreeCity_Gym_Text_AshleyIntro: @ 8216B1A
 	.string "WINONA taught me personally!\n"
 	.string "You can't beat me easily!$"
 
@@ -205,7 +205,7 @@ FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
 	.string "Thanks to WINONA, the people of\n"
 	.string "FORTREE can live without fear.$"
 
-FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E
+FortreeCity_Gym_Text_HumbertoIntro: @ 8216B9E
 	.string "When WINONA takes to battle, her face\n"
 	.string "shines with beautiful determination…\p"
 	.string "I'm not letting you witness that\n"
@@ -220,7 +220,7 @@ FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
 	.string "Don't get distracted staring at WINONA\l"
 	.string "or you'll go crashing down in a heap!$"
 
-FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96
+FortreeCity_Gym_Text_DariusIntro: @ 8216C96
 	.string "You'd better know that there are all\n"
 	.string "sorts of FLYING-type POKéMON.\p"
 	.string "You do know that, right?$"
@@ -233,7 +233,7 @@ FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F
 	.string "But you'd better watch it! Our LEADER\l"
 	.string "WINONA's POKéMON are all business.$"
 
-FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75
+FortreeCity_Gym_Text_WinonaIntro: @ 8216D75
 	.string "I am WINONA. I am the LEADER of\n"
 	.string "the FORTREE POKéMON GYM.\p"
 	.string "I have become one with BIRD POKéMON\n"

data/maps/FortreeCity_House2/scripts.inc

@@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB
 	switch VAR_RESULT
 	case 0, FortreeCity_House2_EventScript_WrongGuess
 	msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM10
+	giveitem ITEM_TM10
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM10

data/maps/FortreeCity_House4/scripts.inc

@@ -31,7 +31,7 @@ FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT
-	giveitem_std ITEM_MENTAL_HERB
+	giveitem ITEM_MENTAL_HERB
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MENTAL_HERB

data/maps/GraniteCave_1F/scripts.inc

@@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_Hiker:: @ 822DA5E
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash
 	msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT
-	giveitem_std ITEM_HM05
+	giveitem ITEM_HM05
 	setflag FLAG_RECEIVED_HM05
 	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release

data/maps/GraniteCave_StevensRoom/scripts.inc

@@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM47
+	giveitem ITEM_TM47
 	compare VAR_RESULT, FALSE
 	call_if_eq GraniteCave_StevensRoom_EventScript_BagFull
 	msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT

data/maps/LavaridgeTown/scripts.inc

@@ -70,7 +70,7 @@ LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
 
 LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
 	msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_GO_GOGGLES
+	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_RivalExit
@@ -78,7 +78,7 @@ LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
 
 LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
 	msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_GO_GOGGLES
+	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_RivalExit

data/maps/LavaridgeTown_Gym_1F/scripts.inc

@@ -14,45 +14,37 @@ LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
 	setvar VAR_TEMP_D, 0
 	setvar VAR_TEMP_E, 0
 	setvar VAR_TEMP_F, 0
-	checktrainerflag TRAINER_COLE
+	goto_if_defeated TRAINER_COLE LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
 	setvar VAR_TEMP_B, 1
 LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C
-	checktrainerflag TRAINER_GERALD
+	goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
 	setvar VAR_TEMP_C, 1
 LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A
-	checktrainerflag TRAINER_AXLE
+	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
 	setvar VAR_TEMP_D, 1
 LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
-	checktrainerflag TRAINER_DANIELLE
+	goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_E, 1
 LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
 	return
 
 LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757
-	checktrainerflag TRAINER_COLE
+	goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764
-	checktrainerflag TRAINER_GERALD
+	goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771
-	checktrainerflag TRAINER_AXLE
+	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E
-	checktrainerflag TRAINER_DANIELLE
+	goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
 	return
 
 LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
-	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreBattle, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
+	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryIntro, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch
@@ -89,7 +81,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
 	end
 
 LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
-	giveitem_std ITEM_TM50
+	giveitem ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
@@ -98,7 +90,7 @@ LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
 	end
 
 LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841
-	giveitem_std ITEM_TM50
+	giveitem ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
@@ -111,7 +103,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864
 	end
 
 LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColePreBattle, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColeIntro, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE
 	end
 
@@ -124,37 +116,37 @@ LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
 	end
 
 LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxlePreBattle, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxleIntro, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganPreBattle, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganIntro, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DaniellePreBattle, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DanielleIntro, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldPreBattle, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldIntro, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JacePreBattle, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JaceIntro, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffPreBattle, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffIntro, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliPreBattle, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliIntro, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -207,7 +199,7 @@ LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
 LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8
 	.string "Yow! That was a scorching-hot battle!$"
 
-LavaridgeTown_Gym_1F_Text_ColePreBattle: @ 81FEADE
+LavaridgeTown_Gym_1F_Text_ColeIntro: @ 81FEADE
 	.string "Owowowowow!\n"
 	.string "Yikes, it's hot!$"
 
@@ -220,7 +212,7 @@ LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C
 	.string "It's effective for healing pain in\n"
 	.string "your joints.$"
 
-LavaridgeTown_Gym_1F_Text_AxlePreBattle: @ 81FEB7B
+LavaridgeTown_Gym_1F_Text_AxleIntro: @ 81FEB7B
 	.string "I'm trying to relieve my stress.\n"
 	.string "Don't come along and stress me out!$"
 
@@ -232,7 +224,7 @@ LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1
 	.string "If you spend too much time buried in\n"
 	.string "hot sand, it tuckers you out…$"
 
-LavaridgeTown_Gym_B1F_Text_KeeganPreBattle: @ 81FEC31
+LavaridgeTown_Gym_B1F_Text_KeeganIntro: @ 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"
@@ -249,7 +241,7 @@ LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02
 	.string "If you don't watch yourself, you'll be\n"
 	.string "burned seriously.$"
 
-LavaridgeTown_Gym_1F_Text_GeraldPreBattle: @ 81FED72
+LavaridgeTown_Gym_1F_Text_GeraldIntro: @ 81FED72
 	.string "Can your POKéMON withstand\n"
 	.string "392-degree heat?$"
 
@@ -262,7 +254,7 @@ LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB
 	.string "Your POKéMON beat me, so they should\n"
 	.string "easily survive in magma.$"
 
-LavaridgeTown_Gym_1F_Text_DaniellePreBattle: @ 81FEE22
+LavaridgeTown_Gym_1F_Text_DanielleIntro: @ 81FEE22
 	.string "Um…\n"
 	.string "Okay, I'll battle with you.$"
 
@@ -273,7 +265,7 @@ LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D
 	.string "I'm going to be a pretty and strong\n"
 	.string "TRAINER just like FLANNERY.$"
 
-LavaridgeTown_Gym_B1F_Text_JacePreBattle: @ 81FEE9D
+LavaridgeTown_Gym_B1F_Text_JaceIntro: @ 81FEE9D
 	.string "Come on, get with it!\n"
 	.string "Let's go before my feelings cool!$"
 
@@ -286,7 +278,7 @@ LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07
 	.string "within you, you may stand a chance\l"
 	.string "against our LEADER.$"
 
-LavaridgeTown_Gym_B1F_Text_JeffPreBattle: @ 81FEF60
+LavaridgeTown_Gym_B1F_Text_JeffIntro: @ 81FEF60
 	.string "See how the flames blaze wildly?\n"
 	.string "They flare in anticipation of my win!$"
 
@@ -298,7 +290,7 @@ LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2
 	.string "I can walk on hot coals barefoot!\p"
 	.string "…Don't even think about trying it!$"
 
-LavaridgeTown_Gym_B1F_Text_EliPreBattle: @ 81FF025
+LavaridgeTown_Gym_B1F_Text_EliIntro: @ 81FF025
 	.string "As much as I love mountains,\n"
 	.string "I especially love volcanoes.$"
 
@@ -311,7 +303,7 @@ LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A
 	.string "of FLANNERY's power.\p"
 	.string "Hehehehe.$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryPreBattle: @ 81FF0DC
+LavaridgeTown_Gym_1F_Text_FlanneryIntro: @ 81FF0DC
 	.string "Welcome… No, wait.\p"
 	.string "Puny TRAINER, how good to see you've\n"
 	.string "made it here!\p"

data/maps/LavaridgeTown_Gym_B1F/scripts.inc

@@ -13,39 +13,31 @@ LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F
 	setvar VAR_TEMP_8, 0
 	setvar VAR_TEMP_9, 0
 	setvar VAR_TEMP_A, 0
-	checktrainerflag TRAINER_KEEGAN
+	goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
 	setvar VAR_TEMP_7, 1
 LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1
-	checktrainerflag TRAINER_JACE
+	goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
 	setvar VAR_TEMP_8, 1
 LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF
-	checktrainerflag TRAINER_JEFF
+	goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
 	setvar VAR_TEMP_9, 1
 LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
-	checktrainerflag TRAINER_ELI
+	goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_A, 1
 LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
 	return
 
 LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC
-	checktrainerflag TRAINER_KEEGAN
+	goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9
-	checktrainerflag TRAINER_JACE
+	goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
 	setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6
-	checktrainerflag TRAINER_JEFF
+	goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903
-	checktrainerflag TRAINER_ELI
+	goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910
 	return

data/maps/LavaridgeTown_HerbShop/scripts.inc

@@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
 	faceplayer
 	goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal
 	msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT
-	giveitem_std ITEM_CHARCOAL
+	giveitem ITEM_CHARCOAL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLFLAG_RECEIVED_CHARCOAL

data/maps/LilycoveCity/scripts.inc

@@ -38,7 +38,7 @@ LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8
 	msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9
 LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
-	giveitem ITEM_CONTEST_PASS, 1
+	additem ITEM_CONTEST_PASS
 	setvar VAR_0x800B, 8
 	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1

data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc

@@ -113,16 +113,16 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313
 	checkmoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater:: @ 822031A
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater:: @ 822031A
-	takemoney 200, 0
+	removemoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop:: @ 8220321
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop:: @ 8220321
-	takemoney 300, 0
+	removemoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade:: @ 8220328
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade:: @ 8220328
-	takemoney 350, 0
+	removemoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
@@ -138,16 +138,16 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	compare VAR_TEMP_1, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade
 	updatemoneybox 0, 0
 	bufferitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT
-	giveitem VAR_TEMP_0, 1
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
@@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	playse SE_JIHANKI
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
-	giveitem VAR_TEMP_0, 1
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
@@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	playse SE_JIHANKI
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
-	giveitem VAR_TEMP_0, 1
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT

data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc

@@ -48,7 +48,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C
 	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch
 	compare VAR_0x8004, 4
 	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch
-	giveitem_std VAR_0x8005
+	giveitem VAR_0x8005
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom
 	special TryPutLotteryWinnerReportOnAir
@@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED
 
 LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7
 	msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT
-	giveitem_std VAR_POKELOT_PRIZE_ITEM
+	giveitem VAR_POKELOT_PRIZE_ITEM
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -364,7 +364,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
 	compare VAR_FACING, DIR_EAST
 	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
 	delay 30
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	setvar VAR_0x8004, 2
 	call Common_EventScript_FerryDepart
 	return
@@ -428,7 +428,7 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
 	compare VAR_FACING, DIR_EAST
 	call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
 	delay 30
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	setvar VAR_0x8004, 2
 	call Common_EventScript_FerryDepart
 	return
@@ -457,8 +457,7 @@ LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
 	walk_up
 	step_end
 
-@ Unused
+LilycoveCity_Harbor_Movement_UnusedBoardFerry: @ 821E635
-LilycoveCity_Harbor_Movement_21E635: @ 821E635
 	walk_up
 	step_end
 

data/maps/LilycoveCity_House2/scripts.inc

@@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_FatMan:: @ 821ED75
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest
 	msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM44
+	giveitem ITEM_TM44
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3
 LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA
 	applymovement 1, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT
-	givedecoration_std DECOR_GLASS_ORNAMENT
+	givedecoration DECOR_GLASS_ORNAMENT
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT

data/maps/LittlerootTown/scripts.inc

@@ -167,7 +167,7 @@ LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17
 	waitmovement 0
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setvar VAR_LITTLEROOT_INTRO_STATE, 3
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -563,7 +563,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8
 
 LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT
-	giveitem_std ITEM_POKE_BALL, 5
+	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, FALSE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT
@@ -572,7 +572,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352
 
 LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT
-	giveitem_std ITEM_POKE_BALL, 5
+	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, FALSE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT

data/maps/MauvilleCity/scripts.inc

@@ -425,7 +425,7 @@ MauvilleCity_EventScript_Wattson:: @ 81DF73A
 	goto_if_eq MauvilleCity_EventScript_CompletedNewMauville
 	goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville
 	msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT
-	giveitem_std ITEM_BASEMENT_KEY
+	giveitem ITEM_BASEMENT_KEY
 	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
 	msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
 	release
@@ -438,7 +438,7 @@ MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A
 
 MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
 	msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM24
+	giveitem ITEM_TM24
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_GOT_TM24_FROM_WATTSON

data/maps/MauvilleCity_BikeShop/scripts.inc

@@ -44,13 +44,13 @@ MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A
 
 MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53
 	msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
-	giveitem_std ITEM_MACH_BIKE
+	giveitem ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
 MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D
 	msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
-	giveitem_std ITEM_ACRO_BIKE
+	giveitem ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
@@ -89,16 +89,16 @@ MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5
 MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT
-	takeitem ITEM_ACRO_BIKE, 1
+	removeitem ITEM_ACRO_BIKE
-	giveitem_std ITEM_MACH_BIKE
+	giveitem ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
 MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT
-	takeitem ITEM_MACH_BIKE, 1
+	removeitem ITEM_MACH_BIKE
-	giveitem_std ITEM_ACRO_BIKE
+	giveitem ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -49,8 +49,8 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
 	checkmoney COINS_PRICE_50, 0
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney
-	givecoins 50
+	addcoins 50
-	takemoney COINS_PRICE_50, 0
+	removemoney COINS_PRICE_50, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -67,8 +67,8 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
 	checkmoney COINS_PRICE_500, 0
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney
-	givecoins 500
+	addcoins 500
-	takemoney COINS_PRICE_500, 0
+	removemoney COINS_PRICE_500, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
 	playse SE_REGI
@@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB
 	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
-	takecoins DOLL_COINS
+	removecoins DOLL_COINS
-	givedecoration DECOR_TREECKO_DOLL
+	adddecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
@@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05
 	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
-	takecoins DOLL_COINS
+	removecoins DOLL_COINS
-	givedecoration DECOR_TORCHIC_DOLL
+	adddecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
@@ -201,8 +201,8 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F
 	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll
-	takecoins DOLL_COINS
+	removecoins DOLL_COINS
-	givedecoration DECOR_MUDKIP_DOLL
+	adddecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
@@ -309,8 +309,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD
 	checkitemspace ITEM_TM32, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
-	takecoins TM32_COINS
+	removecoins TM32_COINS
-	giveitem ITEM_TM32, 1
+	additem ITEM_TM32
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
@@ -324,8 +324,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017
 	checkitemspace ITEM_TM29, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
-	takecoins TM29_COINS
+	removecoins TM29_COINS
-	giveitem ITEM_TM29, 1
+	additem ITEM_TM29
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
@@ -339,8 +339,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051
 	checkitemspace ITEM_TM35, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
-	takecoins TM35_COINS
+	removecoins TM35_COINS
-	giveitem ITEM_TM35, 1
+	additem ITEM_TM35
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
@@ -354,8 +354,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B
 	checkitemspace ITEM_TM24, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
-	takecoins TM24_COINS
+	removecoins TM24_COINS
-	giveitem ITEM_TM24, 1
+	additem ITEM_TM24
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
@@ -369,8 +369,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5
 	checkitemspace ITEM_TM13, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM
-	takecoins TM13_COINS
+	removecoins TM13_COINS
-	giveitem ITEM_TM13, 1
+	additem ITEM_TM13
 	updatecoinsbox 1, 1
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
@@ -420,7 +420,7 @@ MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
-	givedecoration_std DECOR_TREECKO_DOLL
+	givedecoration DECOR_TREECKO_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
@@ -431,7 +431,7 @@ MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
-	givedecoration_std DECOR_TORCHIC_DOLL
+	givedecoration DECOR_TORCHIC_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
@@ -442,7 +442,7 @@ MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT
-	givedecoration_std DECOR_MUDKIP_DOLL
+	givedecoration DECOR_MUDKIP_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
@@ -479,7 +479,7 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D
 	compare VAR_TEMP_1, 1  @ Only give 20 coins if player has no coins
 	goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	setflag FLAG_RECEIVED_20_COINS
-	givecoins 20
+	addcoins 20
 	msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT
 	playse SE_REGI
 	goto MauvilleCity_GameCorner_EventScript_PokefanMNormal

data/maps/MauvilleCity_Gym/scripts.inc

@@ -74,7 +74,7 @@ MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7
 	end
 
 MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
-	trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreBattle, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
+	trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonIntro, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_Gym_EventScript_WattsonRematch
@@ -115,7 +115,7 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
 	end
 
 MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
-	giveitem_std ITEM_TM34
+	giveitem ITEM_TM34
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT
@@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
 	end
 
 MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
-	giveitem_std ITEM_TM34
+	giveitem ITEM_TM34
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT
@@ -206,27 +206,27 @@ MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4
 	end
 
 MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9
-	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkPreBattle, MauvilleCity_Gym_Text_KirkDefeat
+	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkIntro, MauvilleCity_Gym_Text_KirkDefeat
 	msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0
-	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnPreBattle, MauvilleCity_Gym_Text_ShawnDefeat
+	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnIntro, MauvilleCity_Gym_Text_ShawnDefeat
 	msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7
-	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenPreBattle, MauvilleCity_Gym_Text_BenDefeat
+	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenIntro, MauvilleCity_Gym_Text_BenDefeat
 	msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE
-	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianPreBattle, MauvilleCity_Gym_Text_VivianDefeat
+	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianIntro, MauvilleCity_Gym_Text_VivianDefeat
 	msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_Angelo:: @ 820E115
-	trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloPreBattle, MauvilleCity_Gym_Text_AngeloDefeat
+	trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloIntro, MauvilleCity_Gym_Text_AngeloDefeat
 	msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -280,7 +280,7 @@ MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283
 	.string "Whoa, you're electrifying!\n"
 	.string "You've powered the door open!$"
 
-MauvilleCity_Gym_Text_KirkPreBattle: @ 820E2BC
+MauvilleCity_Gym_Text_KirkIntro: @ 820E2BC
 	.string "My electric soul, it'll shatter your\n"
 	.string "dreams whole, whoa-yeahah!$"
 
@@ -292,7 +292,7 @@ MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336
 	.string "POKéMON and rock, it's all about heart,\n"
 	.string "whoa-yeah!$"
 
-MauvilleCity_Gym_Text_ShawnPreBattle: @ 820E369
+MauvilleCity_Gym_Text_ShawnIntro: @ 820E369
 	.string "I trained under WATTSON!\n"
 	.string "There ain't no way I'll lose easily!$"
 
@@ -305,7 +305,7 @@ MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1
 	.string "He was battling even before your\n"
 	.string "daddy was born, that tough coot.$"
 
-MauvilleCity_Gym_Text_BenPreBattle: @ 820E443
+MauvilleCity_Gym_Text_BenIntro: @ 820E443
 	.string "This GYM's got puzzles!\n"
 	.string "Isn't it fun?$"
 
@@ -316,7 +316,7 @@ MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E
 	.string "WATTSON says he likes setting up\n"
 	.string "little traps with switches.$"
 
-MauvilleCity_Gym_Text_VivianPreBattle: @ 820E4BB
+MauvilleCity_Gym_Text_VivianIntro: @ 820E4BB
 	.string "With my charm and my POKéMON's moves,\n"
 	.string "you'll be shocked!$"
 
@@ -330,7 +330,7 @@ MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F
 	.string "became TRAINERS.\l"
 	.string "He must know all sorts of things!$"
 
-MauvilleCity_Gym_Text_AngeloPreBattle: @ 820E593
+MauvilleCity_Gym_Text_AngeloIntro: @ 820E593
 	.string "I love shiny things!$"
 
 MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8
@@ -341,7 +341,7 @@ MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2
 	.string "MAUVILLE GYM's WATTSON has a shiny\n"
 	.string "forehead. It makes me happy!$"
 
-MauvilleCity_Gym_Text_WattsonPreBattle: @ 820E602
+MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
 	.string "I've given up on my plans to convert\n"
 	.string "the city, I have.\p"
 	.string "And so, I put my time into making\n"

data/maps/MauvilleCity_House1/scripts.inc

@@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash
 	msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_HM06
+	giveitem ITEM_HM06
 	setflag FLAG_RECEIVED_HM06
 	setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
 	msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT

data/maps/MauvilleCity_House2/scripts.inc

@@ -27,8 +27,8 @@ MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82
 
 MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
 	msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
-	takeitem ITEM_HARBOR_MAIL, 1
+	removeitem ITEM_HARBOR_MAIL
-	giveitem_std ITEM_COIN_CASE
+	giveitem ITEM_COIN_CASE
 	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_ReceivedCoinCase
 	end

data/maps/MirageTower_4F/scripts.inc

@@ -7,7 +7,7 @@ MirageTower_4F_EventScript_RootFossil:: @ 823AD48
 	msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil
-	giveitem_std ITEM_ROOT_FOSSIL
+	giveitem ITEM_ROOT_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
@@ -28,7 +28,7 @@ MirageTower_4F_EventScript_ClawFossil:: @ 823AD89
 	msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil
-	giveitem_std ITEM_CLAW_FOSSIL
+	giveitem ITEM_CLAW_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL

data/maps/MossdeepCity/scripts.inc

@@ -229,7 +229,7 @@ MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
 	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
 	msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
-	giveitem_std ITEM_KINGS_ROCK
+	giveitem ITEM_KINGS_ROCK
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK

data/maps/MossdeepCity_Gym/scripts.inc

@@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885
 	end
 
 MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898
-	trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreBattle, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC
+	trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaIntro, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch
@@ -91,7 +91,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
 	end
 
 MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
-	giveitem_std ITEM_TM04
+	giveitem ITEM_TM04
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT
@@ -100,7 +100,7 @@ MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
 	end
 
 MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
-	giveitem_std ITEM_TM04
+	giveitem ITEM_TM04
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT
@@ -207,62 +207,62 @@ MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1
 	end
 
 MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD
-	trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat
+	trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonIntro, MossdeepCity_Gym_Text_PrestonDefeat
 	msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14
-	trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat
+	trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilIntro, MossdeepCity_Gym_Text_VirgilDefeat
 	msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B
-	trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat
+	trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakeIntro, MossdeepCity_Gym_Text_BlakeDefeat
 	msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42
-	trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat
+	trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahIntro, MossdeepCity_Gym_Text_HannahDefeat
 	msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59
-	trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat
+	trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaIntro, MossdeepCity_Gym_Text_SamanthaDefeat
 	msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Maura:: @ 8220B70
-	trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat
+	trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraIntro, MossdeepCity_Gym_Text_MauraDefeat
 	msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87
-	trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaPreBattle, MossdeepCity_Gym_Text_SylviaDefeat
+	trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaIntro, MossdeepCity_Gym_Text_SylviaDefeat
 	msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E
-	trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NatePreBattle, MossdeepCity_Gym_Text_NateDefeat
+	trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NateIntro, MossdeepCity_Gym_Text_NateDefeat
 	msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5
-	trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyPreBattle, MossdeepCity_Gym_Text_MaceyDefeat
+	trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyIntro, MossdeepCity_Gym_Text_MaceyDefeat
 	msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC
-	trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordPreBattle, MossdeepCity_Gym_Text_CliffordDefeat
+	trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordIntro, MossdeepCity_Gym_Text_CliffordDefeat
 	msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3
-	trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasPreBattle, MossdeepCity_Gym_Text_NicholasDefeat
+	trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasIntro, MossdeepCity_Gym_Text_NicholasDefeat
 	msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA
-	trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenPreBattle, MossdeepCity_Gym_Text_KathleenDefeat
+	trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenIntro, MossdeepCity_Gym_Text_KathleenDefeat
 	msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -385,7 +385,7 @@ MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A
 	.string "Wow, you're astounding!\n"
 	.string "You're one great TRAINER!$"
 
-MossdeepCity_Gym_Text_PrestonPreBattle: @ 8220E5C
+MossdeepCity_Gym_Text_PrestonIntro: @ 8220E5C
 	.string "Battles hinge on the strength of your\n"
 	.string "spirit! The weak-spirited will never win!$"
 
@@ -397,7 +397,7 @@ MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3
 	.string "The indecisive lose.\n"
 	.string "That's my warning to you.$"
 
-MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02
+MossdeepCity_Gym_Text_VirgilIntro: @ 8220F02
 	.string "Let me see your talent!$"
 
 MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A
@@ -409,7 +409,7 @@ MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A
 	.string "However, you may be even more talented\n"
 	.string "than them…$"
 
-MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0
+MossdeepCity_Gym_Text_BlakeIntro: @ 8220FB0
 	.string "Fufufufu… Watch me levitate a POKé\n"
 	.string "BALL telekinetically!\p"
 	.string "Wrooooooooaaaar!\n"
@@ -428,7 +428,7 @@ MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055
 	.string "No, I'm not cheating!\n"
 	.string "I didn't blow on it! Honestly!$"
 
-MossdeepCity_Gym_Text_HannahPreBattle: @ 82210EE
+MossdeepCity_Gym_Text_HannahIntro: @ 82210EE
 	.string "When you lose to me, don't be too hard\n"
 	.string "on yourself.\p"
 	.string "It's not that you're weak--I'm just\n"
@@ -443,7 +443,7 @@ MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A
 	.string "Positive thinking--that's my strong\n"
 	.string "point!$"
 
-MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2
+MossdeepCity_Gym_Text_SamanthaIntro: @ 82211E2
 	.string "I see it…\n"
 	.string "I see your future…\p"
 	.string "If you can beat me, I will tell you\n"
@@ -458,7 +458,7 @@ MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D
 	.string "The result…\n"
 	.string "You won't hear it from me!$"
 
-MossdeepCity_Gym_Text_MauraPreBattle: @ 82212A6
+MossdeepCity_Gym_Text_MauraIntro: @ 82212A6
 	.string "The roads you have traveled…\n"
 	.string "What you have experienced…\p"
 	.string "Come at me with everything you've\n"
@@ -474,7 +474,7 @@ MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E
 	.string "only despair at the end.\p"
 	.string "What goes around comes around…$"
 
-MossdeepCity_Gym_Text_SylviaPreBattle: @ 82213C2
+MossdeepCity_Gym_Text_SylviaIntro: @ 82213C2
 	.string "Even at the risk of life, I will win\n"
 	.string "this battle!$"
 
@@ -487,7 +487,7 @@ MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412
 	.string "It won't be my fault if something\n"
 	.string "horrible befalls you…$"
 
-MossdeepCity_Gym_Text_NatePreBattle: @ 8221460
+MossdeepCity_Gym_Text_NateIntro: @ 8221460
 	.string "Hohoho.\p"
 	.string "You need me to show you how tenacious\n"
 	.string "the PSYCHIC type can be.$"
@@ -500,7 +500,7 @@ MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3
 	.string "I… I don't let defeat rattle m-me,\n"
 	.string "however b-badly.$"
 
-MossdeepCity_Gym_Text_KathleenPreBattle: @ 8221507
+MossdeepCity_Gym_Text_KathleenIntro: @ 8221507
 	.string "Let me show you a perfectly awful,\n"
 	.string "horrifying time!$"
 
@@ -511,7 +511,7 @@ MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545
 	.string "Your vitality is contagious!\n"
 	.string "Get away from me quickly!$"
 
-MossdeepCity_Gym_Text_CliffordPreBattle: @ 822157C
+MossdeepCity_Gym_Text_CliffordIntro: @ 822157C
 	.string "I may be past my prime, but I suggest\n"
 	.string "you not patronize me.$"
 
@@ -523,7 +523,7 @@ MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2
 	.string "It seems that I could not overcome\n"
 	.string "your youthful energy.$"
 
-MossdeepCity_Gym_Text_MaceyPreBattle: @ 822161B
+MossdeepCity_Gym_Text_MaceyIntro: @ 822161B
 	.string "You're not getting through to the end!\n"
 	.string "Not if I can help it!$"
 
@@ -536,7 +536,7 @@ MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680
 	.string "not suitable for the PSYCHIC type!\p"
 	.string "The way you battle is somehow brutal!$"
 
-MossdeepCity_Gym_Text_NicholasPreBattle: @ 82216EE
+MossdeepCity_Gym_Text_NicholasIntro: @ 82216EE
 	.string "Wroooar! Have a taste of my super\n"
 	.string "POKéMON hard-battling power!$"
 
@@ -548,7 +548,7 @@ MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A
 	.string "All right! I think I'll develop a special\n"
 	.string "invincible POKéMON power next.$"
 
-MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783
+MossdeepCity_Gym_Text_TateAndLizaIntro: @ 8221783
 	.string "TATE: Hehehe… Were you surprised?\p"
 	.string "LIZA: Fufufu… Were you surprised?\p"
 	.string "TATE: That there are two GYM LEADERS?\n"

data/maps/MossdeepCity_House3/scripts.inc

@@ -9,7 +9,7 @@ MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3
 	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod
 	msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT
-	giveitem_std ITEM_SUPER_ROD
+	giveitem ITEM_SUPER_ROD
 	setflag FLAG_RECEIVED_SUPER_ROD
 	msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT
 	release

data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc

@@ -119,7 +119,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma
 	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone
 	msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT
-	giveitem_std ITEM_SUN_STONE
+	giveitem ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
@@ -135,7 +135,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0
 MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA
 	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma
 	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_SUN_STONE
+	giveitem ITEM_SUN_STONE
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA
 	applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer
 	waitmovement 0
 	msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT
-	giveitem_std ITEM_HM08
+	giveitem ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT
@@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
 
 @ Unused, leftover from RS
 MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
-	finditem_std ITEM_HM08
+	finditem ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	end
 

data/maps/MtChimney/scripts.inc

@@ -110,8 +110,8 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
 	msgbox MtChimney_Text_ThankYouDear, MSGBOX_DEFAULT
 	checkitemspace ITEM_LAVA_COOKIE, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq MtChimney_EventScript_TakeMoney
+	call_if_eq MtChimney_EventScript_RemoveMoney
-	giveitem_std ITEM_LAVA_COOKIE
+	giveitem ITEM_LAVA_COOKIE
 	compare VAR_RESULT, FALSE
 	goto_if_eq MtChimney_EventScript_BagIsFull
 	hidemoneybox
@@ -124,8 +124,8 @@ MtChimney_EventScript_BagIsFull:: @ 822EF51
 	release
 	end
 
-MtChimney_EventScript_TakeMoney:: @ 822EF5E
+MtChimney_EventScript_RemoveMoney:: @ 822EF5E
-	takemoney 200, 0
+	removemoney 200, 0
 	updatemoneybox 0, 0
 	return
 
@@ -184,8 +184,7 @@ MtChimney_Movement_ArchieExitNorth: @ 822EF9C
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused1: @ 822EFA6
-MtChimney_Movement_22EFA6: @ 822EFA6
 	walk_down
 	walk_down
 	walk_down
@@ -205,8 +204,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused2: @ 822EFB8
-MtChimney_Movement_22EFB8: @ 822EFB8
 	walk_down
 	walk_down
 	walk_down
@@ -217,8 +215,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused3: @ 822EFC1
-MtChimney_Movement_22EFC1: @ 822EFC1
 	walk_right
 	walk_down
 	walk_down
@@ -235,8 +232,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused4: @ 822EFD0
-MtChimney_Movement_22EFD0: @ 822EFD0
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
@@ -263,8 +259,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused5: @ 822EFE9
-MtChimney_Movement_22EFE9: @ 822EFE9
 	delay_16
 	delay_16
 	delay_16
@@ -277,8 +272,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused6: @ 822EFF4
-MtChimney_Movement_22EFF4: @ 822EFF4
 	delay_16
 	walk_left
 	walk_down
@@ -296,8 +290,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused7: @ 822F004
-MtChimney_Movement_22F004: @ 822F004
 	delay_16
 	walk_left
 	walk_left
@@ -316,8 +309,7 @@ MtChimney_Movement_22F004: @ 822F004
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused8: @ 822F015
-MtChimney_Movement_22F015: @ 822F015
 	delay_16
 	walk_down
 	walk_left
@@ -327,8 +319,7 @@ MtChimney_Movement_22F015: @ 822F015
 	walk_in_place_fastest_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused9: @ 822F01D
-MtChimney_Movement_22F01D: @ 822F01D
 	walk_down
 	walk_down
 	walk_down
@@ -344,13 +335,11 @@ MtChimney_Movement_22F01D: @ 822F01D
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused10: @ 822F02B
-MtChimney_Movement_22F02B: @ 822F02B
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused11: @ 822F02D
-MtChimney_Movement_22F02D: @ 822F02D
 	walk_down
 	walk_down
 	walk_down
@@ -360,8 +349,7 @@ MtChimney_Movement_22F02D: @ 822F02D
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused12: @ 822F035
-MtChimney_Movement_22F035: @ 822F035
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
@@ -373,8 +361,7 @@ MtChimney_Movement_22F035: @ 822F035
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused13: @ 822F03F
-MtChimney_Movement_22F03F: @ 822F03F
 	delay_16
 	delay_16
 	delay_16
@@ -387,16 +374,14 @@ MtChimney_Movement_22F03F: @ 822F03F
 	walk_down
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused14: @ 822F04A
-MtChimney_Movement_22F04A: @ 822F04A
 	lock_facing_direction
 	walk_fast_left
 	unlock_facing_direction
 	face_right
 	step_end
 
-@ Unused
+MtChimney_Movement_Unused15: @ 822F04F
-MtChimney_Movement_22F04F: @ 822F04F
 	walk_left
 	walk_in_place_fastest_right
 	delay_16
@@ -464,7 +449,7 @@ MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4
 	compare VAR_RESULT, NO
 	goto_if_eq MtChimney_EventScript_LeaveMeteoriteAlone
 	msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT
-	giveitem_std ITEM_METEORITE
+	giveitem ITEM_METEORITE
 	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end

data/maps/MtPyre_1F/scripts.inc

@@ -6,7 +6,7 @@ MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag
 	msgbox MtPyre_1F_Text_TakeThisForYourOwnGood, MSGBOX_DEFAULT
-	giveitem_std ITEM_CLEANSE_TAG
+	giveitem ITEM_CLEANSE_TAG
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG

data/maps/MtPyre_Summit/scripts.inc

@@ -64,7 +64,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2
 	msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_MAGMA_EMBLEM
+	giveitem ITEM_MAGMA_EMBLEM
 	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD
 	releaseall

data/maps/OldaleTown/scripts.inc

@@ -71,7 +71,7 @@ OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
 
 OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
 	msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT
-	giveitem_std ITEM_POTION
+	giveitem ITEM_POTION
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_EventScript_BagIsFull
 	msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT

data/maps/PacifidlogTown_House2/scripts.inc

@@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812
 
 PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816
 	msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM27
+	giveitem ITEM_TM27
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
@@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845
 
 PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F
 	msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM21
+	giveitem ITEM_TM21
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK

data/maps/PetalburgCity/scripts.inc

@@ -351,7 +351,8 @@ PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
 	waitmovement 0
 	return
 
-PetalburgCity_Movement_1DC611:: @ 81DC611
+@ Unused
+PetalburgCity_Movement_Delay48:: @ 81DC611
 	delay_16
 	delay_16
 	delay_16

data/maps/PetalburgCity_Gym/scripts.inc

@@ -16,20 +16,13 @@ PetalburgCity_Gym_OnLoad: @ 820489E
 PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5
 	setvar VAR_0x8005, 1
 	call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors
-	checktrainerflag TRAINER_RANDALL
+	call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors
-	call_if_eq PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors
+	call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors
-	checktrainerflag TRAINER_MARY
+	call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors
-	call_if_eq PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors
+	call_if_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors
-	checktrainerflag TRAINER_PARKER
+	call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors
-	call_if_eq PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors
+	call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors
-	checktrainerflag TRAINER_ALEXIA
+	call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_OpenOHKORoomDoors
-	call_if_eq PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors
-	checktrainerflag TRAINER_GEORGE
-	call_if_eq PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors
-	checktrainerflag TRAINER_JODY
-	call_if_eq PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors
-	checktrainerflag TRAINER_BERKE
-	call_if_eq PetalburgCity_Gym_EventScript_OpenOHKORoomDoors
 	end
 
 PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF
@@ -403,7 +396,7 @@ PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17
 	return
 
 PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
-	giveitem_std ITEM_ENIGMA_BERRY
+	giveitem ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
@@ -411,7 +404,7 @@ PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
 	end
 
 PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
-	msgbox PetalburgCity_Gym_Text_NormanPreBattle, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_NormanIntro, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat
 	message PetalburgCity_Gym_Text_ReceivedBalanceBadge
 	waitmessage
@@ -444,7 +437,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
 	end
 
 PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
-	giveitem_std ITEM_TM42
+	giveitem ITEM_TM42
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
 	setflag FLAG_RECEIVED_TM42
@@ -673,8 +666,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
 	walk_up
 	step_end
 
-@ Unused
+PetalburgCity_Gym_Movement_Unused: @ 82050D8
-PetalburgCity_Gym_Movement_2050D8: @ 82050D8
 	walk_in_place_fastest_up
 	delay_16
 	delay_16
@@ -830,8 +822,7 @@ PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187
 
 PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC
 	lockall
-	checktrainerflag TRAINER_RANDALL
+	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 46
 	msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO
@@ -843,8 +834,7 @@ PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC
 
 PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF
 	lockall
-	checktrainerflag TRAINER_RANDALL
+	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO
@@ -856,8 +846,7 @@ PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF
 
 PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222
 	lockall
-	checktrainerflag TRAINER_MARY
+	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO
@@ -869,8 +858,7 @@ PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222
 
 PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255
 	lockall
-	checktrainerflag TRAINER_MARY
+	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 72
 	msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO
@@ -882,8 +870,7 @@ PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255
 
 PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288
 	lockall
-	checktrainerflag TRAINER_PARKER
+	goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO
@@ -895,8 +882,7 @@ PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288
 
 PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB
 	lockall
-	checktrainerflag TRAINER_ALEXIA
+	goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO
@@ -908,8 +894,7 @@ PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB
 
 PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE
 	lockall
-	checktrainerflag TRAINER_ALEXIA
+	goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO
@@ -921,8 +906,7 @@ PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE
 
 PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321
 	lockall
-	checktrainerflag TRAINER_GEORGE
+	goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO
@@ -934,8 +918,7 @@ PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321
 
 PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354
 	lockall
-	checktrainerflag TRAINER_JODY
+	goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO
@@ -947,8 +930,7 @@ PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354
 
 PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
 	lockall
-	checktrainerflag TRAINER_BERKE
+	goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_DoorLocked
-	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO
@@ -959,7 +941,7 @@ PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
 	end
 
 PetalburgCity_Gym_EventScript_Randall:: @ 82053BA
-	trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallPreBattle, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
+	trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallIntro, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge
 	msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -976,7 +958,7 @@ PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED
 	end
 
 PetalburgCity_Gym_EventScript_Parker:: @ 82053F6
-	trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerPreBattle, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
+	trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerIntro, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge
 	msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -993,7 +975,7 @@ PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429
 	end
 
 PetalburgCity_Gym_EventScript_George:: @ 8205432
-	trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgePreBattle, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
+	trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgeIntro, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge
 	msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1010,7 +992,7 @@ PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465
 	end
 
 PetalburgCity_Gym_EventScript_Berke:: @ 820546E
-	trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkePreBattle, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
+	trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkeIntro, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge
 	msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1027,7 +1009,7 @@ PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1
 	end
 
 PetalburgCity_Gym_EventScript_Mary:: @ 82054AA
-	trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryPreBattle, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
+	trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryIntro, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge
 	msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1044,7 +1026,7 @@ PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD
 	end
 
 PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6
-	trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaPreBattle, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
+	trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaIntro, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge
 	msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1061,7 +1043,7 @@ PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519
 	end
 
 PetalburgCity_Gym_EventScript_Jody:: @ 8205522
-	trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyPreBattle, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
+	trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyIntro, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge
 	msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1358,7 +1340,7 @@ PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87
 	.string "I can tell by the number of BADGES\n"
 	.string "that you've earned.$"
 
-PetalburgCity_Gym_Text_NormanPreBattle: @ 8205FE5
+PetalburgCity_Gym_Text_NormanIntro: @ 8205FE5
 	.string "DAD: Hm…\n"
 	.string "So, you did get four GYM BADGES.\p"
 	.string "Fine, as I promised, we will have\n"
@@ -1454,7 +1436,7 @@ PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3
 	.string "Like, whoa!\n"
 	.string "What a stunning turn of events!$"
 
-PetalburgCity_Gym_Text_RandallPreBattle: @ 820674F
+PetalburgCity_Gym_Text_RandallIntro: @ 820674F
 	.string "The ability to attack before the\n"
 	.string "opponent…\p"
 	.string "Just that alone puts me at a great\n"
@@ -1477,7 +1459,7 @@ PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E
 	.string "That's what I think being a\n"
 	.string "GYM LEADER is all about.$"
 
-PetalburgCity_Gym_Text_ParkerPreBattle: @ 82068FD
+PetalburgCity_Gym_Text_ParkerIntro: @ 82068FD
 	.string "This is the CONFUSION ROOM.\p"
 	.string "Let me see how well bonded you are\n"
 	.string "with your POKéMON!$"
@@ -1494,7 +1476,7 @@ PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9
 	.string "After you beat our LEADER, the\n"
 	.string "training has become a lot tougher.$"
 
-PetalburgCity_Gym_Text_GeorgePreBattle: @ 8206A1B
+PetalburgCity_Gym_Text_GeorgeIntro: @ 8206A1B
 	.string "Just when you think you're going to\n"
 	.string "win, your opponent restores HP…\p"
 	.string "Can you just imagine how awful that\n"
@@ -1519,7 +1501,7 @@ PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1
 	.string "I'm going to keep training at GYMS.\n"
 	.string "One day, I'll become a LEADER.$"
 
-PetalburgCity_Gym_Text_BerkePreBattle: @ 8206BF4
+PetalburgCity_Gym_Text_BerkeIntro: @ 8206BF4
 	.string "I'm not going to take it easy just\n"
 	.string "because you're our LEADER's kid.\p"
 	.string "I'll show you how horrid it is for\n"
@@ -1542,7 +1524,7 @@ PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56
 	.string "the TRAINERS of PETALBURG CITY have\l"
 	.string "become a lot tougher.$"
 
-PetalburgCity_Gym_Text_MaryPreBattle: @ 8206DB2
+PetalburgCity_Gym_Text_MaryIntro: @ 8206DB2
 	.string "Giggle…\n"
 	.string "This is the ACCURACY ROOM.\p"
 	.string "It's pretty nasty when every attack\n"
@@ -1565,7 +1547,7 @@ PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8
 	.string "We're striving to become soul mates\n"
 	.string "with our POKéMON.$"
 
-PetalburgCity_Gym_Text_AlexiaPreBattle: @ 8206F44
+PetalburgCity_Gym_Text_AlexiaIntro: @ 8206F44
 	.string "The higher the DEFENSE, the more\n"
 	.string "reckless I can be in attack.$"
 
@@ -1585,7 +1567,7 @@ PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F
 PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069
 	.string "Hi! Have you tried using SURF?$"
 
-PetalburgCity_Gym_Text_JodyPreBattle: @ 8207088
+PetalburgCity_Gym_Text_JodyIntro: @ 8207088
 	.string "Our GYM LEADER told us to go all out\n"
 	.string "and beat you.\p"
 	.string "Even if you happen to be the\n"

data/maps/PetalburgCity_WallysHouse/scripts.inc

@@ -19,7 +19,7 @@ PetalburgCity_WallysHouse_OnFrame: @ 8204247
 PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
 	lockall
 	msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT
-	giveitem_std ITEM_HM03
+	giveitem ITEM_HM03
 	setflag FLAG_RECEIVED_HM03
 	msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT
 	setvar VAR_PETALBURG_CITY_STATE, 5

data/maps/PetalburgWoods/scripts.inc

@@ -88,7 +88,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT
-	giveitem_std ITEM_GREAT_BALL
+	giveitem ITEM_GREAT_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_BagFull
 	goto PetalburgWoods_EventScript_DevonResearcherFinish
@@ -251,7 +251,7 @@ PetalburgWoods_EventScript_Girl:: @ 822E222
 	faceplayer
 	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed
 	msgbox PetalburgWoods_Text_TryUsingThisItem, MSGBOX_DEFAULT
-	giveitem_std ITEM_MIRACLE_SEED
+	giveitem ITEM_MIRACLE_SEED
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MIRACLE_SEED

data/maps/Route104/scripts.inc

@@ -269,7 +269,7 @@ Route104_EventScript_ExpertF:: @ 81ECF8C
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry
 	msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_CHESTO_BERRY
+	giveitem ITEM_CHESTO_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104
@@ -287,7 +287,7 @@ Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD
 	faceplayer
 	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb
 	msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT
-	giveitem_std ITEM_WHITE_HERB
+	giveitem ITEM_WHITE_HERB
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WHITE_HERB
@@ -340,7 +340,7 @@ Route104_EventScript_Boy2:: @ 81ED057
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed
 	msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM09
+	giveitem ITEM_TM09
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM09

data/maps/Route104_PrettyPetalFlowerShop/scripts.inc

@@ -75,7 +75,7 @@ Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C
 
 Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421
 	msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_WAILMER_PAIL
+	giveitem ITEM_WAILMER_PAIL
 	msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_WAILMER_PAIL
 	release
@@ -89,7 +89,7 @@ Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
 	msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT
 	random 8
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY

data/maps/Route109/scripts.inc

@@ -330,7 +330,7 @@ Route109_EventScript_SoftSandGirl:: @ 81EE9B5
 	special GetPlayerBigGuyGirlString
 	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand
 	msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_SOFT_SAND
+	giveitem ITEM_SOFT_SAND
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	closemessage

data/maps/Route109_SeashoreHouse/scripts.inc

@@ -24,7 +24,7 @@ Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428
 
 Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
 	msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
-	giveitem_std ITEM_SODA_POP, 6
+	giveitem ITEM_SODA_POP, 6
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_BagFull
 	setflag FLAG_RECEIVED_6_SODA_POP
@@ -54,9 +54,9 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace
 	msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
-	takemoney 300, 0
+	removemoney 300, 0
 	updatemoneybox 0, 0
-	giveitem_std ITEM_SODA_POP
+	giveitem ITEM_SODA_POP
 	hidemoneybox
 	release
 	end
@@ -89,12 +89,9 @@ Route109_SeashoreHouse_EventScript_Simon:: @ 8269518
 	end
 
 Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
-	checktrainerflag TRAINER_DWAYNE
+	goto_if_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
-	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
+	goto_if_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
-	checktrainerflag TRAINER_JOHANNA
+	goto_if_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
-	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
-	checktrainerflag TRAINER_SIMON
-	goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	setflag FLAG_DEFEATED_SEASHORE_HOUSE
 	release
 	end

data/maps/Route110/scripts.inc

@@ -473,7 +473,7 @@ Route110_EventScript_BrendanDefeated:: @ 81EF8C4
 	end
 
 Route110_EventScript_GiveItemfinder:: @ 81EF8DF
-	giveitem_std ITEM_ITEMFINDER
+	giveitem ITEM_ITEMFINDER
 	return
 
 Route110_EventScript_RivalExit:: @ 81EF8EC

data/maps/Route110_TrickHouseEnd/scripts.inc

@@ -13,7 +13,7 @@ Route110_TrickHouseEnd_OnResume: @ 826ACC4
 Route110_TrickHouseEnd_OnTransition: @ 826ACD0
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
-	special SetTrickHouseEndRoomFlag
+	special SetTrickHouseNuggetFlag
 	end
 
 Route110_TrickHouseEnd_OnWarp: @ 826ACDE
@@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84
 	msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_RARE_CANDY
+	giveitem ITEM_RARE_CANDY
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0
 	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TIMER_BALL
+	giveitem ITEM_TIMER_BALL
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC
 	msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_HARD_STONE
+	giveitem ITEM_HARD_STONE
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38
 	msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_SMOKE_BALL
+	giveitem ITEM_SMOKE_BALL
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74
 	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TM12
+	giveitem ITEM_TM12
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0
 	msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_MAGNET
+	giveitem ITEM_MAGNET
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC
 	msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_PP_MAX
+	giveitem ITEM_PP_MAX
 	compare VAR_RESULT, FALSE
 	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
 	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
@@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
 	call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent
 	msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT
 	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
-	special ResetTrickHouseEndRoomFlag
+	special ResetTrickHouseNuggetFlag
 	release
 	end
 
@@ -182,11 +182,11 @@ Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5
 	goto Route110_TrickHouseEnd_EventScript_GiveBlueTent
 
 Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF
-	givedecoration_std DECOR_RED_TENT
+	givedecoration DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
-	givedecoration_std DECOR_BLUE_TENT
+	givedecoration DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF

data/maps/Route110_TrickHouseEntrance/scripts.inc

@@ -367,7 +367,7 @@ Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
-	giveitem_std ITEM_RARE_CANDY
+	giveitem ITEM_RARE_CANDY
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -377,7 +377,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
-	giveitem_std ITEM_TIMER_BALL
+	giveitem ITEM_TIMER_BALL
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -387,7 +387,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
-	giveitem_std ITEM_HARD_STONE
+	giveitem ITEM_HARD_STONE
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -397,7 +397,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
-	giveitem_std ITEM_SMOKE_BALL
+	giveitem ITEM_SMOKE_BALL
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -407,7 +407,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
-	giveitem_std ITEM_TM12
+	giveitem ITEM_TM12
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -417,7 +417,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
-	giveitem_std ITEM_MAGNET
+	giveitem ITEM_MAGNET
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -427,7 +427,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
 	end
 
 Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
-	giveitem_std ITEM_PP_MAX
+	giveitem ITEM_PP_MAX
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
 	compare VAR_RESULT, FALSE
@@ -464,11 +464,11 @@ Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
 	goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
 
 Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A
-	givedecoration_std DECOR_RED_TENT
+	givedecoration DECOR_RED_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092
-	givedecoration_std DECOR_BLUE_TENT
+	givedecoration DECOR_BLUE_TENT
 	return
 
 Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A

data/maps/Route111/scripts.inc

@@ -48,8 +48,7 @@ Route111_OnTransition: @ 81F0D87
 	call_if_eq Route111_EventScript_SetMirageTowerGone
 	call Route111_EventScript_CheckSetSandstorm
 	call GabbyAndTy_EventScript_UpdateLocation
-	checktrainerflag TRAINER_VICKY
+	goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_SetWinstratesNotDefeated
-	goto_if_lt Route111_EventScript_SetWinstratesNotDefeated
 	end
 
 Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
@@ -162,7 +161,7 @@ Route111_EventScript_Girl:: @ 81F0EB9
 	dotimebasedevents
 	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry
 	msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT
-	giveitem_std ITEM_RAZZ_BERRY
+	giveitem ITEM_RAZZ_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY

data/maps/Route111_WinstrateFamilysHouse/scripts.inc

@@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2
 	setvar VAR_0x8008, 3
 	goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace
 	msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT
-	giveitem_std ITEM_MACHO_BRACE
+	giveitem ITEM_MACHO_BRACE
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MACHO_BRACE

data/maps/Route113_GlassWorkshop/scripts.inc

@@ -31,7 +31,7 @@ Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E
 	compare VAR_GLASS_WORKSHOP_STATE, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack
 	msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_SOOT_SACK
+	giveitem ITEM_SOOT_SACK
 	setvar VAR_GLASS_WORKSHOP_STATE, 1
 	msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
 	release
@@ -220,13 +220,13 @@ Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
 	end
 
 Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047
-	giveitem_std VAR_0x8008
+	giveitem VAR_0x8008
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute
 	return
 
 Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F
-	givedecoration_std VAR_0x8008
+	givedecoration VAR_0x8008
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor
 	return

data/maps/Route114/scripts.inc

@@ -33,7 +33,7 @@ Route114_EventScript_Man:: @ 81F2582
 	random NUM_ROUTE_114_MAN_BERRIES
 	addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
@@ -51,7 +51,7 @@ Route114_EventScript_RoarGentleman:: @ 81F25D1
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar
 	msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM05
+	giveitem ITEM_TM05
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05

data/maps/Route114_FossilManiacsHouse/scripts.inc

@@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig
 	msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT
-	giveitem_std ITEM_TM28
+	giveitem ITEM_TM28
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM28

data/maps/Route114_LanettesHouse/scripts.inc

@@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2
 	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice
 	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT
-	givedecoration_std DECOR_LOTAD_DOLL
+	givedecoration DECOR_LOTAD_DOLL
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowNoRoomForDecor
 	setflag FLAG_RECEIVED_DOLL_LANETTE

data/maps/Route116/scripts.inc

@@ -58,7 +58,7 @@ Route116_EventScript_DevonEmployee:: @ 81F2CA2
 
 Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	setflag FLAG_MET_DEVON_EMPLOYEE
-	giveitem_std ITEM_REPEAT_BALL
+	giveitem ITEM_REPEAT_BALL
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route116_EventScript_NoRoomForRepeatBall
 	msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT