Merge branch 'master' into doc-matchcall

asm/berry_crush.s

@@ -296,7 +296,7 @@ _08021C5E:
 	lsrs r2, 24
 	mov r1, r10
 	lsrs r3, r1, 24
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	movs r4, 0
 	str r4, [sp, 0x4]
@@ -338,7 +338,7 @@ _08021CC8:
 	ldrb r0, [r0]
 	mov r4, r10
 	lsrs r3, r4, 24
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
@@ -402,7 +402,7 @@ sub_8021D34: @ 8021D34
 	ldrh r1, [r2, 0x4]
 	bl sub_8021944
 	ldrb r0, [r4]
-	ldr r4, =gUnknown_082F32D8
+	ldr r4, =sBerryCrushTextColors1
 	str r4, [sp]
 	str r6, [sp, 0x4]
 	ldr r1, =gText_TimeColon
@@ -423,7 +423,7 @@ sub_8021D34: @ 8021D34
 	lsrs r6, r0, 24
 	mov r2, r9
 	ldrb r0, [r2]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	mov r2, r10
 	str r2, [sp, 0x4]
@@ -464,7 +464,7 @@ sub_8021D34: @ 8021D34
 	lsrs r6, r0, 24
 	mov r4, r9
 	ldrb r0, [r4]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	mov r2, r10
 	str r2, [sp, 0x4]
@@ -484,7 +484,7 @@ sub_8021D34: @ 8021D34
 	lsrs r6, r0, 24
 	mov r1, r9
 	ldrb r0, [r1]
-	ldr r2, =gUnknown_082F32D8
+	ldr r2, =sBerryCrushTextColors1
 	str r2, [sp]
 	mov r1, r10
 	str r1, [sp, 0x4]
@@ -515,7 +515,7 @@ sub_8021D34: @ 8021D34
 	lsrs r6, r0, 24
 	mov r4, r9
 	ldrb r0, [r4]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	mov r2, r10
 	str r2, [sp, 0x4]
@@ -529,7 +529,7 @@ sub_8021D34: @ 8021D34
 	lsls r0, 24
 	lsrs r7, r0, 24
 	ldrb r0, [r4]
-	ldr r4, =gUnknown_082F32D8
+	ldr r4, =sBerryCrushTextColors1
 	str r4, [sp]
 	mov r1, r10
 	str r1, [sp, 0x4]
@@ -552,7 +552,7 @@ sub_8021D34: @ 8021D34
 	lsrs r6, r0, 24
 	mov r1, r9
 	ldrb r0, [r1]
-	ldr r2, =gUnknown_082F32D8
+	ldr r2, =sBerryCrushTextColors1
 	str r2, [sp]
 	mov r1, r10
 	str r1, [sp, 0x4]
@@ -633,7 +633,7 @@ _08021F0A:
 	lsls r0, 1
 	add r0, r8
 	ldrb r0, [r0]
-	ldr r1, =gUnknown_082F32E7
+	ldr r1, =sBerryCrushTextColors4
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
@@ -649,7 +649,7 @@ _08021FC4:
 	lsls r0, 1
 	add r0, r8
 	ldrb r0, [r0]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	str r2, [sp, 0x4]
 	str r4, [sp, 0x8]
@@ -667,7 +667,7 @@ _08021FDE:
 	add r8, r4
 	mov r1, r8
 	ldrb r0, [r1]
-	ldr r2, =gUnknown_082F32D8
+	ldr r2, =sBerryCrushTextColors1
 	mov r9, r2
 	str r2, [sp]
 	movs r5, 0
@@ -1019,7 +1019,7 @@ _080222D0:
 	lsls r0, 24
 	lsrs r7, r0, 24
 	ldrb r0, [r6, 0x2]
-	ldr r5, =gUnknown_082F32E1
+	ldr r5, =sBerryCrushTextColorTable
 	str r5, [sp]
 	mov r1, r9
 	str r1, [sp, 0x4]
@@ -1062,7 +1062,7 @@ _08022336:
 	ldr r1, =gText_Var1Players
 	bl StringExpandPlaceholders
 	ldrb r0, [r6, 0x2]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
@@ -1082,7 +1082,7 @@ _08022336:
 	lsls r1, 24
 	lsrs r7, r1, 24
 	ldrb r0, [r6, 0x2]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
@@ -1155,7 +1155,7 @@ _080223CA:
 	lsls r0, 24
 	lsrs r7, r0, 24
 	ldrb r0, [r6, 0x2]
-	ldr r1, =gUnknown_082F32D8
+	ldr r1, =sBerryCrushTextColors1
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
@@ -1405,7 +1405,7 @@ _08022616:
 	mov r1, r8
 	str r1, [sp]
 	str r1, [sp, 0x4]
-	ldr r1, =gUnknown_082F32DB
+	ldr r1, =sBerryCrushTextColors2
 	str r1, [sp, 0x8]
 	mov r1, r8
 	str r1, [sp, 0xC]
@@ -1432,7 +1432,7 @@ _08022668:
 	mov r1, r8
 	str r1, [sp]
 	str r1, [sp, 0x4]
-	ldr r1, =gUnknown_082F32DE
+	ldr r1, =sBerryCrushTextColors3
 	str r1, [sp, 0x8]
 	mov r1, r8
 	str r1, [sp, 0xC]

asm/macros/battle_frontier/apprentice.inc

@@ -1,22 +1,24 @@
-@ TODO: These need to have description comment
-
+	@ TRUE if the player has talked to the Apprentice and answered their level mode question
 	.macro apprentice_gavelvlmode
 	setvar VAR_0x8004, APPRENTICE_FUNC_GAVE_LVLMODE
 	special CallApprenticeFunction
 	.endm
 
+	@ Set the level mode the Apprentice should battle in
 	.macro apprentice_setlvlmode lvlmode:req
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_LVLMODE
 	setorcopyvar VAR_0x8005, \lvlmode
-	addvar VAR_0x8005, 1
+	addvar VAR_0x8005, 1  @ Apprentice lvl mode is +1 from regular lvl mode value
 	special CallApprenticeFunction
 	.endm
 
+	@ Question was answered, increment the number of questions answered
 	.macro apprentice_answeredquestion
 	setvar VAR_0x8004, APPRENTICE_FUNC_ANSWERED_QUESTION
 	special CallApprenticeFunction
 	.endm
 
+	@ Show the response selection box to answer the Apprentice question. Menus are defined as APPRENTICE_ASK_*
 	.macro apprentice_menu  which:req
 	setvar VAR_0x8004, APPRENTICE_FUNC_MENU
 	setvar VAR_0x8005, \which
@@ -24,16 +26,19 @@
 	waitstate
 	.endm
 
+	@ Shuffle and set the Apprentice party mons to pick between from their list of possible party species
 	.macro apprentice_shufflespecies
 	setvar VAR_0x8004, APPRENTICE_FUNC_SHUFFLE_SPECIES
 	special CallApprenticeFunction
 	.endm
 
+	@ Randomize the question data (e.g. moves to pick between) and shuffle the order to ask them in
 	.macro apprentice_randomizequestions
 	setvar VAR_0x8004, APPRENTICE_FUNC_RANDOMIZE_QUESTIONS
 	special CallApprenticeFunction
 	.endm
 
+	@ Print the APPRENTICE_MSG_* text for the current Apprentice
 	.macro apprentice_msg  waitbuttonpress:req, which:req
 	setvar VAR_0x8004, APPRENTICE_FUNC_PRINT_MSG
 	setvar VAR_0x8005, \waitbuttonpress
@@ -42,46 +47,54 @@
 	waitstate
 	.endm
 
+	@ Clear the data for the current Player Apprentice
 	.macro apprentice_reset
 	setvar VAR_0x8004, APPRENTICE_FUNC_RESET
 	special CallApprenticeFunction
 	.endm
 
+	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason 
 	.macro apprentice_shouldcheckgone
 	setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
 	special CallApprenticeFunction
 	.endm
 
+	@ Return the APPRENTICE_QUESTION_* value for the current question to ask
 	.macro apprentice_getquestion
 	setvar VAR_0x8004, APPRENTICE_FUNC_GET_QUESTION
 	special CallApprenticeFunction
 	.endm
 
+	@ Get the number of mons that have been chosen for the Apprentice's party so far
 	.macro apprentice_getnumpartymons
 	setvar VAR_0x8004, APPRENTICE_FUNC_GET_NUM_PARTY_MONS
 	special CallApprenticeFunction
 	.endm
 
+	@ Set the Apprentice party mon at the given slot. VAR_0x8005 is used implicitly as which of the 2 mons was selected
 	.macro apprentice_setpartymon  slot:req
 	copyvar VAR_0x8006, \slot
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_PARTY_MON
 	special CallApprenticeFunction
 	.endm
 
+	@ Allocate and set up data to track about the question
 	.macro apprentice_initquestion  which:req
 	setvar VAR_0x8004, APPRENTICE_FUNC_INIT_QUESTION_DATA
 	setvar VAR_0x8005, \which
 	special CallApprenticeFunction
 	.endm
 
+	@ Free allocated question data
 	.macro apprentice_freequestion
 	setvar VAR_0x8004, APPRENTICE_FUNC_FREE_QUESTION_DATA
 	special CallApprenticeFunction
 	.endm
 
-	.macro apprentice_buff  whichstringvar:req, tobuff:req
+	@ Buffer some APPRENTICE_BUFF_* string to the given stringvar (0 for STR_VAR_1, 1 for STR_VAR_2, 2 for STR_VAR_3)
+	.macro apprentice_buff  stringvar:req, tobuff:req
 	setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
-	setvar VAR_0x8005, \whichstringvar
+	setvar VAR_0x8005, \stringvar
 	.if \tobuff >= VARS_START
 	copyvar VAR_0x8006, \tobuff
 	.else
@@ -90,43 +103,51 @@
 	special CallApprenticeFunction
 	.endm
 
+	@ Set which move to use that the player chose (implicitly VAR_0x8005)
 	.macro apprentice_setmove
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_MOVE
 	special CallApprenticeFunction
 	.endm
 
+	@ Set which mon the Apprentice should lead with 
 	.macro apprentice_setleadmon  monId:req
 	copyvar VAR_0x8005, \monId
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON
 	special CallApprenticeFunction
 	.endm
 
+	@ Open the Bag Menu for the player to choose an item to recommend as a held item
 	.macro apprentice_openbag
 	setvar VAR_0x8004, APPRENTICE_FUNC_OPEN_BAG
 	special CallApprenticeFunction
 	waitstate
 	.endm
 
+	@ Try and set the recommended held item. FALSE if the item has been recommended before, as Battle Frontier forbids using the same held item for multiple party mons
 	.macro apprentice_trysetitem
 	setvar VAR_0x8004, APPRENTICE_FUNC_TRY_SET_HELD_ITEM
 	special CallApprenticeFunction
 	.endm
 
+	@ Save the current Player Apprentice to the saveblock to make room for a new Apprentice
 	.macro apprentice_save
 	setvar VAR_0x8004, APPRENTICE_FUNC_SAVE
 	special CallApprenticeFunction
 	.endm
 
+	@ Set the object event gfx for the Apprentice based on their trainer class
 	.macro apprentice_setgfx
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_GFX
 	special CallApprenticeFunction
 	.endm
 
+	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason 
 	.macro apprentice_shouldleave
 	setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
 	special CallApprenticeFunction
 	.endm
 
+	@ Shift the other saved Apprentices over to make room for saving a new Apprentice
 	.macro apprentice_shiftsaved
 	setvar VAR_0x8004, APPRENTICE_FUNC_SHIFT_SAVED
 	special CallApprenticeFunction

asm/macros/battle_frontier/battle_arena.inc

@@ -1,45 +1,49 @@
-   @ Initialize the Battle Arena challenge
-    .macro arena_init
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_INIT
-    special CallBattleArenaFunction
-    .endm
+	@ Initialize the Battle Arena challenge
+	.macro arena_init
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_INIT
+	special CallBattleArenaFunction
+	.endm
 
-    @ Unused. Get the value of some ARENA_DATA_*. See GetArenaData for the data types that can be retrieved
-    .macro arena_get data:req
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_DATA
-    setvar VAR_0x8005, \data
-    special CallBattleArenaFunction
-    .endm
+	@ Unused. Get the value of some ARENA_DATA_*. See GetArenaData for the data types that can be retrieved
+	.macro arena_get data:req
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattleArenaFunction
+	.endm
 
-    @ Set some ARENA_DATA_* to val. See SetArenaData for the data types that can be set
-    .macro arena_set data:req, val:req
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_DATA
-    setvar VAR_0x8005, \data
-    setvar VAR_0x8006, \val
-    special CallBattleArenaFunction
-    .endm
+	@ Set some ARENA_DATA_* to val. See SetArenaData for the data types that can be set
+	.macro arena_set data:req, val:req
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	.if \val >= VARS_START
+	copyvar VAR_0x8006, \val
+	.else
+	setvar VAR_0x8006, \val
+	.endif
+	special CallBattleArenaFunction
+	.endm
 
-    @ Save the game and set the challenge status
-    .macro arena_save challengeStatus:req
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_SAVE
-    setvar VAR_0x8005, \challengeStatus
-    special CallBattleArenaFunction
-    .endm
+	@ Save the game and set the challenge status
+	.macro arena_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattleArenaFunction
+	.endm
 
-    @ Unused. Set the reward item to give from one of two lists of possible awards, depending on streak.
-    .macro arena_setreward
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_REWARD
-    special CallBattleArenaFunction
-    .endm
+	@ Unused. Set the prize item to give from one of two lists of possible prizes, depending on streak.
+	.macro arena_setprize
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_PRIZE
+	special CallBattleArenaFunction
+	.endm
 
-    @ Unused. Give the set award item to the player. TRUE if room in Bag for award, FALSE otherwise
-    .macro arena_givereward
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_GIVE_REWARD
-    special CallBattleArenaFunction
-    .endm
+	@ Unused. Give the set prize item to the player. TRUE if room in Bag for prize, FALSE otherwise
+	.macro arena_giveprize
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_GIVE_PRIZE
+	special CallBattleArenaFunction
+	.endm
 
