aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/MtMoonB2F.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/MtMoonB2F.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/MtMoonB2F.asm')
-rw-r--r--scripts/MtMoonB2F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index 2b2dea4e..0f336136 100644
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -80,7 +80,7 @@ IF DEF(_DEBUG)
ENDC
CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
call z, MtMoonB2FScript_49d28
- CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
+ CheckEvent EVENT_BEAT_MT_MOON_3_JESSIE_JAMES
call z, MtMoonB2FScript_49e15
ret
@@ -395,7 +395,7 @@ MtMoonB2FScript15:
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
- SetEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
+ SetEvent EVENT_BEAT_MT_MOON_3_JESSIE_JAMES
ResetEventReuseHL EVENT_57E
ld a, SCRIPT_MTMOONB2F_DEFAULT
call MtMoonB2FSetScript
@@ -433,11 +433,11 @@ MtMoonB2F_TextPointers:
MtMoon3TrainerHeaders:
def_trainers 3
MtMoon3TrainerHeader0:
- trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoonB2FRocket2BattleText, MtMoonB2FRocket2EndBattleText, MtMoonB2FRocket2AfterBattleText
+ trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoonB2FRocket2BattleText, MtMoonB2FRocket2EndBattleText, MtMoonB2FRocket2AfterBattleText
MtMoon3TrainerHeader1:
- trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoonB2FRocket3BattleText, MtMoonB2FRocket3EndBattleText, MtMoonB2FRocket3AfterBattleText
+ trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoonB2FRocket3BattleText, MtMoonB2FRocket3EndBattleText, MtMoonB2FRocket3AfterBattleText
MtMoon3TrainerHeader2:
- trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoonB2FRocket4BattleText, MtMoonB2FRocket4EndBattleText, MtMoonB2FRocket4AfterBattleText
+ trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoonB2FRocket4BattleText, MtMoonB2FRocket4EndBattleText, MtMoonB2FRocket4AfterBattleText
db -1 ; end
MtMoonB2FJessieJamesText: