diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ceruleanhouse2.asm | 2 | ||||
| -rwxr-xr-x | scripts/daycarem.asm | 4 | ||||
| -rwxr-xr-x | scripts/namerater.asm | 2 | ||||
| -rwxr-xr-x | scripts/pokemontower6.asm | 2 | ||||
| -rwxr-xr-x | scripts/route12.asm | 2 | ||||
| -rwxr-xr-x | scripts/route16.asm | 2 | ||||
| -rwxr-xr-x | scripts/vermiliondock.asm | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/scripts/ceruleanhouse2.asm b/scripts/ceruleanhouse2.asm index a45c0fda..7cc1aa74 100755 --- a/scripts/ceruleanhouse2.asm +++ b/scripts/ceruleanhouse2.asm @@ -27,7 +27,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) ld [wcf8c], a xor a ld [wcf93], a - ld [wcc35], a + ld [wMenuItemToSwap], a ld a, SPECIALLISTMENU ld [wListMenuID], a call DisplayListMenuID diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index e463d380..73ae6636 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -26,7 +26,7 @@ DayCareMText1: ; 56254 (15:6254) xor a ld [wcfcb], a ld [wd07d], a - ld [wcc35], a + ld [wMenuItemToSwap], a call DisplayPartyMenu push af call GBPalWhiteOutWithDelay3 @@ -65,7 +65,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, $3 ld [wcc49], a call LoadMonData - callab Func_58f43 + callab CalcLevelFromExperience ld a, d cp $64 jr c, .asm_56315 diff --git a/scripts/namerater.asm b/scripts/namerater.asm index ca357ad1..28d53b1e 100755 --- a/scripts/namerater.asm +++ b/scripts/namerater.asm @@ -51,7 +51,7 @@ NameRaterText1: ; 1da56 (7:5a56) xor a ld [wd07d], a ld [wcfcb], a - ld [wcc35], a + ld [wMenuItemToSwap], a call DisplayPartyMenu push af call GBPalWhiteOutWithDelay3 diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index fe33ce29..646c956a 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -57,7 +57,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) call UpdateSprites ld a, $f0 ld [wJoyIgnore], a - ld a, [wcf0b] + ld a, [wBattleResult] and a jr nz, .asm_60b82 ld hl, wd768 diff --git a/scripts/route12.asm b/scripts/route12.asm index b7ec451a..04b86207 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -47,7 +47,7 @@ Route12Script3: ; 5964c (16:564c) cp $ff jr z, Route12Script_59606 call UpdateSprites - ld a, [wcf0b] + ld a, [wBattleResult] cp $2 jr z, .asm_59664 ld a, $e diff --git a/scripts/route16.asm b/scripts/route16.asm index 01bd35ad..2e60d77b 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -48,7 +48,7 @@ Route16Script3: ; 5998f (16:598f) cp $ff jp z, Route16Script_59946 call UpdateSprites - ld a, [wcf0b] + ld a, [wBattleResult] cp $2 jr z, .asm_599a8 ld a, $b diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 03dc4377..77216739 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -106,10 +106,10 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) jr nz, .asm_1dbfa ; 0x1dc22 $d6 xor a ld [$ff4a], a - ld [$ffb0], a + ld [hVBlankWY], a call VermilionDock_1dc94 ld a, $90 - ld [$ffb0], a + ld [hVBlankWY], a ld a, $1 ld [wcfcb], a pop hl |