Merge branch 'master' of https://github.com/pret/pokered into patch-3

pret · Nov 19, 2023 · 445a1b0 · 445a1b0
2 parents 81cc14c + 12a2f7a
commit 445a1b0
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 48 deletions.
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
@@ -538,9 +538,9 @@ CeruleanCave2FHS:
 	db CERULEAN_CAVE_2F, CERULEANCAVE2F_ULTRA_BALL,   SHOW
 	db CERULEAN_CAVE_2F, CERULEANCAVE2F_FULL_RESTORE, SHOW
 CeruleanCaveB1FHS:
-	db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MEWTWO,     SHOW
-	db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_ULTRA_BALL, SHOW
-	db CERULEAN_CAVE_B1F, CERULEANCAVE_B1F_MAX_REVIVE, SHOW
+	db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_MEWTWO,     SHOW
+	db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_ULTRA_BALL, SHOW
+	db CERULEAN_CAVE_B1F, CERULEANCAVEB1F_MAX_REVIVE, SHOW
 VictoryRoad1FHS:
 	db VICTORY_ROAD_1F, VICTORYROAD1F_TM_SKY_ATTACK, SHOW
 	db VICTORY_ROAD_1F, VICTORYROAD1F_RARE_CANDY,    SHOW

diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
@@ -1,7 +1,7 @@
 	object_const_def
-	const_export CERULEANCAVE_B1F_MEWTWO
-	const_export CERULEANCAVE_B1F_ULTRA_BALL
-	const_export CERULEANCAVE_B1F_MAX_REVIVE
+	const_export CERULEANCAVEB1F_MEWTWO
+	const_export CERULEANCAVEB1F_ULTRA_BALL
+	const_export CERULEANCAVEB1F_MAX_REVIVE
 
 CeruleanCaveB1F_Object:
 	db $7d ; border block

diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm
@@ -12,7 +12,6 @@
 	const_export MTMOON1F_ESCAPE_ROPE
 	const_export MTMOON1F_POTION2
 	const_export MTMOON1F_TM_WATER_GUN
-	const_export MTMOON1F_BEWARE_ZUBAT_SIGN
 
 MtMoon1F_Object:
 	db $3 ; border block

diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm
@@ -5,8 +5,6 @@
 	const_export POKEMONFANCLUB_SEEL
 	const_export POKEMONFANCLUB_CHAIRMAN
 	const_export POKEMONFANCLUB_RECEPTIONIST
-	const_export POKEMONFANCLUB_SIGN_1
-	const_export POKEMONFANCLUB_SIGN_2
 
 PokemonFanClub_Object:
 	db $d ; border block

diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm
@@ -20,7 +20,7 @@ Route19_Object:
 
 	def_object_events
 	object_event  8,  7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M1, OPP_SWIMMER, 2
-	object_event 13,  7, SPRITE_COOLTRAINER_M,STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3
+	object_event 13,  7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3
 	object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER1, OPP_SWIMMER, 4
 	object_event  4, 27, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER2, OPP_SWIMMER, 5
 	object_event 16, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER3, OPP_SWIMMER, 6

diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm
@@ -3,9 +3,9 @@
 	const_export ROUTE24_COOLTRAINER_M2
 	const_export ROUTE24_COOLTRAINER_M3
 	const_export ROUTE24_COOLTRAINER_F1
-	const_export ROUTE24_YOUNGSTER_1
+	const_export ROUTE24_YOUNGSTER1
 	const_export ROUTE24_COOLTRAINER_F2
-	const_export ROUTE24_YOUNGSTER_2
+	const_export ROUTE24_YOUNGSTER2
 	const_export ROUTE24_TM_THUNDER_WAVE
 
 Route24_Object:
@@ -20,9 +20,9 @@ Route24_Object:
 	object_event  5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2
 	object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3
 	object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7
-	object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4
+	object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER1, OPP_YOUNGSTER, 4
 	object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8
-	object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9
+	object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER2, OPP_BUG_CATCHER, 9
 	object_event 10,  5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE
 
 	def_warps_to ROUTE_24
diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm
@@ -1,10 +1,10 @@
 	object_const_def
 	const_export ROUTE6_COOLTRAINER_M1
 	const_export ROUTE6_COOLTRAINER_F1