-    @ Buffer the opponents name to STR_VAR_1
-    .macro arena_gettrainername
-    setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_TRAINER_NAME
-    special CallBattleArenaFunction
-    .endm
+	@ Buffer the opponents name to STR_VAR_1
+	.macro arena_gettrainername
+	setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_TRAINER_NAME
+	special CallBattleArenaFunction
+	.endm

asm/macros/battle_frontier/battle_dome.inc

@@ -1 +1,146 @@
-@ To be populated with macros for CallBattleDomeFunction
+@ TODO: Add explanatory comments to macros
+
+	@ Initialize the Battle Dome challenge
+	.macro dome_init
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
+	special CallBattleDomeFunction
+	.endm
+
+	@ Get the value of some DOME_DATA_*. See GetDomeData for the data types that can be retrieved
+	.macro dome_get data:req
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattleDomeFunction
+	.endm
+
+	@ Set some DOME_DATA_* to val. See SetDomeData for the data types that can be set
+	.macro dome_set data:req, val=0xFFFF
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	.if \val != 0xFFFF
+	setvar VAR_0x8006, \val
+	.endif
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_getroundtext
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_getopponentname
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_initopponentparty
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_showopponentinfo
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_showtourneytree
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_showresultstree
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_setopponent
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_setopponentgfx
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_showstatictourneytree
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_resolvewinners arg:req
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
+	setvar VAR_0x8005, \arg
+	special CallBattleDomeFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro dome_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattleDomeFunction
+	.endm
+
+	@ Unused. Increment the win streaks for the current challenge by one
+	.macro dome_incrementstreaks
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INCREMENT_STREAK
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_settrainers
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
+	special CallBattleDomeFunction
+	.endm
+
+	@ If any moves were copied using Sketch during the challenge then restore them to Sketch
+	.macro dome_resetsketch
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESET_SKETCH
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_restorehelditems
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_reduceparty
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_compareseeds
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS
+	special CallBattleDomeFunction
+	.endm
+
+	@ Buffer the name of the winner for the last Dome challenge to STR_VAR_1
+	.macro dome_getwinnersname
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_WINNER_NAME
+	special CallBattleDomeFunction
+	.endm
+
+	@ TODO: Document this macro and its function
+	.macro dome_21
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_21
+	special CallBattleDomeFunction
+	.endm
+
+	@
+	.macro dome_inittrainers
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
+	special CallBattleDomeFunction
+	.endm

asm/macros/battle_frontier/battle_factory.inc

@@ -1 +1,103 @@
-@ To be populated with macros for CallBattleFactoryFunction
+@ TODO: Add explanatory comments to macros
+
+	@ Initialize the Battle Factory challenge
+	.macro factory_init
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_INIT
+	special CallBattleFactoryFunction
+	.endm
+
+	@ Get the value of some FACTORY_DATA_*. See GetBattleFactoryData for the data types that can be retrieved
+	.macro factory_get data:req
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattleFactoryFunction
+	.endm
+
+	@ Set some FACTORY_DATA_* to val. See SetBattleFactoryData for the data types that can be set
+	.macro factory_set data:req, val=0xFFFF
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	.if \val == 0xFFFF
+	@ argument not provided
+	.elseif \val >= VARS_START
+	copyvar VAR_0x8006, \val
+	.else
+	setvar VAR_0x8006, \val
+	.endif
+	special CallBattleFactoryFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro factory_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattleFactoryFunction
+	.endm
+
+	@  
+	.macro factory_rentmons
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SELECT_RENT_MONS
+	special CallBattleFactoryFunction
+	.endm
+
+	@ 
+	.macro factory_swapmons
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SWAP_RENT_MONS
+	special CallBattleFactoryFunction
+	.endm
+
+	@
+	.macro factory_setswapped
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_SWAPPED
+	special CallBattleFactoryFunction
+	.endm
+
+	@ 
+	.macro factory_setopponentmons
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_OPPONENT_MONS
+	special CallBattleFactoryFunction
+	.endm
+
+	@ 
+	.macro factory_setparties arg:req
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_PARTIES
+	setvar VAR_0x8005, \arg
+	special CallBattleFactoryFunction
+	.endm
+
+	@ 
+	.macro factory_setopponentgfx
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_OPPONENT_GFX
+	special CallBattleFactoryFunction
+	.endm
+
+	@  
+	.macro factory_generateopponentmons
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GENERATE_OPPONENT_MONS
+	special CallBattleFactoryFunction
+	.endm
+
+	@  
+	.macro factory_generaterentalmons
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GENERATE_RENTAL_MONS
+	special CallBattleFactoryFunction
+	.endm
+
+	@  
+	.macro factory_getopponentmontype
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_MON_TYPE
+	special CallBattleFactoryFunction
+	.endm
+
+	@ 
+	.macro factory_getopponentstyle 
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE
+	special CallBattleFactoryFunction
+	.endm
+
+	@  
+	.macro factory_resethelditems
+	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_RESET_HELD_ITEMS
+	special CallBattleFactoryFunction
+	.endm
+

asm/macros/battle_frontier/battle_palace.inc

@@ -1,7 +1,63 @@
-@ To be populated with macros for CallBattlePalaceFunction
+	@ Initialize the Battle Palace challenge
+	.macro palace_init
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_INIT
+	special CallBattlePalaceFunction
+	.endm
 
-    @ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory 
-    .macro palace_getopponentintro
-    setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
-    special CallBattlePalaceFunction
-    .endm
+	@ Get the value of some PALACE_DATA_*. See GetPalaceData for the data types that can be retrieved
+	.macro palace_get data:req
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Set some PALACE_DATA_* to val. See SetPalaceData for the data types that can be set
+	.macro palace_set data:req, val:req
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	setvar VAR_0x8006, \val
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Get the id of the comment to be made while being led through the corridor
+	.macro palace_getcomment
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_COMMENT_ID
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Unused. Choose and set the opponent gfx id. The equivalent macro from Battle Tower is used instead
+	.macro palace_setopponent
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_OPPONENT
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory 
+	.macro palace_getopponentintro
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Increments the current win streak by 1
+	.macro palace_incrementstreak
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_INCREMENT_STREAK
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro palace_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattlePalaceFunction
+	.endm
+
+	@ Unused. Set the prize item to give from one of two lists of possible prizes, depending on streak.
+	.macro palace_setprize
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_SET_PRIZE
+	special CallBattleArenaFunction
+	.endm
+
+	@ Unused. Give the set prize item to the player. TRUE if room in Bag for prize, FALSE otherwise
+	.macro palace_giveprize
+	setvar VAR_0x8004, BATTLE_PALACE_FUNC_GIVE_PRIZE
+	special CallBattleArenaFunction
+	.endm

asm/macros/battle_frontier/battle_pike.inc

@@ -1,54 +1,171 @@
-@ To be populated with macros for CallBattlePikeFunction
-
-	.macro battlepike_getstreak
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
-	setvar VAR_0x8005, 1
-	special CallBattlePikeFunction
-	.endm
-
-	.macro battlepike_setstreak streak:req
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 1
-	.if \streak >= VARS_START
-	copyvar VAR_0x8006, \streak
-	.else
-	setvar VAR_0x8006, \streak
-	.endif
-	special CallBattlePikeFunction
-	.endm
-
-	.macro battlepike_isfinalroom
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM
-	special CallBattlePikeFunction
-	.endm
-
-	.macro battlepike_setroomobjects
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS
-	special CallBattlePikeFunction
-	.endm
-
-	.macro battlepike_getroomtype
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
-	special CallBattlePikeFunction
-	.endm
-
-	.macro battlepike_setnextroom
+	@ Set sRoomType to the next PIKE_ROOM_* id
+	.macro pike_setnextroom
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
 	special CallBattlePikeFunction
 	.endm
 
-	.macro battlepike_gethint
+	@ Get the value of some PIKE_DATA_*. See GetBattlePikeData for the data types that can be retrieved
+	.macro pike_get data:req
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattlePikeFunction
+	.endm
+
+	@ Set some PIKE_DATA_* to val. See SetBattlePikeData for the data types that can be set
+	.macro pike_set data:req, val:req
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	.if \val >= VARS_START
+	copyvar VAR_0x8006, \val
+	.else
+	setvar VAR_0x8006, \val
+	.endif
+	special CallBattlePikeFunction
+	.endm
+
+	@ TRUE if the next room is the last (15th) room, FALSE otherwise
+	.macro pike_isfinalroom
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM
+	special CallBattlePikeFunction
+	.endm
+
+	@ Set the object event gfx for the room being entered
+	.macro pike_setroomobjects
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Get the current room type (sRoomType)
+	.macro pike_getroomtype
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
+	special CallBattlePikeFunction
+	.endm
+
+	@ Sets a bool that's never read
+	.macro pike_inwildmonroom
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM
+	special CallBattlePikeFunction
+	.endm
+
+	@ Clears a bool that's never read
+	.macro pike_exitwildmonroom
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM
+	special CallBattlePikeFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro pike_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattlePikeFunction
+	.endm
+
+	@ Returns the PIKE_STATUS_* to be afflicted for the status room
+	.macro pike_getstatus
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Returns the PIKE_STATUSMON_* that attacks the player for the status room
+	.macro pike_getstatusmon
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
+	special CallBattlePikeFunction
+	.endm
+
+	@ Randomly heals either one or two party mons and returns the number of mons healed
+	.macro pike_healonetwomons
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Buffers a message for the lone NPC in the NPC room to gStringVar4
+	.macro pike_getnpcmsg
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
+	special CallBattlePikeFunction
+	.endm
+
+	@ Flashes the screen 3 times for when the Dusclops/Kirlia attacks the player
+	.macro pike_flashscreen
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH
+	special CallBattlePikeFunction
+	.endm
+
+	@ TRUE if the player is currently in a Battle Pike challenge map
+	.macro pike_inchallenge
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
+	special CallBattlePikeFunction
+	.endm
+
+	@ Set which room to give a hint about. TRUE if its the Pike Queens room next
+	.macro pike_sethintroom
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
+	special CallBattlePikeFunction
+	.endm
+
+	@ Get PIKE_ROOM_(LEFT/CENTER/RIGHT) for which room to give a hint about
+	.macro pike_gethintroomid
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID
+	special CallBattlePikeFunction
+	.endm
+
+	@ Get the PIKE_HINT_* to give about the next room
+	.macro pike_gethint
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
 	special CallBattlePikeFunction
 	.endm
 
-	.macro battlepike_nohealing set:req
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
+	@ Reset the frontier trainer ids for the start of the challenge
+	.macro pike_cleartrainerids
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Buffer the opponents battle intro speech to gStringVar4. \trainer 0 for Trainer A, 1 for Trainer B
+	.macro pike_gettrainerintro trainer:req
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_TRAINER_INTRO
+	setvar VAR_0x8005, \trainer
+	special CallBattlePikeFunction
+	.endm
+
+	@ Get the status of the Pike Queen (Not ready, Silver/Gold streak before symbols, Silver/Gold streak after symbols)
+	.macro pike_getbrainstatus
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
+	special CallBattlePikeFunction
+	.endm
+
+	@ Heal 0-2 party mons depending on which room was chosen for the Pike Queen battle. Return the number healed
+	.macro pike_prequeenheal
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
+	special CallBattlePikeFunction
+	.endm
+
+	@ When \set is TRUE, prevent healing rooms from appearing (for 1st room or when party is full health). \set FALSE to re-enable healing rooms
+	.macro pike_nohealing set:req
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEAL_ROOMS_DISABLED
 	setvar VAR_0x8005, \set
 	special CallBattlePikeFunction
 	.endm
 
-	.macro battlepike_ispartyfullhealth
+	@ TRUE if the party is full health (full HP, PP, and no status), FALSE otherwise
+	.macro pike_ispartyfullhealth
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH
 	special CallBattlePikeFunction
 	.endm
+
+	@ Save the party held items in pikeHeldItemsBackup
+	.macro pike_savehelditems
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_HELD_ITEMS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Restore the party held items from pikeHeldItemsBackup
+	.macro pike_resethelditems
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_RESET_HELD_ITEMS
+	special CallBattlePikeFunction
+	.endm
+
+	@ Initialize the Battle Pike challenge
+	.macro pike_init
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT
+	special CallBattlePikeFunction
+	.endm

asm/macros/battle_frontier/battle_pyramid.inc

@@ -1 +1,97 @@
-@ To be populated with macros for CallBattlePyramidFunction
+@ TODO: Add explanatory comments to macros
+
+	@ Initialize the Battle Pyramid challenge
+	.macro pyramid_init
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT
+	special CallBattlePyramidFunction 
+	.endm
+
+	@ Get the value of some PYRAMID_DATA_*. See GetBattlePyramidData for the data types that can be retrieved
+	.macro pyramid_get data:req
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattlePyramidFunction
+	.endm
+
+	@ Set some PYRAMID_DATA_* to val. See SetBattlePyramidData for the data types that can be set
+	.macro pyramid_set data:req, val:req
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	setvar VAR_0x8006, \val
+	special CallBattlePyramidFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro pyramid_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattlePyramidFunction
+	.endm
+
+	@
+	.macro pyramid_setprize
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_PRIZE
+	special CallBattlePyramidFunction
+	.endm
+
+	@  
+	.macro pyramid_seedfloor
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
+	special CallBattlePyramidFunction
+	.endm
+
+	@   
+	.macro pyramid_setitem
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
+	special CallBattlePyramidFunction
+	.endm
+
+	@  
+	.macro pyramid_hideitem
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
+	special CallBattlePyramidFunction
+	.endm
+
+	@ 
+	.macro pyramid_inittrainers
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
+	special CallBattlePyramidFunction 
+	.endm
+
+	@  
+	.macro pyramid_showhint
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
+	special CallBattlePyramidFunction
+	.endm
+
+	@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise 
+	.macro pyramid_inchallenge
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
+	special CallBattlePyramidFunction
+	.endm   
+
+	@  
+	.macro pyramid_updatelight radius:req, mode:req
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
+	setvar VAR_0x8005, \radius
+	setvar VAR_0x8006, \mode
+	special CallBattlePyramidFunction
+	.endm  
+
+	@  
+	.macro pyramid_clearhelditems
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
+	special CallBattlePyramidFunction
+	.endm
+
+	@  
+	.macro pyramid_setfloorpal
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
+	special CallBattlePyramidFunction
+	.endm
+
+	@
+	.macro pyramid_healparty
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
+	special CallBattlePyramidFunction 
+	.endm

