From bdeea4ca2855696db8c6ca51872ec7d19783636f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Sep 2019 17:16:57 -0400 Subject: field_fadetransition begin --- include/cable_club.h | 1 + include/field_fadetransition.h | 2 ++ include/field_map_obj.h | 1 + include/field_player_avatar.h | 3 +++ include/field_screen_effect.h | 1 + include/fldeff.h | 2 ++ include/link.h | 1 + include/map_preview_screen.h | 1 + include/overworld.h | 3 +++ include/quest_log.h | 1 + include/start_menu.h | 2 ++ 11 files changed, 18 insertions(+) (limited to 'include') diff --git a/include/cable_club.h b/include/cable_club.h index 401cfacf1..5375c2210 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -9,5 +9,6 @@ // Exported ROM declarations void sub_8081A90(u8 taskId); +u8 sub_8081150(void); #endif //GUARD_CABLE_CLUB_H diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 4ba350491..fe67fec30 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -16,4 +16,6 @@ void sub_807DC18(void); void FieldCallback_ReturnToEventScript2(void); void sub_807DC00(void); +bool32 sub_807E418(void); + #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 83cc263e5..7228b9318 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -90,6 +90,7 @@ u8 sub_805EB44(u8, u8, s16, s16); void npc_paltag_set_load(u8 mode); bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject); u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject); +u8 sub_8063F84(u8 direction); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index b87de3fef..00a3b7978 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -28,5 +28,8 @@ u8 GetPlayerAvatarObjectId(void); u8 PlayerGetZCoord(void); u8 GetPlayerAvatarGraphicsIdByCurrentState(void); void sub_805CB70(void); +void sub_805CB04(bool8); +void sub_805DC04(void); +bool32 sub_805DC24(void); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index d1fde7eac..0c6cc35cb 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -7,5 +7,6 @@ void sub_80AF79C(void); void sub_807F028(u8); void sub_80B0244(void); void sub_807E3EC(void); +void sub_807F114(void); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/fldeff.h b/include/fldeff.h index e5e7e5f7d..e3f703947 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -13,6 +13,8 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId); u8 oei_task_add(void); // flash +u8 sub_80C9DCC(u8 lightLevel, u8 mapType); +u8 sub_80C9D7C(u8 mapType1, u8 mapType2); // cut diff --git a/include/link.h b/include/link.h index 5f8d8f161..950c48d3f 100644 --- a/include/link.h +++ b/include/link.h @@ -213,5 +213,6 @@ void sub_8054A28(void); void sub_800B1F4(void); void LoadWirelessStatusIndicatorSpriteGfx(void); void CreateWirelessStatusIndicatorSprite(u8, u8); +void sub_8009FE8(void); #endif // GUARD_LINK_H diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 6590019e2..71015aacf 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -47,5 +47,6 @@ struct MapPreviewScreen u16 sub_80F8318(u8 id); void sub_80F85BC(u16 a0); u16 sub_80F856C(u8 id); +bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime); #endif //GUARD_MAP_PREVIEW_SCREEN_H diff --git a/include/overworld.h b/include/overworld.h index 8c5dde2b0..2b6013217 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -133,6 +133,9 @@ void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); u8 GetCurrentMapType(void); +u8 get_map_light_from_warp0(void); +const struct MapHeader *warp1_get_mapheader(void); + void Overworld_CreditsMainCB(void); bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8); diff --git a/include/quest_log.h b/include/quest_log.h index 858ea593a..0690dd282 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -32,6 +32,7 @@ void sub_8112EDC(u8 a0); u8 sub_8112EB4(void); void sub_8113018(const u8 * text, u8 mode); void MapNamePopupWindowIdSetDummy(void); +void sub_8111CF0(void); extern u8 gUnknown_203ADFA; diff --git a/include/start_menu.h b/include/start_menu.h index f5b38ee5e..c4a3ce19d 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -4,5 +4,7 @@ #include "global.h" void AppendToList(u8* list, u8* pos, u8 newEntry); +void sub_806F1F0(u8 taskId); +void sub_806F1D4(void); #endif // GUARD_START_MENU_H -- cgit v1.2.3 From 3a6b6bf9e99ecdeb9c39c2a320252c1b57c2b275 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 26 Sep 2019 10:50:41 -0400 Subject: Finish field_fadetransition --- include/field_effect.h | 4 ++++ include/field_map_obj.h | 3 +++ include/field_player_avatar.h | 2 ++ include/link.h | 1 + include/map_preview_screen.h | 1 + include/overworld.h | 2 ++ 6 files changed, 13 insertions(+) (limited to 'include') diff --git a/include/field_effect.h b/include/field_effect.h index 0ab2d0475..8c89f8c9c 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -85,5 +85,9 @@ void FieldEffectActiveListRemove(u8 id); void sub_8085620(void); void FieldEffectStop(struct Sprite *sprite, u8 id); u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); +void sub_8084454(void); +void sub_8084784(u8 a0, u8 a1); +void sub_8084F2C(u8 a0); +void sub_80853CC(u8 a0); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 7228b9318..baed87ac6 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -52,9 +52,12 @@ u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8); u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); +void CameraObjectReset2(void); void FieldObjectSetGraphicsId(struct MapObject *, u8); void FieldObjectTurn(struct MapObject *, u8); void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); +void FieldObjectForceSetSpecialAnim(struct MapObject *, u8); +u8 sub_8064270(u8 a0); const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void gpu_pal_allocator_reset__manage_upper_four(void); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 00a3b7978..2c408afc9 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -30,6 +30,8 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void); void sub_805CB70(void); void sub_805CB04(bool8); void sub_805DC04(void); +void sub_805DAB0(void); +bool32 sub_805DAD0(void); bool32 sub_805DC24(void); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/link.h b/include/link.h index 950c48d3f..d5d3f08a3 100644 --- a/include/link.h +++ b/include/link.h @@ -214,5 +214,6 @@ void sub_800B1F4(void); void LoadWirelessStatusIndicatorSpriteGfx(void); void CreateWirelessStatusIndicatorSprite(u8, u8); void sub_8009FE8(void); +void sub_800A068(void); #endif // GUARD_LINK_H diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 71015aacf..5ab5584e5 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -48,5 +48,6 @@ u16 sub_80F8318(u8 id); void sub_80F85BC(u16 a0); u16 sub_80F856C(u8 id); bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime); +bool32 sub_80F83B0(void); #endif //GUARD_MAP_PREVIEW_SCREEN_H diff --git a/include/overworld.h b/include/overworld.h index 2b6013217..92b0f6001 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -135,6 +135,8 @@ u8 GetCurrentMapType(void); u8 get_map_light_from_warp0(void); const struct MapHeader *warp1_get_mapheader(void); +void sub_8055F88(void); +void sub_8056788(void); void Overworld_CreditsMainCB(void); bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8); -- cgit v1.2.3 From 55a70ffb18320e47591bcf98a414481cf477e546 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 26 Sep 2019 11:17:06 -0400 Subject: Some cleanup --- include/field_screen_effect.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 0c6cc35cb..1b8044592 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -8,5 +8,6 @@ void sub_807F028(u8); void sub_80B0244(void); void sub_807E3EC(void); void sub_807F114(void); +void sub_807F204(u8 taskId); #endif // GUARD_FIELD_SCREEN_EFFECT_H -- cgit v1.2.3