Rearranged NPCs

SoupPotato · Nov 18, 2024 · 24853f1 · 24853f1
1 parent cda7570
commit 24853f1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 25 deletions.
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
@@ -3,7 +3,7 @@
 	const GOLDENRODDEPTSTORE3F_TEACHER
 	const GOLDENRODDEPTSTORE3F_BEAUTY
 	const GOLDENRODDEPTSTORE3F_YOUNGSTER
-	const GOLDENRODDEPTSTORE3F_GAMEBOY_KID
+	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 
 GoldenrodDeptStore3F_MapScripts:
 	def_scene_scripts
@@ -737,14 +737,8 @@ GoldenrodDeptStore3FTeacherScript:
 GoldenrodDeptStore3FYoungsterScript:
 	jumptextfaceplayer GoldenrodDeptStore3FYoungsterText
 
-GoldenrodDeptStore3FGameboyKidScript:
-	faceplayer
-	opentext
-	writetext GoldenrodDeptStore3FGameboyKidText
-	waitbutton
-	closetext
-	turnobject GOLDENRODDEPTSTORE3F_GAMEBOY_KID, DOWN
-	end
+GoldenrodDeptStore3FSuperNerdScript:
+	jumptextfaceplayer GoldenrodDeptStore3FSuperNerdText
 
 GoldenrodDeptStore3FBeautyScript:
 	jumptextfaceplayer GoldenrodDeptStore3FBeautyText
@@ -783,21 +777,19 @@ GoldenrodDeptStore3FYoungsterText:
 	cont "rage right now."
 	done
 
-GoldenrodDeptStore3FGameboyKidText:
-	text "Some #MON"
-	line "evolve only by"
-
-	para "being traded via a"
-	line "Game Link cable."
+GoldenrodDeptStore3FSuperNerdText:
+	text "There are vending"
+	line "machines that give"
 
-	para "I know of four:"
-	line "MACHOKE, KADABRA,"
+	para "out #MON dolls"
+	line "on the top floor."
 
-	para "HAUNTER and, um,"
-	line "GRAVELER."
+	para "But whatever you"
+	line "get is totally"
+	cont "random…"
 
-	para "I heard there are"
-	line "others too."
+	para "It can be very"
+	line "expensive!"
 	done
 
 GoldenrodDeptStore3FClerkText:
@@ -866,8 +858,8 @@ GoldenrodDeptStore3F_MapEvents:
 	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
 
 	def_object_events
-	object_event  6,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1
-	object_event 12,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 1, -1, -1, PAL_NPC_PINK, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FTeacherScript, -1
+	object_event 6,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1
+	object_event 12, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 1, -1, -1, PAL_NPC_PINK, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FTeacherScript, -1
 	object_event 8,  7, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FBeautyScript, -1
 	object_event 2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FYoungsterScript, -1
-	object_event  1,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FGameboyKidScript, -1
+	object_event 10, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
@@ -4,6 +4,7 @@
 	const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
 	const GOLDENRODDEPTSTORE4F_ROCKER
+	const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
 
 GoldenrodDeptStore4F_MapScripts:
 	def_scene_scripts
@@ -33,6 +34,15 @@ GoldenrodDeptStore4FBugCatcherScript:
 GoldenrodDeptStore4FRockerScript:
 	jumptextfaceplayer GoldenrodDeptStore4FRockerText
 
+GoldenrodDeptStore4FGameboyKidScript:
+	faceplayer
+	opentext
+	writetext GoldenrodDeptStore4FGameboyKidText
+	waitbutton
+	closetext
+	turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+	end
+
 GoldenrodDeptStore4FDirectory:
 	jumptext GoldenrodDeptStore4FDirectoryText
 
@@ -48,7 +58,6 @@ GoldenrodDeptStore4FCooltrainerMText:
 	cont "their ATTACK."
 	done
 
-
 GoldenrodDeptStore4FRockerText:
 	text "Hey! When you bat-"
 	line "tle, do you use X"
@@ -64,6 +73,23 @@ GoldenrodDeptStore4FBugCatcherText:
 	line "#MON's DEFENSE."
 	done
 
+GoldenrodDeptStore4FGameboyKidText:
+	text "Some #MON"
+	line "evolve only by"
+
+	para "being traded via a"
+	line "Game Link cable."
+
+	para "I know of four:"
+	line "MACHOKE, KADABRA,"
+
+	para "HAUNTER and, um,"
+	line "GRAVELER."
+
+	para "I heard there are"
+	line "others too."
+	done
+
 GoldenrodDeptStore4FDirectoryText:
 	text "Let Us Pump Up"
 	line "Your #MON!"
@@ -91,3 +117,4 @@ GoldenrodDeptStore4F_MapEvents:
 	object_event 11,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
 	object_event  7,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
 	object_event  3,  6, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FRockerScript, -1
+	object_event  5,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FGameboyKidScript, -1