Consistent capitalization for map names, matching their constants

maps/DayCare.asm

@@ -14,15 +14,15 @@ DayCare_MapScriptHeader:
 	dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
-	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
-	iftrue .PutDaycareManOutside
-	clearevent EVENT_DAYCARE_MAN_IN_DAYCARE
-	setevent EVENT_DAYCARE_MAN_ON_ROUTE_34
+	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
+	iftrue .PutDayCareManOutside
+	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	return
 
-.PutDaycareManOutside:
-	setevent EVENT_DAYCARE_MAN_IN_DAYCARE
-	clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34
+.PutDayCareManOutside:
+	setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	return
 
 DayCareManScript_Inside:
@@ -62,7 +62,7 @@ DayCareManScript_Inside:
 DayCareLadyScript:
 	faceplayer
 	opentext
-	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
+	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	iftrue .HusbandWasLookingForYou
 	special Special_DayCareLady
 	waitbutton
@@ -179,5 +179,5 @@ DayCare_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAYCARE_MAN_IN_DAYCARE
+	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1

maps/LakeOfRage.asm

@@ -12,7 +12,7 @@ const_value set 2
 	const LAKEOFRAGE_POKE_BALL1
 	const LAKEOFRAGE_POKE_BALL2
 
-LakeofRage_MapScriptHeader:
+LakeOfRage_MapScriptHeader:
 .MapTriggers:
 	db 2
 
@@ -132,10 +132,10 @@ SuperNerdScript_0x700a2:
 CooltrainerFScript_0x700a5:
 	jumptextfaceplayer UnknownText_0x704bb
 
-MapLakeofRageSignpost0Script:
+MapLakeOfRageSignpost0Script:
 	jumptext UnknownText_0x708d7
 
-MapLakeofRageSignpost1Script:
+MapLakeOfRageSignpost1Script:
 	opentext
 	writetext UnknownText_0x70903
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
@@ -230,21 +230,21 @@ WesleyNotWednesdayScript:
 	closetext
 	end
 
-LakeofRageElixer:
+LakeOfRageElixer:
 	itemball ELIXER
 
-LakeofRageTMDetect:
+LakeOfRageTMDetect:
 	itemball TM_DETECT
 
-LakeofRageHiddenFullRestore:
+LakeOfRageHiddenFullRestore:
 	dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
 
 
-LakeofRageHiddenRareCandy:
+LakeOfRageHiddenRareCandy:
 	dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
 
 
-LakeofRageHiddenMaxPotion:
+LakeOfRageHiddenMaxPotion:
 	dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
 
 
@@ -501,7 +501,7 @@ UnknownText_0x70903:
 	line "HOUSE"
 	done
 
-LakeofRage_MapEventHeader:
+LakeOfRage_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -515,11 +515,11 @@ LakeofRage_MapEventHeader:
 
 .Signposts:
 	db 5
-	signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script
-	signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script
-	signpost 28, 11, SIGNPOST_ITEM, LakeofRageHiddenFullRestore
-	signpost 4, 4, SIGNPOST_ITEM, LakeofRageHiddenRareCandy
-	signpost 5, 35, SIGNPOST_ITEM, LakeofRageHiddenMaxPotion
+	signpost 27, 21, SIGNPOST_READ, MapLakeOfRageSignpost0Script
+	signpost 31, 25, SIGNPOST_READ, MapLakeOfRageSignpost1Script
+	signpost 28, 11, SIGNPOST_ITEM, LakeOfRageHiddenFullRestore
+	signpost 4, 4, SIGNPOST_ITEM, LakeOfRageHiddenRareCandy
+	signpost 5, 35, SIGNPOST_ITEM, LakeOfRageHiddenMaxPotion
 
 .PersonEvents:
 	db 12
@@ -533,5 +533,5 @@ LakeofRage_MapEventHeader:
 	person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
 	person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
 	person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
-	person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
-	person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
+	person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
+	person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT

maps/LakeOfRageHiddenPowerHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
-LakeofRageHiddenPowerHouse_MapScriptHeader:
+LakeOfRageHiddenPowerHouse_MapScriptHeader:
 .MapTriggers:
 	db 0
 
@@ -67,7 +67,7 @@ HiddenPowerGuyText3:
 	text "I am meditating…"
 	done
 
-LakeofRageHiddenPowerHouse_MapEventHeader:
+LakeOfRageHiddenPowerHouse_MapEventHeader:
 	; filler
 	db 0, 0
 

maps/LakeOfRageMagikarpHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
-LakeofRageMagikarpHouse_MapScriptHeader:
+LakeOfRageMagikarpHouse_MapScriptHeader:
 .MapTriggers:
 	db 0
 
@@ -205,7 +205,7 @@ UnknownText_0x19aabc:
 	text_from_ram StringBuffer4
 	db "@@"
 
-LakeofRageMagikarpHouse_MapEventHeader:
+LakeOfRageMagikarpHouse_MapEventHeader:
 	; filler
 	db 0, 0
 

maps/Route32RuinsOfAlphGate.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
 
-Route32RuinsofAlphGate_MapScriptHeader:
+Route32RuinsOfAlphGate_MapScriptHeader:
 .MapTriggers:
 	db 0
 
@@ -46,7 +46,7 @@ UnknownText_0x69abd:
 	cont "what they are."
 	done
 
-Route32RuinsofAlphGate_MapEventHeader:
+Route32RuinsOfAlphGate_MapEventHeader:
 	; filler
 	db 0, 0
 

maps/Route34.asm

@@ -6,8 +6,8 @@ const_value set 2
 	const ROUTE34_OFFICER
 	const ROUTE34_POKEFAN_M
 	const ROUTE34_GRAMPS
-	const ROUTE34_DAYCARE_MON_1
-	const ROUTE34_DAYCARE_MON_2
+	const ROUTE34_DAY_CARE_MON_1
+	const ROUTE34_DAY_CARE_MON_2
 	const ROUTE34_COOLTRAINER_F1
 	const ROUTE34_COOLTRAINER_F2
 	const ROUTE34_COOLTRAINER_F3
@@ -25,35 +25,35 @@ Route34_MapScriptHeader:
 	dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
-	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
-	iftrue .PutDaycareManOutside
-	clearevent EVENT_DAYCARE_MAN_IN_DAYCARE
-	setevent EVENT_DAYCARE_MAN_ON_ROUTE_34
+	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
+	iftrue .PutDayCareManOutside
+	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	jump .CheckMon1
 
-.PutDaycareManOutside:
-	setevent EVENT_DAYCARE_MAN_IN_DAYCARE
-	clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34
+.PutDayCareManOutside:
+	setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	jump .CheckMon1
 
 .CheckMon1:
-	checkflag ENGINE_DAYCARE_MAN_HAS_MON
+	checkflag ENGINE_DAY_CARE_MAN_HAS_MON
 	iffalse .HideMon1
-	clearevent EVENT_DAYCARE_MON_1
+	clearevent EVENT_DAY_CARE_MON_1
 	jump .CheckMon2
 
 .HideMon1:
-	setevent EVENT_DAYCARE_MON_1
+	setevent EVENT_DAY_CARE_MON_1
 	jump .CheckMon2
 
 .CheckMon2:
-	checkflag ENGINE_DAYCARE_LADY_HAS_MON
+	checkflag ENGINE_DAY_CARE_LADY_HAS_MON
 	iffalse .HideMon2
-	clearevent EVENT_DAYCARE_MON_2
+	clearevent EVENT_DAY_CARE_MON_2
 	return
 
 .HideMon2:
-	setevent EVENT_DAYCARE_MON_2
+	setevent EVENT_DAY_CARE_MON_2
 	return
 
 DayCareManScript_Outside:
@@ -63,7 +63,7 @@ DayCareManScript_Outside:
 	waitbutton
 	closetext
 	if_equal $1, .end_fail
-	clearflag ENGINE_DAYCARE_MAN_HAS_EGG
+	clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	checkcode VAR_FACING
 	if_equal RIGHT, .walk_around_player
 	applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
@@ -78,13 +78,13 @@ DayCareManScript_Outside:
 	disappear ROUTE34_GRAMPS
 	end
 
-DaycareMon1Script:
+DayCareMon1Script:
 	opentext
 	special Special_DayCareMon1
 	closetext
 	end
 
-DaycareMon2Script:
+DayCareMon2Script:
 	opentext
 	special Special_DayCareMon2
 	closetext
@@ -773,9 +773,9 @@ Route34_MapEventHeader:
 	db 5
 	warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE
 	warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE
