Merge pull request #833 from GriffinRichards/doc-inc2

Document .incs split from event_scripts Round 2

data/event_scripts.s

@@ -35,6 +35,7 @@
 #include "constants/trade.h"
 #include "constants/trainer_hill.h"
 #include "constants/trainers.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
 	.include "asm/macros.inc"

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -1,140 +1,140 @@
 EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame
 	.byte 0
 
 EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
 	call Common_EventScript_SetupRivalGfxId
 	end
 
-EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
+EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
+EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
+EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
+EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4
 	waitmovement 0
 	delay 40
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A45
+	goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
     releaseall
     end
 
-EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
+EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
+EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
 	playbgm MUS_DAIGO, 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC
+	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
-	goto EverGrandeCity_ChampionsRoom_EventScript_228A61
+	goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
+EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
 	playse SE_DOOR
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
 	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	closemessage
 	playse SE_DOOR
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
 	addobject 2
-	call EverGrandeCity_ChampionsRoom_EventScript_228BFD
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice
 	compare VAR_RESULT, FEMALE
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC
+EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC
 	playbgm MUS_GIRL_SUP, 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1
+EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1
 	playbgm MUS_BOY_SUP, 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
+EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
-	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
 	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
-	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
+EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
 	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_228C12
+	call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT
-	goto EverGrandeCity_ChampionsRoom_EventScript_228B30
+	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
+EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
 	closemessage
 	addobject 3
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT
-	call EverGrandeCity_ChampionsRoom_EventScript_272184
+	call ProfBirch_EventScript_RatePokedex
-	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart
 	applymovement 3, Common_Movement_WalkInPlaceFastestUp
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
 	waitmovement 0
 	delay 20
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations
 	compare VAR_RESULT, FEMALE
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
 	closemessage
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
@@ -142,32 +142,32 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	releaseall
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB
+EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 8228BEB
-	msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
+EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4
-	msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
+EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12
+EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D
+EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: @ 8228C1D
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
+EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20
 	walk_up
 	delay_16
 	walk_up
@@ -175,7 +175,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
+EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26
 	walk_up
 	walk_up
 	walk_up
@@ -186,7 +186,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
 	walk_in_place_fastest_right
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
+EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_fastest_right
@@ -197,24 +197,24 @@ EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
 	delay_16
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
+EverGrandeCity_ChampionsRoom_Movement_RivalFollows: @ 8228C38
 	walk_right
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
+EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: @ 8228C3B
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
+EverGrandeCity_ChampionsRoom_Movement_WallaceExit: @ 8228C3F
 	walk_up
 	delay_8
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
+EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
 	walk_up
 	walk_up
 	walk_up
@@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
 	walk_in_place_fastest_left
 	step_end
 
-EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
+EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C
 	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
 	.string "That incident in SOOTOPOLIS CITY…\n"
 	.string "That was superb work, putting an end\l"
@@ -248,7 +248,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
 	.string "their POKéMON in HOENN?\p"
 	.string "Show me right here and now!$"
 
-EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
+EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC
 	.string "I, the CHAMPION, fall in defeat…\p"
 	.string "That was wonderful work.\n"
 	.string "You were elegant, infuriatingly so.\l"
@@ -257,7 +257,7 @@ EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC
 	.string "You are a truly noble POKéMON\n"
 	.string "TRAINER!$"
 
-EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
+EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66
 	.string "WALLACE: The POKéMON you sent into\n"
 	.string "battle…\p"
 	.string "At times they danced like a spring\n"
@@ -272,29 +272,29 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66
 	.string "I now proclaim you to be the new\n"
 	.string "HOENN region…$"
 
-EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA
+EverGrandeCity_ChampionsRoom_Text_MayAdvice: @ 82290CA
 	.string "MAY: {PLAYER}{KUN}!\p"
 	.string "Here's some advice before you challenge\n"
 	.string "the CHAMPION…$"
 
-EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B
+EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver: @ 822910B
 	.string "MAY: Huh?\n"
 	.string "What, what, what?\p"
 	.string "{PLAYER}{KUN}…\n"
 	.string "Could it be that…\l"
 	.string "It's already over?$"
 
-EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152
+EverGrandeCity_ChampionsRoom_Text_BrendanAdvice: @ 8229152
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "How would you like some advice before\n"
 	.string "you challenge the CHAMPION?…$"
 
-EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2
+EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon: @ 82291A2
 	.string "BRENDAN: {PLAYER}…\p"
 	.string "Are you trying to tell me…\n"
 	.string "You've beaten the CHAMPION?$"
 
-EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
+EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6
 	.string "PROF. BIRCH: See?\n"
 	.string "What did I tell you, {RIVAL}?\p"
 	.string "Didn't I tell you that you don't need\n"
@@ -310,25 +310,25 @@ EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6
 	.string "What became of your POKéDEX?\n"
 	.string "Here, let me see.$"
 
-EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D
+EverGrandeCity_ChampionsRoom_Text_BirchCongratulations: @ 822934D
 	.string "PROF. BIRCH: Anyways,\n"
 	.string "congratulations!\p"
 	.string "Now, go proudly into the final room!$"
 
-EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399
+EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe: @ 8229399
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "No, let me rephrase that properly.\p"
 	.string "The new CHAMPION!\p"
 	.string "Come with me.$"
 
-EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB
+EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside: @ 82293EB
 	.string "WALLACE: I'm sorry, but…\p"
 	.string "From here on, only those TRAINERS who\n"
 	.string "have become CHAMPIONS may enter.\p"
 	.string "You'll have to wait outside with\n"
 	.string "PROF. BIRCH.$"
 
-EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
+EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479
 	.string "MAY: Groan…\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
@@ -337,7 +337,7 @@ EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479
 	.string "{PLAYER}{KUN}!\n"
 	.string "Honestly, congratulations!$"
 
-EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5
+EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations: @ 82294F5
 	.string "BRENDAN: Whaaaat?! … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "It can't be helped if that's the rule.\p"

data/maps/EverGrandeCity_DrakesRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3",
+      "script": "EverGrandeCity_DrakesRoom_EventScript_Drake",
       "flag": "0"
     }
   ],

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -1,67 +1,68 @@
 EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	.byte 0
 
-EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
+@ Unused, Drake uses Sidneys identical OnWarp for some reason
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6
+EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
+EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
+EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB
-	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
+	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
+EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5
 	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
 
-EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
+EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2
-	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 4
-	call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
+	call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7
+EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82286E7
-	call EverGrandeCity_DrakesRoom_EventScript_2724BC
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED
+EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 82286ED
-	call EverGrandeCity_DrakesRoom_EventScript_27255F
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
+EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
+	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat
-	goto EverGrandeCity_DrakesRoom_EventScript_228724
+	goto EverGrandeCity_DrakesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A
+EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A
-	msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724
+EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
 	setvar VAR_0x8004, 0
 	special sub_813BF7C
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_2723F8
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
-	msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E
+EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E
 	.string "I am the last of the POKéMON LEAGUE\n"
 	.string "ELITE FOUR, DRAKE the DRAGON master!\p"
 	.string "In their natural state, POKéMON are\n"
