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/silphco3.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/SilphCo3F.asm (renamed from scripts/silphco3.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm index b8dfb7fb..42b5d611 100755 --- a/scripts/silphco3.asm +++ b/scripts/SilphCo3F.asm @@ -1,11 +1,11 @@ -SilphCo3Script: +SilphCo3F_Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing - ld hl, SilphCo3TrainerHeaders - ld de, SilphCo3ScriptPointers - ld a, [wSilphCo3CurScript] + ld hl, SilphCo3TrainerHeader0 + ld de, SilphCo3F_ScriptPointers + ld a, [wSilphCo3FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo3CurScript], a + ld [wSilphCo3FCurScript], a ret SilphCo3Script_59f71: @@ -50,18 +50,17 @@ SilphCo3Script_59fad: SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret -SilphCo3ScriptPointers: +SilphCo3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo3TextPointers: +SilphCo3F_TextPointers: dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 dw PickUpItemText -SilphCo3TrainerHeaders: SilphCo3TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 db ($2 << 4) ; trainer's view range |