Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 98 insertions, 96 deletions

diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index c1c2d190..9437a55d 100644
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -8,49 +8,50 @@ PewterCity_Script:
 	ret
 
 PewterCity_ScriptPointers:
-	dw PewterCityScript0
-	dw PewterCityScript1
-	dw PewterCityScript2
-	dw PewterCityScript3
-	dw PewterCityScript4
-	dw PewterCityScript5
-	dw PewterCityScript6
+	def_script_pointers
+	dw_const PewterCityDefaultScript,                     SCRIPT_PEWTERCITY_DEFAULT
+	dw_const PewterCitySuperNerd1ShowsPlayerMuseumScript, SCRIPT_PEWTERCITY_SUPER_NERD1_SHOWS_PLAYER_MUSEUM
+	dw_const PewterCityHideSuperNerd1Script,              SCRIPT_PEWTERCITY_HIDE_SUPER_NERD1
+	dw_const PewterCityResetSuperNerd1Script,             SCRIPT_PEWTERCITY_RESET_SUPER_NERD1
+	dw_const PewterCityYoungsterShowsPlayerGymScript,     SCRIPT_PEWTERCITY_YOUNGSTER_SHOWS_PLAYER_GYM
+	dw_const PewterCityHideYoungsterScript,               SCRIPT_PEWTERCITY_HIDE_YOUNGSTER
+	dw_const PewterCityResetYoungsterScript,              SCRIPT_PEWTERCITY_RESET_YOUNGSTER
 
-PewterCityScript0:
+PewterCityDefaultScript:
 	xor a
 	ld [wMuseum1FCurScript], a
 	ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
-	call PewterCityScript_1925e
+	call PewterCityCheckPlayerLeavingEastScript
 	ret
 
-PewterCityScript_1925e:
+PewterCityCheckPlayerLeavingEastScript:
 	CheckEvent EVENT_BEAT_BROCK
 	ret nz
 IF DEF(_DEBUG)
 	call DebugPressedOrHeldB
 	ret nz
 ENDC
-	ld hl, CoordsData_19277
+	ld hl, PewterCityPlayerLeavingEastCoords
 	call ArePlayerCoordsInArray
 	ret nc
-	ld a, $fc
+	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $5
+	ld a, TEXT_PEWTERCITY_YOUNGSTER
 	ldh [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_19277:
+PewterCityPlayerLeavingEastCoords:
 	dbmapcoord 35, 17
 	dbmapcoord 36, 17
 	dbmapcoord 37, 18
 	dbmapcoord 37, 19
 	db -1 ; end
 
-PewterCityScript1:
+PewterCitySuperNerd1ShowsPlayerMuseumScript:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
-	ld a, $3
+	ld a, PEWTERCITY_SUPER_NERD1
 	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_UP
 	ldh [hSpriteFacingDirection], a
@@ -61,7 +62,7 @@ PewterCityScript1:
 	call PlayDefaultMusic
 	ld hl, wFlags_0xcd60
 	set 4, [hl]
-	ld a, $d
+	ld a, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $3c
@@ -72,14 +73,14 @@ PewterCityScript1:
 	ldh [hSpriteMapYCoord], a
 	ld a, 17
 	ldh [hSpriteMapXCoord], a
-	ld a, $3
+	ld a, PEWTERCITY_SUPER_NERD1
 	ld [wSpriteIndex], a
 	call SetSpritePosition1
-	ld a, $3
+	ld a, PEWTERCITY_SUPER_NERD1
 	ldh [hSpriteIndex], a
 	ld de, MovementData_PewterMuseumGuyExit
 	call MoveSprite
-	ld a, $2
+	ld a, SCRIPT_PEWTERCITY_HIDE_SUPER_NERD1
 	ld [wPewterCityCurScript], a
 	ret
 
@@ -90,19 +91,19 @@ MovementData_PewterMuseumGuyExit:
 	db NPC_MOVEMENT_DOWN
 	db -1 ; end
 
-PewterCityScript2:
+PewterCityHideSuperNerd1Script:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	ld a, HS_MUSEUM_GUY
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, $3
+	ld a, SCRIPT_PEWTERCITY_RESET_SUPER_NERD1
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript3:
-	ld a, $3
+PewterCityResetSuperNerd1Script:
+	ld a, PEWTERCITY_SUPER_NERD1
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
 	ld a, HS_MUSEUM_GUY
@@ -110,15 +111,15 @@ PewterCityScript3:
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
+	ld a, SCRIPT_PEWTERCITY_DEFAULT
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript4:
+PewterCityYoungsterShowsPlayerGymScript:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
-	ld a, $5
+	ld a, PEWTERCITY_YOUNGSTER
 	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_LEFT
 	ldh [hSpriteFacingDirection], a
@@ -126,7 +127,7 @@ PewterCityScript4:
 	call PlayDefaultMusic
 	ld hl, wFlags_0xcd60
 	set 4, [hl]
-	ld a, $e
+	ld a, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $3c
@@ -137,14 +138,14 @@ PewterCityScript4:
 	ldh [hSpriteMapYCoord], a
 	ld a, 16
 	ldh [hSpriteMapXCoord], a
-	ld a, $5
+	ld a, PEWTERCITY_YOUNGSTER
 	ld [wSpriteIndex], a
 	call SetSpritePosition1
-	ld a, $5
+	ld a, PEWTERCITY_YOUNGSTER
 	ldh [hSpriteIndex], a
 	ld de, MovementData_PewterGymGuyExit
 	call MoveSprite
-	ld a, $5
+	ld a, SCRIPT_PEWTERCITY_HIDE_YOUNGSTER
 	ld [wPewterCityCurScript], a
 	ret
 
@@ -156,19 +157,19 @@ MovementData_PewterGymGuyExit:
 	db NPC_MOVEMENT_RIGHT
 	db -1 ; end
 
-PewterCityScript5:
+PewterCityHideYoungsterScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	ld a, HS_GYM_GUY
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, $6
+	ld a, SCRIPT_PEWTERCITY_RESET_YOUNGSTER
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript6:
-	ld a, $5
+PewterCityResetYoungsterScript:
+	ld a, PEWTERCITY_YOUNGSTER
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
 	ld a, HS_GYM_GUY
@@ -176,47 +177,48 @@ PewterCityScript6:
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
+	ld a, SCRIPT_PEWTERCITY_DEFAULT
 	ld [wPewterCityCurScript], a
 	ret
 
 PewterCity_TextPointers:
-	dw PewterCityText1
-	dw PewterCityText2
-	dw PewterCityText3
-	dw PewterCityText4
-	dw PewterCityText5
-	dw PewterCityText6
-	dw PewterCityText7
-	dw MartSignText
-	dw PokeCenterSignText
-	dw PewterCityText10
-	dw PewterCityText11
-	dw PewterCityText12
-	dw PewterCityText13
-	dw PewterCityText14
+	def_text_pointers
+	dw_const PewterCityCooltrainerFText,           TEXT_PEWTERCITY_COOLTRAINER_F
+	dw_const PewterCityCooltrainerMText,           TEXT_PEWTERCITY_COOLTRAINER_M
+	dw_const PewterCitySuperNerd1Text,             TEXT_PEWTERCITY_SUPER_NERD1
+	dw_const PewterCitySuperNerd2Text,             TEXT_PEWTERCITY_SUPER_NERD2
+	dw_const PewterCityYoungsterText,              TEXT_PEWTERCITY_YOUNGSTER
+	dw_const PewterCityTrainerTipsText,            TEXT_PEWTERCITY_TRAINER_TIPS
+	dw_const PewterCityPoliceNoticeSignText,       TEXT_PEWTERCITY_POLICE_NOTICE_SIGN
+	dw_const MartSignText,                         TEXT_PEWTERCITY_MART_SIGN
+	dw_const PokeCenterSignText,                   TEXT_PEWTERCITY_POKECENTER_SIGN
+	dw_const PewterCityMuseumSignText,             TEXT_PEWTERCITY_MUSEUM_SIGN
+	dw_const PewterCityGymSignText,                TEXT_PEWTERCITY_GYM_SIGN
+	dw_const PewterCitySignText,                   TEXT_PEWTERCITY_SIGN
+	dw_const PewterCitySuperNerd1ItsRightHereText, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE
+	dw_const PewterCityYoungsterGoTakeOnBrockText, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK
 
-PewterCityText1:
-	text_far _PewterCityText1
+PewterCityCooltrainerFText:
+	text_far _PewterCityCooltrainerFText
 	text_end
 
-PewterCityText2:
-	text_far _PewterCityText2
+PewterCityCooltrainerMText:
+	text_far _PewterCityCooltrainerMText
 	text_end
 
-PewterCityText3:
+PewterCitySuperNerd1Text:
 	text_asm
-	ld hl, PewterCityText_193f1
+	ld hl, .DidYouCheckOutMuseumText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .playerDidNotGoIntoMuseum
-	ld hl, PewterCityText_193f6
+	ld hl, .WerentThoseFossilsAmazingText
 	call PrintText
 	jr .done
 .playerDidNotGoIntoMuseum
-	ld hl, PewterCityText_193fb
+	ld hl, .YouHaveToGoText
 	call PrintText
 	xor a
 	ldh [hJoyPressed], a
@@ -226,62 +228,62 @@ PewterCityText3:
 	ld [wNPCMovementScriptPointerTableNum], a
 	ldh a, [hLoadedROMBank]
 	ld [wNPCMovementScriptBank], a
-	ld a, $3
+	ld a, PEWTERCITY_SUPER_NERD1
 	ld [wSpriteIndex], a
 	call GetSpritePosition2
-	ld a, $1
+	ld a, SCRIPT_PEWTERCITY_SUPER_NERD1_SHOWS_PLAYER_MUSEUM
 	ld [wPewterCityCurScript], a
 .done
 	jp TextScriptEnd
 
-PewterCityText_193f1:
-	text_far _PewterCityText_193f1
+.DidYouCheckOutMuseumText:
+	text_far _PewterCitySuperNerd1DidYouCheckOutMuseumText
 	text_end
 
-PewterCityText_193f6:
-	text_far _PewterCityText_193f6
+.WerentThoseFossilsAmazingText:
+	text_far _PewterCitySuperNerd1WerentThoseFossilsAmazingText
 	text_end
 
-PewterCityText_193fb:
-	text_far _PewterCityText_193fb
+.YouHaveToGoText:
+	text_far _PewterCitySuperNerd1YouHaveToGoText
 	text_end
 
-PewterCityText13:
-	text_far _PewterCityText13
+PewterCitySuperNerd1ItsRightHereText:
+	text_far _PewterCitySuperNerd1ItsRightHereText
 	text_end
 
-PewterCityText4:
+PewterCitySuperNerd2Text:
 	text_asm
-	ld hl, PewterCityText_19427
+	ld hl, .DoYouKnowWhatImDoingText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	cp $0
 	jr nz, .playerDoesNotKnow
-	ld hl, PewterCityText_1942c
+	ld hl, .ThatsRightText
 	call PrintText
 	jr .done
 .playerDoesNotKnow
-	ld hl, PewterCityText_19431
+	ld hl, .ImSprayingRepelText
 	call PrintText
 .done
 	jp TextScriptEnd
 
-PewterCityText_19427:
-	text_far _PewterCityText_19427
+.DoYouKnowWhatImDoingText:
+	text_far _PewterCitySuperNerd2DoYouKnowWhatImDoingText
 	text_end
 
-PewterCityText_1942c:
-	text_far _PewterCityText_1942c
+.ThatsRightText:
+	text_far _PewterCitySuperNerd2ThatsRightText
 	text_end
 
-PewterCityText_19431:
-	text_far _PewterCityText_19431
+.ImSprayingRepelText:
+	text_far _PewterCitySuperNerd2ImSprayingRepelText
 	text_end
 
-PewterCityText5:
+PewterCityYoungsterText:
 	text_asm
-	ld hl, PewterCityText_1945d
+	ld hl, .YoureATrainerFollowMeText
 	call PrintText
 	xor a
 	ldh [hJoyHeld], a
@@ -290,37 +292,37 @@ PewterCityText5:
 	ld [wNPCMovementScriptPointerTableNum], a
 	ldh a, [hLoadedROMBank]
 	ld [wNPCMovementScriptBank], a
-	ld a, $5
+	ld a, PEWTERCITY_YOUNGSTER
 	ld [wSpriteIndex], a
 	call GetSpritePosition2
-	ld a, $4
+	ld a, SCRIPT_PEWTERCITY_YOUNGSTER_SHOWS_PLAYER_GYM
 	ld [wPewterCityCurScript], a
 	jp TextScriptEnd
 
-PewterCityText_1945d:
-	text_far _PewterCityText_1945d
+.YoureATrainerFollowMeText:
+	text_far _PewterCityYoungsterYoureATrainerFollowMeText
 	text_end
 
-PewterCityText14:
-	text_far _PewterCityText14
+PewterCityYoungsterGoTakeOnBrockText:
+	text_far _PewterCityYoungsterGoTakeOnBrockText
 	text_end
 
-PewterCityText6:
-	text_far _PewterCityText6
+PewterCityTrainerTipsText:
+	text_far _PewterCityTrainerTipsText
 	text_end
 
-PewterCityText7:
-	text_far _PewterCityText7
+PewterCityPoliceNoticeSignText:
+	text_far _PewterCityPoliceNoticeSignText
 	text_end
 
-PewterCityText10:
-	text_far _PewterCityText10
+PewterCityMuseumSignText:
+	text_far _PewterCityMuseumSignText
 	text_end
 
-PewterCityText11:
-	text_far _PewterCityText11
+PewterCityGymSignText:
+	text_far _PewterCityGymSignText
 	text_end
 
-PewterCityText12:
-	text_far _PewterCityText12
+PewterCitySignText:
+	text_far _PewterCitySignText
 	text_end