diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
| commit | 35493bef27ba0425860a0f419c64371b824b6981 (patch) | |
| tree | b57de4968c66fc768f404e3dd03849b1fd64eace /scripts/pokemontower6.asm | |
| parent | 80f7845a0771c1666288f22dba2c3c8e6a308f26 (diff) | |
| parent | 32de1b269468f48d073a8e6d52843877baff0ba4 (diff) | |
Merge remote-tracking branch 'danny/master'
Diffstat (limited to 'scripts/pokemontower6.asm')
| -rwxr-xr-x | scripts/pokemontower6.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index b7be3941..fe33ce29 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -7,7 +7,7 @@ PokemonTower6Script: ; 60aef (18:4aef) ld [W_POKEMONTOWER6CURSCRIPT], a ret -Func_60b02: ; 60b02 (18:4b02) +PokemonTower6Script_60b02: ; 60b02 (18:4b02) xor a ld [wJoyIgnore], a ld [W_POKEMONTOWER6CURSCRIPT], a @@ -48,7 +48,7 @@ CoordsData_60b45: ; 60b45 (18:4b45) PokemonTower6Script4: ; 60b48 (18:4b48) ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff - jp z, Func_60b02 + jp z, PokemonTower6Script_60b02 ld a, $ff ld [wJoyIgnore], a ld a, [wd72d] |