-	const_export ROUTE6_YOUNGSTER_1
+	const_export ROUTE6_YOUNGSTER1
 	const_export ROUTE6_COOLTRAINER_M2
 	const_export ROUTE6_COOLTRAINER_F2
-	const_export ROUTE6_YOUNGSTER_2
+	const_export ROUTE6_YOUNGSTER2
 
 Route6_Object:
 	db $f ; border block
@@ -21,9 +21,9 @@ Route6_Object:
 	def_object_events
 	object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4
 	object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2
-	object_event  0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10
+	object_event  0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER1, OPP_BUG_CATCHER, 10
 	object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5
 	object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3
-	object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11
+	object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER2, OPP_BUG_CATCHER, 11
 
 	def_warps_to ROUTE_6
diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm
@@ -3,11 +3,11 @@
 	const_export ROUTE9_COOLTRAINER_M1
 	const_export ROUTE9_COOLTRAINER_M2
 	const_export ROUTE9_COOLTRAINER_F2
-	const_export ROUTE9_HIKER_1
-	const_export ROUTE9_HIKER_2
-	const_export ROUTE9_YOUNGSTER_1
-	const_export ROUTE9_HIKER_3
-	const_export ROUTE9_YOUNGSTER_2
+	const_export ROUTE9_HIKER1
+	const_export ROUTE9_HIKER2
+	const_export ROUTE9_YOUNGSTER1
+	const_export ROUTE9_HIKER3
+	const_export ROUTE9_YOUNGSTER2
 	const_export ROUTE9_TM_TELEPORT
 
 Route9_Object:
@@ -23,11 +23,11 @@ Route9_Object:
 	object_event 24,  7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7
 	object_event 31,  7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8
 	object_event 48,  8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6
-	object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11
-	object_event 43,  3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6
-	object_event 22,  2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13
-	object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5
-	object_event 40,  8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14
+	object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER1, OPP_HIKER, 11
+	object_event 43,  3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER2, OPP_HIKER, 6
+	object_event 22,  2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER1, OPP_BUG_CATCHER, 13
+	object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER3, OPP_HIKER, 5
+	object_event 40,  8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER2, OPP_BUG_CATCHER, 14
 	object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT
 
 	def_warps_to ROUTE_9
diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm
@@ -65,20 +65,20 @@ CeladonCityGramps3Text:
 	jp TextScriptEnd
 
 .Text:
-	text_far _CeledonCityGramps3Text
+	text_far _CeladonCityGramps3Text
 	text_end
 
 .ReceivedTM41Text:
-	text_far _CeledonCityGramps3ReceivedTM41Text
+	text_far _CeladonCityGramps3ReceivedTM41Text
 	sound_get_item_1
 	text_end
 
 .TM41ExplanationText:
-	text_far _CeledonCityGramps3TM41ExplanationText
+	text_far _CeladonCityGramps3TM41ExplanationText
 	text_end
 
 .TM41NoRoomText:
-	text_far _CeledonCityGramps3TM41NoRoomText
+	text_far _CeladonCityGramps3TM41NoRoomText
 	text_end
 
 CeladonCityFisherText:

diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
@@ -93,7 +93,7 @@ CinnabarGymGetOpponentTextScript:
 
 CinnabarGymFlagAction:
 	predef_jump FlagActionPredef
-	; fallthrough
+
 CinnabarGymOpenGateScript:
 	ld a, [wIsInBattle]
 	cp $ff

diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
@@ -60,7 +60,7 @@ HallOfFameDefaultScript:
 	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
-	ld de, HallOfFakeEntryMovement
+	ld de, HallOfFameEntryMovement
 	call DecodeRLEList
 	dec a
 	ld [wSimulatedJoypadStatesIndex], a
@@ -69,7 +69,7 @@ HallOfFameDefaultScript:
 	ld [wHallOfFameCurScript], a
 	ret
 
-HallOfFakeEntryMovement:
+HallOfFameEntryMovement:
 	db D_UP, 5
 	db -1 ; end
 

diff --git a/scripts/Route24.asm b/scripts/Route24.asm
@@ -83,9 +83,9 @@ Route24_TextPointers:
 	dw_const Route24CooltrainerM2Text, TEXT_ROUTE24_COOLTRAINER_M2
 	dw_const Route24CooltrainerM3Text, TEXT_ROUTE24_COOLTRAINER_M3
 	dw_const Route24CooltrainerF1Text, TEXT_ROUTE24_COOLTRAINER_F1
