diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-28 17:15:54 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-28 17:15:54 -0400 |
| commit | 3394d8320f35f524231aa13bd9cae34e22246a6d (patch) | |
| tree | 6df27b17970a668ee19ec5fe2478c33163db7c58 /engine | |
| parent | ae920d1be7641712b3df90151cbf91af7c614a47 (diff) | |
Make pokeyellow build to baserom.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3d/link_menu.asm | 4 | ||||
| -rw-r--r-- | engine/bank3f/main.asm | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 3915c85d..a460eb00 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -787,8 +787,8 @@ LinkMenu: ; f580c (3d:580c) inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [wcc47], a - ld hl,SpecialWarpIn - ld b,BANK(SpecialWarpIn) + ld hl,Func_5ce4 + ld b,BANK(Func_5ce4) jp Bankswitch .choseCancel xor a diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index a17d5138..b9c34e1a 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -60,7 +60,7 @@ Func_fc534:: ; fc534 (3f:4534) ret Func_fc53f:: ; fc53f (3f:453f) - ld bc,wSpriteStateData1 + $10 + ld bc,wSpriteStateData1 + $f0 ld a,[W_YCOORD] add $4 ld e,a @@ -160,7 +160,7 @@ Func_fc5bc:: ; fc5bc (3f:45bc) jr z,.asm_fc5e4 cp $7 jr z,.asm_fc5f1 - call Func_fc4b2 + call Func_fccb2 ret .asm_fc5e4 @@ -272,12 +272,12 @@ Func_fc69a:: ; fc69a (3f:469a) jr .asm_fc6bd .asm_fc6a7 ld a,[wSpriteStateData1 + $9] - cp SPRITE_FACING_DOWN + cp SPRITE_FACING_UP jr z,.asm_fc6b9 jr .asm_fc6bd .asm_fc6b0 ld a,[wSpriteStateData1 + $9] - cp SPRITE_FACING_DOWN + cp SPRITE_FACING_UP jr z,.asm_fc6b9 jr .asm_fc6bd .asm_fc6b9 @@ -296,7 +296,9 @@ Func_fc6d5:: ; fc6d5 (3f:46d5) Func_fcb84: ; fcb84 (3f:45bc) dr $fcb84,$fcc08 Func_fcc08:: ; fcc08 (3f:4c08) - dr $fcc08,$fcdb8 + dr $fcc08,$fccb2 +Func_fccb2:: ; fccb2 (3f:4cb2) + dr $fccb2,$fcdb8 Func_fcdb8:: ; fcdb8 (3f:4db8) dr $fcdb8,$fce18 Func_fce18:: ; fce18 (3f:4e18) |