diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
| commit | dac95cb42bb8bc953c7a1e1d345a549846d51abf (patch) | |
| tree | b996727e4f739da761fc1fa2418c65415ebf93d8 /engine/cable_club.asm | |
| parent | Don't redundantly define sprite dimensions (diff) | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| download | pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.gz pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.xz pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index fc049ceb..06f69a73 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -537,7 +537,7 @@ TradeCenter_SelectMon: ld [wTileMap + $141], a .asm_574a call JoypadLowSensitivity - ld a, [$ffb5] + ld a, [hJoy5] and a jr z, .asm_574a ; 0x5750 $f8 bit 0, a @@ -896,7 +896,7 @@ Func_5a5f: ; 5a5f (1:5a5f) ld [W_GRASSRATE], a ; W_GRASSRATE inc a ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE - ld [$ffb5], a + ld [hJoy5], a ld a, $a ld [wMusicHeaderPointer], a ld a, BANK(Music_Celadon) |