diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/game_corner_slots2.asm | |
| parent | Pull a lot of engine out of main.asm (diff) | |
| parent | Update INSTALL.md (diff) | |
| download | pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/game_corner_slots2.asm')
| -rwxr-xr-x | engine/game_corner_slots2.asm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 719c50e7..66e51237 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -1,10 +1,9 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) - ld a, [$c102] + ld a, [wSpriteStateData1 + 2] and $8 jr z, .done ; not able ld b, COIN_CASE - ld a, $1c - call Predef ; IsItemInBag_ + predef IsItemInBag_ ; IsItemInBag_ ld a, b and a ld b, $33 ; GameCornerCoinCaseText @@ -20,7 +19,7 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) call PrintPredefTextID xor a .done - ld [$cd3d], a + ld [wWhichTrade], a ret GameCornerCoinCaseText: ; 2ff32 (b:7f32) |