summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h2
-rw-r--r--include/constants/battle_anim.h2
-rw-r--r--include/constants/metatile_behaviors.h14
-rw-r--r--include/constants/quest_log.h11
-rw-r--r--include/event_object_lock.h4
-rw-r--r--include/event_object_movement.h2
-rw-r--r--include/field_control_avatar.h6
-rw-r--r--include/field_fadetransition.h4
-rw-r--r--include/field_player_avatar.h4
-rw-r--r--include/field_screen_effect.h2
-rw-r--r--include/global.h4
-rw-r--r--include/graphics.h4
-rw-r--r--include/metatile_behavior.h10
-rw-r--r--include/quest_log.h4
-rw-r--r--include/scrcmd.h2
15 files changed, 40 insertions, 35 deletions
diff --git a/include/battle.h b/include/battle.h
index c9534745d..aac94da7b 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -33,7 +33,7 @@
#define B_ACTION_RUN 3
#define B_ACTION_SAFARI_WATCH_CAREFULLY 4
#define B_ACTION_SAFARI_BALL 5
-#define B_ACTION_SAFARI_POKEBLOCK 6
+#define B_ACTION_SAFARI_BAIT 6
#define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8
#define B_ACTION_OLDMAN_THROW 9
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index 962cad668..80be08905 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -276,7 +276,7 @@
#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266)
#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267)
#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268)
-#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269)
+#define ANIM_TAG_SAFARI_BAIT (ANIM_SPRITES_START + 269)
#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270)
#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272)
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index da979084a..e26f79be0 100644
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -16,12 +16,12 @@
#define MB_OCEAN_WATER 0x15
#define MB_PUDDLE 0x16
#define MB_SHALLOW_WATER 0x17
-#define MB_19 0x19
+#define MB_UNDERWATER_BLOCKED_ABOVE 0x19
#define MB_1A 0x1A
#define MB_1B 0x1B
#define MB_STRENGTH_BUTTON 0x20
#define MB_SAND 0x21
-#define MB_22 0x22
+#define MB_SEAWEED 0x22
#define MB_ICE 0x23
#define MB_THIN_ICE 0x26
#define MB_CRACKED_ICE 0x27
@@ -68,14 +68,14 @@
#define MB_SOUTH_ARROW_WARP 0x65
#define MB_FALL_WARP 0x66
#define MB_REGULAR_WARP 0x67
-#define MB_68 0x68
+#define MB_LAVARIDGE_1F_WARP 0x68
#define MB_WARP_DOOR 0x69
#define MB_UP_ESCALATOR 0x6A
#define MB_DOWN_ESCALATOR 0x6B
-#define MB_UNKNOWN_WARP_6C 0x6C
-#define MB_UNKNOWN_WARP_6D 0x6D
-#define MB_UNKNOWN_WARP_6E 0x6E
-#define MB_UNKNOWN_WARP_6F 0x6F
+#define MB_UP_RIGHT_STAIR_WARP 0x6C
+#define MB_UP_LEFT_STAIR_WARP 0x6D
+#define MB_DOWN_RIGHT_STAIR_WARP 0x6E
+#define MB_DOWN_LEFT_STAIR_WARP 0x6F
#define MB_UNION_ROOM_WARP 0x71
#define MB_COUNTER 0x80
#define MB_BOOKSHELF 0x81
diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h
index b5494e7b9..b6f8dc319 100644
--- a/include/constants/quest_log.h
+++ b/include/constants/quest_log.h
@@ -2,9 +2,14 @@
#define GUARD_CONSTANTS_QUEST_LOG_H
// TODO: Name and use state constants
-#define QL_STATE_1 1
-#define QL_STATE_2 2
-#define QL_STATE_3 3
+#define QL_STATE_RECORDING 1
+#define QL_STATE_PLAYBACK 2
+#define QL_STATE_PLAYBACK_LAST 3
+
+#define QL_START_NORMAL 1
+#define QL_START_WARP 2
+
+#define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST)
#define QL_EVENT_0 0 // Null
#define QL_EVENT_1 1 // Null
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 1a0f452fc..de5b9903e 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -3,9 +3,9 @@
#include "global.h"
-bool8 sub_8069590(void);
+bool8 NativeScript_WaitPlayerStopMoving(void);
void ScriptFreezeObjectEvents(void);
-bool8 sub_8069648(void);
+bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void);
void LockSelectedObjectEvent(void);
void sub_8098630(void);
bool8 sub_8098734(void);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 0c383b2bb..1b7ee756e 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -66,7 +66,7 @@ u8 GetObjectEventIdByXY(s16, s16);
void SetObjectEventDirection(struct ObjectEvent *, u8);
u8 sub_808D4F4(void);
void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
-u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup);
+u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
void LoadPlayerObjectReflectionPalette(u16, u8);
void LoadSpecialObjectReflectionPalette(u16, u8);
void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index e0873aa52..25eaf45ae 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -26,15 +26,15 @@ extern struct FieldInput gInputToStoreInQuestLogMaybe;
void RestartWildEncounterImmunitySteps(void);
void ClearPoisonStepCounter(void);
int SetCableClubWarp(void);
-void sub_806DE28(struct ObjectEvent *);
+void HandleBoulderFallThroughHole(struct ObjectEvent *);
bool8 dive_warp(struct MapPosition * pos, u16 behavior);
-bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection);
+bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection);
const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
const u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
void FieldClearPlayerInput(struct FieldInput *input);
int ProcessPlayerFieldInput(struct FieldInput *input);
void FieldInput_HandleCancelSignpost(struct FieldInput * input);
void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
-void sub_806DE70(u16 x, u16 y);
+void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y);
#endif //GUARD_FIELD_CONTROL_AVATAR_H
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index b57ef14b0..0decdd9ff 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -10,7 +10,7 @@ void DoDoorWarp(void);
void DoFallWarp(void);
void DoTeleportWarp(void);
-void sub_807E500(void);
+void DoTeleport2Warp(void);
void FieldCB_DefaultWarpExit(void);
void WarpFadeOutScreen(void);
void FieldCB_ContinueScriptHandleMusic(void);
@@ -22,7 +22,7 @@ void sub_807DCE4(void);
bool32 FieldFadeTransitionBackgroundEffectIsFinished(void);
void palette_bg_faded_fill_black(void);
-void sub_807E4A0(u16 metatileBehavior, u16 delay);
+void DoStairWarp(u16 metatileBehavior, u16 delay);
void DoEscalatorWarp(u8 a0);
void DoLavaridgeGymB1FWarp(void);
void DoLavaridgeGym1FWarp(void);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index df9084eab..60ece38fe 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -14,7 +14,7 @@ u8 PlayerGetCopyableMovement(void);
void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite);
-void sub_805C270(void);
+void HandleEnforcedLookDirectionOnPlayerStopMoving(void);
void StopPlayerAvatar(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetPlayerAvatarGraphicsIdByStateId(u8);
@@ -22,7 +22,7 @@ void SetPlayerAvatarStateMask(u8 mask);
void AlignFishingAnimationFrames(struct Sprite *sprite);
void CreateStopSurfingTask_NoMusicChange(u8 direction);
void SavePlayerFacingDirectionForTeleport(u8 direction);
-void SetPlayerAvatarTransitionFlags(u16 a);
+void SetPlayerAvatarTransitionFlags(u16 flags);
bool8 IsPlayerFacingSurfableFishableWater(void);
void StartFishing(u8 secondaryId);
u8 GetPlayerAvatarObjectId(void);
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 06c56d38a..bf27cb49c 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -6,7 +6,7 @@
void sub_80AF79C(void);
void AnimateFlash(u8);
void sub_80B0244(void);
-void sub_807E3EC(void);
+void FieldCB_SafariZoneRanOutOfBalls(void);
void DoOutwardBarnDoorWipe(void);
void Task_BarnDoorWipe(u8 taskId);
void FieldCB_RushInjuredPokemonToCenter(void);
diff --git a/include/global.h b/include/global.h
index aa60be994..2b8da3c14 100644
--- a/include/global.h
+++ b/include/global.h
@@ -619,7 +619,7 @@ struct QuestLogObjectEvent
struct QuestLog
{
- /*0x0000*/ u8 unk_000;
+ /*0x0000*/ u8 startType;
/*0x0001*/ u8 mapGroup;
/*0x0002*/ u8 mapNum;
/*0x0003*/ u8 warpId;
@@ -632,7 +632,7 @@ struct QuestLog
/*0x0148*/ u8 flags[FLAGS_COUNT];
/*0x02c8*/ u16 vars[VARS_COUNT];
/*0x0468*/ struct QuestLogNPCData npcData[64];
- /*0x0568*/ u16 unk_568[128];
+ /*0x0568*/ u16 script[128];
/*0x0668*/ u16 end[0];
};
diff --git a/include/graphics.h b/include/graphics.h
index 8978719a8..40a41b87e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3943,7 +3943,7 @@ extern const u32 gBattleAnimSpriteGfx_IcicleSpear[];
extern const u32 gBattleAnimSpriteGfx_Hail[];
extern const u32 gBattleAnimSpriteGfx_GlowyRedOrb[];
extern const u32 gBattleAnimSpriteGfx_GreenSpike[];
-extern const u32 gBattleAnimSpriteGfx_Pokeblock[];
+extern const u32 gBattleAnimSpriteGfx_SafariBait[];
extern const u32 gBattleAnimSpriteGfx_WhiteFeather[];
extern const u32 gBattleAnimSpriteGfx_Sparkle6[];
extern const u32 gBattleAnimSpriteGfx_Splash[];
@@ -4196,7 +4196,7 @@ extern const u32 gBattleAnimSpritePal_GlowyGreenOrb[];
extern const u32 gBattleAnimSpritePal_GreenSpike[];
extern const u32 gBattleAnimSpritePal_WhiteCircleOfLight[];
extern const u32 gBattleAnimSpritePal_GlowyBlueOrb[];
-extern const u32 gBattleAnimSpritePal_Pokeblock[];
+extern const u32 gBattleAnimSpritePal_SafariBait[];
extern const u32 gBattleAnimSpritePal_WhiteFeather[];
extern const u32 gBattleAnimSpritePal_Sparkle6[];
extern const u32 gBattleAnimSpritePal_Splash[];
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 793eeb8a1..8af4664a0 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -17,11 +17,11 @@ bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior);
bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
diff --git a/include/quest_log.h b/include/quest_log.h
index 090d0daf6..5d474e4f9 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -7,7 +7,7 @@
#include "field_control_avatar.h"
extern u8 gQuestLogState;
-extern u8 gUnknown_3005E88;
+extern u8 gQuestLogPlaybackState;
extern const u16 gUnknown_84566A8[];
extern struct FieldInput gQuestLogFieldInput;
@@ -59,7 +59,7 @@ bool8 sub_8113748(void);
void sub_81119C8(void);
void sub_8111F14(void);
void sub_8110FCC(void);
-u8 sub_8110AC8(void);
+u8 GetQuestLogStartType(void);
void sub_81113E4(void);
void sub_8111438(void);
diff --git a/include/scrcmd.h b/include/scrcmd.h
index 0ef357ece..fca747fa0 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -1,6 +1,6 @@
#ifndef GUARD_SCRCMD_H
#define GUARD_SCRCMD_H
-extern struct ScriptContext * gUnknown_3005070;
+extern struct ScriptContext * sQuestLogScriptContextPtr;
#endif //GUARD_SCRCMD_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-13 19:56:40 +0000