aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/FightingDojo.asm10
-rw-r--r--scripts/PalletTown.asm10
-rw-r--r--scripts/Route18.asm10
-rw-r--r--scripts/Route22.asm24
-rw-r--r--scripts/SafariZoneGate.asm18
-rw-r--r--scripts/SilphCo11F.asm10
-rw-r--r--scripts/SilphCo7F.asm8
-rw-r--r--scripts/VermilionCity.asm2
8 files changed, 46 insertions, 46 deletions
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm
index 298c2fcb..d434f681 100644
--- a/scripts/FightingDojo.asm
+++ b/scripts/FightingDojo.asm
@@ -32,15 +32,15 @@ FightingDojoDefaultScript:
ret nz
xor a
ldh [hJoyHeld], a
- ld [wcf0d], a
+ ld [wSavedCoordIndex], a
ld a, [wYCoord]
cp 3
ret nz
ld a, [wXCoord]
cp 4
ret nz
- ld a, $1
- ld [wcf0d], a
+ ld a, 1
+ ld [wSavedCoordIndex], a
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, FIGHTINGDOJO_KARATE_MASTER
@@ -57,8 +57,8 @@ FightingDojoKarateMasterPostBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, FightingDojoResetScripts
- ld a, [wcf0d]
- and a
+ ld a, [wSavedCoordIndex]
+ and a ; nz if the player was at (4, 3), left of the Karate Master
jr z, .already_facing
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm
index 07e59cc0..9c8ab449 100644
--- a/scripts/PalletTown.asm
+++ b/scripts/PalletTown.asm
@@ -55,7 +55,7 @@ PalletTownOakHeyWaitScript:
ld a, ~(A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
xor a
- ld [wcf0d], a
+ ld [wOakWalkedToPlayer], a
ld a, TEXT_PALLETTOWN_OAK
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@@ -109,7 +109,7 @@ PalletTownOakGreetsPlayerScript:
ld a, ~(A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld a, 1
- ld [wcf0d], a
+ ld [wOakWalkedToPlayer], a
ld a, $2
ld [wSprite01StateData1MovementStatus], a
ld a, SPRITE_FACING_UP
@@ -153,8 +153,8 @@ PalletTownPikachuBattleScript:
ret
PalletTownAfterPikachuBattleScript:
- ld a, $2
- ld [wcf0d], a
+ ld a, 2
+ ld [wOakWalkedToPlayer], a
ld a, TEXT_PALLETTOWN_OAK
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@@ -232,7 +232,7 @@ PalletTown_TextPointers:
PalletTownOakText:
text_asm
- ld a, [wcf0d]
+ ld a, [wOakWalkedToPlayer]
and a
jr nz, .next
ld a, 1
diff --git a/scripts/Route18.asm b/scripts/Route18.asm
index 26d660c8..43ae9318 100644
--- a/scripts/Route18.asm
+++ b/scripts/Route18.asm
@@ -15,11 +15,11 @@ Route18_ScriptPointers:
Route18_TextPointers:
def_text_pointers
- dw_const Route18CooltrainerM1Text, SCRIPT_ROUTE18_COOLTRAINER_M1
- dw_const Route18CooltrainerM2Text, SCRIPT_ROUTE18_COOLTRAINER_M2
- dw_const Route18CooltrainerM3Text, SCRIPT_ROUTE18_COOLTRAINER_M3
- dw_const Route18SignText, SCRIPT_ROUTE18_SIGN
- dw_const Route18CyclingRoadSignText, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN
+ dw_const Route18CooltrainerM1Text, TEXT_ROUTE18_COOLTRAINER_M1
+ dw_const Route18CooltrainerM2Text, TEXT_ROUTE18_COOLTRAINER_M2
+ dw_const Route18CooltrainerM3Text, TEXT_ROUTE18_COOLTRAINER_M3
+ dw_const Route18SignText, TEXT_ROUTE18_SIGN
+ dw_const Route18CyclingRoadSignText, TEXT_ROUTE18_CYCLING_ROAD_SIGN
Route18TrainerHeaders:
def_trainers
diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index a1b8d0ea..40e2ea92 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -39,7 +39,7 @@ Route22Script_50ee1:
Route22MoveRivalRightScript:
ld de, Route22RivalMovementData
- ld a, [wcf0d]
+ ld a, [wSavedCoordIndex]
cp $1
jr z, .skip_first_right
inc de
@@ -63,7 +63,7 @@ Route22DefaultScript:
call ArePlayerCoordsInArray
ret nc
ld a, [wCoordIndex]
- ld [wcf0d], a
+ ld [wSavedCoordIndex], a
xor a
ldh [hJoyHeld], a
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
@@ -106,8 +106,8 @@ Route22Rival1StartBattleScript:
ld a, [wd730]
bit 0, a
ret nz
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords
jr nz, .set_rival_facing_right
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
@@ -174,8 +174,8 @@ Route22Rival1AfterBattleScript:
call DisplayTextID
call StopAllMusic
farcall Music_RivalAlternateStart
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords
jr nz, .exit_movement_2
call .RivalExit1Script
jr .next_script
@@ -261,8 +261,8 @@ Route22Rival2StartBattleScript:
ret nz
ld a, ROUTE22_RIVAL2
ldh [hSpriteIndex], a
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords
jr nz, .set_player_direction_left
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
@@ -305,8 +305,8 @@ Route22Rival2AfterBattleScript:
jp z, Route22SetDefaultScript
ld a, ROUTE22_RIVAL2
ldh [hSpriteIndex], a
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords
jr nz, .set_player_direction_left
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
@@ -327,8 +327,8 @@ Route22Rival2AfterBattleScript:
call DisplayTextID
call StopAllMusic
farcall Music_RivalAlternateStartAndTempo
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in Route22DefaultScript.Route22RivalBattleCoords
jr nz, .exit_movement_2
call .RivalExit1Script
jr .next_script
diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm
index f6ca2277..db91146c 100644
--- a/scripts/SafariZoneGate.asm
+++ b/scripts/SafariZoneGate.asm
@@ -30,14 +30,14 @@ SafariZoneGateDefaultScript:
ld a, SPRITE_FACING_RIGHT
ld [wSpritePlayerStateData1FacingDirection], a
ld a, [wCoordIndex]
- cp $1
+ cp 1 ; index of second, lower entry in .PlayerNextToSafariZoneWorker1CoordsArray
jr z, .player_not_next_to_worker
ld a, SCRIPT_SAFARIZONEGATE_WOULD_YOU_LIKE_TO_JOIN
ld [wSafariZoneGateCurScript], a
ret
.player_not_next_to_worker
ld a, D_RIGHT
- ld c, $1
+ ld c, 1
call SafariZoneEntranceAutoWalk
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a
@@ -91,7 +91,7 @@ SafariZoneGateLeavingSafariScript:
ld [wSafariSteps], a
ld [wSafariSteps], a ; ?????
ld a, D_DOWN
- ld c, $3
+ ld c, 3
call SafariZoneEntranceAutoWalk
ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_DOWN
ld [wSafariZoneGateCurScript], a
@@ -116,7 +116,7 @@ SafariZoneGateSetScriptAfterMoveScript:
call SafariZoneGateReturnSimulatedJoypadStateScript
ret nz
call Delay3
- ld a, [wcf0d]
+ ld a, [wNextSafariZoneGateScript]
ld [wSafariZoneGateCurScript], a
ret
@@ -165,11 +165,11 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText:
xor a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_DOWN
- ld c, $3
+ ld c, 3
call SafariZoneEntranceAutoWalk
ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE
- ld a, $0
- ld [wcf0d], a
+ ld a, SCRIPT_SAFARIZONEGATE_DEFAULT
+ ld [wNextSafariZoneGateScript], a
jr .set_current_script
.not_ready_to_leave
ld hl, .GoodLuckText
@@ -177,10 +177,10 @@ SafariZoneGateSafariZoneWorker1LeavingEarlyText:
ld a, SPRITE_FACING_UP
ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_UP
- ld c, $1
+ ld c, 1
call SafariZoneEntranceAutoWalk
ld a, SCRIPT_SAFARIZONEGATE_LEAVING_SAFARI
- ld [wcf0d], a
+ ld [wNextSafariZoneGateScript], a
.set_current_script
ld a, SCRIPT_SAFARIZONEGATE_SET_SCRIPT_AFTER_MOVE
ld [wSafariZoneGateCurScript], a
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index 237efd0b..abc5cb02 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -116,7 +116,7 @@ SilphCo11FScript_621c5:
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
ld a, [wCoordIndex]
- ld [wcf0d], a
+ ld [wSavedCoordIndex], a
xor a
ldh [hJoyHeld], a
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
@@ -156,8 +156,8 @@ SilphCo11FGiovanniAfterBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, SilphCo11FResetCurScript
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray
jr z, .face_player_up
ld a, PLAYER_DIR_LEFT
ld b, SPRITE_FACING_RIGHT
@@ -189,8 +189,8 @@ SilphCo11FGiovanniStartBattleScript:
ld a, SILPHCO11F_GIOVANNI
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray
jr z, .face_player_up
ld a, PLAYER_DIR_LEFT
ld b, SPRITE_FACING_RIGHT
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index 131cf851..74788bf6 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -143,8 +143,8 @@ SilphCo7FDefaultScript:
call SetSpriteMovementBytesToFF
ld de, .RivalMovementUp
ld a, [wCoordIndex]
- ld [wcf0d], a
- cp $1
+ ld [wSavedCoordIndex], a
+ cp 1 ; index of second, lower entry in .RivalEncounterCoordinates
jr z, .full_rival_movement
inc de
.full_rival_movement
@@ -211,8 +211,8 @@ SilphCo7FRivalAfterBattleScript:
call StopAllMusic
farcall Music_RivalAlternateStart
ld de, .RivalWalkAroundPlayerMovement
- ld a, [wcf0d]
- cp $1
+ ld a, [wSavedCoordIndex]
+ cp 1 ; index of second, lower entry in SilphCo7FDefaultScript.RivalEncounterCoordinates
jr nz, .walk_around_player
ld de, .RivalExitRightMovement
.walk_around_player
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index 0f69174c..7056a337 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -62,7 +62,7 @@ VermilionCityDefaultScript:
jr nc, .return
xor a
ldh [hJoyHeld], a
- ld [wcf0d], a
+ ld [wSavedCoordIndex], a ; unnecessary
ld a, TEXT_VERMILIONCITY_SAILOR1
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
generated by cgit v1.3.1-sl0p (git 2.54.0) at 2026-07-22 09:58:29 +0000 — sl0p fork