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/PokemonTower3F.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/PokemonTower3F.asm (renamed from scripts/pokemontower3.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm index 8be15c9e..7d8f63e9 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/PokemonTower3F.asm @@ -1,24 +1,23 @@ -PokemonTower3Script: +PokemonTower3F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower3TrainerHeaders - ld de, PokemonTower3ScriptPointers - ld a, [wPokemonTower3CurScript] + ld hl, PokemonTower3TrainerHeader0 + 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 dw PickUpItemText -PokemonTower3TrainerHeaders: PokemonTower3TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 db ($2 << 4) ; trainer's view range |