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

1 files changed, 35 insertions, 35 deletions

diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm
index cece9d38..b7271b05 100755
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -1,13 +1,13 @@
-PewterCityScript: ; 192f5 (6:52f5)
+PewterCityScript:
 	call EnableAutoTextBoxDrawing
-	ld hl, wPreventBlackout
+	ld hl, wd492
 	res 7, [hl]
 	ld hl, PewterCityScriptPointers
 	ld a, [wPewterCityCurScript]
 	call JumpTable
 	ret
 
-PewterCityScriptPointers: ; 19307 (6:5307)
+PewterCityScriptPointers:
 	dw PewterCityScript0
 	dw PewterCityScript1
 	dw PewterCityScript2
@@ -16,14 +16,14 @@ PewterCityScriptPointers: ; 19307 (6:5307)
 	dw PewterCityScript5
 	dw PewterCityScript6
 
-PewterCityScript0: ; 19315 (6:5315)
+PewterCityScript0:
 	xor a
 	ld [wMuseum1FCurScript], a
 	ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
 	call PewterCityScript_1925e
 	ret
 
-PewterCityScript_1925e: ; 1925e (6:525e)
+PewterCityScript_1925e:
 	CheckEvent EVENT_BEAT_BROCK
 	ret nz
 	ld hl, CoordsData_19277
@@ -35,14 +35,14 @@ PewterCityScript_1925e: ; 1925e (6:525e)
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_19277: ; 19277 (6:5277)
+CoordsData_19277:
 	db $11,$23
 	db $11,$24
 	db $12,$25
 	db $13,$25
 	db $ff
 
-PewterCityScript1: ; 19280 (6:5280)
+PewterCityScript1:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -79,14 +79,14 @@ PewterCityScript1: ; 19280 (6:5280)
 	ld [wPewterCityCurScript], a
 	ret
 
-MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce)
+MovementData_PewterMuseumGuyExit:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-PewterCityScript2: ; 192d3 (6:52d3)
+PewterCityScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -97,7 +97,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript3: ; 192e9 (6:52e9)
+PewterCityScript3:
 	ld a, $3
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
@@ -110,7 +110,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript4: ; 19305 (6:5305)
+PewterCityScript4:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -144,7 +144,7 @@ PewterCityScript4: ; 19305 (6:5305)
 	ld [wPewterCityCurScript], a
 	ret
 
-MovementData_PewterGymGuyExit: ; 19353 (6:5353)
+MovementData_PewterGymGuyExit:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -152,7 +152,7 @@ MovementData_PewterGymGuyExit: ; 19353 (6:5353)
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-PewterCityScript5: ; 19359 (6:5359)
+PewterCityScript5:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -163,7 +163,7 @@ PewterCityScript5: ; 19359 (6:5359)
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript6: ; 1936f (6:536f)
+PewterCityScript6:
 	ld a, $5
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
@@ -176,7 +176,7 @@ PewterCityScript6: ; 1936f (6:536f)
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityTextPointers: ; 1938b (6:538b)
+PewterCityTextPointers:
 	dw PewterCityText1
 	dw PewterCityText2
 	dw PewterCityText3
@@ -192,15 +192,15 @@ PewterCityTextPointers: ; 1938b (6:538b)
 	dw PewterCityText13
 	dw PewterCityText14
 
-PewterCityText1: ; 193a7 (6:53a7)
+PewterCityText1:
 	TX_FAR _PewterCityText1
 	db "@"
 
-PewterCityText2: ; 193ac (6:53ac)
+PewterCityText2:
 	TX_FAR _PewterCityText2
 	db "@"
 
-PewterCityText3: ; 193b1 (6:53b1)
+PewterCityText3:
 	TX_ASM
 	ld hl, PewterCityText_193f1
 	call PrintText
@@ -230,23 +230,23 @@ PewterCityText3: ; 193b1 (6:53b1)
 .asm_193ee
 	jp TextScriptEnd
 
-PewterCityText_193f1: ; 193f1 (6:53f1)
+PewterCityText_193f1:
 	TX_FAR _PewterCityText_193f1
 	db "@"
 
-PewterCityText_193f6: ; 193f6 (6:53f6)
+PewterCityText_193f6:
 	TX_FAR _PewterCityText_193f6
 	db "@"
 
-PewterCityText_193fb: ; 193fb (6:53fb)
+PewterCityText_193fb:
 	TX_FAR _PewterCityText_193fb
 	db "@"
 
-PewterCityText13: ; 19400 (6:5400)
+PewterCityText13:
 	TX_FAR _PewterCityText13
 	db "@"
 
-PewterCityText4: ; 19405 (6:5405)
+PewterCityText4:
 	TX_ASM
 	ld hl, PewterCityText_19427
 	call PrintText
@@ -263,19 +263,19 @@ PewterCityText4: ; 19405 (6:5405)
 .asm_19424
 	jp TextScriptEnd
 
-PewterCityText_19427: ; 19427 (6:5427)
+PewterCityText_19427:
 	TX_FAR _PewterCityText_19427
 	db "@"
 
-PewterCityText_1942c: ; 1942c (6:542c)
+PewterCityText_1942c:
 	TX_FAR _PewterCityText_1942c
 	db "@"
 
-PewterCityText_19431: ; 19431 (6:5431)
+PewterCityText_19431:
 	TX_FAR _PewterCityText_19431
 	db "@"
 
-PewterCityText5: ; 19436 (6:5436)
+PewterCityText5:
 	TX_ASM
 	ld hl, PewterCityText_1945d
 	call PrintText
@@ -293,32 +293,32 @@ PewterCityText5: ; 19436 (6:5436)
 	ld [wPewterCityCurScript], a
 	jp TextScriptEnd
 
-PewterCityText_1945d: ; 1945d (6:545d)
+PewterCityText_1945d:
 	TX_FAR _PewterCityText_1945d
 	db "@"
 
-PewterCityText14: ; 19462 (6:5462)
+PewterCityText14:
 
-PewterCityText_19462: ; 19462 (6:5462)
+PewterCityText_19462:
 	TX_FAR _PewterCityText_19462
 	db "@"
 
-PewterCityText6: ; 19467 (6:5467)
+PewterCityText6:
 	TX_FAR _PewterCityText6
 	db "@"
 
-PewterCityText7: ; 1946c (6:546c)
+PewterCityText7:
 	TX_FAR _PewterCityText7
 	db "@"
 
-PewterCityText10: ; 19471 (6:5471)
+PewterCityText10:
 	TX_FAR _PewterCityText10
 	db "@"
 
-PewterCityText11: ; 19476 (6:5476)
+PewterCityText11:
 	TX_FAR _PewterCityText11
 	db "@"
 
-PewterCityText12: ; 1947b (6:547b)
+PewterCityText12:
 	TX_FAR _PewterCityText12
 	db "@"