asm/macros/battle_frontier/battle_tower.inc

@@ -1,7 +1,62 @@
-@ To be populated with macros for CallBattleTowerFunc
-
-	.macro battletower_getstreak
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
-	setvar VAR_0x8005, 1
+	@ Initialize the Battle Tower challenge
+	.macro tower_init
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
+	special CallBattleTowerFunc
+	.endm
+
+	@ Get the value of some TOWER_DATA_*. See GetTowerData for the data types that can be retrieved
+	.macro tower_get data:req
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
+	setvar VAR_0x8005, \data
+	special CallBattleTowerFunc
+	.endm
+
+	@ Set some TOWER_DATA_* to val. See SetTowerData for the data types that can be set
+	.macro tower_set data:req, val=0xFFFF
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
+	setvar VAR_0x8005, \data
+	.if \val != 0xFFFF
+	setvar VAR_0x8006, \val
+	.endif
+	special CallBattleTowerFunc
+	.endm
+
+	@ Choose and set the gfx for the next opponent. Also used by Battle Tents
+	.macro tower_setopponent
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_OPPONENT
+	special CallBattleTowerFunc
+	.endm
+
+	@ Increments the battle number and returns the new one. Also clears E-Reader trainer if defeated, and saves the current win streak
+	.macro tower_setbattlewon
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_BATTLE_WON
+	special CallBattleTowerFunc
+	.endm
+
+	@ Try to award ribbons for completing 56th straight Battle Tower win. VAR_RESULT is TRUE if ribbons were awarded.
+	.macro tower_giveribbons
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GIVE_RIBBONS
+	special CallBattleTowerFunc
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro tower_save challengeStatus:req
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallBattleTowerFunc
+	.endm
+
+	@ Buffer the opponent's easy chat intro speech to STR_VAR_4
+	.macro tower_getopponentintro opponent:req
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO
+	setvar VAR_0x8005, \opponent
+	special CallBattleTowerFunc
+	.endm
+
+	@ TODO: Document and add macros for BATTLE_TOWER_FUNC_10 - BATTLE_TOWER_FUNC_14 
+
+	@ Set the data used for the post-challenge Battle Tower interview
+	.macro tower_setinterviewdata
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA
 	special CallBattleTowerFunc
 	.endm

asm/macros/battle_tent.inc

@@ -1 +1,167 @@
-@ To be populated with macros for CallVerdanturfTentFunction, CallFallarborTentFunction, and CallSlateportTentFunction
+@ Verdanturf Tent
+
+	@ Initialize the Verdanturf Battle Tent challenge
+	.macro verdanturftent_init
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_INIT
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Get the current prize item id
+	.macro verdanturftent_getprize
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_PRIZE
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Unused. Set the prize item to be given
+	.macro verdanturftent_setprize unusedArg:req, itemId:req
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SET_PRIZE
+	setvar VAR_0x8005, \unusedArg
+	setvar VAR_0x8006, \itemId
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Unused. Set the opponent trainer and gfx. SetNextBattleTentOpponent is used through tower_setopponent instead
+	.macro verdanturftent_setopponentgfx
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SET_OPPONENT_GFX
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents. 
+	.macro battletent_getopponentintro
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro verdanturftent_save challengeStatus:req
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallVerdanturfTentFunction  
+	.endm
+
+	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
+	.macro verdanturftent_setrandomprize
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SET_RANDOM_PRIZE
+	special CallVerdanturfTentFunction
+	.endm
+
+	@ Give the current prize item. FALSE if no room for prize
+	.macro verdanturftent_giveprize
+	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GIVE_PRIZE
+	special CallVerdanturfTentFunction
+	.endm  
+
+
+@ Fallarbor Tent
+
+	@ Initialize the Fallarbor Battle Tent challenge
+	.macro fallarbortent_init
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_INIT
+	special CallFallarborTentFunction
+	.endm
+
+	@ Get the current prize item id
+	.macro fallarbortent_getprize
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_PRIZE
+	special CallFallarborTentFunction
+	.endm
+
+	@ Unused. Set the prize item to be given
+	.macro fallarbortent_setprize unusedArg:req, itemId:req
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SET_PRIZE
+	setvar VAR_0x8005, \unusedArg
+	setvar VAR_0x8006, \itemId
+	special CallFallarborTentFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro fallarbortent_save challengeStatus:req
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallFallarborTentFunction
+	.endm   
+
+	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
+	.macro fallarbortent_setrandomprize
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SET_RANDOM_PRIZE
+	special CallFallarborTentFunction
+	.endm
+
+	@ Give the current prize item. FALSE if no room for prize
+	.macro fallarbortent_giveprize
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GIVE_PRIZE
+	special CallFallarborTentFunction
+	.endm
+
+	@ Buffer the opponent trainers name to STR_VAR_1
+	.macro fallarbortent_getopponentname
+	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME
+	special CallFallarborTentFunction
+	.endm 
+
+
+@ Slateport Tent
+
+	@ Initialize the Slateport Battle Tent challenge
+	.macro slateporttent_init
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_INIT
+	special CallSlateportTentFunction
+	.endm
+
+	@ Get the current prize item id
+	.macro slateporttent_getprize
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GET_PRIZE
+	special CallSlateportTentFunction
+	.endm
+
+	@ Unused. Set the prize item to be given
+	.macro slateporttent_setprize unusedArg:req, itemId:req
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_PRIZE
+	setvar VAR_0x8005, \unusedArg
+	setvar VAR_0x8006, \itemId
+	special CallSlateportTentFunction
+	.endm
+
+	@ Save the game and set the challenge status
+	.macro slateporttent_save challengeStatus:req
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SAVE
+	setvar VAR_0x8005, \challengeStatus
+	special CallSlateportTentFunction
+	.endm   
+
+	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item 
+	.macro slateporttent_setrandomprize
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE
+	special CallSlateportTentFunction
+	.endm
+
+	@ Give the current prize item. FALSE if no room for prize 
+	.macro slateporttent_giveprize
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GIVE_PRIZE
+	special CallSlateportTentFunction
+	.endm
+
+	@ Slateport Tent's version of factory_rentmons
+	.macro slateporttent_rentmons
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SELECT_RENT_MONS
+	special CallSlateportTentFunction
+	.endm
+
+	@ Slateport Tent's version of factory_swapmons
+	.macro slateporttent_swapmons
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SWAP_RENT_MONS
+	special CallSlateportTentFunction
+	.endm
+
+	@ Slateport Tent's version of factory_generateopponentmons
+	.macro slateporttent_generateopponentmons
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS
+	special CallSlateportTentFunction
+	.endm 
+
+	@ Slateport Tent's version of factory_generaterentalmons
+	.macro slateporttent_generaterentalmons
+	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_RENTAL_MONS
+	special CallSlateportTentFunction
+	.endm
+

asm/macros/trainer_hill.inc

@@ -1,90 +1,106 @@
-@ TODO: These need to have description comment
-
+	@ Initialize the Trainer Hill challenge and start the timer
 	.macro trainerhill_start
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
 	special CallTrainerHillFunction
 	.endm
 
+	@ 0 if not spoken to yet, 1 if spoken to but not received prize, 2 if received prize
 	.macro trainerhill_getownerstate
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
 	special CallTrainerHillFunction
 	.endm
 
+	@ Try to give prize. 0 if given successfully, 1 if no room for prize, 2 if giving prize should be skipped
 	.macro trainerhill_giveprize
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
 	special CallTrainerHillFunction
 	.endm
 
+	@ Check the final challenge time. 0 if new record, 1 if not, 2 if time has already been checked
 	.macro trainerhill_finaltime
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
 	special CallTrainerHillFunction
 	.endm
 
+	@ Resume the timer. Wont resume if owner has been spoken to or max time has been reached
 	.macro trainerhill_resumetimer
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	.endm
 
+	@ Set player lost the challenge (trainerHill.hasLost) to TRUE
 	.macro trainerhill_lost
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
 	special CallTrainerHillFunction
 	.endm
 
+	@ Get the current challenge status (TRAINER_HILL_PLAYER_STATUS_*)
 	.macro trainerhill_getstatus
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
 	special CallTrainerHillFunction
 	.endm
 
+	@ Buffer the current timer to string vars (mins to STR_VAR_1, secs to STR_VAR_2, fraction of sec to STR_VAR_3)
 	.macro trainerhill_gettime
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME
 	special CallTrainerHillFunction
 	.endm
 
+	@ FALSE if fewer than all 4 floors used, TRUE otherwise. Only FALSE in JP-exclusive modes
 	.macro trainerhill_allfloorsused
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
 	special CallTrainerHillFunction
 	.endm
 
+	@ Unknown, dummied. Only side effect is setting VAR_RESULT to 0.
 	.macro trainerhill_clearresult
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
 	.endm
 
+	@ TRUE if currently in a Trainer Hill challenge
 	.macro trainerhill_inchallenge
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
 	.endm
 
+	@ Show the post battle text for the spoken to Trainer Hill trainer
 	.macro trainerhill_postbattletext
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT
 	special CallTrainerHillFunction
 	.endm
 
+	@ Set all Trainer Hill trainers defeated
 	.macro trainerhill_settrainerflags
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	.endm
 
+	@ TRUE if the game has been saved for the challenge, FALSE otherwise
 	.macro trainerhill_getsaved
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
 	special CallTrainerHillFunction
 	.endm
 
+	@ Set that the game has been saved for the challenge
 	.macro trainerhill_setsaved
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	.endm
 
+	@ Clear that the game has been saved for the challenge
 	.macro trainerhill_clearsaved
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
 	special CallTrainerHillFunction
 	.endm
 
+	@ FALSE if the Trainer Hill challenge was lost, TRUE otherwise
 	.macro trainerhill_getwon
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
 	special CallTrainerHillFunction
 	.endm
 
+	@ Set the challenge mode to HILL_TAG_* (Normal, Variety, Unique, or Expert)
 	.macro trainerhill_settag tag:req
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
 	copyvar VAR_0x8005, \tag

data/berry_crush.s

@@ -47,21 +47,21 @@ gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure
 	.byte 0xb3, 0x30, 0x00, 0x00
 
 	.align 2
-gUnknown_082F32D8:: @ 82F32D8
-	.byte 0x01, 0x02, 0x03
+sBerryCrushTextColors1:: @ 82F32D8
+	.byte 0x01, 0x02, 0x03  @ TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY
 
-gUnknown_082F32DB:: @ 82F32DB
-	.byte 0x00, 0x01, 0x02
+sBerryCrushTextColors2:: @ 82F32DB
+	.byte 0x00, 0x01, 0x02  @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY
 
-gUnknown_082F32DE:: @ 82F32DE
-	.byte 0x00, 0x03, 0x04
+sBerryCrushTextColors3:: @ 82F32DE
+	.byte 0x00, 0x03, 0x04  @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_RED
 
-gUnknown_082F32E1:: @ 82F32E1
-	.byte 0x01, 0x08, 0x09
-	.byte 0x01, 0x06, 0x07
+sBerryCrushTextColorTable:: @ 82F32E1
+	.byte 0x01, 0x08, 0x09  @ TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE
+	.byte 0x01, 0x06, 0x07  @ TEXT_COLOR_WHITE, TEXT_COLOR_GREEN, TEXT_COLOR_LIGHT_GREEN
 
-gUnknown_082F32E7:: @ 82F32E7
-	.byte 0x01, 0x04, 0x05
+sBerryCrushTextColors4:: @ 82F32E7
+	.byte 0x01, 0x04, 0x05  @ TEXT_COLOR_WHITE, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED
 
 	.align 2
 gUnknown_082F32EC:: @ 82F32EC

data/contest_link_80F57C4.s

@@ -83,6 +83,6 @@ gUnknown_0858D8E0:: @ 858D8E0
 	obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
 
 	.align 2
-gUnknown_0858D8E8:: @ 858D8E8
-	.byte 0x01, 0x0f, 0x0e, 0x00
+sContestLinkTextColors:: @ 858D8E8
+	.byte 0x01, 0x0f, 0x0e, 0x00  @ TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5
 

data/event_scripts.s

@@ -2,11 +2,14 @@
 #include "constants/apprentice.h"
 #include "constants/battle.h"
 #include "constants/battle_arena.h"
+#include "constants/battle_dome.h"
+#include "constants/battle_factory.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_palace.h"
 #include "constants/battle_pike.h"
 #include "constants/battle_pyramid.h"
 #include "constants/battle_setup.h"
+#include "constants/battle_tent.h"
 #include "constants/battle_tower.h"
 #include "constants/berry.h"
 #include "constants/cable_club.h"
@@ -453,21 +456,6 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/SSTidalLowerDeck/scripts.inc"
 	.include "data/maps/SSTidalRooms/scripts.inc"
 	.include "data/maps/BattlePyramidSquare01/scripts.inc"
-	.include "data/maps/BattlePyramidSquare02/scripts.inc"
-	.include "data/maps/BattlePyramidSquare03/scripts.inc"
-	.include "data/maps/BattlePyramidSquare04/scripts.inc"
-	.include "data/maps/BattlePyramidSquare05/scripts.inc"
-	.include "data/maps/BattlePyramidSquare06/scripts.inc"
-	.include "data/maps/BattlePyramidSquare07/scripts.inc"
-	.include "data/maps/BattlePyramidSquare08/scripts.inc"
-	.include "data/maps/BattlePyramidSquare09/scripts.inc"
-	.include "data/maps/BattlePyramidSquare10/scripts.inc"
-	.include "data/maps/BattlePyramidSquare11/scripts.inc"
-	.include "data/maps/BattlePyramidSquare12/scripts.inc"
-	.include "data/maps/BattlePyramidSquare13/scripts.inc"
-	.include "data/maps/BattlePyramidSquare14/scripts.inc"
-	.include "data/maps/BattlePyramidSquare15/scripts.inc"
-	.include "data/maps/BattlePyramidSquare16/scripts.inc"
 	.include "data/maps/UnionRoom/scripts.inc"
 	.include "data/maps/SafariZone_Northwest/scripts.inc"
 	.include "data/maps/SafariZone_North/scripts.inc"
