diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_scripts.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 | ||||
| -rw-r--r-- | include/link.h | 4 | ||||
| -rw-r--r-- | include/quest_log.h | 2 | ||||
| -rw-r--r-- | include/save_location.h | 4 | ||||
| -rw-r--r-- | include/script.h | 2 | ||||
| -rw-r--r-- | include/vs_seeker.h | 6 |
7 files changed, 9 insertions, 13 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index a1bb5e35d..0f076ed28 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1254,7 +1254,7 @@ extern const u8 EventScript_CurrentTooFast[]; extern const u8 EventScript_UseSurf[]; extern const u8 EventScript_Waterfall[]; extern const u8 EventScript_CantUseWaterfall[]; -extern const u8 gUnknown_81A8CED[]; +extern const u8 EventScript_VsSeekerChargingDone[]; extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 EventScript_1C1361[]; diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 79e6c2aef..df9084eab 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -15,7 +15,7 @@ void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void MovementType_Player(struct Sprite * sprite); void sub_805C270(void); -void sub_805C780(void); +void StopPlayerAvatar(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetPlayerAvatarGraphicsIdByStateId(u8); void SetPlayerAvatarStateMask(u8 mask); diff --git a/include/link.h b/include/link.h index d6f35f66d..899f0cb03 100644 --- a/include/link.h +++ b/include/link.h @@ -79,8 +79,8 @@ #define LINKTYPE_BATTLE_TOWER 0x2288 #define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3322 0x3322 -#define LINKTYPE_0x4411 0x4411 -#define LINKTYPE_0x6601 0x6601 +#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 +#define LINKTYPE_CONTEST_GMODE 0x6601 #define MASTER_HANDSHAKE 0x8FFF #define SLAVE_HANDSHAKE 0xB9A0 diff --git a/include/quest_log.h b/include/quest_log.h index 56542fa2a..4aca7f569 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -28,7 +28,7 @@ void ResetQuestLog(void); void ResetTrainerFanClub(void); void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId); void sub_8112450(void); -void sub_8112364(void); +void QuestLog_OnInteractionWithSpecialNpc(void); u8 sub_8112CAC(void); void sub_81138F8(void); void sub_811231C(void); diff --git a/include/save_location.h b/include/save_location.h index c8e362231..2d2cb1974 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -10,7 +10,7 @@ void TrySetMapSaveWarpStatus(void); bool32 IsCurMapPokeCenter(void); -void sub_810B810(void); -void sub_810B82C(void); +void SetUnlockedPokedexFlags(void); +void SetPostgameFlags(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/include/script.h b/include/script.h index a37909137..ba1de4f1c 100644 --- a/include/script.h +++ b/include/script.h @@ -78,7 +78,7 @@ u8 GetRegisteredQuestLogInput(void); void ResetFacingNpcOrSignPostVars(void); bool8 CanWalkAwayToCancelMsgBox(void); void SetWalkingIntoSignVars(void); -bool8 sub_80699D4(void); +bool8 IsMsgBoxWalkawayDisabled(void); extern const u8 *gRAMScriptPtr; extern u8 gWalkAwayFromSignInhibitTimer; diff --git a/include/vs_seeker.h b/include/vs_seeker.h index 8c3b86194..6668cc6b4 100644 --- a/include/vs_seeker.h +++ b/include/vs_seeker.h @@ -3,18 +3,14 @@ #include "global.h" -void sub_810C604(void); -void sub_810C640(void); - void Task_VsSeeker_0(u8 taskId); void sub_810CB90(void); void sub_810CDE8(void); int GetRematchTrainerId(u16 a0); bool8 sub_810CF04(u8 a0); -u8 sub_810CF54(); void sub_810D0D0(void); void sub_810CB90(void); -bool8 sub_810C4EC(void); +bool8 UpdateVsSeekerStepCounter(void); void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum); #endif //GUARD_VS_SEEKER_H |