aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SilphCo11F.asm
diff options
context:
space:
mode:
authorRangi42 <remy.oukaour+rangi42@gmail.com>2024-07-24 11:16:39 -0400
committerRangi42 <remy.oukaour+rangi42@gmail.com>2024-07-24 11:16:39 -0400
commitc1d65106807e899637058365986157c6a0b10855 (patch)
tree7c8f11f8f9b17354fad7ec0621af6cc8db4fe821 /scripts/SilphCo11F.asm
parentBuild with RGBDS 0.8.0, though it is not yet required (diff)
downloadpokeyellow-c1d65106807e899637058365986157c6a0b10855.tar.gz
pokeyellow-c1d65106807e899637058365986157c6a0b10855.tar.xz
pokeyellow-c1d65106807e899637058365986157c6a0b10855.zip
Rename event constants for Jessie/James battles
Diffstat (limited to 'scripts/SilphCo11F.asm')
-rw-r--r--scripts/SilphCo11F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index abc5cb02..be004d68 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -103,7 +103,7 @@ IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
- CheckEvent EVENT_BEAT_SILPH_CO_11F_TRAINER_0
+ CheckEvent EVENT_BEAT_SILPH_CO_11F_JESSIE_JAMES
call z, SilphCo11FScript_6229c
CheckEvent EVENT_782
ret nz
@@ -452,7 +452,7 @@ SilphCo11FScript14:
ldh [hJoyHeld], a
ld [wJoyIgnore], a
ResetEvent EVENT_782
- SetEventReuseHL EVENT_BEAT_SILPH_CO_11F_TRAINER_0
+ SetEventReuseHL EVENT_BEAT_SILPH_CO_11F_JESSIE_JAMES
ld a, SCRIPT_SILPHCO11F_DEFAULT
call SilphCo11FSetCurScript
ret
@@ -485,7 +485,7 @@ SilphCo11F_TextPointers:
SilphCo11TrainerHeaders:
def_trainers 5
SilphCo11TrainerHeader0:
- trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11FRocketBattleText, SilphCo11FRocketEndBattleText, SilphCo11FRocketAfterBattleText
+ trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 3, SilphCo11FRocketBattleText, SilphCo11FRocketEndBattleText, SilphCo11FRocketAfterBattleText
db -1 ; end
SilphCo11FJessieJamesText: