diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-02-04 22:45:04 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-02-04 22:45:04 -0500 |
| commit | 8b007e8d51ec86992d97fa4b1c05b762e0916427 (patch) | |
| tree | 17932d687fef4c87e555c45fda32564f4df7aa0a /engine | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Fix more w-izing edge cases.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld.asm | 8 | ||||
| -rw-r--r-- | engine/pack.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/color.asm b/engine/color.asm index 21842b7b3..4f07d0fdb 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer: ret .male - ld hl, wPlayerPalette + ld hl, PlayerPalette ret GetFrontpicPalettePointer: diff --git a/engine/overworld.asm b/engine/overworld.asm index 7e3a69c6f..79c6ed526 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -233,9 +233,9 @@ GetMonSprite: ; 14259 cp SPRITE_POKEMON jr c, .Normal cp SPRITE_DAY_CARE_MON_1 - jr z, .wBreedMon1 + jr z, .BreedMon1 cp SPRITE_DAY_CARE_MON_2 - jr z, .wBreedMon2 + jr z, .BreedMon2 cp SPRITE_VARS jr nc, .Variable jr .Icon @@ -253,11 +253,11 @@ GetMonSprite: ; 14259 ld a, [hl] jr .Mon -.wBreedMon1 +.BreedMon1 ld a, [wBreedMon1Species] jr .Mon -.wBreedMon2 +.BreedMon2 ld a, [wBreedMon2Species] .Mon: diff --git a/engine/pack.asm b/engine/pack.asm index dfe30612d..e900c75b8 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb ; entries correspond to *_POCKET constants dw .Items dw .Balls - dw .wKeyItems + dw .KeyItems dw .TMHM .Items: ; 107e9 (4:47e9) @@ -1174,7 +1174,7 @@ TutorialPack: ; 107bb dba UpdateItemDescription ; 10807 -.wKeyItems: ; 10807 (4:4807) +.KeyItems: ; 10807 (4:4807) ld a, KEY_ITEM_POCKET ld hl, .KeyItemsMenuDataHeader jr .DisplayPocket |