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/SilphCo2F.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/SilphCo2F.asm (renamed from scripts/silphco2.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm index 3a5d3650..5fd542cb 100755 --- a/scripts/silphco2.asm +++ b/scripts/SilphCo2F.asm @@ -1,11 +1,11 @@ -SilphCo2Script: +SilphCo2F_Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing - ld hl, SilphCo2TrainerHeaders - ld de, SilphCo2ScriptPointers - ld a, [wSilphCo2CurScript] + ld hl, SilphCo2TrainerHeader0 + ld de, SilphCo2F_ScriptPointers + ld a, [wSilphCo2FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo2CurScript], a + ld [wSilphCo2FCurScript], a ret SilphCo2Script_59d07: @@ -86,19 +86,18 @@ SilphCo2Script_59d6f: SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -SilphCo2ScriptPointers: +SilphCo2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo2TextPointers: +SilphCo2F_TextPointers: dw SilphCo2Text1 dw SilphCo2Text2 dw SilphCo2Text3 dw SilphCo2Text4 dw SilphCo2Text5 -SilphCo2TrainerHeaders: SilphCo2TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -162,7 +161,8 @@ SilphCo2Text_59ded: ReceivedTM36Text: TX_FAR _ReceivedTM36Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM36ExplanationText: TX_FAR _TM36ExplanationText |