aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/MtMoonB2F.asm10
-rw-r--r--scripts/PokemonTower7F.asm16
-rw-r--r--scripts/RocketHideoutB4F.asm16
-rw-r--r--scripts/SilphCo11F.asm6
4 files changed, 24 insertions, 24 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:
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm
index d0332cb6..5334afd2 100644
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -32,7 +32,7 @@ IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
- CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
+ CheckEvent EVENT_BEAT_POKEMONTOWER_7_JESSIE_JAMES
call z, PokemonTower7FScript_60d2a
ret
@@ -40,14 +40,14 @@ PokemonTower7FScript_60d2a:
ld a, [wYCoord]
cp $c
ret nz
- ResetEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ ResetEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
ld a, [wXCoord]
cp $a
jr z, .asm_60d47
ld a, [wXCoord] ; why?
cp $b
ret nz
- SetEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ SetEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
.asm_60d47
call StopAllMusic
ld c, BANK(Music_MeetJessieJames)
@@ -82,7 +82,7 @@ PokemonTower7FMovementData_60d7b:
PokemonTower7FScript1:
ld de, PokemonTower7FMovementData_60d7b
- CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ CheckEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
jr z, .asm_60d8c
ld de, PokemonTower7FMovementData_60d7a
.asm_60d8c
@@ -104,7 +104,7 @@ PokemonTower7FScript2:
PokemonTower7FScript3:
ld a, SPRITE_FACING_DOWN
ld [wSprite01StateData1FacingDirection], a
- CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ CheckEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
jr z, .asm_60dba
ld a, SPRITE_FACING_RIGHT
ld [wSprite01StateData1FacingDirection], a
@@ -113,7 +113,7 @@ PokemonTower7FScript3:
ld [wSprite01StateData1MovementStatus], a
PokemonTower7FScript4:
ld de, PokemonTower7FMovementData_60d7a
- CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ CheckEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
jr z, .asm_60dcc
ld de, PokemonTower7FMovementData_60d7b
.asm_60dcc
@@ -137,7 +137,7 @@ PokemonTower7FScript6:
ld [wSprite02StateData1MovementStatus], a
ld a, SPRITE_FACING_LEFT
ld [wSprite02StateData1FacingDirection], a
- CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
+ CheckEvent EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
jr z, .asm_60dff
ld a, SPRITE_FACING_DOWN
ld [wSprite02StateData1FacingDirection], a
@@ -217,7 +217,7 @@ PokemonTower7FScript10:
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
- SetEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
+ SetEvent EVENT_BEAT_POKEMONTOWER_7_JESSIE_JAMES
ld a, SCRIPT_POKEMONTOWER7F_SCRIPT0
call PokemonTower7FSetScript
ret
diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm
index 0a417abc..81e11696 100644
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -74,7 +74,7 @@ IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
- CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
+ CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_JESSIE_JAMES
call z, RocketHideoutB4FScript_455a5
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
call z, CheckFightingMapTrainers
@@ -84,14 +84,14 @@ RocketHideoutB4FScript_455a5:
ld a, [wYCoord]
cp $e
ret nz
- ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ ResetEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
ld a, [wXCoord]
cp $18
jr z, .asm_455c2
ld a, [wXCoord]
cp $19
ret nz
- SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ SetEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
.asm_455c2
xor a
ldh [hJoyHeld], a
@@ -132,7 +132,7 @@ RocketHideoutB4FJessieJamesMovementData_45606:
RocketHideoutB4FScript4:
ld de, RocketHideoutB4FJessieJamesMovementData_45605
- CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ CheckEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
jr z, .asm_45617
ld de, RocketHideoutB4FJessieJamesMovementData_45606
.asm_45617
@@ -156,7 +156,7 @@ RocketHideoutB4FScript6:
ld [wSprite02StateData1MovementStatus], a
ld a, SPRITE_FACING_LEFT
ld [wSprite02StateData1FacingDirection], a
- CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ CheckEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
jr z, .asm_4564a
ld a, SPRITE_FACING_DOWN
ld [wSprite02StateData1FacingDirection], a
@@ -166,7 +166,7 @@ RocketHideoutB4FScript6:
ld [wJoyIgnore], a
RocketHideoutB4FScript7:
ld de, RocketHideoutB4FJessieJamesMovementData_45606
- CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ CheckEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
jr z, .asm_4565f
ld de, RocketHideoutB4FJessieJamesMovementData_45605
.asm_4565f
@@ -192,7 +192,7 @@ RocketHideoutB4FScript9:
ld [wSprite03StateData1MovementStatus], a
ld a, SPRITE_FACING_DOWN
ld [wSprite03StateData1FacingDirection], a
- CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ CheckEvent EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
jr z, .asm_45697
ld a, SPRITE_FACING_RIGHT
ld [wSprite03StateData1FacingDirection], a
@@ -271,7 +271,7 @@ RocketHideoutB4FScript13:
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
- SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
+ SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_JESSIE_JAMES
ld a, SCRIPT_ROCKETHIDEOUTB4F_DEFAULT
call RocketHideoutB4FSetScript
ret
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:
generated by cgit v1.3.1-sl0p (git 2.54.0) at 2026-07-22 17:54:12 +0000 — sl0p fork