shithub: pokecrystal

Download patch

ref: 8758550960c5589cefde0acfc05b39097c5ba2bd
parent: 09194683b44ba4382a88217a5181823ed039af0b
author: DeeDeeG <[email protected]>
date: Sat Apr 20 20:01:50 EDT 2019

PowerPlant.asm: Rename some NPCs

GymGuy3 --> Officer2
POWERPLANT_FISHER --> POWERPLANT_MANAGER

--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -4,7 +4,7 @@
 	const POWERPLANT_GYM_GUY2
 	const POWERPLANT_OFFICER2
 	const POWERPLANT_GYM_GUY3
-	const POWERPLANT_FISHER
+	const POWERPLANT_MANAGER
 	const POWERPLANT_FOREST
 
 PowerPlant_MapScripts:
@@ -99,18 +99,18 @@
 	closetext
 	end
 
-PowerPlantGymGuy3Script:
+PowerPlantOfficer2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
 	iftrue .ReturnedMachinePart
-	writetext PowerPlantGymGuy3ManagerHasBeenSadAndFuriousText
+	writetext PowerPlantOfficer2ManagerHasBeenSadAndFuriousText
 	waitbutton
 	closetext
 	end
 
 .ReturnedMachinePart:
-	writetext PowerPlantGymGuy3ManagerHasBeenCheerfulText
+	writetext PowerPlantOfficer2ManagerHasBeenCheerfulText
 	waitbutton
 	closetext
 	end
@@ -279,7 +279,7 @@
 	line "running again!"
 	done
 
-PowerPlantGymGuy3ManagerHasBeenSadAndFuriousText:
+PowerPlantOfficer2ManagerHasBeenSadAndFuriousText:
 	text "The POWER PLANT's"
 	line "MANAGER is up"
 	cont "ahead."
@@ -291,7 +291,7 @@
 	cont "furious…"
 	done
 
-PowerPlantGymGuy3ManagerHasBeenCheerfulText:
+PowerPlantOfficer2ManagerHasBeenCheerfulText:
 	text "Since the gener-"
 	line "ator's been fixed,"
 
@@ -404,7 +404,7 @@
 	object_event  4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1
 	object_event  2,  9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1
 	object_event  6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1
-	object_event  9,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1
+	object_event  9,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficer2Script, -1
 	object_event  7,  2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1
 	object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
 	object_event  5,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1