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/silphco9.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/SilphCo9F.asm (renamed from scripts/silphco9.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/silphco9.asm b/scripts/SilphCo9F.asm index 6757eb49..66291e98 100755 --- a/scripts/silphco9.asm +++ b/scripts/SilphCo9F.asm @@ -1,11 +1,11 @@ -SilphCo9Script: +SilphCo9F_Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing - ld hl, SilphCo9TrainerHeaders - ld de, SilphCo9ScriptPointers - ld a, [wSilphCo9CurScript] + ld hl, SilphCo9TrainerHeader0 + ld de, SilphCo9F_ScriptPointers + ld a, [wSilphCo9FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo9CurScript], a + ld [wSilphCo9FCurScript], a ret SilphCo9Script_5d7d1: @@ -118,18 +118,17 @@ SilphCo9Script_5d863: SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -SilphCo9ScriptPointers: +SilphCo9F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo9TextPointers: +SilphCo9F_TextPointers: dw SilphCo9Text1 dw SilphCo9Text2 dw SilphCo9Text3 dw SilphCo9Text4 -SilphCo9TrainerHeaders: SilphCo9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 db ($4 << 4) ; trainer's view range |