diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
| commit | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (patch) | |
| tree | ca189f210cb5f404d4791ace04fcd70de6b3a642 /scripts/pokemontower2.asm | |
| parent | 42a9f7e8fd9f2f56a271cd5378467bb6a0f5bd21 (diff) | |
Part 1 of syncing with pokered.
Diffstat (limited to 'scripts/pokemontower2.asm')
| -rwxr-xr-x | scripts/pokemontower2.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 6b0c1f00..28e57d22 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -1,22 +1,22 @@ -PokemonTower2Script: ; 604f2 (18:44f2) +PokemonTower2Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers ld a, [W_POKEMONTOWER2CURSCRIPT] jp JumpTable -PokemonTower2Script_604fe: ; 604fe (18:44fe) +PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -PokemonTower2ScriptPointers: ; 60509 (18:4509) +PokemonTower2ScriptPointers: dw PokemonTower2Script0 dw PokemonTower2Script1 dw PokemonTower2Script2 -PokemonTower2Script0: ; 6050f (18:450f) +PokemonTower2Script0: CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ret nz ld hl, CoordsData_6055e @@ -51,12 +51,12 @@ PokemonTower2Script0: ; 6050f (18:450f) ld [hJoyPressed], a ret -CoordsData_6055e: ; 6055e (18:455e) +CoordsData_6055e: db $05,$0F db $06,$0E db $0F ; isn't this supposed to end in $ff? -PokemonTower2Script1: ; 60563 (18:4563) +PokemonTower2Script1: ld a, [wIsInBattle] cp $ff jp z, PokemonTower2Script_604fe @@ -82,7 +82,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld [W_CURMAPSCRIPT], a ret -MovementData_605a9: ; 605a9 (18:45a9) +MovementData_605a9: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -93,7 +93,7 @@ MovementData_605a9: ; 605a9 (18:45a9) db NPC_MOVEMENT_RIGHT db $FF -MovementData_605b2: ; 605b2 (18:45b2) +MovementData_605b2: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT @@ -104,7 +104,7 @@ MovementData_605b2: ; 605b2 (18:45b2) db NPC_MOVEMENT_DOWN db $FF -PokemonTower2Script2: ; 605bb (18:45bb) +PokemonTower2Script2: ld a, [wd730] bit 0, a ret nz @@ -119,11 +119,11 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld [W_CURMAPSCRIPT], a ret -PokemonTower2TextPointers: ; 605db (18:45db) +PokemonTower2TextPointers: dw PokemonTower2Text1 dw PokemonTower2Text2 -PokemonTower2Text1: ; 605df (18:45df) +PokemonTower2Text1: TX_ASM CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL jr z, .asm_16f24 @@ -151,22 +151,22 @@ PokemonTower2Text1: ; 605df (18:45df) .asm_41852 jp TextScriptEnd -PokemonTower2Text_6062d: ; 6062d (18:462d) +PokemonTower2Text_6062d: TX_FAR _PokemonTower2Text_6062d db "@" -PokemonTower2Text_60632: ; 60632 (18:4632) +PokemonTower2Text_60632: TX_FAR _PokemonTower2Text_60632 db "@" -PokemonTower2Text_60637: ; 60637 (18:4637) +PokemonTower2Text_60637: TX_FAR _PokemonTower2Text_60637 db "@" -PokemonTower2Text_6063c: ; 6063c (18:463c) +PokemonTower2Text_6063c: TX_FAR _PokemonTower2Text_6063c db "@" -PokemonTower2Text2: ; 60641 (18:4641) +PokemonTower2Text2: TX_FAR _PokemonTower2Text2 db "@" |