@@ -775,8 +763,8 @@ Common_EventScript_NoRoomForDecor:: @ 8272071
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_SetAlternatingWeather:: @ 827207A
-	setweather WEATHER_ALTERNATING
+Common_EventScript_SetAbnormalWeather:: @ 827207A
+	setweather WEATHER_ABNORMAL
 	return
 
 Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
@@ -1024,7 +1012,7 @@ gText_LegendaryFlewAway:: @ 8273204
 
 	.include "data/text/pc_transfer.inc"
 	.include "data/text/mevent.inc"
-	.include "data/text/unusual_weather.inc"
+	.include "data/text/abnormal_weather.inc"
 
 EventScript_SelectWithoutRegisteredItem:: @ 82736B3
 	msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
@@ -1074,7 +1062,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 
 	.include "data/scripts/pc_transfer.inc"
 	.include "data/scripts/mevent.inc"
-	.include "data/scripts/unusual_weather.inc"
+	.include "data/scripts/abnormal_weather.inc"
 	.include "data/scripts/trainer_script.inc"
 	.include "data/scripts/berry_tree.inc"
 	.include "data/scripts/secret_base.inc"

data/maps/AbandonedShip_Underwater1/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_DEEPDEEP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
   "map_type": "MAP_TYPE_UNDERWATER",
   "allow_bike": true,
   "allow_escape_rope": false,

data/maps/AbandonedShip_Underwater2/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_DEEPDEEP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
-  "weather": "WEATHER_BUBBLES",
+  "weather": "WEATHER_UNDERWATER_BUBBLES",
   "map_type": "MAP_TYPE_UNDERWATER",
   "allow_bike": true,
   "allow_escape_rope": false,

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -52,8 +52,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
-	special CallBattleTowerFunc
+	tower_setopponent
 	addobject 7
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
 	waitmovement 0
@@ -146,7 +145,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
 	call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord
+	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
@@ -155,7 +154,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord:: @ 8257768
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8257768
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
@@ -255,7 +254,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
 	waitmessage
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord
+	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
@@ -264,7 +263,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord:: @ 825792B
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 825792B
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -6,8 +6,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 	.byte 0
 
 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
-	setvar VAR_0x8004, 10
-	special CallBattleDomeFunction
+	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, 0
@@ -68,20 +67,16 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
-	setvar VAR_0x8004, 4
-	special CallBattleDomeFunction
+	dome_getopponentname
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT
 	closemessage
 	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
 	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
 	waitmovement 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_getopponentintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 5
-	special CallBattleDomeFunction
+	dome_initopponentparty
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
 	setvar VAR_TEMP_2, 0
 	switch VAR_RESULT
@@ -105,16 +100,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
 	waitmovement 0
 	compare VAR_TEMP_2, 2
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	setvar VAR_0x8004, 19
-	special CallBattleDomeFunction
+	dome_compareseeds
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
 	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	setvar VAR_0x8004, 4
-	special CallBattleDomeFunction
+	dome_getopponentname
 	compare VAR_TEMP_2, 0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
 	compare VAR_TEMP_2, 1
@@ -126,10 +119,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
 	delay 60
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 2
-	special CallBattleDomeFunction
-
+	dome_resolvewinners 2
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
@@ -162,11 +152,8 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 	playse SE_W227B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
 	delay 60
-	setvar VAR_0x8004, 3
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special CallBattleDomeFunction
+	dome_getroundtext
+	dome_resolvewinners 1
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -205,20 +192,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 6
-	special CallBattleDomeFunction
+	dome_get DOME_DATA_6
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
-	special CallBattleDomeFunction
+	dome_get DOME_DATA_7
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special CallBattleDomeFunction
-	compare VAR_RESULT, 0
+	dome_get DOME_DATA_WIN_STREAK_ACTIVE
+	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
 	return
@@ -417,9 +398,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special CallBattleDomeFunction
+	dome_resolvewinners 1
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -449,9 +428,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special CallBattleDomeFunction
+	dome_resolvewinners 1
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -496,11 +473,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
 	special DoSpecialTrainerBattle
 	waitstate
 	setvar VAR_TEMP_9, 0
-	setvar VAR_0x8004, 17
-	special CallBattleDomeFunction
+	dome_restorehelditems
 	special HealPlayerParty
-	setvar VAR_0x8004, 16
-	special CallBattleDomeFunction
+	dome_resetsketch
 	return
 
 BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -5,8 +5,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
 	.byte 0
 
 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
-	setvar VAR_0x8004, 21
-	special CallBattleDomeFunction
+	dome_21
 	end
 
 BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
@@ -35,18 +34,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_WIN_STREAK, 0
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
+	dome_set DOME_DATA_6, 1
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -73,18 +63,9 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_6, 1
+	dome_set DOME_DATA_7, 1
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_249991
@@ -97,21 +78,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
+	dome_set DOME_DATA_6, 1
 	special LoadPlayerParty
 	special HealPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 0
-	special CallBattleDomeFunction
+	dome_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
@@ -139,9 +112,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_24A61A
 	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 1
-	special CallBattleDomeFunction
+	dome_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -213,8 +184,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallBattleDomeFunction
+	dome_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
@@ -224,14 +194,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
-	setvar VAR_0x8004, 22
-	special CallBattleDomeFunction
-
+	dome_inittrainers
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	setvar VAR_0x8004, 15
-	special CallBattleDomeFunction
+	dome_settrainers
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
@@ -392,9 +359,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 9
-	special CallBattleDomeFunction
+	dome_get DOME_DATA_9
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
 	compare VAR_RESULT, 1
@@ -404,8 +369,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
 	compare VAR_RESULT, 3
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
 	fadescreen 1
-	setvar VAR_0x8004, 8
-	special CallBattleDomeFunction
+	dome_showresultstree
 	waitstate
 	end
 
@@ -426,8 +390,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
 	return
 
 BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
-	setvar VAR_0x8004, 20
-	special CallBattleDomeFunction
+	dome_getwinnersname
 	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
 	end
 

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -82,17 +82,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 9
-	special CallBattleDomeFunction
+	dome_resolvewinners 9
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
 	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 2
-	special CallBattleDomeFunction
+	dome_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
@@ -102,16 +98,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
 	fadescreen 1
-	setvar VAR_0x8004, 6
-	special CallBattleDomeFunction
+	dome_showopponentinfo
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
 	fadescreen 1
-	setvar VAR_0x8004, 7
-	special CallBattleDomeFunction
+	dome_showtourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
@@ -153,13 +147,9 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	frontier_resetsketch
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 8
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 18
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, 9
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_8
+	dome_reduceparty
+	dome_setopponent
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
@@ -238,8 +228,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	special HealPlayerParty
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
 	fadescreen 1
-	setvar VAR_0x8004, 11
-	special CallBattleDomeFunction
+	dome_showstatictourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -66,8 +66,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
 	waitmovement 0
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
-	setvar VAR_0x8004, 11
-	special CallBattleFactoryFunction
+	factory_setopponentgfx
 	removeobject 2
 	setobjectxyperm 2, 7, 1
 	addobject 2
@@ -90,7 +89,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 	waitstate
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
-
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
@@ -98,16 +96,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
 @ 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special CallBattleFactoryFunction
+	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special CallBattleFactoryFunction
+	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
 	call BattleFrontier_EventScript_IncrementWinStreak
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
@@ -196,26 +190,17 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
 	return
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special CallBattleFactoryFunction
+	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special CallBattleFactoryFunction
+	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
+	factory_get FACTORY_DATA_WIN_STREAK
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallBattleFactoryFunction
+	factory_set FACTORY_DATA_WIN_STREAK, VAR_RESULT
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -28,20 +28,10 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 8
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 0
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattleFactoryFunction
+	factory_setswapped
+	factory_set FACTORY_DATA_WIN_STREAK_SWAPS, 0
+	factory_set FACTORY_DATA_WIN_STREAK, 0
+	factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -68,9 +58,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
 	waitmessage
 	frontier_checkairshow
 	special LoadPlayerParty
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallBattleFactoryFunction
+	factory_save 0
 	playse SE_SAVE
 	waitse
 	goto BattleFrontier_BattleFactoryLobby_EventScript_25853B
@@ -82,13 +70,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
 	waitmessage
 	frontier_checkairshow
 	special LoadPlayerParty
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallBattleFactoryFunction
+	factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, FALSE
+	factory_save 0
 	playse SE_SAVE
 	waitse
 
@@ -117,9 +100,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_258E77
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special CallBattleFactoryFunction
+	factory_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -177,13 +158,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
 
 BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special CallBattleFactoryFunction
+	factory_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattleFactoryFunction
+	factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	closemessage
 	delay 2

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -31,33 +31,26 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
 	waitmovement 0
 	compare VAR_0x8006, 2
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
-	setvar VAR_0x8004, 13
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 12
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 14
-	special CallBattleFactoryFunction
+	factory_generaterentalmons
+	factory_generateopponentmons
+	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 15
-	special CallBattleFactoryFunction
+	factory_getopponentstyle
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT
 	fadescreen 1
-	setvar VAR_0x8004, 8
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 6
-	special CallBattleFactoryFunction
+	factory_setswapped
+	factory_rentmons
 	waitstate
-
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_EventScript_GetLvlMode
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FRONTIER_LVL_50
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, FRONTIER_LVL_OPEN
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
 	waitmovement 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
@@ -65,10 +58,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
-	setvar VAR_0x8004, 9
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 16
-	special CallBattleFactoryFunction
+	factory_setopponentmons
+	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
@@ -160,13 +151,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
-	setvar VAR_0x8004, 12
-	special CallBattleFactoryFunction
-	setvar VAR_0x8004, 14
-	special CallBattleFactoryFunction
+	factory_generateopponentmons
+	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_0x8004, 15
-	special CallBattleFactoryFunction
+	factory_getopponentstyle
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
@@ -178,13 +166,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
 	fadescreen 1
-	setvar VAR_0x8004, 7
-	special CallBattleFactoryFunction
+	factory_swapmons
 	waitstate
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	setvar VAR_0x8004, 8
-	special CallBattleFactoryFunction
+	factory_setswapped
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
 
@@ -221,9 +207,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special CallBattleFactoryFunction
+	factory_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
@@ -232,50 +216,48 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
 	special SavePlayerParty
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 0
-	special CallBattleFactoryFunction
+	factory_setparties 0
 	frontier_set FRONTIER_DATA_6, 1
 	special CalculatePlayerPartyCount
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT
-	compare VAR_0x8005, 0
+	compare VAR_0x8005, TYPE_NORMAL
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
-	compare VAR_0x8005, 1
+	compare VAR_0x8005, TYPE_FIGHTING
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
-	compare VAR_0x8005, 2
+	compare VAR_0x8005, TYPE_FLYING
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
-	compare VAR_0x8005, 3
+	compare VAR_0x8005, TYPE_POISON
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
-	compare VAR_0x8005, 4
+	compare VAR_0x8005, TYPE_GROUND
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
-	compare VAR_0x8005, 5
+	compare VAR_0x8005, TYPE_ROCK
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
-	compare VAR_0x8005, 6
+	compare VAR_0x8005, TYPE_BUG
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
-	compare VAR_0x8005, 7
+	compare VAR_0x8005, TYPE_GHOST
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
-	compare VAR_0x8005, 8
+	compare VAR_0x8005, TYPE_STEEL
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
-	compare VAR_0x8005, 10
+	compare VAR_0x8005, TYPE_FIRE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
-	compare VAR_0x8005, 11
+	compare VAR_0x8005, TYPE_WATER
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
-	compare VAR_0x8005, 12
+	compare VAR_0x8005, TYPE_GRASS
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
-	compare VAR_0x8005, 13
+	compare VAR_0x8005, TYPE_ELECTRIC
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
-	compare VAR_0x8005, 14
+	compare VAR_0x8005, TYPE_PSYCHIC
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
-	compare VAR_0x8005, 15
+	compare VAR_0x8005, TYPE_ICE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
-	compare VAR_0x8005, 16
+	compare VAR_0x8005, TYPE_DRAGON
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
-	compare VAR_0x8005, 17
+	compare VAR_0x8005, TYPE_DARK
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
-	compare VAR_0x8005, 18
+	compare VAR_0x8005, NUMBER_OF_MON_TYPES
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
 	return
 
@@ -352,23 +334,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
 	return
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
-	compare VAR_0x8006, 0
+	compare VAR_0x8006, FACTORY_STYLE_NONE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
-	compare VAR_0x8006, 1
+	compare VAR_0x8006, FACTORY_STYLE_PREPARATION
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
-	compare VAR_0x8006, 2
+	compare VAR_0x8006, FACTORY_STYLE_SLOW_STEADY
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
-	compare VAR_0x8006, 3
+	compare VAR_0x8006, FACTORY_STYLE_ENDURANCE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
-	compare VAR_0x8006, 4
+	compare VAR_0x8006, FACTORY_STYLE_HIGH_RISK
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
-	compare VAR_0x8006, 5
+	compare VAR_0x8006, FACTORY_STYLE_WEAKENING
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
-	compare VAR_0x8006, 6
+	compare VAR_0x8006, FACTORY_STYLE_UNPREDICTABLE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
-	compare VAR_0x8006, 7
+	compare VAR_0x8006, FACTORY_STYLE_WEATHER
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
-	compare VAR_0x8006, 8
+	compare VAR_0x8006, FACTORY_NUM_STYLES
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
 	return
 

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -1,249 +1,246 @@
 BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_0