@@ -74,10 +75,10 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E
 	.string "If you don't, then you will never\n"
 	.string "prevail over me!$"
 
-EverGrandeCity_DrakesRoom_Text_228895: @ 8228895
+EverGrandeCity_DrakesRoom_Text_Defeat: @ 8228895
 	.string "Superb, it should be said.$"
 
-EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0
+EverGrandeCity_DrakesRoom_Text_PostBattleSpeech: @ 82288B0
 	.string "You deserve every credit for coming\n"
 	.string "this far as a TRAINER of POKéMON.\p"
 	.string "You do seem to know what is needed.\p"

data/maps/EverGrandeCity_GlaciasRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_GlaciasRoom_EventScript_228469",
+      "script": "EverGrandeCity_GlaciasRoom_EventScript_Glacia",
       "flag": "0"
     }
   ],

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -1,65 +1,65 @@
 EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp
 	.byte 0
 
-EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
+EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
+EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
+EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431
-	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
+	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
+EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B
 	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
 
-EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
+EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448
-	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 3
-	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
+	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D
+EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 822845D
-	call EverGrandeCity_GlaciasRoom_EventScript_2724BC
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463
+EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 8228463
-	call EverGrandeCity_GlaciasRoom_EventScript_27255F
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
+EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
+	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat
-	goto EverGrandeCity_GlaciasRoom_EventScript_22849A
+	goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490
+EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 8228490
-	msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A
+EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_2723F8
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
-	msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC
+EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC
 	.string "Welcome, my name is GLACIA\n"
 	.string "of the ELITE FOUR.\p"
 	.string "I've traveled from afar to HOENN\n"
@@ -70,14 +70,14 @@ EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC
 	.string "It would please me to no end if I could\n"
 	.string "go all out against you!$"
 
-EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4
+EverGrandeCity_GlaciasRoom_Text_Defeat: @ 82285B4
 	.string "You and your POKéMON…\n"
 	.string "How hot your spirits burn!\p"
 	.string "The all-consuming heat overwhelms.\p"
 	.string "It's no surprise that my icy skills\n"
 	.string "failed to harm you.$"
 
-EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640
+EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech: @ 8228640
 	.string "Advance to the next room.\p"
 	.string "And there, confirm the truly fearsome\n"
 	.string "side of the POKéMON LEAGUE.$"

data/maps/EverGrandeCity_PhoebesRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB",
+      "script": "EverGrandeCity_PhoebesRoom_EventScript_Phoebe",
       "flag": "0"
     }
   ],

data/maps/EverGrandeCity_PhoebesRoom/scripts.inc

@@ -1,65 +1,65 @@
 EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame
 	.byte 0
 
-EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
+EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
+EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
+EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193
-	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
+	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
+EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D
 	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
 
-EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
+EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA
-	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 2
-	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
+	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF
+EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82281BF
-	call EverGrandeCity_PhoebesRoom_EventScript_2724BC
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5
+EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 82281C5
-	call EverGrandeCity_PhoebesRoom_EventScript_27255F
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB
+EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325
+	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat
-	goto EverGrandeCity_PhoebesRoom_EventScript_2281FC
+	goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2
+EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 82281F2
-	msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC
+EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_2723F8
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
-	msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E
+EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E
 	.string "Ahahaha!\p"
 	.string "I'm PHOEBE of the ELITE FOUR.\n"
 	.string "I did my training on MT. PYRE.\p"
@@ -70,11 +70,11 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E
 	.string "So, come on, just try and see if you can\n"
 	.string "even inflict damage on my POKéMON!$"
 
-EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325
+EverGrandeCity_PhoebesRoom_Text_Defeat: @ 8228325
 	.string "Oh, darn.\n"
 	.string "I've gone and lost.$"
 
-EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343
+EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech: @ 8228343
 	.string "There's a definite bond between you\n"
 	.string "and your POKéMON, too.\p"
 	.string "I didn't recognize it, so it's only\n"

data/maps/EverGrandeCity_SidneysRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_SidneysRoom_EventScript_227F64",
+      "script": "EverGrandeCity_SidneysRoom_EventScript_Sidney",
       "flag": "0"
     }
   ],

data/maps/EverGrandeCity_SidneysRoom/scripts.inc

@@ -1,8 +1,8 @@
 EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
-	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame
 	.byte 0
 
 EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
@@ -10,63 +10,62 @@ EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	end
 
-EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
+EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D
-	call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
+	call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 1
-	call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
+	call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32
+EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 8227F32
-	call EverGrandeCity_SidneysRoom_EventScript_2724BC
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38
+EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38
-	call EverGrandeCity_SidneysRoom_EventScript_27255F
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E
+EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E
-EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
+EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
+EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D
-	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
+	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
+EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 8227F57
 	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_272475
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
+EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
+	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
 	playbgm MUS_SITENNOU, 0
-	msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
+	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat
-	goto EverGrandeCity_SidneysRoom_EventScript_227F95
+	goto EverGrandeCity_SidneysRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
+EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 8227F8B
-	msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
+EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95
 	setflag FLAG_DEFEATED_ELITE_4_SIDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_2723F8
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
-	msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7
+EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7
 	.string "Welcome, challenger!\n"
 	.string "I'm SIDNEY of the ELITE FOUR.\p"
 	.string "I like that look you're giving me.\n"
@@ -76,11 +75,11 @@ EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7
 	.string "a battle that can only be staged\l"
 	.string "here in the POKéMON LEAGUE!$"
 
-EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2
+EverGrandeCity_SidneysRoom_Text_Defeat: @ 82280A2
 	.string "Well, how do you like that? I lost!\n"
 	.string "Eh, it was fun, so it doesn't matter.$"
 
-EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC
+EverGrandeCity_SidneysRoom_Text_PostBattleSpeech: @ 82280EC
 	.string "Well, listen to what this loser has\n"
 	.string "to say.\p"
 	.string "You've got what it takes to go far.\n"

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_OnTransition: @ 821A21C
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
-	getpricereduction 4
+	getpricereduction POKENEWS_BLENDMASTER
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT

data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc

@@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
 	.byte 0
 
 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
-	getpricereduction 3
+	getpricereduction POKENEWS_LILYCOVE
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
 	compare VAR_RESULT, 0
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
 LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
 	lock
 	faceplayer
-	getpricereduction 3
+	getpricereduction POKENEWS_LILYCOVE
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	call Common_EventScript_SetupRivalGfxId
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
 	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	end
 