-	warp_def $e, $b, 1, DAYCARE
-	warp_def $f, $b, 2, DAYCARE
-	warp_def $f, $d, 3, DAYCARE
+	warp_def $e, $b, 1, DAY_CARE
+	warp_def $f, $b, 2, DAY_CARE
+	warp_def $f, $d, 3, DAY_CARE
 
 .XYTriggers:
 	db 0
@@ -796,9 +796,9 @@ Route34_MapEventHeader:
 	person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
 	person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1
 	person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
-	person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAYCARE_MAN_ON_ROUTE_34
-	person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script, EVENT_DAYCARE_MON_1
-	person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script, EVENT_DAYCARE_MON_2
+	person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
+	person_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
+	person_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
 	person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
 	person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
 	person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1

maps/Route35GoldenrodGate.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
 
-Route35Goldenrodgate_MapScriptHeader:
+Route35GoldenrodGate_MapScriptHeader:
 .MapTriggers:
 	db 0
 
@@ -195,7 +195,7 @@ UnknownText_0x6a0cb:
 	line "different kinds."
 	done
 
-Route35Goldenrodgate_MapEventHeader:
+Route35GoldenrodGate_MapEventHeader:
 	; filler
 	db 0, 0
 

maps/Route35NationalParkGate.asm

@@ -3,57 +3,57 @@ const_value set 2
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
 
-Route35NationalParkgate_MapScriptHeader:
+Route35NationalParkGate_MapScriptHeader:
 .MapTriggers:
 	db 3
 
 	; triggers
-	dw Route35NationalParkgate_Trigger1, 0
-	dw Route35NationalParkgate_Trigger2, 0
-	dw Route35NationalParkgate_Trigger3, 0
+	dw Route35NationalParkGate_Trigger1, 0
+	dw Route35NationalParkGate_Trigger2, 0
+	dw Route35NationalParkGate_Trigger3, 0
 
 .MapCallbacks:
 	db 2
 
 	; callbacks
 
-	dbw MAPCALLBACK_NEWMAP, Route35NationalParkgate_CheckIfStillInContest
+	dbw MAPCALLBACK_NEWMAP, Route35NationalParkGate_CheckIfStillInContest
 
-	dbw MAPCALLBACK_OBJECTS, Route35NationalParkgate_CheckIfContestDay
+	dbw MAPCALLBACK_OBJECTS, Route35NationalParkGate_CheckIfContestDay
 
-Route35NationalParkgate_Trigger1:
+Route35NationalParkGate_Trigger1:
 	end
 
-Route35NationalParkgate_Trigger2:
+Route35NationalParkGate_Trigger2:
 	end
 
-Route35NationalParkgate_Trigger3:
+Route35NationalParkGate_Trigger3:
 	priorityjump Route35NationalParkGate_LeavingContestEarly
 	end
 
-Route35NationalParkgate_CheckIfStillInContest:
+Route35NationalParkGate_CheckIfStillInContest:
 	checkflag ENGINE_BUG_CONTEST_TIMER
-	iftrue Route35NationalParkgate_Yes
+	iftrue Route35NationalParkGate_Yes
 	dotrigger $0
 	return
 
-Route35NationalParkgate_Yes:
+Route35NationalParkGate_Yes:
 	dotrigger $2
 	return
 
-Route35NationalParkgate_CheckIfContestDay:
+Route35NationalParkGate_CheckIfContestDay:
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, Route35NationalParkgate_IsContestDay
-	if_equal THURSDAY, Route35NationalParkgate_IsContestDay
-	if_equal SATURDAY, Route35NationalParkgate_IsContestDay
+	if_equal TUESDAY, Route35NationalParkGate_IsContestDay
+	if_equal THURSDAY, Route35NationalParkGate_IsContestDay
+	if_equal SATURDAY, Route35NationalParkGate_IsContestDay
 	checkflag ENGINE_BUG_CONTEST_TIMER
-	iftrue Route35NationalParkgate_Yes
+	iftrue Route35NationalParkGate_Yes
 	disappear ROUTE35NATIONALPARKGATE_OFFICER1
 	appear ROUTE35NATIONALPARKGATE_YOUNGSTER
 	appear ROUTE35NATIONALPARKGATE_OFFICER2
 	return
 
-Route35NationalParkgate_IsContestDay:
+Route35NationalParkGate_IsContestDay:
 	appear ROUTE35NATIONALPARKGATE_OFFICER1
 	disappear ROUTE35NATIONALPARKGATE_YOUNGSTER
 	disappear ROUTE35NATIONALPARKGATE_OFFICER2
