diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/sprite_anims.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index 1d3aa6a8b..b410377df 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -747,7 +747,7 @@ DoAnimFrame: ret .IntroSuicune - ld a, [wcf65] + ld a, [wIntroSceneTimer] and a jr nz, .asm_8d645 ret diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index d7138646e..b63e481f6 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -776,8 +776,8 @@ BillsPC_InitRAM: call ClearSprites call ClearTileMap call BillsPC_InitGFX - ld hl, wBillsPCPokemonList - ld bc, $338 + ld hl, wBillsPCData + ld bc, wBillsPCDataEnd - wBillsPCData xor a call ByteFill xor a diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 19fecff19..624a7c964 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -247,12 +247,12 @@ GiveTakePartyMonItem: .loop farcall DepositSellPack - ld a, [wcf66] + ld a, [wPackUsedItem] and a jr z, .quit - ld a, [wcf65] - cp 2 + ld a, [wCurPocket] + cp KEY_ITEM_POCKET jr z, .next call CheckTossableItem |