-	dw_const Route24Youngster1Text,    TEXT_ROUTE24_YOUNGSTER_1
+	dw_const Route24Youngster1Text,    TEXT_ROUTE24_YOUNGSTER1
 	dw_const Route24CooltrainerF2Text, TEXT_ROUTE24_COOLTRAINER_F2
-	dw_const Route24Youngster2Text,    TEXT_ROUTE24_YOUNGSTER_2
+	dw_const Route24Youngster2Text,    TEXT_ROUTE24_YOUNGSTER2
 	dw_const PickUpItemText,           TEXT_ROUTE24_TM_THUNDER_WAVE
 
 Route24TrainerHeaders:

diff --git a/scripts/Route6.asm b/scripts/Route6.asm
@@ -17,10 +17,10 @@ Route6_TextPointers:
 	def_text_pointers
 	dw_const Route6CooltrainerM1Text,       TEXT_ROUTE6_COOLTRAINER_M1
 	dw_const Route6CooltrainerF1Text,       TEXT_ROUTE6_COOLTRAINER_F1
-	dw_const Route6Youngster1Text,          TEXT_ROUTE6_YOUNGSTER_1
+	dw_const Route6Youngster1Text,          TEXT_ROUTE6_YOUNGSTER1
 	dw_const Route6CooltrainerM2Text,       TEXT_ROUTE6_COOLTRAINER_M2
 	dw_const Route6CooltrainerF2Text,       TEXT_ROUTE6_COOLTRAINER_F2
-	dw_const Route6Youngster2Text,          TEXT_ROUTE6_YOUNGSTER_2
+	dw_const Route6Youngster2Text,          TEXT_ROUTE6_YOUNGSTER2
 	dw_const Route6UndergroundPathSignText, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN
 
 Route6TrainerHeaders:

diff --git a/scripts/Route9.asm b/scripts/Route9.asm
@@ -19,11 +19,11 @@ Route9_TextPointers:
 	dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1
 	dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2
 	dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2
-	dw_const Route9Hiker1Text,        TEXT_ROUTE9_HIKER_1
-	dw_const Route9Hiker2Text,        TEXT_ROUTE9_HIKER_2
-	dw_const Route9Youngster1Text,    TEXT_ROUTE9_YOUNGSTER_1
-	dw_const Route9Hiker3Text,        TEXT_ROUTE9_HIKER_3
-	dw_const Route9Youngster2Text,    TEXT_ROUTE9_YOUNGSTER_2
+	dw_const Route9Hiker1Text,        TEXT_ROUTE9_HIKER1
+	dw_const Route9Hiker2Text,        TEXT_ROUTE9_HIKER2
+	dw_const Route9Youngster1Text,    TEXT_ROUTE9_YOUNGSTER1
+	dw_const Route9Hiker3Text,        TEXT_ROUTE9_HIKER3
+	dw_const Route9Youngster2Text,    TEXT_ROUTE9_YOUNGSTER2
 	dw_const PickUpItemText,          TEXT_ROUTE9_TM_TELEPORT
 	dw_const Route9SignText,          TEXT_ROUTE9_SIGN
 

diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm
@@ -28,7 +28,7 @@ _CeladonCityGramps2Text::
 	cont "coins for prizes!"
 	done
 
-_CeledonCityGramps3Text::
+_CeladonCityGramps3Text::
 	text "Hello, there!"
 
 	para "I've seen you,"
@@ -39,14 +39,14 @@ _CeledonCityGramps3Text::
 	line "dropping by!"
 	prompt
 
-_CeledonCityGramps3ReceivedTM41Text::
+_CeladonCityGramps3ReceivedTM41Text::
 	text "<PLAYER> received"
 	line "@"
 	text_ram wStringBuffer
 	text "!@"
 	text_end
 
-_CeledonCityGramps3TM41ExplanationText::
+_CeladonCityGramps3TM41ExplanationText::
 	text "TM41 teaches"
 	line "SOFTBOILED!"
 
@@ -57,7 +57,7 @@ _CeledonCityGramps3TM41ExplanationText::
 	line "CHANSEY!"
 	done
 
-_CeledonCityGramps3TM41NoRoomText::
+_CeladonCityGramps3TM41NoRoomText::
 	text "Oh, your pack is"
 	line "full of items!"
 	done