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/PokemonTower4F.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/PokemonTower4F.asm (renamed from scripts/pokemontower4.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/pokemontower4.asm b/scripts/PokemonTower4F.asm index fe7a4e08..b8e0d772 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/PokemonTower4F.asm @@ -1,18 +1,18 @@ -PokemonTower4Script: +PokemonTower4F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower4TrainerHeaders - ld de, PokemonTower4ScriptPointers - ld a, [wPokemonTower4CurScript] + ld hl, PokemonTower4TrainerHeader0 + ld de, PokemonTower4F_ScriptPointers + ld a, [wPokemonTower4FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower4CurScript], a + ld [wPokemonTower4FCurScript], a ret -PokemonTower4ScriptPointers: +PokemonTower4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower4TextPointers: +PokemonTower4F_TextPointers: dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 @@ -20,7 +20,6 @@ PokemonTower4TextPointers: dw PickUpItemText dw PickUpItemText -PokemonTower4TrainerHeaders: PokemonTower4TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 db ($2 << 4) ; trainer's view range |