@@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
+EventScript_RegisterProfBirch:: @ 81FA2D2
-Route101_EventScript_1FA2D2:: @ 81FA2D2
 	msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
 	closemessage
 	delay 30

data/maps/MauvilleCity_GameCorner/map.json

@@ -291,7 +291,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -299,7 +299,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -307,7 +307,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -315,7 +315,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -323,7 +323,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -331,7 +331,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+      "script": "Roulette_EventScript_Table1"
     },
     {
       "type": "sign",
@@ -339,7 +339,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -347,7 +347,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -355,7 +355,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     },
     {
       "type": "sign",
@@ -379,7 +379,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+      "script": "Roulette_EventScript_Table2"
     }
   ]
 }

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 2
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 3
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 4
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 5
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 6
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 7
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 8
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 9
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 10
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
@@ -655,15 +655,15 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 11
 	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_210456:: @ 8210456
+MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456
-	msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT
+	msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -811,7 +811,7 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04
 	.string "That would total 660 COINS, but it's\n"
 	.string "very difficult to get.$"
 
-MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E
+MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase: @ 8210C2E
 	.string "You can't play if you don't have\n"
 	.string "a COIN CASE.$"
 

data/maps/Route101/map.json

@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_272141",
+      "script": "ProfBirch_EventScript_RatePokedexOrRegister",
       "flag": "FLAG_HIDE_ROUTE_101_BIRCH"
     },
     {

data/maps/Route101/scripts.inc

@@ -4,7 +4,7 @@ Route101_MapScripts:: @ 81EBCBA
 	.byte 0
 
 Route101_OnTransition: @ 81EBCC5
-	call Route101_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route101_MapScript2_1EBCCB: @ 81EBCCB

data/maps/Route103/map.json

@@ -165,7 +165,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_272141",
+      "script": "ProfBirch_EventScript_RatePokedexOrRegister",
       "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
     },
     {

data/maps/Route103/scripts.inc

@@ -5,7 +5,7 @@ Route103_MapScripts:: @ 81EC38E
 
 Route103_OnTransition: @ 81EC399
 	call Common_EventScript_SetupRivalGfxId
-	call Route103_EventScript_2720AD
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route103_MapScript1_1EC3A4: @ 81EC3A4

data/maps/Route105/scripts.inc

@@ -19,7 +19,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B
 
 Route105_OnTransition: @ 81EE21E
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route105_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
 	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH

data/maps/Route114/scripts.inc

@@ -6,7 +6,7 @@ Route114_MapScripts:: @ 81F252F
 
 Route114_OnTransition: @ 81F253F
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route114_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
 	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH

data/maps/Route115/scripts.inc

@@ -13,7 +13,7 @@ Route115_MapScript1_1F2930: @ 81F2930
 
 Route115_OnTransition: @ 81F2947
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route115_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
 	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST

data/maps/Route116/scripts.inc

@@ -7,7 +7,7 @@ Route116_MapScripts:: @ 81F2C0C
 Route116_OnTransition: @ 81F2C1C
 	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route116_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH

data/maps/Route118/scripts.inc

@@ -7,7 +7,7 @@ Route118_MapScripts:: @ 81F3DBC
 Route118_OnTransition: @ 81F3DCC
 	call Route118_EventScript_28CCC7
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route118_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
 	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST

data/maps/Route125/scripts.inc

@@ -7,7 +7,7 @@ Route125_MapScripts:: @ 81F6748
 Route125_OnTransition: @ 81F6758
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route125_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
 	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST

data/maps/Route127/scripts.inc

@@ -7,7 +7,7 @@ Route127_MapScripts:: @ 81F69D9
 Route127_OnTransition: @ 81F69E9
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route127_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
 	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH

data/maps/Route129/scripts.inc

@@ -13,7 +13,7 @@ Route129_MapScript1_1F7294: @ 81F7294
 
 Route129_OnTransition: @ 81F72AB
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route129_EventScript_273D13
+	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
 	call_if_ge Route129_EventScript_1F72D8
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST

data/scripts/elite_four.inc

@@ -1,7 +1,3 @@
-EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
-EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
 	waitmovement 0
@@ -21,10 +17,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
 	special DrawWholeMapView
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
-EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475
-EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475
-EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
 	waitmovement 0
 	playse SE_TRACK_DOOR
@@ -37,10 +30,8 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
 	special DrawWholeMapView
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC
+@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
-EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
-EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC
-EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
 	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -61,10 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC
 	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F
+PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F
-EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F
-EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F
-EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
 	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1

data/scripts/field_move_scripts.inc

@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
 	lockall
 	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
 	lockall
 	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
 	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
 EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantWaterfall
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
 EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantDive
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
 EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantSurface
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT

data/scripts/mevent.inc

@@ -1,27 +1,26 @@
-
 EventScript_Questionnaire:: @ 827381B
 	lockall
-	msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO
+	msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_2738FD
+	goto_if_eq Mevent_EventScript_Release
 	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, GetMartEmployeeObjectEventId
 	compare VAR_0x8004, 1
-	goto_if_eq EventScript_27386D
+	goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase
 	compare VAR_0x8004, 2
-	goto_if_eq EventScript_2738B5
+	goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_2738FD
+	goto_if_eq Mevent_EventScript_Release
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_2738FF
+	goto_if_eq Mevent_EventScript_QuestionnaireThankYou
 	end
 
-EventScript_27386D:: @ 827386D
+Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
-	goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
+	goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
-	goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF
+	goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
 	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	playse SE_PIN
@@ -29,15 +28,15 @@ EventScript_27386D:: @ 827386D
 	waitmovement 0
 	applymovement VAR_0x8008, Common_Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_08273506, MSGBOX_DEFAULT
+	msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT
 	setflag FLAG_SYS_MYSTERY_EVENT_ENABLE
-	msgbox gUnknown_08273559, MSGBOX_DEFAULT
+	msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_2738B5:: @ 82738B5
+Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
-	goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF
+	goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
-	goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF
+	goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
 	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	playse SE_PIN
@@ -45,19 +44,19 @@ EventScript_2738B5:: @ 82738B5
 	waitmovement 0
 	applymovement VAR_0x8008, Common_Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_08273446, MSGBOX_DEFAULT
+	msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT
 	setflag FLAG_SYS_MYSTERY_GIFT_ENABLE
-	msgbox gUnknown_082734CC, MSGBOX_DEFAULT
+	msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_2738FD:: @ 82738FD
+Mevent_EventScript_Release:: @ 82738FD
 	releaseall
 	end
 
-EventScript_2738FF:: @ 82738FF
+Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF
 	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
-	msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT
+	msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT
 	releaseall
 	end

data/scripts/pc.inc

@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
 	msgbox Text_BootUpPC, MSGBOX_DEFAULT
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271DAC:: @ 8271DAC
+EventScript_PCMainMenu:: @ 8271DAC
 	message gText_WhichPCShouldBeAccessed
 	waitmessage
 	special ScriptMenu_CreatePCMultichoice
 	waitstate
-	goto EventScript_271DBC
+	goto EventScript_AccessPC
 	end
 
-EventScript_271DBC:: @ 8271DBC
+EventScript_AccessPC:: @ 8271DBC
 	switch VAR_RESULT
-	case 0, EventScript_271E0E
+	case 0, EventScript_AccessPokemonStorage
-	case 1, EventScript_271DF9
+	case 1, EventScript_AccessPlayersPC
-	case 2, EventScript_271E54
+	case 2, EventScript_AccessHallOfFame
-	case 3, EventScript_271E47
+	case 3, EventScript_TurnOffPC
-	case MULTI_B_PRESSED, EventScript_271E47
+	case MULTI_B_PRESSED, EventScript_TurnOffPC
 	end
 
-EventScript_271DF9:: @ 8271DF9
+EventScript_AccessPlayersPC:: @ 8271DF9
 	playse SE_PC_LOGIN
 	msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
 	special PlayerPC
 	waitstate
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271E0E:: @ 8271E0E
+EventScript_AccessPokemonStorage:: @ 8271E0E
 	playse SE_PC_LOGIN
-	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
-	call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
 	msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
 	special ShowPokemonStorageSystemPC
 	waitstate
-	goto EventScript_271DAC
+	goto EventScript_PCMainMenu
 	end
 
-EventScript_271E35:: @ 8271E35
+EventScript_AccessSomeonesPC:: @ 8271E35
 	msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_271E3E:: @ 8271E3E
+EventScript_AccessLanettesPC:: @ 8271E3E
 	msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_271E47:: @ 8271E47
+EventScript_TurnOffPC:: @ 8271E47
 	setvar VAR_0x8004, 0
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-EventScript_271E54:: @ 8271E54
+EventScript_AccessHallOfFame:: @ 8271E54
-	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
 	playse SE_PC_LOGIN
 	special AccessHallOfFamePC
 	waitstate
-	goto EventScript_271DBC
+	goto EventScript_AccessPC
 	end

data/scripts/prof_birch.inc

@@ -1,94 +1,89 @@
-LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
+ProfBirch_EventScript_UpdateLocation:: @ 82720AD
-Route101_EventScript_2720AD:: @ 82720AD
-Route103_EventScript_2720AD:: @ 82720AD
 	compare VAR_PETALBURG_GYM_STATE, 0
 	goto_if_eq Common_EventScript_NopReturn
-	goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
+	goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 0
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 1
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 2
-	call_if_eq Route101_EventScript_272127
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
 	compare VAR_BIRCH_STATE, 3
-	call_if_eq Route101_EventScript_272127
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
 	compare VAR_BIRCH_STATE, 4
-	call_if_eq Route101_EventScript_272134
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
 	compare VAR_BIRCH_STATE, 5
-	call_if_eq Route101_EventScript_272134
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
 	compare VAR_BIRCH_STATE, 6
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	compare VAR_BIRCH_STATE, 7
-	call_if_eq Route101_EventScript_27211A
+	call_if_eq ProfBirch_EventScript_MoveToLab
 	return
 
-Route101_EventScript_27211A:: @ 827211A
+ProfBirch_EventScript_MoveToLab:: @ 827211A
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-Route101_EventScript_272127:: @ 8272127
+ProfBirch_EventScript_MoveToRoute101:: @ 8272127
 	clearflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-Route101_EventScript_272134:: @ 8272134
+ProfBirch_EventScript_MoveToRoute103:: @ 8272134
 	clearflag FLAG_HIDE_ROUTE_103_BIRCH
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
+ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
-Route101_EventScript_272141:: @ 8272141
-Route103_EventScript_272141:: @ 8272141
 	lock
 	faceplayer
-	goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155
+	goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
-	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2
+	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 
-Route101_EventScript_272155:: @ 8272155
+ProfBirch_EventScript_AskRatePokedex:: @ 8272155
 	msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route101_EventScript_27216F
+	goto_if_eq ProfBirch_EventScript_DeclineRating
-	call Route101_EventScript_272184
+	call ProfBirch_EventScript_RatePokedex
 	release
 	end
 
-Route101_EventScript_27216F:: @ 827216F
+ProfBirch_EventScript_DeclineRating:: @ 827216F
 	msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
 	release
 	end
 
-Route101_EventScript_272179:: @ 8272179
+ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
 	copyvar VAR_0x8004, VAR_0x8009
 	special ShowPokedexRatingMessage
 	waitmessage
 	waitbuttonpress
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
+ProfBirch_EventScript_RatePokedex:: @ 8272184
-Route101_EventScript_272184:: @ 8272184
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
 	copyvar VAR_0x800A, VAR_RESULT
-	buffernumberstring 0, VAR_0x8008
+	buffernumberstring 0, VAR_0x8008  @ Num Hoenn seen
-	buffernumberstring 1, VAR_0x8009
+	buffernumberstring 1, VAR_0x8009  @ Num Hoenn caught
 	msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
-	call Route101_EventScript_272179
+	call ProfBirch_EventScript_ShowRatingMessage
 	compare VAR_0x800A, 0
-	goto_if_eq Common_EventScript_NopReturn
+	goto_if_eq Common_EventScript_NopReturn  @ National dex not enabled
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
 	copyvar VAR_0x8009, VAR_0x8006
-	buffernumberstring 0, VAR_0x8008
+	buffernumberstring 0, VAR_0x8008  @ Num National seen
-	buffernumberstring 1, VAR_0x8009
+	buffernumberstring 1, VAR_0x8009  @ Num National caught
 	msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
 	return

data/scripts/roulette.inc

@@ -1,70 +1,71 @@
-MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1
+Roulette_EventScript_Table1:: @ 82A5AB1
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 0
-	getpricereduction 2
+	getpricereduction POKENEWS_GAME_CORNER
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+	goto_if_eq Roulette_EventScript_Play
 	addvar VAR_0x8004, 128
-	goto MauvilleCity_GameCorner_EventScript_2A5B0D
+	goto Roulette_EventScript_Play
 	end
 
-MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF
+Roulette_EventScript_Table2:: @ 82A5ADF
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
 	setvar VAR_0x8004, 1
-	getpricereduction 2
+	getpricereduction POKENEWS_GAME_CORNER
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+	goto_if_eq Roulette_EventScript_Play
 	addvar VAR_0x8004, 128
-	goto MauvilleCity_GameCorner_EventScript_2A5B0D
+	goto Roulette_EventScript_Play
 	end
 
-MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
+Roulette_EventScript_Play:: @ 82A5B0D
 	special PlayRoulette
 	waitstate
 	end
 	
-gUnknown_082A5B12:: @ 82A5B12
+Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12
 	.string "The minimum wager at this table\n"
 	.string "is {STR_VAR_1}. Do you want to play?$"
 
-gUnknown_082A5B4E:: @ 82A5B4E
+Roulette_Text_NotEnoughCoins:: @ 82A5B4E
 	.string "You don't have enough COINS.$"
 
-gUnknown_082A5B6B:: @ 82A5B6B
+Roulette_Text_SpecialRateTable:: @ 82A5B6B
 	.string "Special rate table right now!$"
 
-gUnknown_082A5B89:: @ 82A5B89
+Roulette_Text_ControlsInstruction:: @ 82A5B89
 	.string "Place your wager with the + Control\n"
 	.string "Pad, then press the A Button.$"
 
-gUnknown_082A5BCB:: @ 82A5BCB
+Roulette_Text_ItsAHit:: @ 82A5BCB
 	.string "It's a hit!$"
 
-gUnknown_082A5BD7:: @ 82A5BD7
+Roulette_Text_Jackpot:: @ 82A5BD7
 	.string "Jackpot!$"
 
-gUnknown_082A5BE0:: @ 82A5BE0
+Roulette_Text_NothingDoing:: @ 82A5BE0
 	.string "Nothing doing!$"
 
-gUnknown_082A5BEF:: @ 82A5BEF
+Roulette_Text_YouveWonXCoins:: @ 82A5BEF
 	.string "You've won {STR_VAR_1} COINS!$"
 
-gUnknown_082A5C04:: @ 82A5C04
+Roulette_Text_NoCoinsLeft:: @ 82A5C04
 	.string "No COINS left…$"
 
-gUnknown_082A5C13:: @ 82A5C13
+Roulette_Text_KeepPlaying:: @ 82A5C13
 	.string "Keep playing?$"
 
-gUnknown_082A5C21:: @ 82A5C21
+Roulette_Text_BoardWillBeCleared:: @ 82A5C21
 	.string "The ROULETTE board will be cleared.$"
 
-gUnknown_082A5C45:: @ 82A5C45
+@ Unused
+Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45
 	.string "You don't have a COIN CASE.$"
 
-gUnknown_082A5C61:: @ 82A5C61
+Roulette_Text_CoinCaseIsFull:: @ 82A5C61
 	.string "Your COIN CASE is full!\n"
 	.string "Coins can be exchanged for prizes.$"

data/scripts/unusual_weather.inc

@@ -158,14 +158,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
 	setmetatile 43, 22, METATILE_General_RoughWater, 0
 	return
 
-Route105_EventScript_273D13:: @ 8273D13
+UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13
-Route114_EventScript_273D13:: @ 8273D13
-Route115_EventScript_273D13:: @ 8273D13
-Route116_EventScript_273D13:: @ 8273D13
-Route118_EventScript_273D13:: @ 8273D13
-Route125_EventScript_273D13:: @ 8273D13
-Route127_EventScript_273D13:: @ 8273D13
-Route129_EventScript_273D13:: @ 8273D13
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 

data/text/mevent.inc

@@ -1,14 +1,14 @@
-gText_FillOutQuestionnaire:: @ 827339F
+Mevent_Text_FillOutQuestionnaire:: @ 827339F
 	.string "There is a questionnaire.\n"
 	.string "Would you like to fill it out?$"
 
-gText_ThankYouForTakingQuestionnaire:: @ 82733D8
+Mevent_Text_QuestionnaireThankYou:: @ 82733D8
 	.string "Thank you for taking the time to\n"
 	.string "fill out our questionnaire.\p"
 	.string "Your feedback will be used for\n"
 	.string "future reference.$"
 
-gUnknown_08273446:: @ 8273446
+Mevent_Text_YouKnowThoseWordsGift:: @ 8273446
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
@@ -16,17 +16,17 @@ gUnknown_08273446:: @ 8273446
 	.string "From now on, you should be\n"
 	.string "receiving MYSTERY GIFTS!$"
 
-gUnknown_082734CC:: @ 82734CC
+Mevent_Text_YouCanAccessMysteryGift:: @ 82734CC
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY GIFT.$"
 
-gUnknown_08273506:: @ 8273506
+Mevent_Text_YouKnowThoseWordsEvent:: @ 8273506
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
 	.string "the MYSTERY EVENT.$"
 
-gUnknown_08273559:: @ 8273559
+Mevent_Text_YouCanAccessMysteryEvent:: @ 8273559
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY EVENT.$"
 

include/constants/tv.h

@@ -0,0 +1,46 @@
+#ifndef GUARD_CONSTANTS_TV_H
+#define GUARD_CONSTANTS_TV_H
+
+#define POKENEWS_NONE         0
+#define POKENEWS_SLATEPORT    1
+#define POKENEWS_GAME_CORNER  2
+#define POKENEWS_LILYCOVE     3
+#define POKENEWS_BLENDMASTER  4
+
+#define TVSHOW_OFF_AIR                              0
+#define TVSHOW_FAN_CLUB_LETTER                      1
+#define TVSHOW_RECENT_HAPPENINGS                    2
+#define TVSHOW_PKMN_FAN_CLUB_OPINIONS               3
+#define TVSHOW_UNKN_SHOWTYPE_04                     4
+#define TVSHOW_NAME_RATER_SHOW                      5
+#define TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE        6
+#define TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE   7
+#define TVSHOW_CONTEST_LIVE_UPDATES                 8
+#define TVSHOW_3_CHEERS_FOR_POKEBLOCKS              9
+#define TVSHOW_BATTLE_UPDATE                        10
+#define TVSHOW_FAN_CLUB_SPECIAL                     11
+#define TVSHOW_CONTEST_LIVE_UPDATES_2               12
+//                                                  //
+#define TVSHOW_POKEMON_TODAY_CAUGHT                 21 
+#define TVSHOW_SMART_SHOPPER                        22
+#define TVSHOW_POKEMON_TODAY_FAILED                 23
+#define TVSHOW_FISHING_ADVICE                       24
+#define TVSHOW_WORLD_OF_MASTERS                     25
+#define TVSHOW_TODAYS_RIVAL_TRAINER                 26
+#define TVSHOW_TREND_WATCHER                        27
+#define TVSHOW_TREASURE_INVESTIGATORS               28
+#define TVSHOW_FIND_THAT_GAMER                      29
+#define TVSHOW_BREAKING_NEWS                        30
+#define TVSHOW_SECRET_BASE_VISIT                    31
+#define TVSHOW_LOTTO_WINNER                         32
+#define TVSHOW_BATTLE_SEMINAR                       33
+#define TVSHOW_TRAINER_FAN_CLUB                     34
+#define TVSHOW_CUTIES                               35
+#define TVSHOW_FRONTIER                             36
+#define TVSHOW_NUMBER_ONE                           37
+#define TVSHOW_SECRET_BASE_SECRETS                  38
+#define TVSHOW_SAFARI_FAN_CLUB                      39
+//                                                  //
+#define TVSHOW_MASS_OUTBREAK                        41 
+
+#endif //GUARD_CONSTANTS_TV_H

include/global.tv.h

@@ -1,45 +1,6 @@
 #ifndef GUARD_GLOBAL_TV_H
 #define GUARD_GLOBAL_TV_H
 
-enum
-{
-    TVSHOW_OFF_AIR,
-    TVSHOW_FAN_CLUB_LETTER,
-    TVSHOW_RECENT_HAPPENINGS,
-    TVSHOW_PKMN_FAN_CLUB_OPINIONS,
-    TVSHOW_UNKN_SHOWTYPE_04,
-    TVSHOW_NAME_RATER_SHOW,
-    TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE,
-    TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE,
-    TVSHOW_CONTEST_LIVE_UPDATES,
-    TVSHOW_3_CHEERS_FOR_POKEBLOCKS,
-    TVSHOW_BATTLE_UPDATE,
-    TVSHOW_FAN_CLUB_SPECIAL,
-    TVSHOW_CONTEST_LIVE_UPDATES_2,
-
-    TVSHOW_POKEMON_TODAY_CAUGHT = 21,
-    TVSHOW_SMART_SHOPPER,
-    TVSHOW_POKEMON_TODAY_FAILED,
-    TVSHOW_FISHING_ADVICE,
-    TVSHOW_WORLD_OF_MASTERS,
-    TVSHOW_TODAYS_RIVAL_TRAINER,
-    TVSHOW_TREND_WATCHER,
-    TVSHOW_TREASURE_INVESTIGATORS,
-    TVSHOW_FIND_THAT_GAMER,
-    TVSHOW_BREAKING_NEWS,
-    TVSHOW_SECRET_BASE_VISIT,
-    TVSHOW_LOTTO_WINNER,
-    TVSHOW_BATTLE_SEMINAR,
-    TVSHOW_TRAINER_FAN_CLUB,
-    TVSHOW_CUTIES,
-    TVSHOW_FRONTIER,
-    TVSHOW_NUMBER_ONE,
-    TVSHOW_SECRET_BASE_SECRETS,
-    TVSHOW_SAFARI_FAN_CLUB,
-
-    TVSHOW_MASS_OUTBREAK = 41,
-};
-
 typedef union // size = 0x24
 {
     // Common
@@ -495,14 +456,6 @@ typedef union // size = 0x24
     } massOutbreak;
 } TVShow;
 
