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/PokemonTower3F.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/PokemonTower3F.asm (renamed from scripts/pokemontower3.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm index 6027b450..7d8f63e9 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/PokemonTower3F.asm @@ -1,18 +1,18 @@ -PokemonTower3Script: +PokemonTower3F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeader0 - ld de, PokemonTower3ScriptPointers - ld a, [wPokemonTower3CurScript] + ld de, PokemonTower3F_ScriptPointers + ld a, [wPokemonTower3FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower3CurScript], a + ld [wPokemonTower3FCurScript], a ret -PokemonTower3ScriptPointers: +PokemonTower3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower3TextPointers: +PokemonTower3F_TextPointers: dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 |