@@ -68,17 +68,17 @@ Route35NationalParkGate_LeavingContestEarly:
 	RAM2MEM $0
 	writetext UnknownText_0x6a79a
 	yesorno
-	iffalse Route35NationalParkgate_GoBackIn
+	iffalse Route35NationalParkGate_GoBackIn
 	writetext UnknownText_0x6a7db
 	waitbutton
 	closetext
 	jumpstd bugcontestresultswarp
 
-Route35NationalParkgate_GoBackIn:
+Route35NationalParkGate_GoBackIn:
 	writetext UnknownText_0x6a823
 	waitbutton
 	closetext
-	scall Route35NationalParkgate_EnterContest
+	scall Route35NationalParkGate_EnterContest
 	playsound SFX_ENTER_DOOR
 	special FadeOutPalettes
 	waitsfx
@@ -87,23 +87,23 @@ Route35NationalParkgate_GoBackIn:
 
 OfficerScript_0x6a204:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, Route35NationalParkgate_NoContestToday
-	if_equal MONDAY, Route35NationalParkgate_NoContestToday
-	if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday
-	if_equal FRIDAY, Route35NationalParkgate_NoContestToday
+	if_equal SUNDAY, Route35NationalParkGate_NoContestToday
+	if_equal MONDAY, Route35NationalParkGate_NoContestToday
+	if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday
+	if_equal FRIDAY, Route35NationalParkGate_NoContestToday
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
-	iftrue Route35NationalParkgate_ContestIsOver
-	scall Route35NationalParkgate_GetDayOfWeek
+	iftrue Route35NationalParkGate_ContestIsOver
+	scall Route35NationalParkGate_GetDayOfWeek
 	writetext UnknownText_0x6a2eb
 	yesorno
-	iffalse Route35NationalParkgate_DeclinedToParticipate
+	iffalse Route35NationalParkGate_DeclinedToParticipate
 	checkcode VAR_PARTYCOUNT
-	if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind
+	if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind
 	special ContestDropOffMons
 	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
-Route35NationalParkgate_OkayToProceed:
+Route35NationalParkGate_OkayToProceed:
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special PlayMapMusic
 	writetext UnknownText_0x6a39d
@@ -115,7 +115,7 @@ Route35NationalParkgate_OkayToProceed:
 	waitbutton
 	closetext
 	special Special_GiveParkBalls
-	scall Route35NationalParkgate_EnterContest
+	scall Route35NationalParkGate_EnterContest
 	playsound SFX_ENTER_DOOR
 	special FadeOutPalettes
 	waitsfx
@@ -123,30 +123,30 @@ Route35NationalParkgate_OkayToProceed:
 	warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
 	end
 
-Route35NationalParkgate_EnterContest:
+Route35NationalParkGate_EnterContest:
 	checkcode VAR_FACING
-	if_equal LEFT, Route35NationalParkgate_FacingLeft
+	if_equal LEFT, Route35NationalParkGate_FacingLeft
 	applymovement PLAYER, MovementData_0x6a2e5
 	end
 
-Route35NationalParkgate_FacingLeft:
+Route35NationalParkGate_FacingLeft:
 	applymovement PLAYER, MovementData_0x6a2e9
 	end
 
-Route35NationalParkgate_LeaveTheRestBehind:
+Route35NationalParkGate_LeaveTheRestBehind:
 	checkcode VAR_PARTYCOUNT
-	if_less_than 6, Route35NationalParkgate_LessThanFullParty
+	if_less_than 6, Route35NationalParkGate_LessThanFullParty
 	checkcode VAR_BOXSPACE
-	if_equal 0, Route35NationalParkgate_NoRoomInBox
+	if_equal 0, Route35NationalParkGate_NoRoomInBox
 
-Route35NationalParkgate_LessThanFullParty: ; 6a27d
+Route35NationalParkGate_LessThanFullParty: ; 6a27d
 	special CheckFirstMonIsEgg
-	if_equal $1, Route35NationalParkgate_FirstMonIsEgg
+	if_equal $1, Route35NationalParkGate_FirstMonIsEgg
 	writetext UnknownText_0x6a4c6
 	yesorno
-	iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind
+	iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
 	special ContestDropOffMons
