summaryrefslogtreecommitdiff
path: root/src/engine/overworld
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2021-11-11 17:22:41 +0000
committerElectroDeoxys <ElectroDeoxys@gmail.com>2021-11-11 17:22:41 +0000
commitab4b96c051bb339476d8d0f383859cf8f726bce6 (patch)
treebbf70da79fe11d7b022041f4b71fa790179fac9e /src/engine/overworld
parent15e986d374fdd11ed0f412fbdc9b858d4c4b9f50 (diff)
Document and label bank04
Diffstat (limited to 'src/engine/overworld')
-rw-r--r--src/engine/overworld/overworld.asm25
-rw-r--r--src/engine/overworld/scripting.asm10
2 files changed, 18 insertions, 17 deletions
diff --git a/src/engine/overworld/overworld.asm b/src/engine/overworld/overworld.asm
index 273f275..a3c6ec8 100644
--- a/src/engine/overworld/overworld.asm
+++ b/src/engine/overworld/overworld.asm
@@ -21,7 +21,7 @@ LoadMap:
xor a
ld [wd291], a
.warp
- farcall Func_10ab4
+ farcall FadeScreenToWhite
call WhiteOutDMGPals
call Func_c241
call EmptyScreen
@@ -48,7 +48,7 @@ LoadMap:
ld [wOverworldTransition], a
ld [wOverworldNPCFlags], a
call PlayDefaultSong
- farcall Func_10af9
+ farcall FadeScreenFromWhite
call Func_c141
call Func_c17a
.overworld_loop
@@ -68,7 +68,7 @@ LoadMap:
call PlaySFX
jp .warp
.no_warp
- farcall Func_10ab4
+ farcall FadeScreenToWhite
call Func_c1a0
ld a, [wMatchStartTheme]
or a
@@ -273,7 +273,7 @@ Func_c1f8:
ld a, [sTextSpeed]
ld [wTextSpeed], a
call DisableSRAM
- farcall Func_10756
+ farcall InitPCPacks
ret
BackupPlayerPosition:
@@ -365,7 +365,7 @@ Func_c2a3:
push bc
push de
call BackupObjectPalettes
- farcall Func_10ab4
+ farcall FadeScreenToWhite
ld a, 1 << HIDE_ALL_NPC_SPRITES
call SetOverworldNPCFlags
lb de, $30, $7f
@@ -422,7 +422,7 @@ ReturnToOverworld:
ld h, a
call CallHL2
.no_callback
- farcall Func_10af9
+ farcall FadeScreenFromWhite
pop de
pop bc
pop hl
@@ -536,6 +536,7 @@ DecompressPermissionMap:
pop hl
ret
+; de = coordinates
Func_c3ca:
push hl
push bc
@@ -1149,7 +1150,7 @@ PauseMenu:
DisplayPauseMenu:
ld a, [wSelectedPauseMenuItem]
ld hl, Unknown_10d98
- farcall InitAndPrintPauseMenu
+ farcall InitAndPrintMenu
ret
PauseMenuPointerTable:
@@ -1173,7 +1174,7 @@ PauseMenu_Deck:
ldh [hSCX], a
ldh [hSCY], a
call Set_OBJ_8x16
- farcall Func_1288c
+ farcall SetDefaultPalettes
farcall DeckSelectionMenu
call Set_OBJ_8x8
ret
@@ -1183,7 +1184,7 @@ PauseMenu_Card:
ldh [hSCX], a
ldh [hSCY], a
call Set_OBJ_8x16
- farcall Func_1288c
+ farcall SetDefaultPalettes
farcall HandlePlayersCardsScreen
call Set_OBJ_8x8
ret
@@ -1246,7 +1247,7 @@ PointerTable_c846:
DisplayPCMenu:
ld a, [wSelectedPCMenuItem]
ld hl, Unknown_10da9
- farcall InitAndPrintPauseMenu
+ farcall InitAndPrintMenu
ret
PCMenu_CardAlbum:
@@ -1254,7 +1255,7 @@ PCMenu_CardAlbum:
ldh [hSCX], a
ldh [hSCY], a
call Set_OBJ_8x16
- farcall Func_1288c
+ farcall SetDefaultPalettes
farcall HandleCardAlbumScreen
call Set_OBJ_8x8
ret
@@ -1272,7 +1273,7 @@ PCMenu_Print:
ldh [hSCX], a
ldh [hSCY], a
call Set_OBJ_8x16
- farcall Func_1288c
+ farcall SetDefaultPalettes
farcall HandlePrinterMenu
call Set_OBJ_8x8
call WhiteOutDMGPals
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