diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /menu | |
| parent | Pull more data out of main.asm (diff) | |
| parent | Documented/Labeled Route 22 scripts. (diff) | |
| download | pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.tar.gz pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.tar.xz pokeyellow-1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329.zip | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'menu')
| -rw-r--r-- | menu/pc.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/menu/pc.asm b/menu/pc.asm index 2167cf47..d2b633f3 100644 --- a/menu/pc.asm +++ b/menu/pc.asm @@ -346,9 +346,7 @@ Func_21673: ; 21673 (8:5673) jp Func_214e8 Func_216b3: ; 216b3 (8:56b3) - ld b, BANK(Func_738a1) - ld hl, Func_738a1 - call Bankswitch ; indirect jump to Func_738a1 (738a1 (1c:78a1)) + callba Func_738a1 jp Func_214e8 Func_216be: ; 216be (8:56be) |