-	iftrue Route35NationalParkgate_FirstMonIsFainted
+	iftrue Route35NationalParkGate_FirstMonIsFainted
 	setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	writetext UnknownText_0x6a537
 	buttonsound
@@ -154,52 +154,52 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d
 	playsound SFX_GOT_SAFARI_BALLS
 	waitsfx
 	buttonsound
-	jump Route35NationalParkgate_OkayToProceed
+	jump Route35NationalParkGate_OkayToProceed
 
-Route35NationalParkgate_DeclinedToParticipate:
+Route35NationalParkGate_DeclinedToParticipate:
 	writetext UnknownText_0x6a5dc
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_DeclinedToLeaveMonsBehind:
+Route35NationalParkGate_DeclinedToLeaveMonsBehind:
 	writetext UnknownText_0x6a597
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_FirstMonIsFainted:
+Route35NationalParkGate_FirstMonIsFainted:
 	writetext UnknownText_0x6a608
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_NoRoomInBox:
+Route35NationalParkGate_NoRoomInBox:
 	writetext UnknownText_0x6a67c
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_FirstMonIsEgg:
+Route35NationalParkGate_FirstMonIsEgg:
 	writetext UnknownText_0x6a71f
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_ContestIsOver:
+Route35NationalParkGate_ContestIsOver:
 	writetext UnknownText_0x6a84f
 	waitbutton
 	closetext
 	end
 
-Route35NationalParkgate_NoContestToday:
+Route35NationalParkGate_NoContestToday:
 	jumptextfaceplayer UnknownText_0x6a894
 
 OfficerScript_0x6a2ca:
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
-	iftrue Route35NationalParkgate_ContestIsOver
+	iftrue Route35NationalParkGate_ContestIsOver
 	writetext UnknownText_0x6a894
 	waitbutton
 	closetext
@@ -208,10 +208,10 @@ OfficerScript_0x6a2ca:
 YoungsterScript_0x6a2d8:
 	jumptextfaceplayer UnknownText_0x6a8d8
 
-MapRoute36NationalParkgateSignpost0Script:
+MapRoute36NationalParkGateSignpost0Script:
 	jumptext UnknownText_0x6a90e
 
-Route35NationalParkgate_GetDayOfWeek:
+Route35NationalParkGate_GetDayOfWeek:
 	jumpstd daytotext
 	end
 
@@ -443,7 +443,7 @@ UnknownText_0x6a90e:
 	line "the contest."
 	done
 
-Route35NationalParkgate_MapEventHeader:
+Route35NationalParkGate_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -459,7 +459,7 @@ Route35NationalParkgate_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script
+	signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script
 
 .PersonEvents:
 	db 3

maps/Route36NationalParkGate.asm

@@ -12,7 +12,7 @@ const_value set 2
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER7
 	const ROUTE36NATIONALPARKGATE_OFFICER2
 
-Route36NationalParkgate_MapScriptHeader:
+Route36NationalParkGate_MapScriptHeader:
 .MapTriggers:
 	db 3
 
@@ -156,7 +156,7 @@ Route36OfficerScriptContest:
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue Route36Officer_ContestHasConcluded
-	scall Route36Parkgate_DayToText
+	scall Route36ParkGate_DayToText
 	writetext UnknownText_0x6add5
 	yesorno
 	iffalse .DecidedNotToJoinContest
@@ -307,7 +307,7 @@ OfficerScript_0x6acf4:
 	closetext
 	end
 
-Route36Parkgate_DayToText:
+Route36ParkGate_DayToText:
 	jumpstd daytotext
 	end
 
@@ -856,7 +856,7 @@ UnknownText_0x6b97f:
 	cont "for you."
 	done
 
-Route36NationalParkgate_MapEventHeader:
+Route36NationalParkGate_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -872,7 +872,7 @@ Route36NationalParkgate_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script
+	signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script
 
 .PersonEvents:
 	db 12

maps/Route36RuinsOfAlphGate.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
-Route36RuinsofAlphgate_MapScriptHeader:
+Route36RuinsOfAlphGate_MapScriptHeader:
 .MapTriggers:
 	db 0
 
@@ -34,7 +34,7 @@ UnknownText_0x6aa5b:
 	line "RUINS OF ALPH."
 	done
 
-Route36RuinsofAlphgate_MapEventHeader:
+Route36RuinsOfAlphGate_MapEventHeader:
 	; filler
 	db 0, 0
 