+	@ The opponent is represented by object event 2, which has the gfx id VAR_OBJ_GFX_ID_1
+
+BattleFrontier_BattlePalaceBattleRoom_OnTransition: @ 824F825
 	frontier_settrainers
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
+@ The opponent's gfx are set to the players by default
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B
+BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
 	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge
 	waitmovement 0
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
 	setvar VAR_TEMP_2, 1
 	frontier_set FRONTIER_DATA_6, 1
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
-	special CallBattleTowerFunc
+BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: @ 824F8BF
+	tower_setopponent
 	addobject 2
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	palace_getopponentintro
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost:: @ 824F8FA
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
+	case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit
 	waitmovement 0
 	removeobject 2
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
 	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
+	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent
 	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent
 	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent
 	compare VAR_RESULT, 4
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent
 	compare VAR_RESULT, 5
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent
 	compare VAR_RESULT, 6
-	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
+	call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
+	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 824FA42
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25009E
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
+	message BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle:: @ 824FAAA
 	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge:: @ 824FAB4
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
+	case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25005A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
+	message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge:: @ 824FB14
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	closemessage
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon:: @ 824FB28
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
+BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
+	message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
 	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	special CallBattlePalaceFunction
+	palace_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
 	frontier_reset
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
+BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61
 	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79
-	message BattleFrontier_BattlePalaceBattleRoom_Text_25014A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
+	message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
 	waitmessage
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
+	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 824FBD0
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
-	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4
-	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
+	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
+	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge
+	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser:: @ 824FC06
 	call BattleFrontier_EventScript_SetBrainObjectGfx
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	setobjectxyperm 2, 15, 1
 	addobject 2
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	setobjectxy 2, 13, 1
 	setobjectxyperm 2, 13, 1
-	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF
-	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7
-	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2
+	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter
+	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter
+	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter
 	waitmovement 0
 	switch VAR_TEMP_F
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver:: @ 824FCAA
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
-	setvar VAR_0x8004, 6
-	special CallBattlePalaceFunction
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824FCC7
+	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle, MSGBOX_DEFAULT
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC
+	message BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
@@ -252,34 +249,33 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold:: @ 824FD3A
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold:: @ 824FD67
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
-	setvar VAR_0x8004, 6
-	special CallBattlePalaceFunction
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD84
+	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable, MSGBOX_DEFAULT
+	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
+	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePalaceBattleRoom_Text_250699
+	message BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
@@ -288,11 +284,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
+	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7
-VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_6, 0
@@ -306,70 +301,69 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E
+BattleFrontier_BattlePalaceBattleRoom_OnWarp: @ 824FE34
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
 	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
-	call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
+	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
 	removeobject 2
-	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
-	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
+	applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
+	applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66:: @ 824FE66
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF28
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 824FE66
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D:: @ 824FE6D
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF54
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 824FE6D
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74:: @ 824FE74
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FF80
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent:: @ 824FE74
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B:: @ 824FE7B
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent:: @ 824FE7B
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82:: @ 824FE82
-	message BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent:: @ 824FE82
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89
-	message BattleFrontier_BattlePalaceBattleRoom_Text_250004
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent:: @ 824FE89
+	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90
+BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible: @ 824FE90
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom: @ 824FE92
 	set_visible
 	walk_up
 	walk_up
 	walk_up
 	walk_up
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight: @ 824FE97
 	face_right
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp: @ 824FE99
 	face_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge: @ 824FE9B
 	set_visible
 	walk_up
 	walk_up
@@ -377,7 +371,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter: @ 824FEA1
 	walk_down
 	walk_down
 	walk_down
@@ -385,50 +379,50 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit: @ 824FEA7
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown: @ 824FEAC
 	face_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter1: @ 824FEAE
 	set_visible
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter2: @ 824FEB3
 	set_visible
 	walk_slow_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3: @ 824FEB6
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: @ 824FEBB
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
-	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
+	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824FED5
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF
+BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter: @ 824FEDF
 	delay_16
 	delay_16
 	set_visible
@@ -438,7 +432,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
+BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: @ 824FEE7
 	set_visible
 	walk_fast_down
 	walk_fast_right
@@ -451,7 +445,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
 	delay_16
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
+BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter: @ 824FEF2
 	delay_16
 	delay_16
 	delay_16
@@ -467,70 +461,64 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00
-VerdanturfTown_BattleTentBattleRoom_Text_24FF00: @ 824FF00
+BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons: @ 824FF00
 	.string "Excellent…\n"
 	.string "Let me restore your POKéMON.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF28: @ 824FF28
-VerdanturfTown_BattleTentBattleRoom_Text_24FF28: @ 824FF28
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent: @ 824FF28
 	.string "The 2nd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF54: @ 824FF54
-VerdanturfTown_BattleTentBattleRoom_Text_24FF54: @ 824FF54
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent: @ 824FF54
 	.string "The 3rd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FF80: @ 824FF80
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent: @ 824FF80
 	.string "The 4th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FFAC: @ 824FFAC
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent: @ 824FFAC
 	.string "The 5th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_24FFD8: @ 824FFD8
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent: @ 824FFD8
 	.string "The 6th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250004: @ 8250004
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent: @ 8250004
 	.string "The 7th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250030: @ 8250030
-VerdanturfTown_BattleTentBattleRoom_Text_250030: @ 8250030
+BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame: @ 8250030
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25005A: @ 825005A
-VerdanturfTown_BattleTentBattleRoom_Text_25005A: @ 825005A
+BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge: @ 825005A
 	.string "Do you wish to quit your challenge?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25007E: @ 825007E
-VerdanturfTown_BattleTentBattleRoom_Text_25007E: @ 825007E
+BattleFrontier_BattlePalaceBattleRoom_Text_SavingData: @ 825007E
 	.string "Saving the data.\n"
 	.string "Have patience…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25009E: @ 825009E
+BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch: @ 825009E
 	.string "Do you wish to record your latest\n"
 	.string "match on your FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2500DD: @ 82500DD
+BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven: @ 82500DD
 	.string "And now…\p"
 	.string "By winning consistently, you have\n"
 	.string "earned the privilege of challenging\l"
 	.string "our master, the PALACE MAVEN…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25014A: @ 825014A
+BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven: @ 825014A
 	.string "I shall send for the PALACE MAVEN.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25017C: @ 825017C
+BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser: @ 825017C
 	.string "Let great fanfare announce the arrival\n"
 	.string "of the PALACE MAVEN, SPENSER!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro: @ 82501C1
 	.string "SPENSER: My physical being is with\n"
 	.string "POKéMON always!\p"
 	.string "My heart beats as one with\n"
@@ -542,34 +530,34 @@ BattleFrontier_BattlePalaceBattleRoom_Text_2501C1: @ 82501C1
 	.string "If your bonds of trust are frail,\n"
 	.string "you will never beat my brethren!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2502C4: @ 82502C4
+BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons: @ 82502C4
 	.string "The bond you share with your POKéMON!\n"
 	.string "Prove it to me here!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2502FF: @ 82502FF
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle: @ 82502FF
 	.string "SPENSER: Gwahahah!\p"
 	.string "Hah, you never fell for my bluster!\n"
 	.string "Sorry for trying that stunt!\p"
 	.string "Here!\n"
 	.string "Bring me the thing!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D
+BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass: @ 825036D
 	.string "My, my, if only you could maintain that\n"
 	.string "facade of distinguished authority…\p"
 	.string "Here!\n"
 	.string "Let's see your FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC
+BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol: @ 82503DC
 	.string "The Spirits Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime: @ 8250412
 	.string "SPENSER: Your POKéMON's eyes are \n"
 	.string "truly clear and unclouded.\p"
 	.string "I will eagerly await the next\n"
 	.string "opportunity to see you.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack: @ 8250485
 	.string "SPENSER: Gwahahah!\n"
 	.string "You've battled your way up again?\p"
 	.string "You must have developed a truly\n"
@@ -580,10 +568,10 @@ BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485
 	.string "Ready now?\n"
 	.string "Prepare to lose!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250572: @ 8250572
+BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah: @ 8250572
 	.string "… … …Kaaah!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable: @ 825057E
 	.string "SPENSER: Well, that was some display!\n"
 	.string "Even fully unleashed, my brethren\l"
 	.string "could not overpower you.\p"
@@ -591,17 +579,17 @@ BattleFrontier_BattlePalaceBattleRoom_Text_25057E: @ 825057E
 	.string "Here!\n"
 	.string "Bring me that thing, will you?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250629: @ 8250629
+BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass: @ 8250629
 	.string "My, my, if only you could maintain\n"
 	.string "a certain level of decorum…\p"
 	.string "Gaaah, here!\n"
 	.string "Hurry with that FRONTIER PASS, you!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_250699: @ 8250699
+BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine: @ 8250699
 	.string "The Spirits Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_2506C4: @ 82506C4
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain: @ 82506C4
 	.string "SPENSER: Gwahahah!\p"
 	.string "Come see me time and again!\n"
 	.string "My brethren and I will be waiting!$"

data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc

@@ -1,90 +1,88 @@
 BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3
+BattleFrontier_BattlePalaceCorridor_OnFrame: @ 824F4A9
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor
 	.2byte 0
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
 	delay 16
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
 	waitmovement 0
 	lockall
-	setvar VAR_0x8004, 3
-	special CallBattlePalaceFunction
+	palace_getcomment
 	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
+	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F594
+	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2
 	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
+	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3
 	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
+	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment
 	compare VAR_RESULT, 4
-	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
+	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment
 	closemessage
 	frontier_get FRONTIER_DATA_LVL_MODE
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
-	goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
+	goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom
 	waitmovement 0
 	opendoor 6, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
 	waitmovement 0
 	closedoor 6, 3
 	waitdooranim
-	goto BattleFrontier_BattlePalaceCorridor_EventScript_24F581
+	goto BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
 	waitmovement 0
 	opendoor 10, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
+	applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
 	waitmovement 0
 	closedoor 10, 3
 	waitdooranim
-
-BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581
+BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom:: @ 824F581
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1:: @ 824F58B
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2:: @ 824F594
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3:: @ 824F59D
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment:: @ 824F5A6
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF
-	msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment:: @ 824F5AF
+	msgbox BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8
+BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor: @ 824F5B8
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom: @ 824F5BD
 	walk_up
 	walk_up
 	walk_left
@@ -93,7 +91,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom: @ 824F5C4
 	walk_up
 	walk_up
 	walk_up
@@ -102,7 +100,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom: @ 824F5CB
 	walk_up
 	walk_right
 	walk_right
@@ -111,7 +109,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom: @ 824F5D2
 	walk_up
 	walk_up
 	walk_right
@@ -120,39 +118,38 @@ BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom: @ 824F5D9
 	walk_up
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom: @ 824F5DA
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD
+BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame: @ 824F5DD
 	.string "People and POKéMON, they are but\n"
 	.string "the same…\p"
 	.string "Their individual nature makes them\n"
 	.string "good at certain things, and not good\l"
 	.string "at others.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B
+BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes: @ 824F65B
 	.string "Rather than trying to make a POKéMON\n"
 	.string "do what it dislikes, try to let it do\l"
 	.string "what it likes and is good at doing.\p"
 	.string "Put yourself in the POKéMON's position\n"
 	.string "and consider what moves it would like.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718
+BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered: @ 824F718
 	.string "A POKéMON's nature is a remarkable\n"
 	.string "thing…\p"
 	.string "Some POKéMON behave in a completely\n"
 	.string "different way when they are cornered.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C
+BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature: @ 824F78C
 	.string "Are you beginning to understand how\n"
 	.string "a POKéMON's nature makes it behave?$"
 
-BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4
+BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons: @ 824F7D4
 	.string "Ah… I see a strong, heartfelt bond\n"
 	.string "between you and your POKéMON…$"
 

data/maps/BattleFrontier_BattlePalaceLobby/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_Man",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_Beauty",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956",
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant",
       "flag": "0"
     }
   ],
@@ -124,7 +124,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC50"
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults"
     },
     {
       "type": "sign",
@@ -132,7 +132,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC69"
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults"
     },
     {
       "type": "sign",
@@ -140,7 +140,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6"
+      "script": "BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard"
     }
   ]
 }

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -1,177 +1,160 @@
 BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D793
+BattleFrontier_BattlePalaceLobby_OnWarp: @ 824D789
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
+BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D7C7
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePalaceLobby_EventScript_24D7D0
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_24D908
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePalaceLobby_EventScript_24D817
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_24D873
+BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
+BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus:: @ 824D7C7
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
+BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving:: @ 824D7D0
 	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
+	palace_set PALACE_DATA_WIN_STREAK, 0
+	palace_set PALACE_DATA_WIN_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
+BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: @ 824D817
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven
+	msgbox BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven:: @ 824D838
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints:: @ 824D840
+	msgbox BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
-	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
+	message BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded
 	waitmessage
-	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
+BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge:: @ 824D873
 	lockall
-	message BattleFrontier_BattlePalaceLobby_Text_24E41E
+	message BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded
 	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
-	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
+	palace_set PALACE_DATA_WIN_STREAK_ACTIVE, FALSE
+	call BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
+BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special CallBattlePalaceFunction
+	palace_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
-	message BattleFrontier_BattlePalaceLobby_Text_24EF16
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
+	message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24D907
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902
+BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch:: @ 824D902
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907
+BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge:: @ 824D907
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
+BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge:: @ 824D908
 	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT
-	message BattleFrontier_BattlePalaceLobby_Text_24E5F6
+	msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
+	message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
 	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special CallBattlePalaceFunction
