diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/PokemonTower6F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PokemonTower6F.asm (renamed from scripts/pokemontower6.asm) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/PokemonTower6F.asm index 82c39a41..14c07c48 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/PokemonTower6F.asm @@ -1,20 +1,20 @@ -PokemonTower6Script: +PokemonTower6F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower6TrainerHeaders - ld de, PokemonTower6ScriptPointers - ld a, [wPokemonTower6CurScript] + ld hl, PokemonTower6TrainerHeader0 + ld de, PokemonTower6F_ScriptPointers + ld a, [wPokemonTower6FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ret PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6ScriptPointers: +PokemonTower6F_ScriptPointers: dw PokemonTower6Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -37,7 +37,7 @@ PokemonTower6Script0: ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -66,7 +66,7 @@ PokemonTower6Script4: xor a ld [wJoyIgnore], a ld a, $0 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret .asm_60b82 @@ -80,7 +80,7 @@ PokemonTower6Script4: ld hl, wd730 set 7, [hl] ld a, $3 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -90,11 +90,11 @@ PokemonTower6Script3: ret nz call Delay3 xor a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6TextPointers: +PokemonTower6F_TextPointers: dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 @@ -103,7 +103,6 @@ PokemonTower6TextPointers: dw PokemonTower6Text6 dw PokemonTower6Text7 -PokemonTower6TrainerHeaders: PokemonTower6TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 db ($3 << 4) ; trainer's view range |