summaryrefslogtreecommitdiff
path: root/src/engine/overworld/scripting.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2021-11-15 13:31:15 -0600
committerGitHub <noreply@github.com>2021-11-15 13:31:15 -0600
commitf516a91f5fa02a741631c77b9097598f466d1328 (patch)
treebac2ee5e3fad02983b061580f5c085baecb5439a /src/engine/overworld/scripting.asm
parent15e986d374fdd11ed0f412fbdc9b858d4c4b9f50 (diff)
parent1fd16cd27fcd4f432bfc09fc5b7a262798b72430 (diff)
Merge pull request #114 from ElectroDeoxys/masterHEADmaster
Some more bank splitting
Diffstat (limited to 'src/engine/overworld/scripting.asm')
-rw-r--r--src/engine/overworld/scripting.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/overworld/scripting.asm b/src/engine/overworld/scripting.asm
index 442bb7b..22239df 100644
--- a/src/engine/overworld/scripting.asm
+++ b/src/engine/overworld/scripting.asm
@@ -996,7 +996,7 @@ ScriptCommand_ShowCardReceivedScreen:
.show_card
push af
- farcall Func_10000
+ farcall InitMenuScreen
farcall FlashWhiteScreen
pop af
bank1call ShowPromotionalCardScreen
@@ -1646,7 +1646,7 @@ ShowMultichoiceTextbox:
ld h, [hl]
ld l, a
ld a, [wd416]
- farcall InitAndPrintPauseMenu
+ farcall InitAndPrintMenu
pop hl
inc hl
ld a, [hli]
@@ -1738,7 +1738,7 @@ ScriptCommand_OpenDeckMachine:
xor a
ldh [hSCX], a
ldh [hSCY], a
- farcall Func_1288c
+ farcall SetDefaultPalettes
call EnableLCD
pop bc
ld a, c
@@ -1776,7 +1776,7 @@ ScriptCommand_EnterMap:
jp IncreaseScriptPointerBy6
ScriptCommand_FlashScreen:
- farcall Func_10c96
+ farcall FlashScreenToWhite
jp IncreaseScriptPointerBy2
ScriptCommand_SaveGame:
@@ -1788,7 +1788,7 @@ ScriptCommand_GiftCenter:
or a
jr nz, .load_gift_center
; show menu
- farcall Func_10dba
+ farcall GiftCenterMenu
ld c, a
set_event_value EVENT_GIFT_CENTER_MENU_CHOICE
jr .done