diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/pewtercity.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/pewtercity.asm')
-rwxr-xr-x | scripts/pewtercity.asm | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 28fa1cc3..5ee83f34 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -1,10 +1,10 @@ -PewterCityScript: ; 19237 (6:5237) +PewterCityScript: call EnableAutoTextBoxDrawing ld hl, PewterCityScriptPointers ld a, [wPewterCityCurScript] jp CallFunctionInTable -PewterCityScriptPointers: ; 19243 (6:5243) +PewterCityScriptPointers: dw PewterCityScript0 dw PewterCityScript1 dw PewterCityScript2 @@ -13,14 +13,14 @@ PewterCityScriptPointers: ; 19243 (6:5243) dw PewterCityScript5 dw PewterCityScript6 -PewterCityScript0: ; 19251 (6:5251) +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 @@ -32,14 +32,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 @@ -76,14 +76,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 @@ -94,7 +94,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ld [wPewterCityCurScript], a ret -PewterCityScript3: ; 192e9 (6:52e9) +PewterCityScript3: ld a, $3 ld [wSpriteIndex], a call SetSpritePosition2 @@ -107,7 +107,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 "@" |