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/silphco10.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/SilphCo10F.asm (renamed from scripts/silphco10.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/silphco10.asm b/scripts/SilphCo10F.asm index 6b35a05a..40506682 100755 --- a/scripts/silphco10.asm +++ b/scripts/SilphCo10F.asm @@ -1,11 +1,11 @@ -SilphCo10Script: +SilphCo10F_Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing - ld hl, SilphCo10TrainerHeaders - ld de, SilphCo10ScriptPointers - ld a, [wSilphCo10CurScript] + ld hl, SilphCo10TrainerHeader0 + ld de, SilphCo10F_ScriptPointers + ld a, [wSilphCo10FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo10CurScript], a + ld [wSilphCo10FCurScript], a ret SilphCo10Script_5a14f: @@ -34,12 +34,12 @@ SilphCo10Text_5a176: SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret -SilphCo10ScriptPointers: +SilphCo10F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo10TextPointers: +SilphCo10F_TextPointers: dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 @@ -47,7 +47,6 @@ SilphCo10TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo10TrainerHeaders: SilphCo10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 db ($3 << 4) ; trainer's view range |