+	palace_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
+	goto BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D944:: @ 824D944
+BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant:: @ 824D944
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
+	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
+BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant:: @ 824D956
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D968
+	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	special CallBattlePalaceFunction
-	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
+BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: @ 824D968
+	palace_get PALACE_DATA_PRIZE
+	compare VAR_RESULT, ITEM_NONE
+	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
-
-BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge
+	case 2, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
-	message BattleFrontier_BattlePalaceLobby_Text_24E119
+BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
+	message BattleFrontier_BattlePalaceLobby_Text_WhichChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT
 	fadescreen 1
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
@@ -179,22 +162,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
+	msgbox BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
-	case YES, BattleFrontier_BattlePalaceLobby_EventScript_24DA87
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
+	case NO, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
+	case YES, BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
+BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge:: @ 824DA87
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattlePalaceFunction
+	palace_init
+	palace_set PALACE_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
@@ -203,135 +182,132 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed
+BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: @ 824DAF3
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT
 	closemessage
-	call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
+	call BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge:: @ 824DB20
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
+	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge:: @ 824DB38
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons:: @ 824DB45
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, BattleFrontier_BattlePalaceLobby_EventScript_24DB60
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D
+	case FRONTIER_LVL_50, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50:: @ 824DB60
+	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 824DB6D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed:: @ 824DB7A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
+	goto BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
+BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge:: @ 824DB91
 	special LoadPlayerParty
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
-
-BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge:: @ 824DB94
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge:: @ 824DB9C
 	release
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle:: @ 824DB9E
+	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, MSGBOX_DEFAULT
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle:: @ 824DBA7
+	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0
-	message BattleFrontier_BattlePalaceLobby_Text_24DDE1
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge:: @ 824DBB0
+	message BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
-	message BattleFrontier_BattlePalaceLobby_Text_24EB8C
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge:: @ 824DBB6
+	message BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
+BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor
 	waitdooranim
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41
+	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor
 	waitdooranim
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC23:: @ 824DC23
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant:: @ 824DC23
 	setvar VAR_LAST_TALKED, 1
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC29:: @ 824DC29
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant:: @ 824DC29
 	setvar VAR_LAST_TALKED, 6
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC2F:: @ 824DC2F
+BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor:: @ 824DC2F
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC35:: @ 824DC35
+BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor:: @ 824DC35
 	opendoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC3B:: @ 824DC3B
+BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor:: @ 824DC3B
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41
+BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor:: @ 824DC41
 	closedoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47
+BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor: @ 824DC47
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49
+BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor: @ 824DC49
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
+BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor: @ 824DC4C
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
+BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults:: @ 824DC50
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -339,7 +315,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
+BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults:: @ 824DC69
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -347,83 +323,83 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, MSGBOX_NPC
+BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt:: @ 824DC82
+	msgbox BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, MSGBOX_NPC
+BattleFrontier_BattlePalaceLobby_EventScript_Man:: @ 824DC8B
+	msgbox BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, MSGBOX_NPC
+BattleFrontier_BattlePalaceLobby_EventScript_Beauty:: @ 824DC94
+	msgbox BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, MSGBOX_NPC
+BattleFrontier_BattlePalaceLobby_EventScript_Maniac:: @ 824DC9D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard:: @ 824DCA6
 	lockall
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+	msgbox BattleFrontier_BattlePalaceLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5
-	message BattleFrontier_BattlePalaceLobby_Text_24EF88
+BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
+	message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13
-	case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21
-	case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DD2F
-	case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D
-	case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B
-	case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
-	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DD59
+	case 0, BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics
+	case 1, BattleFrontier_BattlePalaceLobby_EventScript_RulesNature
+	case 2, BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves
+	case 3, BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered
+	case 4, BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger
+	case 5, BattleFrontier_BattlePalaceLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics:: @ 824DD13
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_RulesNature:: @ 824DD21
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves:: @ 824DD2F
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered:: @ 824DD3D
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B
-	msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger:: @ 824DD4B
+	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_24DD59:: @ 824DD59
+BattleFrontier_BattlePalaceLobby_EventScript_ExitRules:: @ 824DD59
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_Text_24DD5B: @ 824DD5B
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle: @ 824DD5B
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the SINGLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24DDE1: @ 824DDE1
+BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge: @ 824DDE1
 	.string "Do you wish to take\n"
 	.string "the SINGLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17
+BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge: @ 824DE17
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for SINGLE BATTLES\l"
 	.string "that are named SINGLE BATTLE HALLS.\p"
@@ -446,16 +422,16 @@ BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8
+BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified: @ 824E0D8
 	.string "When you have fortified your heart\n"
 	.string "and POKéMON, you must return.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E119: @ 824E119
+BattleFrontier_BattlePalaceLobby_Text_WhichChallenge: @ 824E119
 	.string "There are two BATTLE HALLS,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice of a challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50: @ 824E173
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -469,7 +445,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E173: @ 824E173
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen: @ 824E29E
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -481,65 +457,64 @@ BattleFrontier_BattlePalaceLobby_Text_24E29E: @ 824E29E
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E399: @ 824E399
+BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons: @ 824E399
 	.string "Good. Now, you must select your\n"
 	.string "three POKéMON.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E3C8: @ 824E3C8
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2: @ 824E3C8
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408
+BattleFrontier_BattlePalaceLobby_Text_FollowMe: @ 824E408
 	.string "Good.\n"
 	.string "Now, follow me.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E
+BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded: @ 824E41E
 	.string "I feel privileged for having seen\n"
 	.string "your POKéMON's exploits.\p"
 	.string "The results will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E497: @ 824E497
+BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak: @ 824E497
 	.string "To achieve a 7-win streak…\p"
 	.string "The bonds that bind your heart with\n"
 	.string "your POKéMON seem firm and true.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E4F7: @ 824E4F7
+BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded: @ 824E4F7
 	.string "Your feat will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E533: @ 824E5333
+@ Unused
+BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak: @ 824E5333
     .string "For the feat of your 7-win streak,\n"
     .string "we present you with Battle Point(s).$"
 
-VerdanturfTown_BattleTentLobby_Text_24E57B: @ 824E57B
+BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize: @ 824E57B
 	.string "You seem to have no space for\n"
 	.string "our prize.\p"
 	.string "You should return when you have\n"
 	.string "organized your BAG.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E5D8: @ 824E5D8
-VerdanturfTown_BattleTentLobby_Text_24E5D8: @ 824E5D8
+BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting: @ 824E5D8
 	.string "We have been waiting for you…$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E5F6: @ 824E5F6
-VerdanturfTown_BattleTentLobby_Text_24E5F6: @ 824E5F6
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge: @ 824E5F6
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E636: @ 824E636
-VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636
+BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge: @ 824E636
 	.string "Sigh…\p"
 	.string "You failed to save before you ended\n"
 	.string "your challenge the last time.\p"
 	.string "As a result, your challenge has been\n"
 	.string "disqualified. It is most unfortunate.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9
+@ Unused
+BattleFrontier_BattlePalaceLobby_Text_ReceivedPrize: @ 824E6C9
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3
+BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink: @ 824E6E3
 	.string "For a hardy fellow like me,\n"
 	.string "hardy POKéMON are the best.\p"
 	.string "Offense is the best defense!\n"
@@ -555,7 +530,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3
 	.string "Huh?\n"
 	.string "Why are you looking at me like that?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851
+BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere: @ 824E851
 	.string "Hmm…\p"
 	.string "It appears that the nature of POKéMON\n"
 	.string "and the moves that they have been\l"
@@ -568,7 +543,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851
 	.string "you may need to examine how well\l"
 	.string "its moves match its nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992
+BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms: @ 824E992
 	.string "My POKéMON is usually very docile.\p"
 	.string "But when it's in a BATTLE HALL,\n"
 	.string "it sometimes seems to become\l"
@@ -576,25 +551,25 @@ BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992
 	.string "It becomes totally intimidating.\n"
 	.string "It's shocking, even.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B
+BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway: @ 824EA4B
 	.string "I wonder what sort of nature a POKéMON\n"
 	.string "would have if it favored enfeebling its\l"
 	.string "opponents and chipping away slowly.\p"
 	.string "I'd be surprised if it was a LAX nature.\p"
 	.string "But, nah, that can't be right.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle: @ 824EB06
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the DOUBLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EB8C: @ 824EB8C
+BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge: @ 824EB8C
 	.string "Do you wish to take\n"
 	.string "the DOUBLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2
+BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge: @ 824EBC2
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for DOUBLE BATTLES\l"
 	.string "that are named DOUBLE BATTLE HALLS.\p"
@@ -617,37 +592,34 @@ BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81
+BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers: @ 824EE81
 	.string "To defeat the PALACE MAVEN\n"
 	.string "and seven TRAINERS in a row…$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EEB9: @ 824EEB9
+BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints: @ 824EEB9
 	.string "In honor of the bond you share with\n"
 	.string "your POKéMON, we present you with\l"
 	.string "these Battle Point(s).$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EF16: @ 824EF16
+BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch: @ 824EF16
 	.string "Would you like to record your latest\n"
 	.string "BATTLE PALACE match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EF66: @ 824EF66
+BattleFrontier_BattlePalaceLobby_Text_RulesAreListed: @ 824EF66
 	.string "The BATTLE HALL rules are listed.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EF88: @ 824EF88
-VerdanturfTown_BattleTentLobby_Text_24EF88: @ 824EF88
+BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading: @ 824EF88
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePalaceLobby_Text_24EFAB: @ 824EFAB
-VerdanturfTown_BattleTentLobby_Text_24EFAB: @ 824EFAB
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics: @ 824EFAB
 	.string "Here, POKéMON are required to think\n"
 	.string "and battle by themselves.\p"
 	.string "Unlike in the wild, POKéMON that live\n"
 	.string "with people behave differently\l"
 	.string "depending on their nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24F049: @ 824F049
-VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature: @ 824F049
 	.string "Depending on its nature, a POKéMON\n"
 	.string "may prefer to attack no matter what.\p"
 	.string "Another POKéMON may prefer to protect\n"
@@ -660,8 +632,7 @@ VerdanturfTown_BattleTentLobby_Text_24F049: @ 824F049
 	.string "It may also dislike certain moves that\n"
 	.string "it has trouble using.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24F190: @ 824F190
-VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves: @ 824F190
 	.string "There are offensive moves that inflict\n"
 	.string "direct damage on the foe.\p"
 	.string "There are defensive moves that are\n"
@@ -674,8 +645,7 @@ VerdanturfTown_BattleTentLobby_Text_24F190: @ 824F190
 	.string "POKéMON will consider using moves in\n"
 	.string "these three categories.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24F2E8: @ 824F2E8
-VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered: @ 824F2E8
 	.string "When not under command by its TRAINER,\n"
 	.string "a POKéMON may be unable to effectively\l"
 	.string "use certain moves.\p"
@@ -685,8 +655,7 @@ VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8
 	.string "do not match its nature, it will often\l"
 	.string "be unable to live up to its potential.$"
 
-BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4
-VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger: @ 824F3F4
 	.string "Depending on its nature, a POKéMON may\n"
 	.string "start using moves that don't match its\l"
 	.string "nature when it is in trouble.\p"

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -1,26 +1,25 @@
 BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786
+BattleFrontier_BattlePikeCorridor_OnFrame: @ 825C77C
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
+BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
 	delay 16
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
-	special CallBattlePikeFunction
-	battlepike_nohealing TRUE
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
-	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
+	pike_cleartrainerids
+	pike_nohealing TRUE
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
+	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor
 	waitmovement 0
 	lockall
 	msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
 	waitmovement 0
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -28,27 +27,27 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	waitstate
 	end
 
-BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801
+BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
+BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
+BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
+BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor: @ 825C80E
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
+BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor: @ 825C812
 	walk_up
 	walk_up
 	walk_left

data/maps/BattleFrontier_BattlePikeLobby/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Beauty",
       "flag": "0"
     }
   ],
@@ -98,7 +98,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80"
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_ShowResults"
     },
     {
       "type": "sign",
@@ -106,7 +106,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6"
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_RulesBoard"
     }
   ]
 }

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -1,143 +1,123 @@
 BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_25B710
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_25B762
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_25B806
+BattleFrontier_BattlePikeLobby_OnFrame: @ 825B6D1
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD
+BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
+BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
+BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
+BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
 	special HealPlayerParty
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
-	special CallBattlePikeFunction
+	pike_resethelditems
 	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
-	battlepike_setstreak 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special CallBattlePikeFunction
+	pike_set PIKE_DATA_WIN_STREAK 0
+	pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
+BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen
+	msgbox BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance, MSGBOX_DEFAULT
 	waitmessage
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B78D
+	goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C383, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen:: @ 825B784
+	msgbox BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen, MSGBOX_DEFAULT
 	waitmessage
-
-BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
+	msgbox BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	frontier_checkairshow
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
-	setvar VAR_0x8005, 3
-	special CallBattlePikeFunction
+	pike_get PIKE_DATA_TOTAL_STREAKS
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 3
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallBattlePikeFunction
+	pike_set PIKE_DATA_TOTAL_STREAKS, VAR_RESULT
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
-	special CallBattlePikeFunction
-	message BattleFrontier_BattlePikeLobby_Text_25C1DF
+	pike_resethelditems
+	message BattleFrontier_BattlePikeLobby_Text_ShallRecordResults
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 0
-	special CallBattlePikeFunction
+	pike_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
+BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
 	lockall
-	message BattleFrontier_BattlePikeLobby_Text_25C146
+	message BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults
 	waitmessage
 	frontier_checkairshow
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 0
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 0
-	special CallBattlePikeFunction
+	pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
-	special CallBattlePikeFunction
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 0
-	special CallBattlePikeFunction
+	pike_resethelditems
+	pike_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
+BattleFrontier_BattlePikeLobby_EventScript_Attendant:: @ 825B868
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PIKE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT
-
-BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
-	message BattleFrontier_BattlePikeLobby_Text_25BBC1
+	msgbox BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
+	message BattleFrontier_BattlePikeLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
-	message BattleFrontier_BattlePikeLobby_Text_25BE35
+BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
+	message BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
 	fadescreen 1
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
@@ -145,42 +125,36 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
+	msgbox BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	case YES, BattleFrontier_BattlePikeLobby_EventScript_25B95C
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	case NO, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
+	case YES, BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
+BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
-	special CallBattlePikeFunction
+	pike_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
-	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	special CallBattlePikeFunction
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
-	special CallBattlePikeFunction
+	pike_set PIKE_DATA_WIN_STREAK_ACTIVE, TRUE
+	pike_savehelditems
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
-	special CallBattlePikeFunction
+	pike_savehelditems
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	frontier_settrainers
-	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
+	call BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor
 	special HealPlayerParty
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
@@ -188,36 +162,36 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	waitstate
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B87F
+BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge:: @ 825BA1A
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons:: @ 825BA27
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_25BA42
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
+	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50:: @ 825BA42
+	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 825BA4F
+	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed:: @ 825BA5C
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	goto BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
+BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825BA73
 	special LoadPlayerParty
-BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge:: @ 825BA76
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge:: @ 825BA7E
 	release
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
+BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
 	lockall
 	frontier_results FRONTIER_FACILITY_PIKE
 	waitbuttonpress
@@ -225,67 +199,66 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
-	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6
+BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
+	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6
+BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor: @ 825BAA6
 	walk_up
-
-BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
+BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor: @ 825BAA7
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C422, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Hiker:: @ 825BAAB
+	msgbox BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Twin:: @ 825BAB4
+	msgbox BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Beauty:: @ 825BABD
+	msgbox BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6
+BattleFrontier_BattlePikeLobby_EventScript_RulesBoard:: @ 825BAC6
 	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	msgbox BattleFrontier_BattlePikeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5
-	message BattleFrontier_BattlePikeLobby_Text_25C621
+BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
+	message BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39
-	case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BB47
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder
+	case 3, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C644, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag:: @ 825BB1D
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems:: @ 825BB2B
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder:: @ 825BB39
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47
+BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
 	releaseall
 	end
 
@@ -296,17 +269,17 @@ BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
 	waitse
 	return
 
-BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52
+BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike: @ 825BB52
 	.string "Where the luck of TRAINERS\n"
 	.string "is put to the test…\p"
 	.string "Welcome to the BATTLE PIKE…\p"
 	.string "I am your guide to the BATTLE PIKE…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1
+BattleFrontier_BattlePikeLobby_Text_TakeChallenge: @ 825BBC1
 	.string "Would you like to take the Battle\n"
 	.string "Choice challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
+BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
 	.string "Here we conduct an event we call\n"
 	.string "the Battle Choice.\p"
 	.string "The Battle Choice rules are very\n"
@@ -325,16 +298,16 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02
+BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou: @ 825BE02
 	.string "We look forward to seeing you\n"
 	.string "on another occasion…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35
+BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode: @ 825BE35
 	.string "You have the choice of two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -346,7 +319,7 @@ BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -358,98 +331,101 @@ BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094
+BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons: @ 825C094
 	.string "Please choose the three POKéMON\n"
 	.string "you wish to enter in the challenge…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8
+BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge: @ 825C0D8
 	.string "Before starting your Battle Choice\n"
 	.string "challenge, I must save the game.\l"
 	.string "Is that acceptable?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130
+BattleFrontier_BattlePikeLobby_Text_StepThisWay: @ 825C130
 	.string "Please step this way…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146
+BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults: @ 825C146
 	.string "Your challenge has ended…\p"
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A
+BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance: @ 825C18A
 	.string "You have completed the challenge…\p"
 	.string "I must say… You seem to possess luck\n"
 	.string "in abundance…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF
+BattleFrontier_BattlePikeLobby_Text_ShallRecordResults: @ 825C1DF
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2: @ 825C209
 	.string "To commemorate your completion of\n"
 	.string "the Battle Choice challenge, we award\l"
 	.string "you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit: @ 825C26C
 	.string "You appear to have reached the limit\n"
 	.string "for Battle Points…\pPlease exchange some Battle Points\n"
 	.string "for prizes, then return…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0
+BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting: @ 825C2E0
 	.string "I beg your pardon, but…\p"
 	.string "You failed to save before you quit\n"
 	.string "your challenge the last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. I am sorry…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383
+BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen: @ 825C383
 	.string "Congratulations…\p"
 	.string "You have snatched victory from the\n"
 	.string "PIKE QUEEN and cleared the event…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints: @ 825C3D9
 	.string "In recognition of your amazing luck,\n"
 	.string "we award you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422
+BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal: @ 825C422
 	.string "Arrgh! I blew my chance!\n"
 	.string "I was one room away from the goal!\p"
 	.string "In this place, you'd better watch out\n"
 	.string "for poison, freezing, and so on.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5
+BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer: @ 825C4A5
 	.string "I've completed the challenge 10 times\n"
 	.string "now, but I've never had to battle\l"
 	.string "a TRAINER once.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD
+BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere: @ 825C4FD
 	.string "Listen! Listen!\p"
 	.string "Don't you think that the special\n"
 	.string "abilities of POKéMON will be useful\l"
 	.string "here?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose: @ 825C558
 	.string "What is this weird place?\n"
 	.string "I can't figure it out at all!\p"
 	.string "I've taken the challenge a bunch\n"
 	.string "of times, but all I ever do is run into\l"
 	.string "TRAINERS whichever path I choose.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB
+BattleFrontier_BattlePikeLobby_Text_RulesAreListed: @ 825C5FB
 	.string "The Battle Choice's rules are listed.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621
+BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading: @ 825C621
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644
+BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules: @ 825C644
 	.string "The BAG and POKéNAV may not be used\n"
 	.string "during a Battle Choice challenge.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A
+BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules: @ 825C68A
 	.string "During a Battle Choice challenge,\n"
 	.string "any BERRY or HERB held by POKéMON\l"
 	.string "will be effective only once.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB
+BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules: @ 825C6EB
 	.string "During a Battle Choice challenge,\n"
 	.string "the sequence of POKéMON cannot be\l"
 	.string "changed.\p"

data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc

@@ -4,12 +4,12 @@ BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392
 	.byte 0
 
 BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7
+BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
 	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB
+	applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer
 	waitmovement 0
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	lockall
@@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB: @ 825E3DB
+BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer: @ 825E3DB
 	walk_down
 	walk_down
 	step_end

data/maps/BattleFrontier_BattlePikeRoomNormal/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NPC",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -86,7 +86,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -95,7 +95,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -104,7 +104,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []

data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json

