diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/PokemonTower2F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PokemonTower2F.asm (renamed from scripts/pokemontower2.asm) | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/pokemontower2.asm b/scripts/PokemonTower2F.asm index 0a0aa3d5..54f49cae 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/PokemonTower2F.asm @@ -1,17 +1,17 @@ -PokemonTower2Script: +PokemonTower2F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower2ScriptPointers - ld a, [wPokemonTower2CurScript] - jp JumpTable + ld hl, PokemonTower2F_ScriptPointers + ld a, [wPokemonTower2FCurScript] + jp CallFunctionInTable PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2ScriptPointers: +PokemonTower2F_ScriptPointers: dw PokemonTower2Script0 dw PokemonTower2Script1 dw PokemonTower2Script2 @@ -78,7 +78,7 @@ PokemonTower2Script1: call StopAllMusic callba Music_RivalAlternateStart ld a, $2 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret @@ -108,18 +108,18 @@ PokemonTower2Script2: ld a, [wd730] bit 0, a ret nz - ld a, HS_POKEMONTOWER_2_RIVAL + ld a, HS_POKEMON_TOWER_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2TextPointers: +PokemonTower2F_TextPointers: dw PokemonTower2Text1 dw PokemonTower2Text2 @@ -146,7 +146,7 @@ PokemonTower2Text1: ld [wTrainerNo], a ld a, $1 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a .asm_41852 jp TextScriptEnd |