maps/RuinsOfAlphAerodactylChamber.asm

@@ -1,4 +1,4 @@
-RuinsofAlphAerodactylChamber_MapScriptHeader:
+RuinsOfAlphAerodactylChamber_MapScriptHeader:
 .MapTriggers:
 	db 2
 
@@ -52,7 +52,7 @@ UnknownScript_0x58dd3:
 	closetext
 	end
 
-MapRuinsofAlphAerodactylChamberSignpost2Script:
+MapRuinsOfAlphAerodactylChamberSignpost2Script:
 	refreshscreen $0
 	writebyte $2
 	special Special_UnownPuzzle
@@ -79,13 +79,13 @@ UnknownScript_0x58df7:
 	warpcheck
 	end
 
-MapRuinsofAlphAerodactylChamberSignpost1Script:
+MapRuinsOfAlphAerodactylChamberSignpost1Script:
 	jumptext UnknownText_0x58ec2
 
-MapRuinsofAlphAerodactylChamberSignpost3Script:
+MapRuinsOfAlphAerodactylChamberSignpost3Script:
 	jumptext UnknownText_0x58ee7
 
-MapRuinsofAlphAerodactylChamberSignpost4Script:
+MapRuinsOfAlphAerodactylChamberSignpost4Script:
 	opentext
 	writetext UnknownText_0x58e4f
 	writebyte $1
@@ -93,7 +93,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script:
 	closetext
 	end
 
-MapRuinsofAlphAerodactylChamberSignpost5Script:
+MapRuinsOfAlphAerodactylChamberSignpost5Script:
 	checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
 	iftrue UnknownScript_0x58e46
 	opentext
@@ -148,7 +148,7 @@ UnknownText_0x58ee7:
 	line "fangs."
 	done
 
-RuinsofAlphAerodactylChamber_MapEventHeader:
+RuinsOfAlphAerodactylChamber_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -165,12 +165,12 @@ RuinsofAlphAerodactylChamber_MapEventHeader:
 
 .Signposts:
 	db 6
-	signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script
-	signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script
-	signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost2Script
-	signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost3Script
-	signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script
-	signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script
+	signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
+	signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
+	signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
+	signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
 
 .PersonEvents:
 	db 0

maps/RuinsOfAlphAerodactylItemRoom.asm

@@ -4,26 +4,26 @@ const_value set 2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4
 
-RuinsofAlphAerodactylItemRoom_MapScriptHeader:
+RuinsOfAlphAerodactylItemRoom_MapScriptHeader:
 .MapTriggers:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-RuinsofAlphAerodactylItemRoomGoldBerry:
+RuinsOfAlphAerodactylItemRoomGoldBerry:
 	itemball GOLD_BERRY
 
-RuinsofAlphAerodactylItemRoomMoonStone:
+RuinsOfAlphAerodactylItemRoomMoonStone:
 	itemball MOON_STONE
 
-RuinsofAlphAerodactylItemRoomHealPowder:
+RuinsOfAlphAerodactylItemRoomHealPowder:
 	itemball HEAL_POWDER
 
-RuinsofAlphAerodactylItemRoomEnergyRoot:
+RuinsOfAlphAerodactylItemRoomEnergyRoot:
 	itemball ENERGY_ROOT
 
-MapRuinsofAlphAerodactylItemRoomSignpost1Script:
+MapRuinsOfAlphAerodactylItemRoomSignpost1Script:
 	jumptext UnknownText_0x59ac1
 
 UnknownText_0x59ac1:
@@ -32,7 +32,7 @@ UnknownText_0x59ac1:
 	cont "MON."
 	done
 
-RuinsofAlphAerodactylItemRoom_MapEventHeader:
+RuinsOfAlphAerodactylItemRoom_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -48,12 +48,12 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script
-	signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script
+	signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+	signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
-	person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
-	person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
-	person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
+	person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
+	person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
+	person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM

maps/RuinsOfAlphAerodactylWordRoom.asm

@@ -1,11 +1,11 @@
-RuinsofAlphAerodactylWordRoom_MapScriptHeader:
+RuinsOfAlphAerodactylWordRoom_MapScriptHeader:
 .MapTriggers:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-RuinsofAlphAerodactylWordRoom_MapEventHeader:
+RuinsOfAlphAerodactylWordRoom_MapEventHeader:
 	; filler
 	db 0, 0