@@ -23,7 +23,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit"
     },
     {
       "type": "trigger",
@@ -32,7 +32,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -41,7 +41,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -50,7 +50,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []

data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc

@@ -1,45 +1,44 @@
 BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C
-	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A
+BattleFrontier_BattlePikeRoomWildMons_OnFrame: @ 825E42A
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom
+	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom:: @ 825E43C
 	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
-	special CallBattlePikeFunction
+	pike_inwildmonroom
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A
+BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost:: @ 825E44A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466: @ 825E466
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470
+BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470:: @ 825E470
+BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A: @ 825E47A
+BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_LOST
-	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	compare VAR_RESULT, B_OUTCOME_DREW
-	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3:: @ 825E4A3
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost:: @ 825E4A3
 	setvar VAR_TEMP_1, 1
 	end
 

data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -86,7 +86,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -95,7 +95,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -104,7 +104,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -113,7 +113,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -122,7 +122,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -5,23 +5,23 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
 	.byte 0
 
 BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
-	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78
-	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom
+	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint
 	.2byte 0
 
 BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
+BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus:: @ 825C891
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891
 	frontier_getstatus
 	end
 
@@ -30,13 +30,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 1
-	special CallBattlePikeFunction
+	pike_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -50,99 +48,97 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
+BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Room number
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
-	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
-	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988
-	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998
-	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8
-	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8
-	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1
+	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3
+	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5
+	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7
+	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9
+	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11
+	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1:: @ 825C968
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3:: @ 825C978
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5:: @ 825C988
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7:: @ 825C998
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9:: @ 825C9A8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11:: @ 825C9B8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13:: @ 825C9C8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C9D8
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
+BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
 	frontier_saveparty
 	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 2
-	special CallBattlePikeFunction
+	pike_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
 	frontier_reset
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO
 	switch VAR_RESULT
-	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
-	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5A
 	message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
@@ -151,31 +147,30 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
-	special CallBattlePikeFunction
-	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom:: @ 825CA78
+	pike_sethintroom
+	compare VAR_RESULT, TRUE
+	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: @ 825CA91
 	setvar VAR_TEMP_5, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer
 	waitmovement 0
 	lockall
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT
 	releaseall
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos
 	waitmovement 0
 	setvar VAR_TEMP_5, 255
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
-	battlepike_gethint
+	pike_gethint
 	compare VAR_RESULT, PIKE_HINT_BRAIN
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
 	lock
@@ -194,8 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID
-	special CallBattlePikeFunction
+	pike_gethintroomid
 	switch VAR_RESULT
 	case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint
 	case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint
@@ -215,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
-	battlepike_gethint
+	pike_gethint
 	switch VAR_RESULT
 	case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia
 	case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering
@@ -250,7 +244,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CBCE
 	walk_left
 	walk_left
 	walk_down
@@ -259,7 +253,7 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
 	walk_up
 	walk_up
 	walk_up

data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc

@@ -14,8 +14,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
 	lockall
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 4
-	setvar VAR_0x8006, 1
-	setvar VAR_0x8007, 55
+	setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
+	setvar VAR_0x8007, SE_SAVE
 	setvar VAR_RESULT, 0
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
 	special CallBattlePyramidFunction
@@ -37,8 +37,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
-	special CallBattlePyramidFunction
+	pyramid_setfloorpal
 	frontier_getstatus
 	switch VAR_TEMP_0
 	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
@@ -60,39 +59,27 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	frontier_isbattletype BATTLE_TYPE_TRAINER  @ VAR_RESULT seems to be ignored here
 	setvar VAR_TEMP_D, 1
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
-	special CallBattlePyramidFunction
+	pyramid_healparty
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
-	setvar VAR_0x8005, 7
-	setvar VAR_0x8006, 255
-	special CallBattlePyramidFunction
-
+	pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
-	setvar VAR_0x8005, 0
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
-	special CallBattlePyramidFunction
+	pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
+	pyramid_clearhelditems
 	special HealPlayerParty
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
-	setvar VAR_0x8005, 1
-	special CallBattlePyramidFunction
+	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
-	special CallBattlePyramidFunction
+	pyramid_inittrainers
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end
@@ -103,10 +90,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
-	setvar VAR_0x8005, 32
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
+	pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
 	return
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
@@ -116,8 +100,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	compare VAR_RESULT, 7
 	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
-	special CallBattlePyramidFunction
+	pyramid_seedfloor
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -132,8 +115,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 @ TRAINER_PHILLIP is used as a placeholder
 BattlePyramid_TrainerBattle:: @ 8252C4F
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
-	special CallBattlePyramidFunction
+	pyramid_showhint
 	waitmessage
 	waitbuttonpress
 	closemessage
@@ -141,14 +123,11 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
 	end
 
 BattlePyramid_FindItemBall:: @ 8252C6A
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
-	special CallBattlePyramidFunction
+	pyramid_setitem
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
 	goto_if_eq BattlePyramid_FindItemBall_End
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
-	special CallBattlePyramidFunction
-
+	pyramid_hideitem
 BattlePyramid_FindItemBall_End:: @ 8252C87
 	end
 

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -31,14 +31,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	playse SE_EXPMAX
 	waitse
 	closemessage
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
+	pyramid_set PYRAMID_DATA_WIN_STREAK, 0
+	pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -61,8 +55,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
 	frontier_checkairshow
 	special LoadPlayerParty
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
-	special CallBattlePyramidFunction
+	pyramid_clearhelditems
 	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_2519F8
 	waitmessage
@@ -73,11 +66,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
-	setvar VAR_0x8005, 0
-	special CallBattlePyramidFunction
+	pyramid_setprize
+	pyramid_save 0
 	playse SE_SAVE
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
@@ -89,8 +79,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	frontier_checkairshow
 	special LoadPlayerParty
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
-	special CallBattlePyramidFunction
+	pyramid_clearhelditems
 	special HealPlayerParty
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_251B5A
@@ -99,13 +88,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	waitse
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
-	setvar VAR_0x8005, 0
-	special CallBattlePyramidFunction
+	pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE
+	pyramid_save 0
 	playse SE_SAVE
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
@@ -164,18 +148,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattlePyramidFunction
+	pyramid_init
+	pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
-	special CallBattlePyramidFunction
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
-	special CallBattlePyramidFunction
+	pyramid_seedfloor
+	pyramid_inittrainers
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -251,37 +229,29 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
-	setvar VAR_0x8005, 5
-	special CallBattlePyramidFunction
-	compare VAR_RESULT, 0
+	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53
 	setvar VAR_RESULT, 0
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
-	setvar VAR_0x8005, 3
-	special CallBattlePyramidFunction
+	pyramid_get PYRAMID_DATA_WIN_STREAK_50
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
-	setvar VAR_0x8005, 6
-	special CallBattlePyramidFunction
-	compare VAR_RESULT, 0
+	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
+	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91
 	setvar VAR_RESULT, 0
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
-	setvar VAR_0x8005, 4
-	special CallBattlePyramidFunction
+	pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
@@ -404,9 +374,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
-	setvar VAR_0x8005, 1
-	special CallBattlePyramidFunction
+	pyramid_get PYRAMID_DATA_WIN_STREAK
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -6,10 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
 	.byte 0
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
-	setvar VAR_0x8005, 200
-	setvar VAR_0x8006, 0
-	special CallBattlePyramidFunction
+	pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
 	setvar VAR_TEMP_F, 1
 	end
 
@@ -64,13 +61,10 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
 	end
 
 BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
-	setvar VAR_0x8005, 1
-	special CallBattlePyramidFunction
+	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
-	special CallBattlePyramidFunction
+	pyramid_inittrainers
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -32,14 +32,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
-	special CallBattleTowerFunc
+	tower_setopponent
 	addobject 1
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
 	waitmovement 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_getopponentintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -48,17 +45,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 3
-	special CallBattleTowerFunc
+	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, 3
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	call BattleFrontier_EventScript_IncrementWinStreak
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
-	special CallBattleTowerFunc
+	tower_setbattlewon
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
@@ -141,9 +135,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 3
-	special CallBattleTowerFunc
+	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, 3
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
@@ -151,9 +143,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
 BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
 	message BattleFrontier_BattleTowerBattleRoom_Text_242426
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
-	special CallBattleTowerFunc
+	tower_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
@@ -333,8 +323,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	special HealPlayerParty
 	frontier_resetsketch
 BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_15
-	special CallBattleTowerFunc
+	tower_setinterviewdata
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	return
 

data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc

@@ -58,8 +58,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
-	special CallBattleTowerFunc
+	tower_setopponent
 	addobject 1
 	addobject 4
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
@@ -67,17 +66,13 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_getopponentintro 0
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_getopponentintro 1
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -85,21 +80,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_getopponentintro 0
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
-	messageautoscroll 0x2021fc4
+	messageautoscroll gStringVar4
 	waitmessage
 	delay 48
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_getopponentintro 1
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
-	messageautoscroll 0x2021fc4
+	messageautoscroll gStringVar4
 	waitmessage
 	delay 48
 
@@ -110,17 +101,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 3
-	special CallBattleTowerFunc
+	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
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
-	special CallBattleTowerFunc
+	tower_setbattlewon
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
@@ -220,9 +208,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 3
-	special CallBattleTowerFunc
+	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, 3
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
@@ -230,9 +216,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
 	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
-	special CallBattleTowerFunc
+	tower_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -51,14 +51,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 	faceplayer
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattleTowerFunc
+	tower_set TOWER_DATA_WIN_STREAK, 0
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	release
@@ -78,24 +72,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
 	msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT
 
 BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GIVE_RIBBONS
-	special CallBattleTowerFunc
-	compare VAR_RESULT, 0
+	tower_giveribbons
+	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
 	message BattleFrontier_BattleTowerLobby_Text_23F844
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT
-
 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
 	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 49
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT
@@ -111,18 +101,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
 
 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattleTowerFunc
-
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
 BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
 	lock
 	faceplayer
@@ -141,9 +125,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
@@ -193,9 +175,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	waitmessage
 	message BattleFrontier_BattleTowerLobby_Text_23F754
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -253,12 +233,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
-	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattleTowerFunc
+	tower_init
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
@@ -324,12 +300,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
-	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattleTowerFunc
+	tower_init
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
@@ -396,12 +368,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
-	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattleTowerFunc
+	tower_init
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
@@ -467,19 +435,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
-	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattleTowerFunc
+	tower_init
+	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 0
-	special CallBattleTowerFunc
+	tower_save 0
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
@@ -909,9 +871,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_save CHALLENGE_STATUS_SAVING
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE
@@ -972,9 +932,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
-	setvar VAR_0x8005, 1
-	special CallBattleTowerFunc
+	tower_save CHALLENGE_STATUS_SAVING
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -6,8 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
 	.byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
-	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
-	special CallBattlePyramidFunction
+	pyramid_healparty
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0

data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc

@@ -453,25 +453,25 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
 	end
 
 BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
-	msgbox BattleFrontier_ExchangeServiceCorner_Text_260099, MSGBOX_NPC
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll, MSGBOX_NPC
 	end
 
 BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
-	msgbox BattleFrontier_ExchangeServiceCorner_Text_26002E, MSGBOX_NPC
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher, MSGBOX_NPC
 	end
 
 BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
 	lock
-	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant, MSGBOX_DEFAULT
 	release
 	end
 
 BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
-	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls, MSGBOX_NPC
 	end
 
 BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
-	msgbox BattleFrontier_ExchangeServiceCorner_Text_26012D, MSGBOX_NPC
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
 	end
 
 BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
@@ -629,7 +629,7 @@ BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
 	.string "Please visit us when you have\n"
 	.string "saved up Battle Points.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
+BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
 	.string "Oh, they're so nice!\n"
 	.string "I wish I had them!\l"
 	.string "Cute cushions!\l"
@@ -637,18 +637,18 @@ BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
 	.string "Little plush DOLLS!\l"
 	.string "I wish I had them all!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_25FFD0: @ 825FFD0
+BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant: @ 825FFD0
 	.string "Leave it to your mommy!\p"
 	.string "If it's anything you want, I'll go\n"
 	.string "through anything to get it, honey!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_26002E: @ 826002E
+BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher: @ 826002E
 	.string "If I can get hold of the items here,\n"
 	.string "my POKéMON will get tougher.\p"
 	.string "You bet they will!\n"
 	.string "No question about it!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
+BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
 	.string "Hah?\n"
 	.string "What are you gawking at?\p"
 	.string "I don't like you staring at my plush\n"
@@ -656,7 +656,7 @@ BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
 	.string "If you want it, go get one yourself!\n"
 	.string "Isn't that right, SMOOCHUM?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_26012D: @ 826012D
+BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord: @ 826012D
 	.string "Did you know?\p"
 	.string "If you stretch your record at any of\n"
 	.string "the BATTLE facilities, they start\l"

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -90,11 +90,11 @@ BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
 BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	battletower_getstreak
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 50
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
-	battletower_getstreak
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 50
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
@@ -123,11 +123,11 @@ BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
 BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	battletower_getstreak
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 100
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
-	battletower_getstreak
+	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 100
 	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment

data/maps/BattlePyramidSquare01/scripts.inc

@@ -1 +1,2 @@
 BattlePyramidSquare01_MapScripts:: @ 823D1A5
+	.byte 0

data/maps/BattlePyramidSquare02/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_BOY_3",

data/maps/BattlePyramidSquare02/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare02_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare03/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_BOY_1",

data/maps/BattlePyramidSquare03/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare03_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare04/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",

data/maps/BattlePyramidSquare04/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare04_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare05/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_BOY_2",

data/maps/BattlePyramidSquare05/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare05_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare06/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_GIRL_2",

data/maps/BattlePyramidSquare06/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare06_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare07/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",

data/maps/BattlePyramidSquare07/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare07_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare08/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",

data/maps/BattlePyramidSquare08/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare08_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare09/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",

data/maps/BattlePyramidSquare09/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare09_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare10/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_GIRL_3",

data/maps/BattlePyramidSquare10/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare10_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare11/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_RICH_BOY",

data/maps/BattlePyramidSquare11/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare11_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare12/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",

data/maps/BattlePyramidSquare12/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare12_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare13/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",

data/maps/BattlePyramidSquare13/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare13_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare14/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",

data/maps/BattlePyramidSquare14/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare14_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare15/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",

data/maps/BattlePyramidSquare15/scripts.inc

@@ -1 +0,0 @@
-BattlePyramidSquare15_MapScripts:: @ 823D1A5

data/maps/BattlePyramidSquare16/map.json

@@ -13,6 +13,7 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
   "connections": null,
+  "shared_scripts_map": "BattlePyramidSquare01",
   "object_events": [
     {
       "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",

data/maps/BattlePyramidSquare16/scripts.inc

@@ -1,3 +0,0 @@
-BattlePyramidSquare16_MapScripts:: @ 823D1A5
-	.byte 0
-

data/maps/CaveOfOrigin_B1F/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_NONE",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_UNDERGROUND",
   "allow_bike": false,
   "allow_escape_rope": true,

data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_DAN03",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": true,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_UNDERGROUND",
   "allow_bike": true,
   "allow_escape_rope": true,

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_DAN03",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": true,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_UNDERGROUND",
   "allow_bike": true,
   "allow_escape_rope": true,

data/maps/EverGrandeCity/scripts.inc

@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
 	.byte 0
 
 EverGrandeCity_OnTransition: @ 81E7D21
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
 EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B

data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc

@@ -40,8 +40,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
 	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
 
 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
-	special CallBattleTowerFunc
+	tower_setopponent
 	addobject 3
 	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
 	waitmovement 0
@@ -50,8 +49,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 4
-	special CallVerdanturfTentFunction
+	battletent_getopponentintro
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
@@ -61,8 +59,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	playse SE_W173
 	waitse
 	waitmovement 0
-	setvar VAR_0x8004, 6
-	special CallFallarborTentFunction
+	fallarbortent_getopponentname
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
 
 FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
@@ -143,17 +140,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special CallBattleArenaFunction
+	arena_get ARENA_DATA_WIN_STREAK
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
 	addvar VAR_RESULT, 1
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	copyvar VAR_0x8006, VAR_RESULT
-	special CallBattleArenaFunction
-
+	arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT
 FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
@@ -167,9 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
 FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special CallFallarborTentFunction
+	fallarbortent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -39,19 +39,15 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
 	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
 	message FallarborTown_BattleTentLobby_Text_2C4EFF
 	waitmessage
-	setvar VAR_0x8004, 4
-	special CallFallarborTentFunction
+	fallarbortent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallFallarborTentFunction
+	fallarbortent_save 0
 	playse SE_SAVE
 	waitse
 
 FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
 	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 5
-	special CallFallarborTentFunction
+	fallarbortent_giveprize
 	switch VAR_RESULT
 	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -84,9 +80,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
 	message FallarborTown_BattleTentLobby_Text_2C4FD7
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special CallFallarborTentFunction
+	fallarbortent_save 0
 	playse SE_SAVE
 	waitse
 	msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
@@ -99,9 +93,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 	lockall
 	message FallarborTown_BattleTentLobby_Text_2C504C
 	waitmessage
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special CallFallarborTentFunction
+	fallarbortent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -111,8 +103,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
 FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	special CallFallarborTentFunction
+	fallarbortent_getprize
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84
 	special SavePlayerParty
@@ -153,8 +144,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallFallarborTentFunction
+	fallarbortent_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -7,7 +7,7 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94
 	end
 
 FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98
-	setweather WEATHER_CLOUDS
+	setweather WEATHER_SUNNY_CLOUDS
 	doweather
 	end
 

data/maps/JaggedPass/map.json

@@ -156,7 +156,7 @@
       "x": 21,
       "y": 12,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",

data/maps/JaggedPass/scripts.inc

@@ -26,7 +26,7 @@ JaggedPass_OnTransition: @ 823068B
 	end
 
 JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
-	setweather WEATHER_ASH
+	setweather WEATHER_VOLCANIC_ASH
 	doweather
 	return
 

data/maps/LavaridgeTown_Gym_1F/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_GIM",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_INDOOR",
   "allow_bike": false,
   "allow_escape_rope": false,

data/maps/LavaridgeTown_Gym_B1F/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_GIM",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_INDOOR",
   "allow_bike": false,
   "allow_escape_rope": false,

data/maps/LilycoveCity/scripts.inc

@@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	call Common_EventScript_SetupRivalGfxId
 	end
 

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
 	.byte 0
 
-@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
+@ During the abnormal weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
 @ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
 LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs

data/maps/MarineCave_End/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_DAN01",
   "region_map_section": "MAPSEC_MARINE_CAVE",
   "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_UNDERGROUND",
   "allow_bike": false,
   "allow_escape_rope": true,

data/maps/MarineCave_End/scripts.inc

@@ -47,13 +47,13 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B
 	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
 	goto_if_eq MarineCave_End_EventScript_RanFromKyogre
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	releaseall
 	end
 
 MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084
-	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
+	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	goto Common_EventScript_RemoveStaticPokemon
 	end

data/maps/MauvilleCity_Gym/scripts.inc

@@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
 
 MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
 	trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
-	msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
+	msgbox MauvilleCity_Gym_Text_WattsonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
@@ -410,7 +410,7 @@ MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
 	.string "Oof…\n"
 	.string "Our batteries ran dry…$"
 
-MauvilleCity_Gym_Text_20EA5E: @ 820EA5E
+MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
 	.string "WATTSON: We'll have to recharge our\n"
 	.string "batteries again.\p"
 	.string "When we're fully charged up, we'll\n"

data/maps/MossdeepCity/scripts.inc

@@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
 MossdeepCity_EventScript_PokefanF:: @ 81E4AB2

data/maps/MossdeepCity_GameCorner_1F/scripts.inc

@@ -1,14 +1,14 @@
 MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
 	.byte 0
 
-MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
+MossdeepCity_GameCorner_1F_OnWarp: @ 8224B37
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
 	.2byte 0
 
-MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
+MossdeepCity_GameCorner_1F_OnFrame: @ 8224B41
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
 	.2byte 0
 

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -189,7 +189,8 @@ MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
 MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
 	.string "{PLAYER} obtained a BELDUM.$"
 
-MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
+@ Unused
+MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: @ 8222C03
 	.string "There is no space for another POKéMON.$"
 
 MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A

data/maps/MtChimney/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_TOZAN",
   "region_map_section": "MAPSEC_MT_CHIMNEY",
   "requires_flash": false,
-  "weather": "WEATHER_ASH",
+  "weather": "WEATHER_VOLCANIC_ASH",
   "map_type": "MAP_TYPE_ROUTE",
   "allow_bike": true,
   "allow_escape_rope": false,

data/maps/MtPyre_Exterior/scripts.inc

@@ -13,11 +13,11 @@ MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
 	return
 
 MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
-	setweather WEATHER_FOG_1
+	setweather WEATHER_FOG_HORIZONTAL
 	return
 
 MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
-	setweather WEATHER_FOG_1
+	setweather WEATHER_FOG_HORIZONTAL
 	doweather
 	end
 

data/maps/MtPyre_Summit/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_MACHUPI",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
-  "weather": "WEATHER_FOG_1",
+  "weather": "WEATHER_FOG_HORIZONTAL",
   "map_type": "MAP_TYPE_ROUTE",
   "allow_bike": true,
   "allow_escape_rope": false,

data/maps/PetalburgCity_WallysHouse/scripts.inc

@@ -1,9 +1,9 @@
 PetalburgCity_WallysHouse_MapScripts:: @ 8204229
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp
 	.byte 0
 
-PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234
+PetalburgCity_WallysHouse_OnWarp: @ 8204234
 	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
 	.2byte 0
 
@@ -12,7 +12,7 @@ PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
 	turnobject 1, DIR_WEST
 	end
 
-PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247
+PetalburgCity_WallysHouse_OnFrame: @ 8204247
 	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
 	.2byte 0