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/PokemonTower5F.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/PokemonTower5F.asm (renamed from scripts/pokemontower5.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/pokemontower5.asm b/scripts/PokemonTower5F.asm index 82b912b5..299261e9 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/PokemonTower5F.asm @@ -1,13 +1,13 @@ -PokemonTower5Script: +PokemonTower5F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower5TrainerHeaders - ld de, PokemonTower5ScriptPointers - ld a, [wPokemonTower5CurScript] + ld hl, PokemonTower5TrainerHeader0 + ld de, PokemonTower5F_ScriptPointers + ld a, [wPokemonTower5FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower5CurScript], a + ld [wPokemonTower5FCurScript], a ret -PokemonTower5ScriptPointers: +PokemonTower5F_ScriptPointers: dw PokemonTower5Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -48,7 +48,7 @@ CoordsData_60992: db $09,$0B db $FF -PokemonTower5TextPointers: +PokemonTower5F_TextPointers: dw PokemonTower5Text1 dw PokemonTower5Text2 dw PokemonTower5Text3 @@ -57,7 +57,6 @@ PokemonTower5TextPointers: dw PickUpItemText dw PokemonTower5Text7 -PokemonTower5TrainerHeaders: PokemonTower5TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 db ($2 << 4) ; trainer's view range |