diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 16:58:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 16:58:30 -0400 |
| commit | c1c7ac6826a5033fb06bc1b551bdd7bf4f806e50 (patch) | |
| tree | 01ae490308033e3a7fd7855afabc1e69d69cf127 /home.asm | |
| parent | Attempt to make yellow buildable. (diff) | |
| download | pokeyellow-c1c7ac6826a5033fb06bc1b551bdd7bf4f806e50.tar.gz pokeyellow-c1c7ac6826a5033fb06bc1b551bdd7bf4f806e50.tar.xz pokeyellow-c1c7ac6826a5033fb06bc1b551bdd7bf4f806e50.zip | |
Attempt to make Yellow buildable, part 2.
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -167,7 +167,6 @@ ReadJoypad:: ; 01c8 (0:01c8) INCLUDE "home/overworld.asm" - CheckForUserInterruption:: ; 10ba (0:10ba) ; Return carry if Up+Select+B, Start or A are pressed in c frames. ; Used only in the intro and title screen. @@ -1553,7 +1552,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0) ld a,$01 ; hardcoded bank jr .bankswitch .specialBattleType ; Old Man battle - ld a, Bank(DisplayBattleMenu) + ld a, $1 ; BANK(DisplayBattleMenu) .bankswitch call BankswitchHome ld hl,wd730 @@ -3008,6 +3007,7 @@ IsSurfingPikachuInParty:: ; 342a (0:342a) ld a,[hli] cp b jr nz,.noSurf +.hasSurf ld a,[wd472] set 6,a ld [wd472],a |