-enum {
-    POKENEWS_NONE,
-    POKENEWS_SLATEPORT,
-    POKENEWS_GAME_CORNER,
-    POKENEWS_LILYCOVE,
-    POKENEWS_BLENDMASTER
-};
-
 typedef struct // 2b50
 {
     u8 kind;

src/birch_pc.c

@@ -9,13 +9,13 @@ bool16 ScriptGetPokedexInfo(void)
 {
     if (gSpecialVar_0x8004 == 0) // is national dex not present?
     {
-        gSpecialVar_0x8005 = GetHoennPokedexCount(0);
+        gSpecialVar_0x8005 = GetHoennPokedexCount(FLAG_GET_SEEN);
-        gSpecialVar_0x8006 = GetHoennPokedexCount(1);
+        gSpecialVar_0x8006 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
     }
     else
     {
-        gSpecialVar_0x8005 = GetNationalPokedexCount(0);
+        gSpecialVar_0x8005 = GetNationalPokedexCount(FLAG_GET_SEEN);
-        gSpecialVar_0x8006 = GetNationalPokedexCount(1);
+        gSpecialVar_0x8006 = GetNationalPokedexCount(FLAG_GET_CAUGHT);
     }
 
     return IsNationalPokedexEnabled();

src/easy_chat.c

@@ -121,8 +121,8 @@ static void sub_811B768(void);
 static u8 sub_811B960(u8);
 static void sub_811B9A0(void);
 static u8 sub_811BA1C(void);
-static int sub_811BF20(void);
+static int DidPlayerInputMysteryGiftPhrase(void);
-static u16 sub_811BF40(void);
+static u16 DidPlayerInputABerryMasterWifePhrase(void);
 static bool8 sub_811CE94(void);
 static void sub_811CF64(void);
 static void sub_811CF04(void);
@@ -2597,17 +2597,17 @@ static int FooterHasFourOptions_(void)
     return FooterHasFourOptions();
 }
 
-u8 sub_811BC7C(const u16 *arg0, u8 arg1)
+static bool8 IsPhraseDifferentThanPlayerInput(const u16 *phrase, u8 phraseLength)
 {
     u8 i;
 
-    for (i = 0; i < arg1; i++)
+    for (i = 0; i < phraseLength; i++)
     {
-        if (arg0[i] != sEasyChatScreen->ecWordBuffer[i])
+        if (phrase[i] != sEasyChatScreen->ecWordBuffer[i])
-            return 1;
+            return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
 static u8 GetDisplayedPersonType(void)
@@ -2730,7 +2730,7 @@ static void sub_811BE9C(void)
         FlagSet(FLAG_SYS_CHAT_USED);
         break;
     case EASY_CHAT_TYPE_QUESTIONNAIRE:
-        if (sub_811BF20())
+        if (DidPlayerInputMysteryGiftPhrase())
             gSpecialVar_0x8004 = 2;
         else
             gSpecialVar_0x8004 = 0;
@@ -2740,22 +2740,22 @@ static void sub_811BE9C(void)
         gSpecialVar_0x8004 = sub_81226D8(sEasyChatScreen->ecWordBuffer);
         break;
     case EASY_CHAT_TYPE_GOOD_SAYING:
-        gSpecialVar_0x8004 = sub_811BF40();
+        gSpecialVar_0x8004 = DidPlayerInputABerryMasterWifePhrase();
         break;
     }
 }
 
-static int sub_811BF20(void)
+static int DidPlayerInputMysteryGiftPhrase(void)
 {
-    return sub_811BC7C(sMysteryGiftPhrase, ARRAY_COUNT(sMysteryGiftPhrase)) == 0;
+    return !IsPhraseDifferentThanPlayerInput(sMysteryGiftPhrase, ARRAY_COUNT(sMysteryGiftPhrase));
 }
 
-static u16 sub_811BF40(void)
+static u16 DidPlayerInputABerryMasterWifePhrase(void)
 {
     int i;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < (int)ARRAY_COUNT(sBerryMasterWifePhrases); i++)
     {
-        if (!sub_811BC7C(sBerryMasterWifePhrases[i], ARRAY_COUNT(*sBerryMasterWifePhrases)))
+        if (!IsPhraseDifferentThanPlayerInput(sBerryMasterWifePhrases[i], ARRAY_COUNT(*sBerryMasterWifePhrases)))
             return i + 1;
     }
 

src/field_specials.c

@@ -55,6 +55,7 @@
 #include "constants/heal_locations.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
+#include "constants/tv.h"
 #include "constants/script_menu.h"
 #include "constants/songs.h"
 #include "constants/species.h"

src/main_menu.c

@@ -2172,9 +2172,9 @@ static void MainMenu_FormatSavegamePokedex(void)
     if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
     {
         if (IsNationalPokedexEnabled())
-            dexCount = GetNationalPokedexCount(1);
+            dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
         else
-            dexCount = GetHoennPokedexCount(1);
+            dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
         StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
         AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
         ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3);

src/menu.c

@@ -2148,9 +2148,9 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
             break;
         case 1:
             if (IsNationalPokedexEnabled())
-                string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+                string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
             else
-                string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+                string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
             *string = EOS;
             break;
         case 2:

src/pokedex.c

@@ -1347,13 +1347,13 @@ void CB2_Pokedex(void)
             sPokedexView->selectedScreen = 0;
             if (!IsNationalPokedexEnabled())
             {
-                sPokedexView->seenCount = GetHoennPokedexCount(0);
+                sPokedexView->seenCount = GetHoennPokedexCount(FLAG_GET_SEEN);
-                sPokedexView->ownCount = GetHoennPokedexCount(1);
+                sPokedexView->ownCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
             }
             else
             {
-                sPokedexView->seenCount = GetNationalPokedexCount(0);
+                sPokedexView->seenCount = GetNationalPokedexCount(FLAG_GET_SEEN);
-                sPokedexView->ownCount = GetNationalPokedexCount(1);
+                sPokedexView->ownCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
             }
             sPokedexView->initialVOffset = 8;
             gMain.state++;
@@ -2583,7 +2583,7 @@ static void CreateInterfaceSprites(u8 a)
             spriteId = CreateSprite(&gUnknown_0855D20C, 17, 91, 1);
             StartSpriteAnim(&gSprites[spriteId], 1);
 
-            r6 = GetHoennPokedexCount(0);
+            r6 = GetHoennPokedexCount(FLAG_GET_SEEN);
             _a = 0;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 40, 45, 1);
