diff options
Diffstat (limited to 'scripts/pokemontower2.asm')
| -rwxr-xr-x | scripts/pokemontower2.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index dc9275f2..1bde3ba6 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -20,7 +20,7 @@ PokemonTower2Script0: ; 6050f (18:450f) ld a, [wd764] bit 7, a ret nz - ld hl, CoordsData_6055e ; $455e + ld hl, CoordsData_6055e call ArePlayerCoordsInArray ret nc ld a, $ff @@ -35,7 +35,7 @@ PokemonTower2Script0: ; 6050f (18:450f) cp $1 ld a, $8 ld b, $0 - jr nz, .asm_60544 ; 0x60539 $9 + jr nz, .asm_60544 ld hl, wd764 set 6, [hl] ld a, $2 @@ -74,7 +74,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld de, MovementData_605b2 ld a, [wd764] bit 6, a - jr nz, .asm_60589 ; 0x60584 $3 + jr nz, .asm_60589 ld de, MovementData_605a9 .asm_60589 ld a, $1 @@ -118,18 +118,18 @@ PokemonTower2Text1: ; 605df (18:45df) db $08 ; asm ld a, [wd764] bit 7, a - jr z, .asm_16f24 ; 0x605e5 + jr z, .asm_16f24 ld hl, PokemonTower2Text_6063c call PrintText - jr .asm_41852 ; 0x605ed -.asm_16f24 ; 0x605ef + jr .asm_41852 +.asm_16f24 ld hl, PokemonTower2Text_6062d call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, PokemonTower2Text_60632 - ld de, PokemonTower2Text_60637 ; XXX $4637 + ld de, PokemonTower2Text_60637 call SaveEndBattleTextPointers ld a, SONY2 + $c8 ld [W_CUROPPONENT], a @@ -137,15 +137,15 @@ PokemonTower2Text1: ; 605df (18:45df) ; select which team to use during the encounter ld a, [W_RIVALSTARTER] cp STARTER2 - jr nz, .NotSquirtle ; 0x6060f + jr nz, .NotSquirtle ld a, $4 jr .done -.NotSquirtle ; 0x60615 +.NotSquirtle cp STARTER3 - jr nz, .Charmander ; 0x60617 + jr nz, .Charmander ld a, $5 jr .done -.Charmander ; 0x6061d +.Charmander ld a, $6 .done ld [W_TRAINERNO], a @@ -153,7 +153,7 @@ PokemonTower2Text1: ; 605df (18:45df) ld a, $1 ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a -.asm_41852 ; 0x6062a +.asm_41852 jp TextScriptEnd PokemonTower2Text_6062d: ; 6062d (18:462d) |