summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/celadongym.asm2
-rwxr-xr-xscripts/celadonmartelevator.asm4
-rwxr-xr-xscripts/ceruleangym.asm2
-rwxr-xr-xscripts/cinnabargym.asm10
-rwxr-xr-xscripts/fuchsiagym.asm2
-rwxr-xr-xscripts/oakslab.asm12
-rwxr-xr-xscripts/pewtergym.asm4
-rwxr-xr-xscripts/pokemontower7.asm2
-rwxr-xr-xscripts/rockethideoutelevator.asm4
-rwxr-xr-xscripts/saffrongym.asm2
-rwxr-xr-xscripts/seafoamislands5.asm8
-rwxr-xr-xscripts/silphcoelevator.asm4
-rwxr-xr-xscripts/vermilioncity.asm4
-rwxr-xr-xscripts/vermiliongym.asm4
-rwxr-xr-xscripts/viridiangym.asm2
15 files changed, 33 insertions, 33 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index 9d761a31..5dc328c7 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -62,7 +62,7 @@ CeladonGymText_48963: ; 48963 (12:4963)
.asm_4898c
ld hl, W_OBTAINEDBADGES
set 3, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 3, [hl]
; deactivate gym trainers
diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm
index de924849..53f1f434 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -16,9 +16,9 @@ CeladonMartElevatorScript: ; 48600 (12:4600)
CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
ld hl, wWarpEntries
- ld a, [wd73b]
+ ld a, [wWarpedFromWhichWarp]
ld b, a
- ld a, [wd73c]
+ ld a, [wWarpedFromWhichMap]
ld c, a
call CeladonMartElevatorScript_4862a
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm
index c8ce12b9..a7845c68 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -62,7 +62,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d)
.asm_5c736
ld hl, W_OBTAINEDBADGES
set 1, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 1, [hl]
; deactivate gym trainers
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index 18737d2b..60df9338 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -32,7 +32,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792)
ld [wJoyIgnore], a
ld [W_CINNABARGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a
- ld [wda38], a
+ ld [wOpponentAfterWrongAnswer], a
ret
CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
@@ -47,7 +47,7 @@ CinnabarGymScriptPointers: ; 757a6 (1d:57a6)
dw CinnabarGymScript3
CinnabarGymScript0: ; 757ae (1d:57ae)
- ld a, [wda38]
+ ld a, [wOpponentAfterWrongAnswer]
and a
ret z
ld [H_SPRITEINDEX], a
@@ -83,7 +83,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
ret nz
xor a
ld [wJoyIgnore], a
- ld a, [wda38]
+ ld a, [wOpponentAfterWrongAnswer]
ld [wTrainerHeaderFlagBit], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
@@ -127,7 +127,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
call UpdateCinnabarGymGateTileBlocks
xor a
ld [wJoyIgnore], a
- ld [wda38], a
+ ld [wOpponentAfterWrongAnswer], a
ld a, $0
ld [W_CINNABARGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -159,7 +159,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857)
.asm_75880
ld hl, W_OBTAINEDBADGES
set 6, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 6, [hl]
; deactivate gym trainers
diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm
index 0855d506..9bbc38a8 100755
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -62,7 +62,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497)
.asm_754c0
ld hl, W_OBTAINEDBADGES
set 4, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 4, [hl]
; deactivate gym trainers
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 329d3c25..93f87657 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -522,11 +522,11 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld [wMissableObjectIndex], a
predef ShowObject
ld a, [wNPCMovementDirections2Index]
- ld [wd157], a
- ld b, $0
+ ld [wSavedNPCMovementDirections2Index], a
+ ld b, 0
ld c, a
ld hl, wNPCMovementDirections2
- ld a, $40
+ ld a, NPC_MOVEMENT_UP
call FillMemory
ld [hl], $ff
ld a, $1
@@ -604,11 +604,11 @@ OaksLabScript16: ; 1cf12 (7:4f12)
ld a, HS_OLD_MAN
ld [wMissableObjectIndex], a
predef ShowObject
- ld a, [wd157]
- ld b, $0
+ ld a, [wSavedNPCMovementDirections2Index]
+ ld b, 0
ld c, a
ld hl, wNPCMovementDirections2
- xor a
+ xor a ; NPC_MOVEMENT_DOWN
call FillMemory
ld [hl], $ff
ld a, $ff
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index 704ea104..81fcb600 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -62,7 +62,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
.asm_5c408
ld hl, W_OBTAINEDBADGES
set 0, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 0, [hl]
ld a, HS_GYM_GUY
@@ -183,7 +183,7 @@ PewterGymAfterBattleText1: ; 5c4da (17:44da)
PewterGymText3: ; 5c4df (17:44df)
TX_ASM
- ld a, [wd72a]
+ ld a, [wBeatGymFlags]
bit 0, a
jr nz, .asm_5c50c
ld hl, PewterGymText_5c515
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index f1fceb2f..a4635aa3 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -57,7 +57,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
ld [wJoyIgnore], a
ld [wSpriteIndex], a
ld [wTrainerHeaderFlagBit], a
- ld [wda38], a
+ ld [wUnusedDA38], a
ld a, $0
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm
index be9c7cf2..52c7fad3 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -16,9 +16,9 @@ RocketHideoutElevatorScript: ; 45710 (11:5710)
RocketHideoutElevatorScript_4572c: ; 4572c (11:572c)
ld hl, wWarpEntries
- ld a, [wd73b]
+ ld a, [wWarpedFromWhichWarp]
ld b, a
- ld a, [wd73c]
+ ld a, [wWarpedFromWhichMap]
ld c, a
call RocketHideoutElevatorScript_4573a
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index e712689f..9ee632f7 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -62,7 +62,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
.asm_5d091
ld hl, W_OBTAINEDBADGES
set 5, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 5, [hl]
; deactivate gym trainers
diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm
index eca361f3..87942ca0 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -35,12 +35,12 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
ld a, [wCoordIndex]
cp $3
jr nc, .asm_467e6
- ld a, $40
- ld [wccd4], a
- ld a, $2
+ ld a, NPC_MOVEMENT_UP
+ ld [wSimulatedJoypadStatesEnd + 1], a
+ ld a, 2
jr .asm_467e8
.asm_467e6
- ld a, $1
+ ld a, 1
.asm_467e8
ld [wSimulatedJoypadStatesIndex], a
ld a, D_UP
diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm
index b328c14c..36dbb6d2 100755
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -16,9 +16,9 @@ SilphCoElevatorScript: ; 457c0 (11:57c0)
SilphCoElevatorScript_457dc: ; 457dc (11:57dc)
ld hl, wWarpEntries
- ld a, [wd73b]
+ ld a, [wWarpedFromWhichWarp]
ld b, a
- ld a, [wd73c]
+ ld a, [wWarpedFromWhichMap]
ld c, a
call SilphCoElevatorScript_457ea
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm
index 64ccc477..de721a2f 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -84,8 +84,8 @@ VermilionCityScript2: ; 19833 (6:5833)
ld [wJoyIgnore], a
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
- ld [wccd4], a
- ld a, $2
+ ld [wSimulatedJoypadStatesEnd + 1], a
+ ld a, 2
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index 0282e340..5c504335 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -81,7 +81,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
.asm_5cad3
ld hl, W_OBTAINEDBADGES
set 2, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 2, [hl]
; deactivate gym trainers
@@ -247,7 +247,7 @@ VermilionGymAfterBattleText3: ; 5cbd6 (17:4bd6)
VermilionGymText5: ; 5cbdb (17:4bdb)
TX_ASM
- ld a, [wd72a]
+ ld a, [wBeatGymFlags]
bit 2, a
jr nz, .asm_5cbeb
ld hl, VermilionGymText_5cbf4
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 0e075b2f..8e012040 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -156,7 +156,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995)
.asm_749be
ld hl, W_OBTAINEDBADGES
set 7, [hl]
- ld hl, wd72a
+ ld hl, wBeatGymFlags
set 7, [hl]
; deactivate gym trainers
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-28 09:41:27 +0000