@@ -2626,7 +2626,7 @@ static void CreateInterfaceSprites(u8 a)
             r5 = (sPokedexView->seenCount % 100) % 10;
             StartSpriteAnim(&gSprites[spriteId], r5);
 
-            r6 = GetHoennPokedexCount(1);
+            r6 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
             _a = 0;
 
             spriteId = CreateSprite(&gUnknown_0855D23C, 40, 81, 1);

src/roulette.c

@@ -188,18 +188,18 @@ static void sub_8144A24(struct Sprite *);
 static void sub_8144E60(struct Sprite *);
 static void sub_8145294(struct Sprite *);
 
-extern const u8 gUnknown_082A5B89[];
+extern const u8 Roulette_Text_ControlsInstruction[];
-extern const u8 gUnknown_082A5C13[];
+extern const u8 Roulette_Text_KeepPlaying[];
-extern const u8 gUnknown_082A5BD7[];
+extern const u8 Roulette_Text_Jackpot[];
-extern const u8 gUnknown_082A5BCB[];
+extern const u8 Roulette_Text_ItsAHit[];
-extern const u8 gUnknown_082A5BE0[];
+extern const u8 Roulette_Text_NothingDoing[];
-extern const u8 gUnknown_082A5BEF[];
+extern const u8 Roulette_Text_YouveWonXCoins[];
-extern const u8 gUnknown_082A5C21[];
+extern const u8 Roulette_Text_BoardWillBeCleared[];
-extern const u8 gUnknown_082A5C61[];
+extern const u8 Roulette_Text_CoinCaseIsFull[];
-extern const u8 gUnknown_082A5C04[];
+extern const u8 Roulette_Text_NoCoinsLeft[];
-extern const u8 gUnknown_082A5B12[];
+extern const u8 Roulette_Text_PlayMinimumWagerIsX[];
-extern const u8 gUnknown_082A5B6B[];
+extern const u8 Roulette_Text_SpecialRateTable[];
-extern const u8 gUnknown_082A5B4E[];
+extern const u8 Roulette_Text_NotEnoughCoins[];
 
 static const u16 gUnknown_085B5BFC[] = INCBIN_U16("graphics/roulette/85B5BFC.gbapal");
 static const u32 gUnknown_085B5DFC[] = INCBIN_U32("graphics/roulette/85B5DFC.bin.lz");
