diff options
| author | yenatch <yenatch@gmail.com> | 2013-09-18 21:39:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-09-18 21:39:14 -0400 |
| commit | 5a4e4bdb411efba8441d55316164b826d10fb8da (patch) | |
| tree | d920f4beb1ffbedf56c5a2c3fe088ff84b524452 | |
| parent | 5249fd9773c603e727618eb58167c9804870af2b (diff) | |
fix some farcalls in window asm
| -rw-r--r-- | main.asm | 32 |
1 files changed, 11 insertions, 21 deletions
@@ -511,12 +511,12 @@ ResetWindow: ; 2dba call Function1fbf ld a, [hROMBank] push af - ld a, $1 + ld a, BANK(Function6454) ; and BANK(Function64bf) rst Bankswitch - call $6454 + call Function6454 call Function2e20 - call $64bf + call Function64bf pop af rst Bankswitch @@ -549,12 +549,8 @@ Function2de2: ; 2de2 ld a, $90 ld [hWY], a call Functione4a - ld a, $2e - ld hl, $4000 - rst FarCall - ld a, $41 - ld hl, $6594 - rst FarCall + callba Functionb8000 + callba Function106594 ret ; 2e08 @@ -562,13 +558,13 @@ Function2e08: ; 2e08 call Function1fbf ld a, [hROMBank] push af - ld a, $1 + ld a, BANK(Function6454) ; and BANK(Function64bf) rst Bankswitch - call $6454 + call Function6454 call SpeechTextBox call Function2e20 - call $64bf + call Function64bf pop af rst Bankswitch @@ -580,9 +576,7 @@ Function2e20: ; 2e20 push af ld a, $1 ld [hOAMUpdate], a - ld a, $41 - ld hl, $4110 - rst FarCall + callba Function104110 pop af ld [hOAMUpdate], a ret @@ -19646,9 +19640,7 @@ StartMenu: ; 125cd ld de, SFX_MENU call StartSFX - ld a, $1 - ld hl, $6454 - rst FarCall + callba Function6454 ld hl, StatusFlags2 bit 2, [hl] ; bug catching contest @@ -67408,9 +67400,7 @@ SECTION "bank2E",ROMX,BANK[$2E] Functionb8000: ; b8000 xor a ld [hBGMapMode], a - ld a, $2e - ld hl, $400a - rst FarCall + callba Functionb800a ret ; b800a |