From b0400ef6ba6e6cf49ad2bdc19a29eb2abef26701 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 21 Oct 2019 03:07:59 +0800 Subject: battle_setup funcs --- include/overworld.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 38c213707..c2b759df6 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -61,7 +61,7 @@ void sub_8084EBC(s16, s16); void player_avatar_init_params_reset(void); void Overworld_SetFlashLevel(s32 a1); -//u8 Overworld_GetFlashLevel(void); +u8 Overworld_GetFlashLevel(void); void sub_8085524(u16); void Overworld_SetSavedMusic(u16); @@ -140,5 +140,6 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd bool32 sub_8058318(void); void CB2_ReturnToStartMenu(void); +void CB2_WhiteOut(void); #endif //GUARD_OVERWORLD_H -- cgit v1.2.3 From 1de8b7b197358e52eef5a95e30d7ae069415c7a6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 13:09:47 -0400 Subject: Document overworld whiteout funcs --- include/overworld.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 38c213707..65e3fe723 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -104,7 +104,7 @@ void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); void sub_8055D40(u16 mapDataId); void CleanupOverworldWindowsAndTilemaps(void); -u32 sub_8054C04(void); +u32 ComputeWhiteOutMoneyLoss(void); extern u8 gDisableMapMusicChangeOnMapLoad; extern u8 gUnknown_2036E28; -- cgit v1.2.3 From 0d73967f6c97e1743c7ef3e0b20a9bc31a5a4ebd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 24 Oct 2019 11:42:45 -0400 Subject: field_specials through Special_BattleCardAction; field_specials rodata --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 65e3fe723..a5e975d1d 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -35,6 +35,7 @@ extern struct UCoords32 gDirectionToVectors[]; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern MainCallback gFieldCallback; +extern struct WarpData gUnknown_2031DB4; extern struct WarpData gUnknown_2031DBC; extern u8 gUnknown_2031DE0; -- cgit v1.2.3