@@ -974,7 +974,7 @@ static void sub_81405CC(void)
         sub_81436D0(0);
         sub_81424FC(0);
         DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5B89, 0, 1, TEXT_SPEED_FF, NULL);
+        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_ControlsInstruction, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(gUnknown_0203AB8C, 3);
         gSpriteCoordOffsetX = -60;
         gSpriteCoordOffsetY = 0;
@@ -1045,7 +1045,7 @@ static void sub_8140914(u8 taskId)
 {
     DisplayYesNoMenuDefaultYes();
     DrawStdWindowFrame(gUnknown_0203AB8C, 0);
-    AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0);
+    AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_KeepPlaying, 0, 1, TEXT_SPEED_FF, 0);
     CopyWindowToVram(gUnknown_0203AB8C, 3);
     DoYesNoFuncWithChoice(taskId, &gUnknown_085B6410);
 }
@@ -1552,14 +1552,14 @@ static void sub_814189C(u8 taskId)
         {
             PlayFanfare(MUS_ME_B_BIG);
             DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BD7, 0, 1, TEXT_SPEED_FF, NULL);
+            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(gUnknown_0203AB8C, 3);
         }
         else
         {
             PlayFanfare(MUS_ME_B_SMALL);
             DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BCB, 0, 1, TEXT_SPEED_FF, NULL);
