diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/PokemonTower7F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PokemonTower7F.asm (renamed from scripts/pokemontower7.asm) | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm index 88c62c53..4b2a1827 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/PokemonTower7F.asm @@ -1,20 +1,20 @@ -PokemonTower7Script: +PokemonTower7F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeader0 - ld de, PokemonTower7ScriptPointers - ld a, [wPokemonTower7CurScript] + ld de, PokemonTower7F_ScriptPointers + ld a, [wPokemonTower7FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ret PokemonTower7Script_60d18: xor a ld [wJoyIgnore], a - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7ScriptPointers: +PokemonTower7F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw PokemonTower7Script2 @@ -35,7 +35,7 @@ PokemonTower7Script2: call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -59,19 +59,19 @@ PokemonTower7Script3: ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret PokemonTower7Script4: 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 [wSpriteStateData1 + 9], a - ld a, LAVENDER_HOUSE_1 + ld a, MR_FUJIS_HOUSE ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a @@ -80,7 +80,7 @@ PokemonTower7Script4: ld hl, wd72d set 3, [hl] ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -198,7 +198,7 @@ MovementData_60e37: db NPC_MOVEMENT_DOWN db $FF -PokemonTower7TextPointers: +PokemonTower7F_TextPointers: dw PokemonTower7Text1 dw PokemonTower7Text2 dw PokemonTower7Text3 @@ -257,7 +257,7 @@ PokemonTower7FujiText: 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 @@ -267,7 +267,7 @@ PokemonTower7FujiText: ld [wMissableObjectIndex], a predef ShowObject ld a, $4 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a jp TextScriptEnd |