diff options
Diffstat (limited to 'engine/bank3d')
| -rw-r--r-- | engine/bank3d/bank3d_battle.asm | 4 | ||||
| -rw-r--r-- | engine/bank3d/link_menu.asm | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engine/bank3d/bank3d_battle.asm b/engine/bank3d/bank3d_battle.asm index 1f84d314..876737b7 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/bank3d/bank3d_battle.asm @@ -43,7 +43,7 @@ asm_f601d: ; f601d (f:601d) dec a ld [wAICount], a coord hl, 12, 0 - predef Func_3f0c6 + predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 @@ -103,7 +103,7 @@ InitWildBattle: ; f607c (3d:607c) ld [W_TRAINERCLASS], a ld [$ffe1], a coord hl, 12, 0 - predef Func_3f0c6 + predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles InitBattle_Common: ; f60eb (3d:60eb) diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index bd1f664c..0cb2a962 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -787,9 +787,7 @@ LinkMenu: ; f580c (3d:580c) inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [wEnteringCableClub], a - ld hl,Func_5ce4 - ld b,BANK(Func_5ce4) - jp Bankswitch + jpab SpecialEnterMap .choseCancel xor a ld [wMenuJoypadPollCount], a |