+            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(gUnknown_0203AB8C, 3);
         }
         break;
@@ -1567,7 +1567,7 @@ static void sub_814189C(u8 taskId)
     default:
         m4aSongNumStart(SE_HAZURE);
         DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BE0, 0, 1, TEXT_SPEED_FF, NULL);
+        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(gUnknown_0203AB8C, 3);
         break;
     }
@@ -1609,7 +1609,7 @@ static void sub_8141984(u8 taskId)
 static void sub_8141A18(u8 taskId)
 {
     ConvertIntToDecimalStringN(gStringVar1, (gUnknown_0203AB88->var19 * gTasks[taskId].data[2]), STR_CONV_MODE_LEFT_ALIGN, 2);
-    StringExpandPlaceholders(gStringVar4, gUnknown_082A5BEF);
+    StringExpandPlaceholders(gStringVar4, Roulette_Text_YouveWonXCoins);
     DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
     AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
     CopyWindowToVram(gUnknown_0203AB8C, 3);
@@ -1644,14 +1644,14 @@ static void sub_8141B58(u8 taskId)
         if (gTasks[taskId].data[6] == 6)
         {
             DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C21, 0, 1, TEXT_SPEED_FF, NULL);
+            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_BoardWillBeCleared, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(gUnknown_0203AB8C, 3);
             sub_8141F7C(taskId, dp01t_12_3_battle_menu, 0xFFFF, 3);
         }
         else if (gTasks[taskId].data[13] == 9999)
         {
             DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C61, 0, 1, TEXT_SPEED_FF, NULL);
+            AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(gUnknown_0203AB8C, 3);
             sub_8141F7C(taskId, sub_8140914, 0xFFFF, 0x3);
         }
@@ -1663,7 +1663,7 @@ static void sub_8141B58(u8 taskId)
     else
     {
         DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C04, 0, 1, TEXT_SPEED_FF, NULL);
+        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_NoCoinsLeft, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(gUnknown_0203AB8C, 3);
         sub_8141F7C(taskId, sub_8140994, 0x3C, 0x3);
     }
@@ -1688,7 +1688,7 @@ static void dp01t_12_3_battle_menu(u8 taskId)
     if (gTasks[taskId].data[13] == 9999)
     {
         DrawStdWindowFrame(gUnknown_0203AB8C, FALSE);
-        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C61, 0, 1, TEXT_SPEED_FF, NULL);
+        AddTextPrinterParameterized(gUnknown_0203AB8C, 1, Roulette_Text_CoinCaseIsFull, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(gUnknown_0203AB8C, 3);
         sub_8141F7C(taskId, sub_8140914, 0xFFFF, 3);
     }
@@ -3121,7 +3121,7 @@ static void sub_81429F0(u8 taskId)
     {
         u32 temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)];
         ConvertIntToDecimalStringN(gStringVar1, temp, STR_CONV_MODE_LEADING_ZEROS, 1);
-        StringExpandPlaceholders(gStringVar4, gUnknown_082A5B12);
+        StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX);
         DrawStdWindowFrame(0, FALSE);
         AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(0, 3);
@@ -3140,13 +3140,13 @@ static void Task_Roulette_0(u8 taskId)
         if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 1))
         {
             DrawStdWindowFrame(0, FALSE);
-            AddTextPrinterParameterized(0, 1, gUnknown_082A5B6B, 0, 1, TEXT_SPEED_FF, NULL);
+            AddTextPrinterParameterized(0, 1, Roulette_Text_SpecialRateTable, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(0, 3);
             gTasks[taskId].func = sub_81429F0;
         }
         else
         {
-            StringExpandPlaceholders(gStringVar4, gUnknown_082A5B12);
+            StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX);
             DrawStdWindowFrame(0, FALSE);
             AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(0, 3);
@@ -3155,7 +3155,7 @@ static void Task_Roulette_0(u8 taskId)
     }
     else
     {
-        StringExpandPlaceholders(gStringVar4, gUnknown_082A5B4E);
+        StringExpandPlaceholders(gStringVar4, Roulette_Text_NotEnoughCoins);
         DrawStdWindowFrame(0, FALSE);
         AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(0, 3);

src/scrcmd.c

@@ -1930,9 +1930,9 @@ bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
 
 bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
+    u16 newsKind = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_Result = GetPriceReduction(value);
+    gSpecialVar_Result = GetPriceReduction(newsKind);
     return FALSE;
 }
 

src/shop.c

@@ -38,6 +38,7 @@
 #include "constants/metatile_behaviors.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/tv.h"
 
 EWRAM_DATA struct MartInfo gMartInfo = {0};
 EWRAM_DATA struct ShopData *gShopDataPtr = NULL;
@@ -560,7 +561,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y)
         {
             ConvertIntToDecimalStringN(
                 gStringVar1,
-                ItemId_GetPrice(item) >> GetPriceReduction(1),
+                ItemId_GetPrice(item) >> GetPriceReduction(POKENEWS_SLATEPORT),
                 STR_CONV_MODE_LEFT_ALIGN,
                 5);
         }
@@ -932,7 +933,7 @@ static void Task_BuyMenu(u8 taskId)
 
             if (gMartInfo.martType == MART_TYPE_NORMAL)
             {
-                gShopDataPtr->totalCost = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
+                gShopDataPtr->totalCost = (ItemId_GetPrice(itemId) >> GetPriceReduction(POKENEWS_SLATEPORT));
             }
             else
             {
@@ -1011,7 +1012,7 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
 
     if (AdjustQuantityAccordingToDPadInput(&tItemCount, gShopDataPtr->maxQuantity) == TRUE)
     {
-        gShopDataPtr->totalCost = (ItemId_GetPrice(tItemId) >> GetPriceReduction(1)) * tItemCount;
+        gShopDataPtr->totalCost = (ItemId_GetPrice(tItemId) >> GetPriceReduction(POKENEWS_SLATEPORT)) * tItemCount;
         BuyMenuPrintItemQuantityAndPrice(taskId);
     }
     else

src/start_menu.c

@@ -570,7 +570,7 @@ static bool8 HandleStartMenuInput(void)
         PlaySE(SE_SELECT);
         if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback)
         {
-            if (GetNationalPokedexCount(0) == 0)
+            if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
                 return FALSE;
         }
 

src/tv.c

@@ -42,6 +42,7 @@
 #include "constants/layouts.h"
 #include "constants/metatile_behaviors.h"
 #include "constants/script_menu.h"
+#include "constants/tv.h"
 
 // Static type declarations
 
@@ -1595,7 +1596,7 @@ void SaveRecordedItemPurchasesForTVShow(void)
                     show->smartshopperShow.itemIds[i] = gMartPurchaseHistory[i].itemId;
                     show->smartshopperShow.itemAmounts[i] = gMartPurchaseHistory[i].quantity;
                 }
-                show->smartshopperShow.priceReduced = GetPriceReduction(1);
+                show->smartshopperShow.priceReduced = GetPriceReduction(POKENEWS_SLATEPORT);
                 StringCopy(show->smartshopperShow.playerName, gSaveBlock2Ptr->playerName);
                 tv_store_id_3x(show);
                 show->smartshopperShow.language = gGameLanguage;
@@ -1955,11 +1956,11 @@ void sub_80EDB44(void)
         show->rivalTrainer.badgeCount = nBadges;
         if (IsNationalPokedexEnabled())
         {
-            show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01);
+            show->rivalTrainer.dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
         }
         else
         {
-            show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
+            show->rivalTrainer.dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
         }
         show->rivalTrainer.location = gMapHeader.regionMapSectionId;
         show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;