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/PokemonTower7F.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/PokemonTower7F.asm (renamed from scripts/pokemontower7.asm) | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm index abfb1468..e34edf66 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/PokemonTower7F.asm @@ -1,18 +1,18 @@ -PokemonTower7Script: +PokemonTower7F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower7ScriptPointers - ld a, [wPokemonTower7CurScript] - call JumpTable + ld hl, PokemonTower7F_ScriptPointers + ld a, [wPokemonTower7FCurScript] + call CallFunctionInTable ret PokemonTower7Script_60d01: xor a ld [wJoyIgnore], a PokemonTower7Script_60d05: - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ret -PokemonTower7ScriptPointers: +PokemonTower7F_ScriptPointers: dw PokemonTower7Script0 dw PokemonTower7Script1 dw PokemonTower7Script2 @@ -52,9 +52,9 @@ PokemonTower7Script_60d2a: ld [hJoyHeld], a ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a - ld a, HS_POKEMONTOWER_7_JESSIE + ld a, HS_POKEMON_TOWER_7F_JESSIE call PokemonTower7Script_60eaf - ld a, HS_POKEMONTOWER_7_JAMES + ld a, HS_POKEMON_TOWER_7F_JAMES call PokemonTower7Script_60eaf ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -195,9 +195,9 @@ PokemonTower7Script9: ld a, $ff ld [wJoyIgnore], a call GBFadeOutToBlack - ld a, HS_POKEMONTOWER_7_JESSIE + ld a, HS_POKEMON_TOWER_7F_JESSIE call PokemonTower7Script_60ebe - ld a, HS_POKEMONTOWER_7_JAMES + ld a, HS_POKEMON_TOWER_7F_JAMES call PokemonTower7Script_60ebe call UpdateSprites call Delay3 @@ -231,12 +231,12 @@ PokemonTower7Script_60ebe PokemonTower7Script11: ld a, $ff ld [wJoyIgnore], a - ld a, HS_POKEMONTOWER_7_MR_FUJI + ld a, HS_POKEMON_TOWER_7F_MR_FUJI ld [wMissableObjectIndex], a predef HideObject ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a - ld a, LAVENDER_HOUSE_1 + ld a, MR_FUJIS_HOUSE ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a @@ -245,10 +245,10 @@ PokemonTower7Script11: ld hl, wd72d set 3, [hl] ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ret -PokemonTower7TextPointers: +PokemonTower7F_TextPointers: dw PokemonTower7Text1 dw PokemonTower7Text2 dw PokemonTower7Text3 @@ -297,7 +297,7 @@ PokemonTower7Text3: call PrintText SetEvent EVENT_RESCUED_MR_FUJI SetEvent EVENT_RESCUED_MR_FUJI_2 - ld a, HS_LAVENDER_HOUSE_1_MR_FUJI + ld a, HS_MR_FUJIS_HOUSE_MR_FUJI ld [wMissableObjectIndex], a predef ShowObject ld a, HS_SAFFRON_CITY_E @@ -307,7 +307,7 @@ PokemonTower7Text3: ld [wMissableObjectIndex], a predef ShowObject ld a, $b - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a jp TextScriptEnd PokemonTower7Text_60f75: |