diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/celadongym.asm | 2 | ||||
| -rwxr-xr-x | scripts/ceruleangym.asm | 2 | ||||
| -rwxr-xr-x | scripts/cinnabargym.asm | 2 | ||||
| -rwxr-xr-x | scripts/fuchsiagym.asm | 2 | ||||
| -rwxr-xr-x | scripts/pewtergym.asm | 2 | ||||
| -rwxr-xr-x | scripts/rockethideout2.asm | 2 | ||||
| -rwxr-xr-x | scripts/route22gate.asm | 2 | ||||
| -rwxr-xr-x | scripts/route23.asm | 2 | ||||
| -rwxr-xr-x | scripts/saffrongym.asm | 2 | ||||
| -rwxr-xr-x | scripts/vermiliongym.asm | 2 | ||||
| -rwxr-xr-x | scripts/viridiancity.asm | 4 | ||||
| -rwxr-xr-x | scripts/viridiangym.asm | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 64e85ff7..459ba4b5 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -60,7 +60,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_4898c - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 3, [hl] ld hl, wBeatGymFlags set 3, [hl] diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index ca1c2c7d..0507a1d4 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -60,7 +60,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c736 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 1, [hl] ld hl, wBeatGymFlags set 1, [hl] diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 5bbb94a9..73aad423 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -157,7 +157,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75880 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 6, [hl] ld hl, wBeatGymFlags set 6, [hl] diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 3ec89256..e10f534e 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -60,7 +60,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_754c0 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 4, [hl] ld hl, wBeatGymFlags set 4, [hl] diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 831403bb..608fa4cd 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -60,7 +60,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags set 0, [hl] diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index f269faef..ec4a536e 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -323,7 +323,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) add hl, bc ld a, [hl] ld [wSpriteStateData1 + 2], a - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FACILITY ld hl, FacilitySpinnerArrows jr z, .asm_44ff6 diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 95546a99..e17380f5 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -58,7 +58,7 @@ Route22GateTextPointers: ; 1e6df (7:66df) Route22GateText1: ; 1e6e1 (7:66e1) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] bit 0, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 diff --git a/scripts/route23.asm b/scripts/route23.asm index 35f1b9cb..6462ec88 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -190,7 +190,7 @@ Route23Script_51346: ; 51346 (14:5346) inc a ld c, a ld b, FLAG_TEST - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges predef FlagActionPredef ld a, c and a diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 140b1130..567f79d8 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -60,7 +60,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags set 5, [hl] diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 78a38aec..6dae0751 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -79,7 +79,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5cad3 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags set 2, [hl] diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 79ad444f..be7872e6 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -17,7 +17,7 @@ ViridianCityScript0: ; 19005 (6:5005) ViridianCityScript_1900b: ; 1900b (6:500b) CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 jr nz, .asm_1901e SetEvent EVENT_VIRIDIAN_GYM_OPEN @@ -147,7 +147,7 @@ ViridianCityText1: ; 19102 (6:5102) ViridianCityText2: ; 19107 (6:5107) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 ld hl, ViridianCityText_19127 jr z, .asm_ae9fe diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 6cded55d..1848e5f0 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -154,7 +154,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_749be - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 7, [hl] ld hl, wBeatGymFlags set 7, [hl] |