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/rockethideout3.asm | |
| parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
| parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) | |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/rockethideout3.asm')
| -rwxr-xr-x | scripts/rockethideout3.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 82bdd394..ac08e868 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3Script: ; 45225 (11:5225) +RocketHideout3Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeaders ld de, RocketHideout3ScriptPointers @@ -7,13 +7,13 @@ RocketHideout3Script: ; 45225 (11:5225) ld [wRocketHideout3CurScript], a ret -RocketHideout3ScriptPointers: ; 45238 (11:5238) +RocketHideout3ScriptPointers: dw RocketHideout3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout3Script3 -RocketHideout3Script0: ; 45240 (11:5240) +RocketHideout3Script0: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -36,7 +36,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ;format: ;db y,x ;dw pointer to movement -RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b) +RocketHideout3ArrowTilePlayerMovement: db $d,$a dw RocketHideout3ArrowMovement6 db $13,$a @@ -73,65 +73,65 @@ RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b) ;format: direction, count ;each list is read starting from the $FF and working backwards -RocketHideout3ArrowMovement1: ; 452ac (11:52ac) +RocketHideout3ArrowMovement1: db D_RIGHT,$04 db D_UP,$04 db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement2: ; 452b3 (11:52b3) +RocketHideout3ArrowMovement2: db D_DOWN,$04 db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement3: ; 452b8 (11:52b8) +RocketHideout3ArrowMovement3: db D_LEFT,$02 db $FF -RocketHideout3ArrowMovement4: ; 452bb (11:52bb) +RocketHideout3ArrowMovement4: db D_RIGHT,$04 db D_UP,$02 db D_RIGHT,$02 db $FF -RocketHideout3ArrowMovement5: ; 452c2 (11:52c2) +RocketHideout3ArrowMovement5: db D_RIGHT,$04 db D_UP,$02 db D_RIGHT,$02 db D_UP,$03 db $FF -RocketHideout3ArrowMovement6: ; 452cb (11:52cb) +RocketHideout3ArrowMovement6: db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement7: ; 452ce (11:52ce) +RocketHideout3ArrowMovement7: db D_RIGHT,$02 db $FF -RocketHideout3ArrowMovement8: ; 452d1 (11:52d1) +RocketHideout3ArrowMovement8: db D_RIGHT,$04 db D_UP,$02 db $FF -RocketHideout3ArrowMovement9: ; 452d6 (11:52d6) +RocketHideout3ArrowMovement9: db D_RIGHT,$04 db D_UP,$04 db $FF -RocketHideout3ArrowMovement10: ; 452db (11:52db) +RocketHideout3ArrowMovement10: db D_DOWN,$04 db $FF -RocketHideout3ArrowMovement11: ; 452de (11:52de) +RocketHideout3ArrowMovement11: db D_UP,$02 db $FF -RocketHideout3ArrowMovement12: ; 452e1 (11:52e1) +RocketHideout3ArrowMovement12: db D_UP,$01 db $FF -RocketHideout3Script3: ; 452e4 (11:452e4) +RocketHideout3Script3: ld a, [wSimulatedJoypadStatesIndex] and a jp nz, LoadSpinnerArrowTiles @@ -143,14 +143,14 @@ RocketHideout3Script3: ; 452e4 (11:452e4) ld [wCurMapScript], a ret -RocketHideout3TextPointers: ; 452fa (11:52fa) +RocketHideout3TextPointers: dw RocketHideout3Text1 dw RocketHideout3Text2 dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: ; 45302 (11:5302) -RocketHideout3TrainerHeader0: ; 45302 (11:5302) +RocketHideout3TrainerHeaders: +RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 @@ -159,7 +159,7 @@ RocketHideout3TrainerHeader0: ; 45302 (11:5302) dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: ; 4530e (11:530e) +RocketHideout3TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 @@ -170,38 +170,38 @@ RocketHideout3TrainerHeader2: ; 4530e (11:530e) db $ff -RocketHideout3Text1: ; 4531b (11:531b) +RocketHideout3Text1: TX_ASM ld hl, RocketHideout3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleText2: ; 45325 (11:5325) +RocketHideout3BattleText2: TX_FAR _RocketHideout3BattleText2 db "@" -RocketHideout3EndBattleText2: ; 4532a (11:532a) +RocketHideout3EndBattleText2: TX_FAR _RocketHideout3EndBattleText2 db "@" -RocketHideout3AfterBattleTxt2: ; 4532f (11:532f) +RocketHideout3AfterBattleTxt2: TX_FAR _RocketHideout3AfterBattleTxt2 db "@" -RocketHideout3Text2: ; 45334 (11:5334) +RocketHideout3Text2: TX_ASM ld hl, RocketHideout3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleTxt: ; 4533e (11:533e) +RocketHideout3BattleTxt: TX_FAR _RocketHideout3BattleTxt db "@" -RocketHideout3EndBattleText3: ; 45343 (11:5343) +RocketHideout3EndBattleText3: TX_FAR _RocketHideout3EndBattleText3 db "@" -RocketHideout3AfterBattleText3: ; 45348 (11:5348) +RocketHideout3AfterBattleText3: TX_FAR _RocketHide3AfterBattleText3 db "@" |