summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-03-26 17:53:18 -0400
committerGitHub <noreply@github.com>2020-03-26 17:53:18 -0400
commitb9c604b8d2ffe863cf17336a4d956b08438f0f45 (patch)
tree95935cb5754f89ea78402cf4706830f71eb07e81 /src
parent7a6d4525c4066038832d85a45ed6df6ab4660309 (diff)
parent9130579f1454c869e74ea8c953c0c778a4760396 (diff)
Merge pull request #311 from PikalaxALT/field_player_avatar
Field player avatar
Diffstat (limited to 'src')
-rw-r--r--src/data/object_events/object_event_graphics_info_pointers.h2
-rw-r--r--src/dynamic_placeholder_text_util.c6
-rw-r--r--src/event_data.c2
-rw-r--r--src/event_object_movement.c76
-rw-r--r--src/field_control_avatar.c12
-rw-r--r--src/field_effect.c2
-rw-r--r--src/field_fadetransition.c80
-rw-r--r--src/field_player_avatar.c2165
-rw-r--r--src/field_screen_effect.c4
-rw-r--r--src/fldeff_strength.c2
-rw-r--r--src/item_use.c12
-rw-r--r--src/metatile_behavior.c20
-rw-r--r--src/naming_screen.c2
-rw-r--r--src/new_menu_helpers.c10
-rw-r--r--src/option_menu.c2
-rw-r--r--src/quest_log.c517
-rw-r--r--src/quest_log_objects.c4
-rw-r--r--src/quest_log_player.c20
-rw-r--r--src/scrcmd.c2
-rw-r--r--src/seagallop.c2
-rw-r--r--src/strings.c6
21 files changed, 2556 insertions, 392 deletions
diff --git a/src/data/object_events/object_event_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h
index 351be4549..164199089 100644
--- a/src/data/object_events/object_event_graphics_info_pointers.h
+++ b/src/data/object_events/object_event_graphics_info_pointers.h
@@ -250,7 +250,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_POKEDEX] = &gObjectEventGraphicsInfo_Pokedex,
[OBJ_EVENT_GFX_CUT_TREE] = &gObjectEventGraphicsInfo_CutTree,
[OBJ_EVENT_GFX_ROCK_SMASH_ROCK] = &gObjectEventGraphicsInfo_RockSmashRock,
- [OBJ_EVENT_GFX_STRENGTH_BOULDER] = &gObjectEventGraphicsInfo_StrengthBoulder,
+ [OBJ_EVENT_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_StrengthBoulder,
[OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil,
[OBJ_EVENT_GFX_RUBY] = &gObjectEventGraphicsInfo_Ruby,
[OBJ_EVENT_GFX_SAPPHIRE] = &gObjectEventGraphicsInfo_Sapphire,
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index cefc99eb1..174a1c5d5 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -9,9 +9,9 @@ static const u8 sTextColorTable[] =
{
// [LOW_NYBBLE / 2] = 0xXY, // HIGH_NYBBLE
[OBJ_EVENT_GFX_RED_NORMAL / 2] = 0x00, // OBJ_EVENT_GFX_RED_BIKE
- [OBJ_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJ_EVENT_GFX_RED_ITEM
+ [OBJ_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJ_EVENT_GFX_RED_ITEM
[OBJ_EVENT_GFX_RED_FISH / 2] = 0x00, // OBJ_EVENT_GFX_RED_VS_SEEKER
- [OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2] = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
+ [OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE / 2] = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
[OBJ_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_SURF
[OBJ_EVENT_GFX_GREEN_ITEM / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_FISH
[OBJ_EVENT_GFX_GREEN_VS_SEEKER / 2] = 0x11, // OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
@@ -56,7 +56,7 @@ static const u8 sTextColorTable[] =
[OBJ_EVENT_GFX_TEACHY_TV_HOST / 2] = 0x00, // OBJ_EVENT_GFX_GYM_GUY
[OBJ_EVENT_GFX_ITEM_BALL / 2] = 0x33, // OBJ_EVENT_GFX_TOWN_MAP
[OBJ_EVENT_GFX_POKEDEX / 2] = 0x33, // OBJ_EVENT_GFX_CUT_TREE
- [OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2] = 0x33, // OBJ_EVENT_GFX_STRENGTH_BOULDER
+ [OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2] = 0x33, // OBJ_EVENT_GFX_PUSHABLE_BOULDER
[OBJ_EVENT_GFX_FOSSIL / 2] = 0x33, // OBJ_EVENT_GFX_RUBY
[OBJ_EVENT_GFX_SAPPHIRE / 2] = 0x33, // OBJ_EVENT_GFX_OLD_AMBER
[OBJ_EVENT_GFX_GYM_SIGN / 2] = 0x33, // OBJ_EVENT_GFX_SIGN
diff --git a/src/event_data.c b/src/event_data.c
index a162e8701..f16267c98 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -44,7 +44,7 @@ void sub_806E110(void)
memset(gSaveBlock1Ptr->vars, 0, 16 * 2);
FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE);
- FlagClear(FLAG_SYS_STRENGTH_ACTIVE);
+ FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_SPECIAL_WILD_BATTLE);
FlagClear(FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER);
}
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index c04e1d00a..5361d05dc 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -153,8 +153,6 @@ static void sub_80632BC(struct Sprite *);
static void sub_80632E0(struct Sprite *);
static void MovementType_WanderAroundDuplicate(struct Sprite *);
-extern void sub_805B3B8(struct Sprite *);
-
#define movement_type_def(setup, table) \
static u8 setup##_callback(struct ObjectEvent *, struct Sprite *); \
void setup(struct Sprite *sprite) \
@@ -212,7 +210,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) = {
MovementType_FaceDirection,
MovementType_FaceDirection,
MovementType_FaceDirection,
- sub_805B3B8,
+ MovementType_Player,
NULL,
MovementType_FaceDownAndUp,
MovementType_FaceLeftAndRight,
@@ -806,7 +804,7 @@ const u8 gAcroEndWheelieDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1D,
};
-const u8 gAcroUnusedActionDirectionAnimNums[] = {
+const u8 gUnknown_83A6465[] = {
[DIR_NONE] = 0x18,
[DIR_SOUTH] = 0x18,
[DIR_NORTH] = 0x19,
@@ -818,7 +816,7 @@ const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1B,
};
-const u8 gAcroWheeliePedalDirectionAnimNums[] = {
+const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NONE] = 0x20,
[DIR_SOUTH] = 0x20,
[DIR_NORTH] = 0x21,
@@ -830,7 +828,7 @@ const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x21,
};
-const u8 gFishingDirectionAnimNums[] = {
+const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NONE] = 0x24,
[DIR_SOUTH] = 0x24,
[DIR_NORTH] = 0x25,
@@ -842,7 +840,7 @@ const u8 gFishingDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x25,
};
-const u8 gFishingNoCatchDirectionAnimNums[] = {
+const u8 gFishingDirectionAnimNums[] = {
[DIR_NONE] = 0x0,
[DIR_SOUTH] = 0x0,
[DIR_NORTH] = 0x1,
@@ -854,7 +852,7 @@ const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1,
};
-const u8 gFishingBiteDirectionAnimNums[] = {
+const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NONE] = 0x4,
[DIR_SOUTH] = 0x4,
[DIR_NORTH] = 0x5,
@@ -866,7 +864,7 @@ const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x5,
};
-const u8 gUnknown_83A648A[] = {
+const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NONE] = 0x8,
[DIR_SOUTH] = 0x8,
[DIR_NORTH] = 0x9,
@@ -3040,7 +3038,7 @@ bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent)
s16 minY;
s16 maxY;
- if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH))
+ if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_WATERING))
{
return FALSE;
}
@@ -4962,6 +4960,11 @@ u8 GetAcroEndWheelieDirectionAnimNum(u8 direction)
return gAcroEndWheelieDirectionAnimNums[direction];
}
+u8 sub_80634C0(u8 direction)
+{
+ return gUnknown_83A6465[direction];
+}
+
u8 GetAcroUnusedActionDirectionAnimNum(u8 direction)
{
return gAcroUnusedActionDirectionAnimNums[direction];
@@ -4987,11 +4990,6 @@ u8 GetFishingBiteDirectionAnimNum(u8 direction)
return gFishingBiteDirectionAnimNums[direction];
}
-u8 sub_8063510(u8 direction)
-{
- return gUnknown_83A648A[direction];
-}
-
u8 GetRunningDirectionAnimNum(u8 direction)
{
return gRunningDirectionAnimNums[direction];
@@ -5449,19 +5447,19 @@ u8 sub_8063F10(u32 idx)
}
dirn_to_anim(sub_8063F2C, gUnknown_83A64FB);
-dirn_to_anim(sub_8063F58, gUnknown_83A6500);
+dirn_to_anim(GetWalkSlowMovementAction, gUnknown_83A6500);
dirn_to_anim(GetWalkNormalMovementAction, gUnknown_83A6505);
dirn_to_anim(GetWalkFastMovementAction, gUnknown_83A650A);
dirn_to_anim(sub_8063FDC, gUnknown_83A650F);
dirn_to_anim(sub_8064008, gUnknown_83A6514);
dirn_to_anim(GetWalkFastestMovementAction, gUnknown_83A6519);
dirn_to_anim(GetSlideMovementAction, gUnknown_83A651E);
-dirn_to_anim(sub_806408C, gUnknown_83A6523);
-dirn_to_anim(sub_80640B8, gUnknown_83A6528);
+dirn_to_anim(GetPlayerRunMovementAction, gUnknown_83A6523);
+dirn_to_anim(GetPlayerRunSlowMovementAction, gUnknown_83A6528);
dirn_to_anim(sub_80640E4, gUnknown_83A652D);
dirn_to_anim(GetJump2MovementAction, gUnknown_83A6532);
dirn_to_anim(GetJumpInPlaceMovementAction, gUnknown_83A6537);
-dirn_to_anim(sub_8064168, gUnknown_83A653C);
+dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gUnknown_83A653C);
dirn_to_anim(GetJumpMovementAction, gUnknown_83A6541);
dirn_to_anim(sub_80641C0, gUnknown_83A6546);
dirn_to_anim(sub_80641EC, gUnknown_83A654B);
@@ -5475,15 +5473,15 @@ bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direc
return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction)));
}
-dirn_to_anim(sub_80642F4, gUnknown_83A6564);
-dirn_to_anim(sub_8064320, gUnknown_83A6569);
-dirn_to_anim(sub_806434C, gUnknown_83A656E);
-dirn_to_anim(sub_8064378, gUnknown_83A6573);
-dirn_to_anim(sub_80643A4, gUnknown_83A6578);
-dirn_to_anim(sub_80643D0, gUnknown_83A657D);
-dirn_to_anim(sub_80643FC, gUnknown_83A6582);
-dirn_to_anim(sub_8064428, gUnknown_83A6587);
-dirn_to_anim(sub_8064454, gUnknown_83A658C);
+dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gUnknown_83A6564);
+dirn_to_anim(GetAcroPopWheelieFaceDirectionMovementAction, gUnknown_83A6569);
+dirn_to_anim(GetAcroEndWheelieFaceDirectionMovementAction, gUnknown_83A656E);
+dirn_to_anim(GetAcroWheelieHopFaceDirectionMovementAction, gUnknown_83A6573);
+dirn_to_anim(GetAcroWheelieHopDirectionMovementAction, gUnknown_83A6578);
+dirn_to_anim(GetAcroWheelieJumpDirectionMovementAction, gUnknown_83A657D);
+dirn_to_anim(GetAcroWheelieInPlaceDirectionMovementAction, gUnknown_83A6582);
+dirn_to_anim(GetAcroPopWheelieMoveDirectionMovementAction, gUnknown_83A6587);
+dirn_to_anim(GetAcroWheelieMoveDirectionMovementAction, gUnknown_83A658C);
u8 GetOppositeDirection(u8 direction)
{
@@ -7537,7 +7535,7 @@ void sub_8066C70(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 dire
{
SetObjectEventDirection(objectEvent, direction);
ShiftStillObjectEventCoords(objectEvent);
- obj_npc_animation_step(objectEvent, sprite, GetFishingDirectionAnimNum(direction));
+ obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction));
sprite->animPaused = TRUE;
sprite->data[2] = 1;
}
@@ -7616,25 +7614,25 @@ static bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *ob
static bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH));
+ StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH));
+ StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST));
+ StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST));
return FALSE;
}
static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST));
+ StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST));
return FALSE;
}
@@ -7851,25 +7849,25 @@ static bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objec
static bool8 MovementActionFunc_x88_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sub_80656C4(objectEvent, sprite, DIR_SOUTH, GetFishingDirectionAnimNum(DIR_SOUTH), 8);
+ sub_80656C4(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x89_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sub_80656C4(objectEvent, sprite, DIR_NORTH, GetFishingDirectionAnimNum(DIR_NORTH), 8);
+ sub_80656C4(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x8A_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sub_80656C4(objectEvent, sprite, DIR_WEST, GetFishingDirectionAnimNum(DIR_WEST), 8);
+ sub_80656C4(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
static bool8 MovementActionFunc_x8B_0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sub_80656C4(objectEvent, sprite, DIR_EAST, GetFishingDirectionAnimNum(DIR_EAST), 8);
+ sub_80656C4(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8);
return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
}
@@ -7947,7 +7945,7 @@ static bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *ob
void sub_806751C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{
npc_apply_direction(objectEvent, sprite, direction, speed);
- npc_apply_anim_looping(objectEvent, sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
+ npc_apply_anim_looping(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection));
}
static bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
@@ -8017,7 +8015,7 @@ static bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objec
void sub_806764C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{
npc_apply_direction(objectEvent, sprite, direction, speed);
- npc_apply_anim_looping(objectEvent, sprite, GetAcroUnusedActionDirectionAnimNum(objectEvent->facingDirection));
+ npc_apply_anim_looping(objectEvent, sprite, sub_80634C0(objectEvent->facingDirection));
SeekSpriteAnim(sprite, 0);
}
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 89b90ca92..ee413df2d 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -105,11 +105,11 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
{
if (GetPlayerSpeed() != 4)
{
- if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & 0x40))
+ if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
input->pressedStartButton = TRUE;
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
{
- if (!(gPlayerAvatar.flags & 0x40))
+ if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
{
if (newKeys & SELECT_BUTTON)
input->pressedSelectButton = TRUE;
@@ -625,7 +625,7 @@ static bool8 TryStartStepBasedScript(struct MapPosition *position, u16 metatileB
return TRUE;
if (TryStartStepCountScript(metatileBehavior) == TRUE)
return TRUE;
- if (!(gPlayerAvatar.flags & 0x40) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE)
+ if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE)
return TRUE;
return FALSE;
}
@@ -655,7 +655,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
UpdateHappinessStepCounter();
- if (!(gPlayerAvatar.flags & 0x40) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
+ if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
{
if (sub_810C4EC() == TRUE)
{
@@ -839,7 +839,7 @@ static bool8 TryArrowWarp(struct MapPosition *position, u16 metatileBehavior, u8
else if (sub_806DB84(metatileBehavior, direction) == TRUE)
{
delay = 0;
- if (gPlayerAvatar.flags & 6)
+ if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
{
SetPlayerAvatarTransitionFlags(1);
delay = 12;
@@ -906,7 +906,7 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
return TRUE;
if (MetatileBehavior_IsEscalator(metatileBehavior) == TRUE)
return TRUE;
- if (MetatileBehavior_IsCaveDoor(metatileBehavior) == TRUE)
+ if (MetatileBehavior_IsNonAnimDoor(metatileBehavior) == TRUE)
return TRUE;
if (MetatileBehavior_IsLavaridgeB1FWarp(metatileBehavior) == TRUE)
return TRUE;
diff --git a/src/field_effect.c b/src/field_effect.c
index 082aee32d..b59ce5a6b 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2888,7 +2888,7 @@ u8 FldEff_UseSurf(void)
{
u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff);
gTasks[taskId].data[15] = gFieldEffectArguments[0];
- sav1_reset_battle_music_maybe();
+ Overworld_ClearSavedMusic();
if (sub_8056124(MUS_NAMINORI))
Overworld_ChangeMusicTo(MUS_NAMINORI);
return FALSE;
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 10d6b3d72..03190c095 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -29,9 +29,9 @@ static void sub_807DF4C(u8 a0);
static void sub_807DFBC(u8 taskId);
static void task_map_chg_seq_0807E20C(u8 taskId);
static void task_map_chg_seq_0807E2CC(u8 taskId);
-static void sub_807E31C(u8 taskId);
+static void Task_TeleportWarpIn(u8 taskId);
static void sub_807E718(u8 taskId);
-static void sub_807E784(u8 taskId);
+static void Task_TeleportWarp(u8 taskId);
static void sub_807E80C(u8 taskId);
static void sub_807E980(u8 taskId);
static void sub_807EB64(u16, s16*, s16*);
@@ -126,12 +126,12 @@ static void sub_807DC70(void)
static void sub_807DCB0(bool8 arg)
{
- sub_805CB04(!arg);
+ SetPlayerInvisibility(!arg);
}
static void task0A_nop_for_a_while(u8 taskId)
{
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
DestroyTask(taskId);
}
@@ -145,7 +145,7 @@ void sub_807DCE4(void)
static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskId)
{
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -184,7 +184,7 @@ static void task_mpl_807DD60(u8 taskId)
}
break;
case 2:
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
@@ -218,7 +218,7 @@ static void sub_807DDF0(u8 taskId)
}
break;
case 2:
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
sub_8009FE8();
ScriptContext2_Disable();
@@ -260,7 +260,7 @@ static void sub_807DE78(bool8 a0)
else
{
sub_807DF4C(a0);
- if (MetatileBehavior_IsCaveDoor(behavior) == TRUE)
+ if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE)
func = task_map_chg_seq_0807E20C;
else if (MetatileBehavior_IsUnknownWarp6C_to_6F(behavior) == TRUE)
{
@@ -284,7 +284,7 @@ static void sub_807DF4C(bool8 a0)
FadeInFromBlack();
}
-void sub_807DF64(void)
+void FieldCB_UnionRoomWarp(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
@@ -300,13 +300,13 @@ void sub_807DF7C(void)
ScriptContext2_Enable();
}
-static void sub_807DF94(void)
+static void FieldCB_TeleportWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
PlaySE(SE_TK_WARPOUT);
- CreateTask(sub_807E31C, 10);
+ CreateTask(Task_TeleportWarpIn, 10);
ScriptContext2_Enable();
}
@@ -363,7 +363,7 @@ static void sub_807DFBC(u8 taskId)
}
break;
case 9:
- if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
+ if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
{
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
task->data[0] = 4;
@@ -371,7 +371,7 @@ static void sub_807DFBC(u8 taskId)
break;
// Legacy RS
case 1:
- if (sub_807E418())
+ if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
@@ -413,7 +413,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
task->data[0] = 1;
break;
case 1:
- if (sub_807E418())
+ if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
@@ -444,7 +444,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 1:
- if (sub_807E418())
+ if (FieldFadeTransitionBackgroundEffectIsFinished())
{
UnfreezeObjectEvents();
ScriptContext2_Disable();
@@ -454,18 +454,18 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
}
}
-static void sub_807E31C(u8 taskId)
+static void Task_TeleportWarpIn(u8 taskId)
{
switch (gTasks[taskId].data[0])
{
case 0:
FreezeObjectEvents();
ScriptContext2_Enable();
- sub_805DC04();
+ StartTeleportInPlayerAnim();
gTasks[taskId].data[0]++;
break;
case 1:
- if (sub_807E418() && sub_805DC24() != TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() && WaitTeleportInPlayerAnim() != TRUE)
{
UnfreezeObjectEvents();
ScriptContext2_Disable();
@@ -477,7 +477,7 @@ static void sub_807E31C(u8 taskId)
static void Task_WaitFadeAndCreateStartMenuTask(u8 taskId)
{
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
CreateTask(Task_StartMenuHandleInput, 80);
@@ -499,7 +499,7 @@ bool8 FieldCB2_ReturnToStartMenuInit(void)
static void task_mpl_807E3C8(u8 taskId)
{
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
@@ -515,12 +515,12 @@ void sub_807E3EC(void)
CreateTask(task_mpl_807E3C8, 10);
}
-static bool32 sub_807E40C(void)
+static bool32 WaitWarpFadeOutScreen(void)
{
return gPaletteFade.active;
}
-bool32 sub_807E418(void)
+bool32 FieldFadeTransitionBackgroundEffectIsFinished(void)
{
if (IsWeatherNotFadingIn() == TRUE && ForestMapPreviewScreenIsRunning())
return TRUE;
@@ -535,7 +535,7 @@ void DoWarp(void)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E718, 10);
}
@@ -545,7 +545,7 @@ void DoDiveWarp(void)
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E718, 10);
}
@@ -560,7 +560,7 @@ void sub_807E4A0(u16 metatileBehavior, u16 delay)
void DoDoorWarp(void)
{
ScriptContext2_Enable();
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
CreateTask(sub_807E80C, 10);
}
@@ -568,14 +568,14 @@ void sub_807E500(void)
{
ScriptContext2_Enable();
CreateTask(sub_807E718, 10);
- gFieldCallback = sub_807DF94;
+ gFieldCallback = FieldCB_TeleportWarpIn;
}
void DoUnionRoomWarp(void)
{
ScriptContext2_Enable();
- gFieldCallback = sub_807DF64;
- CreateTask(sub_807E784, 10);
+ gFieldCallback = FieldCB_UnionRoomWarp;
+ CreateTask(Task_TeleportWarp, 10);
}
void DoFallWarp(void)
@@ -606,8 +606,8 @@ void DoTeleportWarp(void)
{
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
- CreateTask(sub_807E784, 10);
- gFieldCallback = sub_807DF94;
+ CreateTask(Task_TeleportWarp, 10);
+ gFieldCallback = FieldCB_TeleportWarpIn;
}
void sub_807E5C4(void)
@@ -628,7 +628,7 @@ static void sub_807E5EC(u8 taskId)
task->data[0]++;
break;
case 1:
- if (!sub_807E40C() && BGMusicStopped())
+ if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 2:
@@ -661,7 +661,7 @@ static void sub_807E678(u8 taskId)
data[0]++;
break;
case 1:
- if (!sub_807E40C() && BGMusicStopped())
+ if (!WaitWarpFadeOutScreen() && BGMusicStopped())
{
Link_TryStartSend5FFF();
data[0]++;
@@ -694,7 +694,7 @@ static void sub_807E718(u8 taskId)
task->data[0]++;
break;
case 1:
- if (!sub_807E40C() && BGMusicStopped())
+ if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 2:
@@ -705,7 +705,7 @@ static void sub_807E718(u8 taskId)
}
}
-static void sub_807E784(u8 taskId)
+static void Task_TeleportWarp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
@@ -714,18 +714,18 @@ static void sub_807E784(u8 taskId)
FreezeObjectEvents();
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
- sub_805DAB0();
+ StartTeleportWarpOutPlayerAnim();
task->data[0]++;
break;
case 1:
- if (!sub_805DAD0())
+ if (!WaitTeleportWarpOutPlayerAnim())
{
WarpFadeOutScreen();
task->data[0]++;
}
break;
case 2:
- if (!sub_807E40C() && BGMusicStopped())
+ if (!WaitWarpFadeOutScreen() && BGMusicStopped())
task->data[0]++;
break;
case 3:
@@ -829,11 +829,11 @@ static void sub_807E980(u8 taskId)
break;
case 3:
sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]);
- if (!sub_807E40C() && BGMusicStopped())
+ if (!WaitWarpFadeOutScreen() && BGMusicStopped())
data[0]++;
break;
default:
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
DestroyTask(taskId);
@@ -898,7 +898,7 @@ static void sub_807EC34(u8 taskId)
switch (data[0])
{
default:
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
CameraObjectReset1();
ScriptContext2_Disable();
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
new file mode 100644
index 000000000..481e55578
--- /dev/null
+++ b/src/field_player_avatar.c
@@ -0,0 +1,2165 @@
+#include "global.h"
+#include "gflib.h"
+#include "bike.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "fieldmap.h"
+#include "field_camera.h"
+#include "field_control_avatar.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_player_avatar.h"
+#include "help_system.h"
+#include "metatile_behavior.h"
+#include "new_menu_helpers.h"
+#include "overworld.h"
+#include "party_menu.h"
+#include "quest_log.h"
+#include "quest_log_player.h"
+#include "random.h"
+#include "script.h"
+#include "strings.h"
+#include "wild_encounter.h"
+#include "constants/event_object_movement.h"
+#include "constants/event_objects.h"
+#include "constants/songs.h"
+#include "constants/flags.h"
+#include "constants/metatile_behaviors.h"
+#include "constants/species.h"
+#include "constants/moves.h"
+
+static EWRAM_DATA struct ObjectEvent * gUnknown_2036E30 = NULL;
+static EWRAM_DATA u8 sTeleportSavedFacingDirection = DIR_NONE;
+EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {};
+EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {};
+
+static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite * sprite);
+static bool8 sub_805B528(void);
+static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent * playerObjEvent, u8 direction);
+static void npc_clear_strange_bits(struct ObjectEvent * playerObjEvent);
+static bool8 TryDoMetatileBehaviorForcedMovement(void);
+static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys);
+static void PlayerAllowForcedMovementIfMovingSameDirection(void);
+static bool8 ForcedMovement_None(void);
+static bool8 ForcedMovement_Slip(void);
+static bool8 ForcedMovement_WalkSouth(void);
+static bool8 ForcedMovement_WalkNorth(void);
+static bool8 ForcedMovement_WalkWest(void);
+static bool8 ForcedMovement_WalkEast(void);
+static bool8 ForcedMovement_SpinRight(void);
+static bool8 ForcedMovement_SpinLeft(void);
+static bool8 ForcedMovement_SpinUp(void);
+static bool8 ForcedMovement_SpinDown(void);
+static void PlaySpinSound(void);
+static bool8 ForcedMovement_PushedSouthByCurrent(void);
+static bool8 ForcedMovement_PushedNorthByCurrent(void);
+static bool8 ForcedMovement_PushedWestByCurrent(void);
+static bool8 ForcedMovement_PushedEastByCurrent(void);
+static bool8 ForcedMovement_SlideSouth(void);
+static bool8 ForcedMovement_SlideNorth(void);
+static bool8 ForcedMovement_SlideWest(void);
+static bool8 ForcedMovement_SlideEast(void);
+static bool8 ForcedMovement_0xBB(void);
+static bool8 ForcedMovement_0xBC(void);
+static u8 CheckMovementInputNotOnBike(u8 direction);
+static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys);
+static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys);
+static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys);
+static u8 CheckForPlayerAvatarCollision(u8 direction);
+u8 CheckForObjectEventCollision(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior);
+static bool8 CanStopSurfing(s16 x, s16 y, u8 direction);
+static bool8 ShouldJumpLedge(s16 x, s16 y, u8 direction);
+static bool8 TryPushBoulder(s16 x, s16 y, u8 direction);
+static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collision);
+static void DoPlayerAvatarTransition(void);
+static void PlayerAvatarTransition_Dummy(struct ObjectEvent * playerObject);
+static void PlayerAvatarTransition_Normal(struct ObjectEvent * playerObject);
+static void PlayerAvatarTransition_Bike(struct ObjectEvent * playerObject);
+static void PlayerAvatarTransition_Surfing(struct ObjectEvent * playerObject);
+static void PlayerAvatarTransition_Underwater(struct ObjectEvent * playerObject);
+static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent * playerObject);
+static bool8 PlayerIsAnimActive(void);
+static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
+static bool8 player_is_anim_in_certain_ranges(void);
+static bool8 sub_805BF58(void);
+static void PlayCollisionSoundIfNotFacingWarp(u8 direction);
+static void PlayerGoSpin(u8 direction);
+static void sub_805C2CC(u8 metatileBehavior);
+static bool8 MetatileAtCoordsIsWaterTile(s16 x, s16 y);
+static void sub_805CC40(struct ObjectEvent * playerObjEvent);
+static void StartStrengthAnim(u8 objectEventId, u8 direction);
+static void Task_BumpBoulder(u8 taskId);
+static bool8 sub_805CD64(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
+static bool8 do_boulder_dust(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
+static bool8 sub_805CE20(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
+static void DoPlayerMatJump(void);
+static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
+static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task * task, struct ObjectEvent * playerObj);
+static void DoPlayerMatSpin(void);
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task * task, struct ObjectEvent * playerObj);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task * task, struct ObjectEvent * playerObj);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task * task, struct ObjectEvent * playerObj);
+static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task * task, struct ObjectEvent * playerObj);
+static void CreateStopSurfingTask(u8 direction);
+static void Task_StopSurfingInit(u8 taskId);
+static void Task_WaitStopSurfing(u8 taskId);
+static void Task_Fishing(u8 taskId);
+static bool8 Fishing1(struct Task * task);
+static bool8 Fishing2(struct Task * task);
+static bool8 Fishing3(struct Task * task);
+static bool8 Fishing4(struct Task * task);
+static bool8 Fishing5(struct Task * task);
+static bool8 Fishing6(struct Task * task);
+static bool8 Fishing7(struct Task * task);
+static bool8 Fishing8(struct Task * task);
+static bool8 Fishing9(struct Task * task);
+static bool8 Fishing10(struct Task * task);
+static bool8 Fishing11(struct Task * task);
+static bool8 Fishing12(struct Task * task);
+static bool8 Fishing13(struct Task * task);
+static bool8 Fishing14(struct Task * task);
+static bool8 Fishing15(struct Task * task);
+static bool8 Fishing16(struct Task * task);
+static void Task_TeleportWarpOutPlayerAnim(u8 taskId);
+static void Task_TeleportWarpInPlayerAnim(u8 taskId);
+static u8 TeleportAnim_RotatePlayer(struct ObjectEvent * object, s16 *timer);
+
+void MovementType_Player(struct Sprite *sprite)
+{
+ UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2);
+}
+
+static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite * sprite)
+{
+ return 0;
+}
+
+void player_step(u8 direction, u16 newKeys, u16 heldKeys)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ sub_805CC40(playerObjEvent);
+ if (!gPlayerAvatar.preventStep && !sub_805B528())
+ {
+ if (!TryInterruptObjectEventSpecialAnim(playerObjEvent, direction))
+ {
+ npc_clear_strange_bits(playerObjEvent);
+ DoPlayerAvatarTransition();
+ if (!TryDoMetatileBehaviorForcedMovement())
+ {
+ MovePlayerAvatarUsingKeypadInput(direction, newKeys, heldKeys);
+ PlayerAllowForcedMovementIfMovingSameDirection();
+ }
+ }
+ }
+}
+
+static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEvent, u8 direction)
+{
+
+ if (ObjectEventIsMovementOverridden(playerObjEvent)
+ && !ObjectEventClearHeldMovementIfFinished(playerObjEvent))
+ {
+ u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerObjEvent);
+ if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN)
+ {
+ if (direction != DIR_NONE && playerObjEvent->movementDirection != direction)
+ {
+ ObjectEventClearHeldMovement(playerObjEvent);
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
+{
+ objEvent->inanimate = FALSE;
+ objEvent->disableAnim = FALSE;
+ objEvent->facingDirectionLocked = FALSE;
+ gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_WATERING;
+}
+
+static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys)
+{
+ if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE)
+ || (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE))
+ MovePlayerOnBike(direction, newKeys, heldKeys);
+ else
+ MovePlayerNotOnBike(direction, heldKeys);
+}
+
+static void PlayerAllowForcedMovementIfMovingSameDirection(void)
+{
+ if (gPlayerAvatar.runningState == MOVING)
+ gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_FIELD_MOVE;
+}
+
+static bool8 sub_805B528(void)
+{
+ if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && MetatileBehavior_IsSpinTile(gPlayerAvatar.lastSpinTile))
+ {
+ gUnknown_2036E30 = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (gUnknown_2036E30->heldMovementFinished)
+ {
+ if (MetatileBehavior_IsStopSpinning(gUnknown_2036E30->currentMetatileBehavior))
+ {
+ return FALSE;
+ }
+ if (MetatileBehavior_IsSpinTile(gUnknown_2036E30->currentMetatileBehavior))
+ {
+ gPlayerAvatar.lastSpinTile = gUnknown_2036E30->currentMetatileBehavior;
+ }
+ ObjectEventClearHeldMovement(gUnknown_2036E30);
+ sub_805C2CC(gPlayerAvatar.lastSpinTile);
+ }
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static const struct {
+ bool8 (*unk0)(u8 metatileBehavior);
+ bool8 (*unk4)(void);
+} sForcedMovementFuncs[] = {
+ {MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip},
+ {MetatileBehavior_IsIce_2, ForcedMovement_Slip},
+ {MetatileBehavior_IsWalkSouth, ForcedMovement_WalkSouth},
+ {MetatileBehavior_IsWalkNorth, ForcedMovement_WalkNorth},
+ {MetatileBehavior_IsWalkWest, ForcedMovement_WalkWest},
+ {MetatileBehavior_IsWalkEast, ForcedMovement_WalkEast},
+ {MetatileBehavior_IsSouthwardCurrent, ForcedMovement_PushedSouthByCurrent},
+ {MetatileBehavior_IsNorthwardCurrent, ForcedMovement_PushedNorthByCurrent},
+ {MetatileBehavior_IsWestwardCurrent, ForcedMovement_PushedWestByCurrent},
+ {MetatileBehavior_IsEastwardCurrent, ForcedMovement_PushedEastByCurrent},
+ {MetatileBehavior_IsSpinRight, ForcedMovement_SpinRight},
+ {MetatileBehavior_IsSpinLeft, ForcedMovement_SpinLeft},
+ {MetatileBehavior_IsSpinUp, ForcedMovement_SpinUp},
+ {MetatileBehavior_IsSpinDown, ForcedMovement_SpinDown},
+ {MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth},
+ {MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth},
+ {MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest},
+ {MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast},
+ {MetatileBehavior_IsWaterfall, ForcedMovement_PushedSouthByCurrent},
+ {MetatileBehavior_UnusedReturnFalse_7, ForcedMovement_0xBB},
+ {MetatileBehavior_UnusedReturnFalse_8, ForcedMovement_0xBC},
+ {NULL, ForcedMovement_None},
+};
+
+static bool8 TryDoMetatileBehaviorForcedMovement(void)
+{
+ int i;
+ u8 behavior;
+ if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FIELD_MOVE))
+ {
+ behavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior;
+ for (i = 0; sForcedMovementFuncs[i].unk0 != NULL; i++)
+ {
+ if (sForcedMovementFuncs[i].unk0(behavior))
+ {
+ gPlayerAvatar.lastSpinTile = behavior;
+ return sForcedMovementFuncs[i].unk4();
+ }
+ }
+ return sForcedMovementFuncs[i].unk4();
+ }
+ else
+ {
+ for (i = 0; sForcedMovementFuncs[i].unk0 != NULL; i++)
+ ;
+ return sForcedMovementFuncs[i].unk4();
+ }
+}
+
+static bool8 ForcedMovement_None(void)
+{
+ if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING)
+ {
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ playerObjEvent->facingDirectionLocked = FALSE;
+ playerObjEvent->enableAnim = TRUE;
+ SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection);
+ gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_FISHING;
+ }
+ return FALSE;
+}
+
+static u8 DoForcedMovement(u8 direction, MovementAction movementAction)
+{
+ struct PlayerAvatar *playerAvatar = &gPlayerAvatar;
+ u8 collision = CheckForPlayerAvatarCollision(direction);
+
+ playerAvatar->flags |= PLAYER_AVATAR_FLAG_FISHING;
+ if (collision)
+ {
+ ForcedMovement_None();
+ if (collision < COLLISION_STOP_SURFING)
+ {
+ return 0;
+ }
+ else
+ {
+ if (collision == COLLISION_LEDGE_JUMP)
+ PlayerJumpLedge(direction);
+ playerAvatar->flags |= PLAYER_AVATAR_FLAG_FISHING;
+ playerAvatar->runningState = MOVING;
+ return 1;
+ }
+ }
+ else
+ {
+ playerAvatar->runningState = MOVING;
+ movementAction(direction);
+ return 1;
+ }
+}
+
+static u8 DoForcedMovementInCurrentDirection(MovementAction movementAction)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ playerObjEvent->disableAnim = TRUE;
+ return DoForcedMovement(playerObjEvent->movementDirection, movementAction);
+}
+
+static bool8 ForcedMovement_Slip(void)
+{
+ return DoForcedMovementInCurrentDirection(PlayerGoSpeed2);
+}
+
+static bool8 ForcedMovement_WalkSouth(void)
+{
+ return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed1);
+}
+
+static bool8 ForcedMovement_WalkNorth(void)
+{
+ return DoForcedMovement(DIR_NORTH, PlayerGoSpeed1);
+}
+
+static bool8 ForcedMovement_WalkWest(void)
+{
+ return DoForcedMovement(DIR_WEST, PlayerGoSpeed1);
+}
+
+static bool8 ForcedMovement_WalkEast(void)
+{
+ return DoForcedMovement(DIR_EAST, PlayerGoSpeed1);
+}
+
+static bool8 ForcedMovement_SpinRight(void)
+{
+ PlaySpinSound();
+ return DoForcedMovement(DIR_EAST, PlayerGoSpin);
+}
+
+static bool8 ForcedMovement_SpinLeft(void)
+{
+ PlaySpinSound();
+ return DoForcedMovement(DIR_WEST, PlayerGoSpin);
+}
+
+static bool8 ForcedMovement_SpinUp(void)
+{
+ PlaySpinSound();
+ return DoForcedMovement(DIR_NORTH, PlayerGoSpin);
+}
+
+static bool8 ForcedMovement_SpinDown(void)
+{
+ PlaySpinSound();
+ return DoForcedMovement(DIR_SOUTH, PlayerGoSpin);
+}
+
+static void PlaySpinSound(void)
+{
+ PlaySE(SE_W013B);
+}
+
+static bool8 ForcedMovement_PushedSouthByCurrent(void)
+{
+ return DoForcedMovement(DIR_SOUTH, PlayerRideWaterCurrent);
+}
+
+static bool8 ForcedMovement_PushedNorthByCurrent(void)
+{
+ return DoForcedMovement(DIR_NORTH, PlayerRideWaterCurrent);
+}
+
+static bool8 ForcedMovement_PushedWestByCurrent(void)
+{
+ return DoForcedMovement(DIR_WEST, PlayerRideWaterCurrent);
+}
+
+static bool8 ForcedMovement_PushedEastByCurrent(void)
+{
+ return DoForcedMovement(DIR_EAST, PlayerRideWaterCurrent);
+}
+
+static u8 ForcedMovement_Slide(u8 direction, MovementAction movementAction)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ playerObjEvent->disableAnim = TRUE;
+ playerObjEvent->facingDirectionLocked = TRUE;
+ return DoForcedMovement(direction, movementAction);
+}
+
+static bool8 ForcedMovement_SlideSouth(void)
+{
+ return ForcedMovement_Slide(DIR_SOUTH, PlayerGoSpeed2);
+}
+
+static bool8 ForcedMovement_SlideNorth(void)
+{
+ return ForcedMovement_Slide(DIR_NORTH, PlayerGoSpeed2);
+}
+
+static bool8 ForcedMovement_SlideWest(void)
+{
+ return ForcedMovement_Slide(DIR_WEST, PlayerGoSpeed2);
+}
+
+static bool8 ForcedMovement_SlideEast(void)
+{
+ return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2);
+}
+
+static bool8 ForcedMovement_0xBB(void)
+{
+ DoPlayerMatJump();
+ return TRUE;
+}
+
+static bool8 ForcedMovement_0xBC(void)
+{
+ DoPlayerMatSpin();
+ return TRUE;
+}
+
+static void (*const gUnknown_835B814[])(u8, u16) = {
+ PlayerNotOnBikeNotMoving,
+ PlayerNotOnBikeTurningInPlace,
+ PlayerNotOnBikeMoving
+};
+
+void MovePlayerNotOnBike(u8 direction, u16 heldKeys)
+{
+ gUnknown_835B814[CheckMovementInputNotOnBike(direction)](direction, heldKeys);
+}
+
+static u8 CheckMovementInputNotOnBike(u8 direction)
+{
+ if (direction == DIR_NONE)
+ {
+ gPlayerAvatar.runningState = NOT_MOVING;
+ return 0;
+ }
+ else if (direction != GetPlayerMovementDirection() && gPlayerAvatar.runningState != MOVING)
+ {
+ gPlayerAvatar.runningState = TURN_DIRECTION;
+ return 1;
+ }
+ else
+ {
+ gPlayerAvatar.runningState = MOVING;
+ return 2;
+ }
+}
+
+static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys)
+{
+ PlayerFaceDirection(GetPlayerFacingDirection());
+}
+
+static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys)
+{
+ PlayerTurnInPlace(direction);
+}
+
+static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
+{
+ u8 collision = CheckForPlayerAvatarCollision(direction);
+
+ if (collision != COLLISION_NONE)
+ {
+ if (collision == COLLISION_LEDGE_JUMP)
+ {
+ PlayerJumpLedge(direction);
+ }
+ else if (collision == COLLISION_UNKNOWN_WARP_6C_6D_6E_6F)
+ {
+ PlayerFaceDirection(direction);
+ }
+ else if (collision != COLLISION_STOP_SURFING && collision != COLLISION_LEDGE_JUMP && collision != COLLISION_PUSHED_BOULDER && collision != COLLISION_UNKNOWN_WARP_6C_6D_6E_6F)
+ {
+ PlayerNotOnBikeCollide(direction);
+ }
+ return;
+ }
+
+ if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+ {
+ // speed 2 is fast, same speed as running
+ PlayerGoSpeed2(direction);
+ return;
+ }
+
+ if ((heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH)
+ && !IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior))
+ {
+ if (PlayerIsMovingOnRockStairs(direction))
+ PlayerRunSlow(direction);
+ else
+ PlayerRun(direction);
+ gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_WATERING;
+ return;
+ }
+ else
+ {
+ if (PlayerIsMovingOnRockStairs(direction))
+ PlayerGoSlow(direction);
+ else
+ PlayerGoSpeed1(direction);
+ }
+}
+
+bool32 PlayerIsMovingOnRockStairs(u8 direction)
+{
+ struct ObjectEvent * objectEvent;
+ s16 x, y;
+
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ x = objectEvent->currentCoords.x;
+ y = objectEvent->currentCoords.y;
+ switch (direction)
+ {
+ case DIR_NORTH:
+ return MetatileBehavior_IsRockStairs(MapGridGetMetatileBehaviorAt(x, y));
+ case DIR_SOUTH:
+ MoveCoords(DIR_SOUTH, &x, &y);
+ return MetatileBehavior_IsRockStairs(MapGridGetMetatileBehaviorAt(x, y));
+ default:
+ return FALSE;
+ }
+}
+
+static u8 CheckForPlayerAvatarCollision(u8 direction)
+{
+ s16 x, y;
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ x = playerObjEvent->currentCoords.x;
+ y = playerObjEvent->currentCoords.y;
+ if (sub_806DB84(MapGridGetMetatileBehaviorAt(x, y), direction))
+ return 8;
+ MoveCoords(direction, &x, &y);
+ return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
+}
+
+u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior)
+{
+ u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction);
+ if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction))
+ return COLLISION_STOP_SURFING;
+
+ if (ShouldJumpLedge(x, y, direction))
+ {
+ IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES);
+ return COLLISION_LEDGE_JUMP;
+ }
+ if (collision == COLLISION_OBJECT_EVENT && TryPushBoulder(x, y, direction))
+ return COLLISION_PUSHED_BOULDER;
+
+ if (collision == COLLISION_NONE)
+ {
+ CheckAcroBikeCollision(x, y, metatileBehavior, &collision);
+ }
+ return collision;
+}
+
+static const u8 gUnknown_835B820[] = {
+ MOVEMENT_ACTION_FACE_DOWN_FAST,
+ MOVEMENT_ACTION_FACE_DOWN_FAST,
+ MOVEMENT_ACTION_FACE_UP_FAST,
+ MOVEMENT_ACTION_FACE_LEFT_FAST,
+ MOVEMENT_ACTION_FACE_RIGHT_FAST
+};
+
+static bool8 CanStopSurfing(s16 x, s16 y, u8 direction)
+{
+ if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+ && MapGridGetZCoordAt(x, y) == 3
+ && GetObjectEventIdByXYZ(x, y, 3) == OBJECT_EVENTS_COUNT)
+ {
+ sub_811278C(gUnknown_835B820[direction], 16);
+ CreateStopSurfingTask(direction);
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static bool8 ShouldJumpLedge(s16 x, s16 y, u8 z)
+{
+ if (GetLedgeJumpDirection(x, y, z) != 0)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+static bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
+{
+ u8 objectEventId;
+ u8 direction_ = direction;
+ if (!FlagGet(FLAG_SYS_USE_STRENGTH))
+ return FALSE;
+
+ objectEventId = GetObjectEventIdByXY(x, y);
+ if (objectEventId == OBJECT_EVENTS_COUNT)
+ return FALSE;
+
+ if (gObjectEvents[objectEventId].graphicsId != OBJ_EVENT_GFX_PUSHABLE_BOULDER)
+ return FALSE;
+
+ x = gObjectEvents[objectEventId].currentCoords.x;
+ y = gObjectEvents[objectEventId].currentCoords.y;
+ MoveCoords(direction_, &x, &y);
+ if (MapGridGetMetatileBehaviorAt(x, y) == MB_FALL_WARP || (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction_) == COLLISION_NONE && !MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y))))
+ {
+ StartStrengthAnim(objectEventId, direction_);
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static bool8 (*const gUnknown_835B828[])(u8) = {
+ MetatileBehavior_IsBumpySlope,
+ MetatileBehavior_IsIsolatedVerticalRail,
+ MetatileBehavior_IsIsolatedHorizontalRail,
+ MetatileBehavior_IsVerticalRail,
+ MetatileBehavior_IsHorizontalRail
+};
+
+static const u8 gUnknown_835B83C[] = {
+ COLLISION_WHEELIE_HOP,
+ COLLISION_ISOLATED_VERTICAL_RAIL,
+ COLLISION_ISOLATED_HORIZONTAL_RAIL,
+ COLLISION_VERTICAL_RAIL,
+ COLLISION_HORIZONTAL_RAIL,
+};
+
+static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collision)
+{
+ u8 i;
+
+ for (i = 0; i < NELEMS(gUnknown_835B828); i++)
+ {
+ if (gUnknown_835B828[i](metatileBehavior))
+ {
+ *collision = gUnknown_835B83C[i];
+ return;
+ }
+ }
+}
+
+void SetPlayerAvatarTransitionFlags(bool16 flags)
+{
+ gPlayerAvatar.transitionFlags |= flags;
+ DoPlayerAvatarTransition();
+}
+
+static void (*const gUnknown_835B844[])(struct ObjectEvent *) = {
+ [PLAYER_AVATAR_STATE_NORMAL] = PlayerAvatarTransition_Normal,
+ [PLAYER_AVATAR_STATE_MACH_BIKE] = PlayerAvatarTransition_Bike,
+ [PLAYER_AVATAR_STATE_ACRO_BIKE] = PlayerAvatarTransition_Bike,
+ [PLAYER_AVATAR_STATE_SURFING] = PlayerAvatarTransition_Surfing,
+ [PLAYER_AVATAR_STATE_UNDERWATER] = PlayerAvatarTransition_Underwater,
+ [PLAYER_AVATAR_STATE_FIELD_MOVE] = PlayerAvatarTransition_ReturnToField,
+ [PLAYER_AVATAR_STATE_FISHING] = PlayerAvatarTransition_Dummy,
+ [PLAYER_AVATAR_STATE_WATERING] = PlayerAvatarTransition_Dummy
+};
+
+static void DoPlayerAvatarTransition(void)
+{
+ u8 i;
+ u8 flags = gPlayerAvatar.transitionFlags;
+
+ if (flags != 0)
+ {
+ for (i = 0; i < NELEMS(gUnknown_835B844); i++, flags >>= 1)
+ {
+ if (flags & 1)
+ gUnknown_835B844[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
+ }
+ gPlayerAvatar.transitionFlags = 0;
+ }
+}
+
+static void PlayerAvatarTransition_Dummy(struct ObjectEvent * playerObjEvent)
+{
+
+}
+
+static void PlayerAvatarTransition_Normal(struct ObjectEvent * playerObjEvent)
+{
+ sub_8150474(0);
+ sub_8150498(0);
+}
+
+static void PlayerAvatarTransition_Bike(struct ObjectEvent * playerObjEvent)
+{
+ sub_8150474(1);
+ sub_8150498(1);
+ sub_80BD620(0, 0);
+}
+
+static void PlayerAvatarTransition_Surfing(struct ObjectEvent * playerObjEvent)
+{
+ sub_8150474(3);
+ sub_8150498(3);
+}
+
+static void PlayerAvatarTransition_Underwater(struct ObjectEvent * playerObjEvent)
+{
+
+}
+
+static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent * playerObjEvent)
+{
+ gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_FIELD_MOVE;
+}
+
+void sub_805BEB8(void)
+{
+ gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
+ if (PlayerIsAnimActive())
+ {
+ if (!PlayerCheckIfAnimFinishedOrInactive())
+ {
+ if (!player_is_anim_in_certain_ranges())
+ gPlayerAvatar.tileTransitionState = T_TILE_TRANSITION;
+ }
+ else
+ {
+ if (!sub_805BF58())
+ gPlayerAvatar.tileTransitionState = T_TILE_CENTER;
+ }
+ }
+}
+
+static bool8 player_is_anim_in_certain_ranges(void)
+{
+ u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId;
+
+ if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT_FAST
+ || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16)
+ || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT)
+ || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT)
+ || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+static bool8 sub_805BF58(void)
+{
+ if (player_is_anim_in_certain_ranges() && gPlayerAvatar.runningState != TURN_DIRECTION)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+static bool8 PlayerIsAnimActive(void)
+{
+ return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]);
+}
+
+static bool8 PlayerCheckIfAnimFinishedOrInactive(void)
+{
+ return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]);
+}
+
+static void PlayerSetCopyableMovement(u8 a)
+{
+ gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a;
+}
+
+u8 PlayerGetCopyableMovement(void)
+{
+ return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement;
+}
+
+static void PlayerForceSetHeldMovement(u8 a)
+{
+ ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a);
+}
+
+static void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
+{
+ if (!PlayerIsAnimActive())
+ {
+ PlayerSetCopyableMovement(copyableMovement);
+ if (!ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId))
+ sub_8112628(movementActionId);
+ }
+}
+
+static void sub_805C06C(struct ObjectEvent * objectEvent, u8 movementAction)
+{
+ if (!ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementAction))
+ sub_81126AC(movementAction, 0);
+}
+
+static void sub_805C0A4(struct ObjectEvent * objectEvent, u8 movementAction)
+{
+ if (!ObjectEventSetHeldMovement(objectEvent, movementAction))
+ sub_8112588(objectEvent->localId, objectEvent->mapNum, objectEvent->mapGroup, movementAction, 32);
+}
+
+void sub_805C0D4(u8 direction)
+{
+ PlayerSetAnimId(sub_8063F2C(direction), 2);
+}
+
+void PlayerGoSlow(u8 direction)
+{
+ PlayerSetAnimId(GetWalkSlowMovementAction(direction), 2);
+}
+
+void PlayerGoSpeed1(u8 direction)
+{
+ PlayerSetAnimId(GetWalkNormalMovementAction(direction), 2);
+}
+
+void PlayerGoSpeed2(u8 direction)
+{
+ PlayerSetAnimId(GetWalkFastMovementAction(direction), 2);
+}
+
+void sub_805C134(u8 direction)
+{
+ PlayerSetAnimId(sub_8063FDC(direction), 2);
+}
+
+void PlayerRideWaterCurrent(u8 direction)
+{
+ PlayerSetAnimId(sub_8064008(direction), 2);
+}
+
+void sub_805C164(u8 direction)
+{
+ PlayerSetAnimId(GetWalkFastestMovementAction(direction), 2);
+}
+
+void PlayerRun(u8 direction)
+{
+ PlayerSetAnimId(GetPlayerRunMovementAction(direction), 2);
+}
+
+void PlayerRunSlow(u8 direction)
+{
+ PlayerSetAnimId(GetPlayerRunSlowMovementAction(direction), 2);
+}
+
+void PlayerOnBikeCollide(u8 direction)
+{
+ PlayCollisionSoundIfNotFacingWarp(direction);
+ PlayerSetAnimId(GetWalkInPlaceNormalMovementAction(direction), 2);
+}
+
+void PlayerNotOnBikeCollide(u8 direction)
+{
+ PlayCollisionSoundIfNotFacingWarp(direction);
+ PlayerSetAnimId(GetStepInPlaceDelay32AnimId(direction), 2);
+}
+
+void PlayerFaceDirection(u8 direction)
+{
+ PlayerSetAnimId(GetFaceDirectionMovementAction(direction), 1);
+}
+
+void PlayerFaceDirectionFast(u8 direction)
+{
+ PlayerSetAnimId(GetFaceDirectionFastMovementAction(direction), 1);
+}
+
+void PlayerTurnInPlace(u8 direction)
+{
+ PlayerSetAnimId(GetWalkInPlaceSlowMovementAction(direction), 1);
+}
+
+void PlayerJumpLedge(u8 direction)
+{
+ PlaySE(SE_DANSA);
+ PlayerSetAnimId(GetJump2MovementAction(direction), 8);
+}
+
+void sub_805C260(void)
+{
+ PlayerSetAnimId(MOVEMENT_ACTION_0x9F, 0);
+}
+
+void sub_805C270(void)
+{
+ if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
+ {
+ if (player_should_look_direction_be_enforced_upon_movement())
+ PlayerForceSetHeldMovement(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection));
+ }
+}
+
+static void PlayerGoSpin(u8 direction)
+{
+ PlayerSetAnimId(sub_80640E4(direction), 3);
+}
+
+static void sub_805C2CC(u8 metatileBehavior)
+{
+ int i;
+
+ for (i = 0; sForcedMovementFuncs[i].unk0 != NULL; i++)
+ {
+ if (sForcedMovementFuncs[i].unk0(metatileBehavior))
+ sForcedMovementFuncs[i].unk4();
+ }
+}
+
+static void PlayerIdleWheelie(u8 direction)
+{
+ PlayerSetAnimId(GetAcroWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+static void PlayerStartWheelie(u8 direction)
+{
+ PlayerSetAnimId(GetAcroPopWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+static void PlayerEndWheelie(u8 direction)
+{
+ PlayerSetAnimId(GetAcroEndWheelieFaceDirectionMovementAction(direction), 1);
+}
+
+static void PlayerStandingHoppingWheelie(u8 direction)
+{
+ PlaySE(SE_JITE_PYOKO);
+ PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(direction), 1);
+}
+
+static void PlayerMovingHoppingWheelie(u8 direction)
+{
+ PlaySE(SE_JITE_PYOKO);
+ PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(direction), 2);
+}
+
+static void PlayerLedgeHoppingWheelie(u8 direction)
+{
+ PlaySE(SE_JITE_PYOKO);
+ PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(direction), 8);
+}
+
+static void PlayerAcroTurnJump(u8 direction)
+{
+ PlaySE(SE_JITE_PYOKO);
+ PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
+}
+
+static void PlayerAcroWheelieCollide(u8 direction)
+{
+ PlaySE(SE_WALL_HIT);
+ PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2);
+}
+
+static void sub_805C408(u8 direction)
+{
+ PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2);
+}
+
+static void sub_805C420(u8 direction)
+{
+ PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2);
+}
+
+static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) = {
+ MetatileBehavior_IsSouthArrowWarp,
+ MetatileBehavior_IsNorthArrowWarp,
+ MetatileBehavior_IsWestArrowWarp,
+ MetatileBehavior_IsEastArrowWarp
+};
+
+static void PlayCollisionSoundIfNotFacingWarp(u8 direction)
+{
+ s16 x, y;
+ u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior;
+
+ if (!sArrowWarpMetatileBehaviorChecks[direction - 1](metatileBehavior))
+ {
+ if (direction == DIR_WEST)
+ {
+ if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior) || MetatileBehavior_IsUnknownWarp6F(metatileBehavior))
+ return;
+ }
+ if (direction == DIR_EAST)
+ {
+ if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior) || MetatileBehavior_IsUnknownWarp6E(metatileBehavior))
+ return;
+ }
+ if (direction == DIR_NORTH)
+ {
+ PlayerGetDestCoords(&x, &y);
+ MoveCoords(DIR_NORTH, &x, &y);
+ metatileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+ if (MetatileBehavior_IsWarpDoor(metatileBehavior))
+ return;
+ }
+ PlaySE(SE_WALL_HIT);
+ }
+}
+
+void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y)
+{
+ *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x;
+ *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
+ MoveCoords(GetPlayerFacingDirection(), x, y);
+}
+
+void PlayerGetDestCoords(s16 *x, s16 *y)
+{
+ *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x;
+ *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
+}
+
+u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
+{
+ struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
+ {
+ *x = object->currentCoords.x;
+ *y = object->currentCoords.y;
+
+ switch (object->movementActionId)
+ {
+ case MOVEMENT_ACTION_WALK_NORMAL_DOWN:
+ case MOVEMENT_ACTION_PLAYER_RUN_DOWN:
+ (*y)++;
+ return TRUE;
+ case MOVEMENT_ACTION_WALK_NORMAL_UP:
+ case MOVEMENT_ACTION_PLAYER_RUN_UP:
+ (*y)--;
+ return TRUE;
+ case MOVEMENT_ACTION_WALK_NORMAL_LEFT:
+ case MOVEMENT_ACTION_PLAYER_RUN_LEFT:
+ (*x)--;
+ return TRUE;
+ case MOVEMENT_ACTION_WALK_NORMAL_RIGHT:
+ case MOVEMENT_ACTION_PLAYER_RUN_RIGHT:
+ (*x)++;
+ return TRUE;
+ }
+ }
+
+ *x = -1;
+ *y = -1;
+ return FALSE;
+}
+
+u8 GetPlayerFacingDirection(void)
+{
+ return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection;
+}
+
+u8 GetPlayerMovementDirection(void)
+{
+ return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection;
+}
+
+u8 PlayerGetZCoord(void)
+{
+ return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation;
+}
+
+void MovePlayerToMapCoords(s16 x, s16 y)
+{
+ MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y);
+}
+
+u8 TestPlayerAvatarFlags(u8 bm)
+{
+ return gPlayerAvatar.flags & bm;
+}
+
+u8 GetPlayerAvatarFlags(void)
+{
+ return gPlayerAvatar.flags;
+}
+
+u8 GetPlayerAvatarObjectId(void)
+{
+ return gPlayerAvatar.spriteId;
+}
+
+void sub_805C774(void)
+{
+ ForcedMovement_None();
+}
+
+void sub_805C780(void)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ npc_clear_strange_bits(playerObjEvent);
+ SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection);
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+ {
+ Bike_HandleBumpySlopeJump();
+ Bike_UpdateBikeCounterSpeed(0);
+ }
+}
+
+static const u8 sPlayerAvatarGfxIds[][2] = {
+ {OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL},
+ {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE},
+ {OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF},
+ {OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM},
+ {OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH},
+ {OBJ_EVENT_GFX_RED_VS_SEEKER, OBJ_EVENT_GFX_GREEN_VS_SEEKER},
+};
+
+static const u8 sHoennLinkPartnerGfxIds[] = {
+ OBJ_EVENT_GFX_RS_BRENDAN,
+ OBJ_EVENT_GFX_RS_MAY
+};
+
+u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
+{
+ return GetPlayerAvatarGraphicsIdByStateIdAndGender(state, gender);
+}
+
+u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender)
+{
+ return sPlayerAvatarGfxIds[state][gender];
+}
+
+u8 GetHoennLinkPartnerGraphicsIdByGender(u8 gender)
+{
+ return sHoennLinkPartnerGfxIds[gender];
+}
+
+u8 GetPlayerAvatarGraphicsIdByStateId(u8 state)
+{
+ return GetPlayerAvatarGraphicsIdByStateIdAndGender(state, gPlayerAvatar.gender);
+}
+
+u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId)
+{
+ switch (gfxId)
+ {
+ case OBJ_EVENT_GFX_GREEN_NORMAL:
+ case OBJ_EVENT_GFX_GREEN_BIKE:
+ case OBJ_EVENT_GFX_GREEN_SURF:
+ case OBJ_EVENT_GFX_GREEN_ITEM:
+ case OBJ_EVENT_GFX_GREEN_FISH:
+ return FEMALE;
+ default:
+ return MALE;
+ }
+}
+
+bool8 PartyHasMonWithSurf(void)
+{
+ u8 i;
+
+ if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+ {
+ for (i = 0; i < PARTY_SIZE; i++)
+ {
+ if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == SPECIES_NONE)
+ break;
+ if (MonKnowsMove(&gPlayerParty[i], MOVE_SURF))
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+bool8 IsPlayerSurfingNorth(void)
+{
+ if (GetPlayerMovementDirection() == DIR_NORTH && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+bool8 IsPlayerFacingSurfableFishableWater(void)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ s16 x = playerObjEvent->currentCoords.x;
+ s16 y = playerObjEvent->currentCoords.y;
+
+ MoveCoords(playerObjEvent->facingDirection, &x, &y);
+ if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == COLLISION_ELEVATION_MISMATCH
+ && PlayerGetZCoord() == 3
+ && MetatileAtCoordsIsWaterTile(x, y) == TRUE)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+bool8 MetatileAtCoordsIsWaterTile(s16 x, s16 y)
+{
+ return TestMetatileAttributeBit(MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_TERRAIN), TILE_TERRAIN_WATER);
+}
+
+void ClearPlayerAvatarInfo(void)
+{
+ gPlayerAvatar = (struct PlayerAvatar){};
+}
+
+void SetPlayerAvatarStateMask(u8 flags)
+{
+ gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_WATERING | PLAYER_AVATAR_FLAG_FISHING | PLAYER_AVATAR_FLAG_FIELD_MOVE);
+ gPlayerAvatar.flags |= flags;
+}
+
+static const u8 gUnknown_835B882[][3][2] = {
+ // Male
+ {
+ {OBJ_EVENT_GFX_RED_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_RED_SURF, PLAYER_AVATAR_FLAG_SURFING},
+ },
+ // Female
+ {
+ {OBJ_EVENT_GFX_GREEN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_GREEN_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_GREEN_SURF, PLAYER_AVATAR_FLAG_SURFING},
+ }
+};
+
+u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
+{
+ u8 i;
+
+ for (i = 0; i < NELEMS(*gUnknown_835B882); i++)
+ {
+ if (gUnknown_835B882[gender][i][0] == graphicsId)
+ return gUnknown_835B882[gender][i][1];
+ }
+ return 1;
+}
+
+u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
+{
+ u8 i;
+ u8 r5 = gPlayerAvatar.flags;
+
+ for (i = 0; i < NELEMS(*gUnknown_835B882); i++)
+ {
+ if (gUnknown_835B882[gPlayerAvatar.gender][i][1] & r5)
+ return gUnknown_835B882[gPlayerAvatar.gender][i][0];
+ }
+ return 0;
+}
+
+void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
+{
+ u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
+
+ gPlayerAvatar.transitionFlags |= unk | b;
+ DoPlayerAvatarTransition();
+}
+
+void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
+{
+ struct ObjectEventTemplate playerObjEventTemplate;
+ u8 objectEventId;
+ struct ObjectEvent *objectEvent;
+
+ playerObjEventTemplate.localId = OBJ_EVENT_ID_PLAYER;
+ playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
+ playerObjEventTemplate.x = x - 7;
+ playerObjEventTemplate.y = y - 7;
+ playerObjEventTemplate.elevation = 0;
+ playerObjEventTemplate.movementType = MOVEMENT_TYPE_PLAYER;
+ playerObjEventTemplate.movementRangeX = 0;
+ playerObjEventTemplate.movementRangeY = 0;
+ playerObjEventTemplate.trainerType = 0;
+ playerObjEventTemplate.trainerRange_berryTreeId = 0;
+ playerObjEventTemplate.script = NULL;
+ playerObjEventTemplate.flagId = 0;
+ objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate);
+ objectEvent = &gObjectEvents[objectEventId];
+ objectEvent->isPlayer = 1;
+ objectEvent->warpArrowSpriteId = CreateWarpArrowSprite();
+ ObjectEventTurn(objectEvent, direction);
+ ClearPlayerAvatarInfo();
+ gPlayerAvatar.runningState = NOT_MOVING;
+ gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
+ gPlayerAvatar.objectEventId = objectEventId;
+ gPlayerAvatar.spriteId = objectEvent->spriteId;
+ gPlayerAvatar.gender = gender;
+ SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_FIELD_MOVE | PLAYER_AVATAR_FLAG_ON_FOOT);
+}
+
+void SetPlayerInvisibility(bool8 invisible)
+{
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = invisible;
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+ gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = invisible;
+}
+
+void sub_805CB70(void)
+{
+ ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
+}
+
+static const u8 gUnknown_835B88E[] = {
+ OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE,
+ OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
+};
+
+u8 sub_805CBB8(void)
+{
+ if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+ return gUnknown_835B88E[gPlayerAvatar.gender];
+ else
+ return GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE);
+}
+
+void sub_805CBE8(void)
+{
+ ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], sub_805CBB8());
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
+}
+
+void sub_805CC2C(u8 direction)
+{
+ sub_8150498(2);
+}
+
+void nullsub_24(void)
+{
+
+}
+
+static void nullsub_25(void)
+{
+
+}
+
+static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = {
+ MetatileBehavior_IsSouthArrowWarp,
+ MetatileBehavior_IsNorthArrowWarp,
+ MetatileBehavior_IsWestArrowWarp,
+ MetatileBehavior_IsEastArrowWarp
+};
+
+static void sub_805CC40(struct ObjectEvent *objectEvent)
+{
+ s16 x;
+ s16 y;
+ u8 direction;
+ u8 metatileBehavior = objectEvent->currentMetatileBehavior;
+
+ for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++)
+ {
+ if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection)
+ {
+ x = objectEvent->currentCoords.x;
+ y = objectEvent->currentCoords.y;
+ MoveCoords(direction, &x, &y);
+ ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y);
+ return;
+ }
+ }
+ SetSpriteInvisible(objectEvent->warpArrowSpriteId);
+}
+
+static bool8 (*const gUnknown_835B8A0[])(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj) = {
+ sub_805CD64,
+ do_boulder_dust,
+ sub_805CE20
+};
+
+static void StartStrengthAnim(u8 a, u8 b)
+{
+ u8 taskId = CreateTask(Task_BumpBoulder, 0xFF);
+
+ gTasks[taskId].data[1] = a;
+ gTasks[taskId].data[2] = b;
+ Task_BumpBoulder(taskId);
+}
+
+static void Task_BumpBoulder(u8 taskId)
+{
+ while (gUnknown_835B8A0[gTasks[taskId].data[0]](&gTasks[taskId],
+ &gObjectEvents[gPlayerAvatar.objectEventId],
+ &gObjectEvents[gTasks[taskId].data[1]]))
+ ;
+}
+
+static bool8 sub_805CD64(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+{
+ ScriptContext2_Enable();
+ gPlayerAvatar.preventStep = TRUE;
+ task->data[0]++;
+ return FALSE;
+}
+
+static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+{
+ if (!ObjectEventIsMovementOverridden(playerObject)
+ && !ObjectEventIsMovementOverridden(strengthObject))
+ {
+ ObjectEventClearHeldMovementIfFinished(playerObject);
+ ObjectEventClearHeldMovementIfFinished(strengthObject);
+ sub_805C06C(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
+ sub_805C0A4(strengthObject, sub_8063F2C((u8)task->data[2]));
+ gFieldEffectArguments[0] = strengthObject->currentCoords.x;
+ gFieldEffectArguments[1] = strengthObject->currentCoords.y;
+ gFieldEffectArguments[2] = strengthObject->previousElevation;
+ gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
+ FieldEffectStart(FLDEFF_DUST);
+ PlaySE(SE_W070);
+ task->data[0]++;
+ }
+ return FALSE;
+}
+
+static bool8 sub_805CE20(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+{
+ if (ObjectEventCheckHeldMovementStatus(playerObject)
+ && ObjectEventCheckHeldMovementStatus(strengthObject))
+ {
+ ObjectEventClearHeldMovementIfFinished(playerObject);
+ ObjectEventClearHeldMovementIfFinished(strengthObject);
+ sub_806DE28(strengthObject);
+ sub_806DE70(strengthObject->currentCoords.x, strengthObject->currentCoords.y);
+ gPlayerAvatar.preventStep = FALSE;
+ ScriptContext2_Disable();
+ DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
+ }
+ return FALSE;
+}
+
+static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = {
+ PlayerAvatar_DoSecretBaseMatJump
+};
+
+static void DoPlayerMatJump(void)
+{
+ DoPlayerAvatarSecretBaseMatJump(CreateTask(DoPlayerAvatarSecretBaseMatJump, 0xFF));
+}
+
+static void DoPlayerAvatarSecretBaseMatJump(u8 taskId)
+{
+ while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]))
+ ;
+}
+
+// because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump.
+static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent)
+{
+ gPlayerAvatar.preventStep = TRUE;
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
+ {
+ PlaySE(SE_DANSA);
+ sub_805C06C(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection));
+ task->data[1]++;
+ if (task->data[1] > 1)
+ {
+ gPlayerAvatar.preventStep = FALSE;
+ gPlayerAvatar.transitionFlags |= PLAYER_AVATAR_FLAG_FIELD_MOVE;
+ DestroyTask(FindTaskIdByFunc(DoPlayerAvatarSecretBaseMatJump));
+ }
+ }
+ return FALSE;
+}
+
+static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task * task, struct ObjectEvent * playerObj) = {
+ PlayerAvatar_SecretBaseMatSpinStep0,
+ PlayerAvatar_SecretBaseMatSpinStep1,
+ PlayerAvatar_SecretBaseMatSpinStep2,
+ PlayerAvatar_SecretBaseMatSpinStep3,
+};
+
+static void DoPlayerMatSpin(void)
+{
+ u8 taskId = CreateTask(PlayerAvatar_DoSecretBaseMatSpin, 0xFF);
+
+ PlayerAvatar_DoSecretBaseMatSpin(taskId);
+}
+
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId)
+{
+ while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]))
+ ;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent)
+{
+ task->data[0]++;
+ task->data[1] = objectEvent->movementDirection;
+ gPlayerAvatar.preventStep = TRUE;
+ ScriptContext2_Enable();
+ PlaySE(SE_TK_WARPIN);
+ return TRUE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent)
+{
+ u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
+ {
+ u8 direction;
+
+ sub_805C06C(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1]));
+ if (direction == (u8)task->data[1])
+ task->data[2]++;
+ task->data[0]++;
+ if (task->data[2] > 3 && direction == GetOppositeDirection(task->data[1]))
+ task->data[0]++;
+ }
+ return FALSE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent)
+{
+ const u8 actions[] = {
+ MOVEMENT_ACTION_DELAY_1,
+ MOVEMENT_ACTION_DELAY_1,
+ MOVEMENT_ACTION_DELAY_2,
+ MOVEMENT_ACTION_DELAY_4,
+ MOVEMENT_ACTION_DELAY_8,
+ };
+
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
+ {
+ sub_805C06C(objectEvent, actions[task->data[2]]);
+ task->data[0] = 1;
+ }
+ return FALSE;
+}
+
+static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent)
+{
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
+ {
+ sub_805C06C(objectEvent, sub_8063F2C(GetOppositeDirection(task->data[1])));
+ ScriptContext2_Disable();
+ gPlayerAvatar.preventStep = FALSE;
+ DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
+ }
+ return FALSE;
+}
+
+static void CreateStopSurfingTask(u8 direction)
+{
+ u8 taskId;
+
+ ScriptContext2_Enable();
+ FreezeObjectEvents();
+ Overworld_ClearSavedMusic();
+ Overworld_ChangeMusicToDefault();
+ gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
+ gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_ON_FOOT;
+ gPlayerAvatar.preventStep = TRUE;
+ taskId = CreateTask(Task_StopSurfingInit, 0xFF);
+ gTasks[taskId].data[0] = direction;
+ Task_StopSurfingInit(taskId);
+}
+
+void CreateStopSurfingTask_NoMusicChange(u8 direction)
+{
+ u8 taskId;
+
+ ScriptContext2_Enable();
+ FreezeObjectEvents();
+ gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
+ gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_ON_FOOT;
+ gPlayerAvatar.preventStep = TRUE;
+ taskId = CreateTask(Task_StopSurfingInit, 0xFF);
+ gTasks[taskId].data[0] = direction;
+ Task_StopSurfingInit(taskId);
+}
+
+void sub_805D1A8(void)
+{
+ if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3)
+ {
+ sub_811278C(gUnknown_835B820[DIR_NORTH], 16);
+ CreateStopSurfingTask(DIR_NORTH);
+ }
+}
+
+static void Task_StopSurfingInit(u8 taskId)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ if (ObjectEventIsMovementOverridden(playerObjEvent))
+ {
+ if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent))
+ return;
+ }
+ sub_80DC44C(playerObjEvent->fieldEffectSpriteId, 2);
+ sub_805C06C(playerObjEvent, sub_80641EC((u8)gTasks[taskId].data[0]));
+ gTasks[taskId].func = Task_WaitStopSurfing;
+}
+
+static void Task_WaitStopSurfing(u8 taskId)
+{
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ if (ObjectEventClearHeldMovementIfFinished(playerObjEvent))
+ {
+ ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
+ sub_805C06C(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection));
+ gPlayerAvatar.preventStep = FALSE;
+ ScriptContext2_Disable();
+ UnfreezeObjectEvents();
+ DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]);
+ DestroyTask(taskId);
+ SetHelpContextForMap();
+ }
+}
+
+static bool8 (*const sFishingStateFuncs[])(struct Task *) =
+{
+ Fishing1,
+ Fishing2,
+ Fishing3,
+ Fishing4,
+ Fishing5,
+ Fishing6,
+ Fishing7,
+ Fishing8,
+ Fishing9,
+ Fishing10,
+ Fishing11,
+ Fishing12,
+ Fishing13,
+ Fishing14,
+ Fishing15,
+ Fishing16,
+};
+
+#define tStep data[0]
+#define tFrameCounter data[1]
+#define tNumDots data[2]
+#define tDotsRequired data[3]
+#define tRoundsPlayed data[12]
+#define tMinRoundsRequired data[13]
+#define tPlayerGfxId data[14]
+#define tFishingRod data[15]
+
+#define FISHING_START_ROUND 3
+#define FISHING_GOT_BITE 6
+#define FISHING_ON_HOOK 9
+#define FISHING_NO_BITE 11
+#define FISHING_GOT_AWAY 12
+#define FISHING_SHOW_RESULT 13
+
+void StartFishing(u8 rod)
+{
+ u8 taskId = CreateTask(Task_Fishing, 0xFF);
+
+ gTasks[taskId].tFishingRod = rod;
+ Task_Fishing(taskId);
+ if (sub_8150474(2) == TRUE)
+ sub_8112C9C();
+}
+
+
+static void Task_Fishing(u8 taskId)
+{
+ while (sFishingStateFuncs[gTasks[taskId].tStep](&gTasks[taskId]))
+ ;
+}
+
+static bool8 Fishing1(struct Task *task)
+{
+ ScriptContext2_Enable();
+ gPlayerAvatar.preventStep = TRUE;
+ task->tStep++;
+ return FALSE;
+}
+
+static bool8 Fishing2(struct Task *task)
+{
+ struct ObjectEvent *playerObjEvent;
+ const s16 arr1[] = {1, 1, 1};
+ const s16 arr2[] = {1, 3, 6};
+
+ task->tRoundsPlayed = 0;
+ task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
+ task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId;
+ playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ ObjectEventClearHeldMovementIfActive(playerObjEvent);
+ playerObjEvent->enableAnim = 1;
+ sub_805CC2C(playerObjEvent->facingDirection);
+ task->tStep++;
+ return FALSE;
+}
+
+static bool8 Fishing3(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+
+ // Wait one second
+ task->tFrameCounter++;
+ if (task->tFrameCounter >= 60)
+ task->tStep++;
+ return FALSE;
+}
+
+static bool8 Fishing4(struct Task *task)
+{
+ u32 randVal;
+
+ sub_80F7768(0, TRUE);
+ task->tStep++;
+ task->tFrameCounter = 0;
+ task->tNumDots = 0;
+ randVal = Random();
+ randVal %= 10;
+ task->tDotsRequired = randVal + 1;
+ if (task->tRoundsPlayed == 0)
+ task->tDotsRequired = randVal + 4;
+ if (task->tDotsRequired >= 10)
+ task->tDotsRequired = 10;
+ return TRUE;
+}
+
+// Play a round of the dot game
+static bool8 Fishing5(struct Task *task)
+{
+ static const u8 dot[] = _("·");
+
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ task->tFrameCounter++;
+ if (task->tFrameCounter >= 20)
+ {
+ task->tFrameCounter = 0;
+ if (task->tNumDots >= task->tDotsRequired)
+ {
+ task->tStep++;
+ if (task->tRoundsPlayed != 0)
+ task->tStep++;
+ task->tRoundsPlayed++;
+ }
+ else
+ {
+ AddTextPrinterParameterized(0, 2, dot, task->tNumDots * 12, 1, 0, NULL);
+ task->tNumDots++;
+ }
+ }
+ return FALSE;
+}
+
+// Determine if fish bites
+static bool8 Fishing6(struct Task *task)
+{
+ bool8 bite;
+
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ task->tStep++;
+ bite = FALSE;
+
+ if (!DoesCurrentMapHaveFishingMons() || Random() & 1)
+ {
+ task->tStep = FISHING_NO_BITE;
+ }
+ else
+ {
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
+ }
+ return TRUE;
+}
+
+// Oh! A Bite!
+static bool8 Fishing7(struct Task *task)
+{
+ task->tStep += 3;
+ return FALSE;
+}
+
+// We have a bite. Now, wait for the player to press A, or the timer to expire.
+static bool8 Fishing8(struct Task *task)
+{
+ const s16 reelTimeouts[3] = {36, 33, 30};
+
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ task->tFrameCounter++;
+ if (task->tFrameCounter >= reelTimeouts[task->tFishingRod])
+ task->tStep = FISHING_GOT_AWAY;
+ else if (gMain.newKeys & A_BUTTON)
+ task->tStep++;
+ return FALSE;
+}
+
+// Determine if we're going to play the dot game again
+static bool8 Fishing9(struct Task *task)
+{
+ const s16 arr[][2] =
+ {
+ {0, 0},
+ {40, 10},
+ {70, 30}
+ };
+
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ task->tStep++;
+ if (task->tRoundsPlayed < task->tMinRoundsRequired)
+ {
+ task->tStep = FISHING_START_ROUND;
+ }
+ else if (task->tRoundsPlayed < 2)
+ {
+ // probability of having to play another round
+ s16 probability = Random() % 100;
+
+ if (arr[task->tFishingRod][task->tRoundsPlayed] > probability)
+ task->tStep = FISHING_START_ROUND;
+ }
+ return FALSE;
+}
+
+static bool8 Fishing10(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ FillWindowPixelBuffer(0, PIXEL_FILL(1));
+ AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ task->tStep++;
+ task->tFrameCounter = 0;
+ return FALSE;
+}
+
+static bool8 Fishing11(struct Task *task)
+{
+ if (task->tFrameCounter == 0)
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+
+ RunTextPrinters();
+
+ if (task->tFrameCounter == 0)
+ {
+ if (!IsTextPrinterActive(0))
+ {
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
+ ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
+ if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+ sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+ gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+ gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+ ClearDialogWindowAndFrame(0, TRUE);
+ task->tFrameCounter++;
+ return FALSE;
+ }
+ }
+
+ if (task->tFrameCounter != 0)
+ {
+ gPlayerAvatar.preventStep = FALSE;
+ ScriptContext2_Disable();
+ FishingWildEncounter(task->tFishingRod);
+ DestroyTask(FindTaskIdByFunc(Task_Fishing));
+ }
+ return FALSE;
+}
+
+// Not even a nibble
+static bool8 Fishing12(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
+ FillWindowPixelBuffer(0, PIXEL_FILL(1));
+ AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ task->tStep = FISHING_SHOW_RESULT;
+ return TRUE;
+}
+
+// It got away
+static bool8 Fishing13(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
+ AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ task->tStep++;
+ return TRUE;
+}
+
+// Wait one second
+static bool8 Fishing14(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ task->tStep++;
+ return FALSE;
+}
+
+static bool8 Fishing15(struct Task *task)
+{
+ AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
+ if (gSprites[gPlayerAvatar.spriteId].animEnded)
+ {
+ struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId);
+ ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
+ if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+ sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
+ gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+ gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+ task->tStep++;
+ }
+ return FALSE;
+}
+
+static bool8 Fishing16(struct Task *task)
+{
+ RunTextPrinters();
+ if (!IsTextPrinterActive(0))
+ {
+ gPlayerAvatar.preventStep = FALSE;
+ ScriptContext2_Disable();
+ UnfreezeObjectEvents();
+ ClearDialogWindowAndFrame(0, TRUE);
+ DestroyTask(FindTaskIdByFunc(Task_Fishing));
+ }
+ return FALSE;
+}
+
+#undef tStep
+#undef tFrameCounter
+#undef tFishingRod
+
+void AlignFishingAnimationFrames(struct Sprite * playerSprite)
+{
+ u8 animCmdIndex;
+ u8 animType;
+
+ AnimateSprite(playerSprite);
+ playerSprite->pos2.x = 0;
+ playerSprite->pos2.y = 0;
+ animCmdIndex = playerSprite->animCmdIndex;
+ if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
+ {
+ animCmdIndex--;
+ }
+ else
+ {
+ playerSprite->animDelayCounter++;
+ if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
+ animCmdIndex--;
+ }
+ animType = playerSprite->anims[playerSprite->animNum][animCmdIndex].type;
+ if (animType == 1 || animType == 2 || animType == 3)
+ {
+ playerSprite->pos2.x = 8;
+ if (GetPlayerFacingDirection() == 3)
+ playerSprite->pos2.x = -8;
+ }
+ if (animType == 5)
+ playerSprite->pos2.y = -8;
+ if (animType == 10 || animType == 11)
+ playerSprite->pos2.y = 8;
+ if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+ sub_80DC4A4(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
+}
+
+#define tState data[0]
+#define tRotationTimer data[1]
+#define tDeltaY data[2]
+#define tYdeflection data[3]
+#define tYpos data[4]
+#define tFinalFacingDirection data[5]
+#define tPriority data[6]
+#define tSubpriority data[7]
+#define tLandingDelay data[8]
+
+static const u8 sTeleportFacingDirectionSequence[] = {
+ [DIR_SOUTH] = DIR_WEST,
+ [DIR_WEST] = DIR_NORTH,
+ [DIR_NORTH] = DIR_EAST,
+ [DIR_EAST] = DIR_SOUTH,
+ [DIR_NONE] = DIR_SOUTH,
+};
+
+void StartTeleportWarpOutPlayerAnim(void)
+{
+ u8 taskId = CreateTask(Task_TeleportWarpOutPlayerAnim, 0);
+ Task_TeleportWarpOutPlayerAnim(taskId);
+}
+
+bool32 WaitTeleportWarpOutPlayerAnim(void)
+{
+ return FuncIsActiveTask(Task_TeleportWarpOutPlayerAnim);
+}
+
+void SavePlayerFacingDirectionForTeleport(u8 direction)
+{
+ sTeleportSavedFacingDirection = direction;
+}
+
+static u8 GetTeleportSavedFacingDirection(void)
+{
+ if (sTeleportSavedFacingDirection == DIR_NONE)
+ return DIR_SOUTH;
+ else
+ return sTeleportSavedFacingDirection;
+}
+
+static void Task_TeleportWarpOutPlayerAnim(u8 taskId)
+{
+ struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
+ struct Sprite *sprite = &gSprites[object->spriteId];
+ s16 *data = gTasks[taskId].data;
+
+ switch (tState)
+ {
+ case 0:
+ if (!ObjectEventClearHeldMovementIfFinished(object))
+ {
+ return;
+ }
+
+ SavePlayerFacingDirectionForTeleport(object->facingDirection);
+ tRotationTimer = 0;
+ tDeltaY = 1;
+ tYdeflection = (u16)(sprite->pos1.y + sprite->pos2.y) * 16;
+ sprite->pos2.y = 0;
+ CameraObjectReset2();
+ object->fixedPriority = TRUE;
+ sprite->oam.priority = 0;
+ sprite->subpriority = 0;
+ sprite->subspriteMode = SUBSPRITES_OFF;
+ tState++;
+ case 1:
+ TeleportAnim_RotatePlayer(object, &tRotationTimer);
+ tYdeflection -= tDeltaY;
+ tDeltaY += 3;
+ sprite->pos1.y = tYdeflection >> 4;
+ if (sprite->pos1.y + (s16)gTotalCameraPixelOffsetY < -32)
+ {
+ tState++;
+ }
+ break;
+ case 2:
+ DestroyTask(taskId);
+ break;
+ }
+}
+
+void StartTeleportInPlayerAnim(void)
+{
+ u8 taskId = CreateTask(Task_TeleportWarpInPlayerAnim, 0);
+ Task_TeleportWarpInPlayerAnim(taskId);
+}
+
+bool32 WaitTeleportInPlayerAnim(void)
+{
+ return FuncIsActiveTask(Task_TeleportWarpInPlayerAnim);
+}
+
+static void Task_TeleportWarpInPlayerAnim(u8 taskId)
+{
+ struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
+ struct Sprite *sprite = &gSprites[object->spriteId];
+ s16 *data = gTasks[taskId].data;
+
+ switch (tState)
+ {
+ case 0:
+ tFinalFacingDirection = GetTeleportSavedFacingDirection();
+ ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(sTeleportFacingDirectionSequence[tFinalFacingDirection]));
+ tRotationTimer = 0;
+ tDeltaY = 116;
+ tYpos = sprite->pos1.y;
+ tPriority = sprite->oam.priority;
+ tSubpriority = sprite->subpriority;
+ tYdeflection = -((u16)sprite->pos2.y + 32) * 16;
+ sprite->pos2.y = 0;
+ CameraObjectReset2();
+ object->fixedPriority = TRUE;
+ sprite->oam.priority = 1;
+ sprite->subpriority = 0;
+ sprite->subspriteMode = SUBSPRITES_OFF;
+ tState++;
+ case 1:
+ TeleportAnim_RotatePlayer(object, &tRotationTimer);
+ tYdeflection += tDeltaY;
+ tDeltaY -= 3;
+ if (tDeltaY < 4)
+ {
+ tDeltaY = 4;
+ }
+ sprite->pos1.y = tYdeflection >> 4;
+ if (sprite->pos1.y >= tYpos)
+ {
+ sprite->pos1.y = tYpos;
+ tLandingDelay = 0;
+ tState++;
+ }
+ break;
+ case 2:
+ TeleportAnim_RotatePlayer(object, &tRotationTimer);
+ tLandingDelay++;
+ if (tLandingDelay > 8)
+ {
+ tState++;
+ }
+ break;
+ case 3:
+ if (tFinalFacingDirection == TeleportAnim_RotatePlayer(object, &tRotationTimer))
+ {
+ object->fixedPriority = 0;
+ sprite->oam.priority = tPriority;
+ sprite->subpriority = tSubpriority;
+ CameraObjectReset1();
+ DestroyTask(taskId);
+ }
+ break;
+ }
+}
+
+static u8 TeleportAnim_RotatePlayer(struct ObjectEvent *object, s16 *a1)
+{
+ if (*a1 < 8 && ++(*a1) < 8)
+ {
+ return object->facingDirection;
+ }
+
+ if (!ObjectEventCheckHeldMovementStatus(object))
+ {
+ return object->facingDirection;
+ }
+
+ ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(sTeleportFacingDirectionSequence[object->facingDirection]));
+ *a1 = 0;
+ return sTeleportFacingDirectionSequence[object->facingDirection];
+}
+
+#undef tLandingDelay
+#undef tSubpriority
+#undef tPriority
+#undef tFinalFacingDirection
+#undef tYpos
+#undef tYdeflection
+#undef tDeltaY
+#undef tRotationTimer
+#undef tState
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 85739ad24..a12b57b24 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -434,14 +434,14 @@ static void sub_807F45C(u8 taskId)
++gTasks[taskId].data[0];
break;
case 3:
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
ScriptContext1_SetupScript(EventScript_AfterWhiteOutHeal);
}
break;
case 6:
- if (sub_807E418() == TRUE)
+ if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
DestroyTask(taskId);
ScriptContext1_SetupScript(EventScript_AfterWhiteOutMomHeal);
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index c6b92b28c..c9a0fd1d5 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -13,7 +13,7 @@ static void ShowMonCB_UseStrength(void);
bool8 SetUpFieldMove_Strength(void)
{
- if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_STRENGTH_BOULDER) != TRUE)
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) != TRUE)
{
return FALSE;
}
diff --git a/src/item_use.c b/src/item_use.c
index 6f81ee0e3..df3dbaceb 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -263,10 +263,10 @@ void FieldUseFunc_MachBike(u8 taskId)
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE
- || MetatileBehavior_ReturnFalse_17(behavior) == TRUE
- || MetatileBehavior_ReturnFalse_18(behavior) == TRUE
- || MetatileBehavior_ReturnFalse_15(behavior) == TRUE
- || MetatileBehavior_ReturnFalse_16(behavior) == TRUE)
+ || MetatileBehavior_IsVerticalRail(behavior) == TRUE
+ || MetatileBehavior_IsHorizontalRail(behavior) == TRUE
+ || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE
+ || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451);
else if (sub_8055C9C() == TRUE && !sub_80BD540())
{
@@ -308,7 +308,7 @@ static bool8 ItemUseCheckFunc_Rod(void)
if (MetatileBehavior_IsWaterfall(behavior))
return FALSE;
- if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER))
return FALSE;
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
{
@@ -327,7 +327,7 @@ static bool8 ItemUseCheckFunc_Rod(void)
static void ItemUseOnFieldCB_Rod(u8 taskId)
{
- sub_805D2C0(ItemId_GetSecondaryId(gSpecialVar_ItemId));
+ StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId));
DestroyTask(taskId);
}
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index d6a983744..c937a3b48 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -191,7 +191,7 @@ bool8 MetatileBehavior_IsLadder(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_IsCaveDoor(u8 metatileBehavior)
+bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior)
{
if(metatileBehavior == MB_CAVE_DOOR)
return TRUE;
@@ -677,11 +677,11 @@ bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior)
return metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS;
}
-bool8 MetatileBehavior_ReturnFalse_14(u8 metatileBehavior) { return FALSE; }
-bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior) { return FALSE; }
-bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior) { return FALSE; }
-bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior) { return FALSE; }
-bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior) { return FALSE; }
+bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior) { return FALSE; }
+bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior) { return FALSE; }
+bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior) { return FALSE; }
+bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior) { return FALSE; }
+bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; }
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior)
{
@@ -750,7 +750,7 @@ bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2)
return FALSE;
}
-bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_RIGHT)
return TRUE;
@@ -758,7 +758,7 @@ bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_LEFT)
return TRUE;
@@ -766,7 +766,7 @@ bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_UP)
return TRUE;
@@ -774,7 +774,7 @@ bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior)
return FALSE;
}
-bool8 MetatileBehavior_UnusedIsSpinDown(u8 metatileBehavior)
+bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior)
{
if(metatileBehavior == MB_SPIN_DOWN)
return TRUE;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index b8b121535..1a41c8c0b 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1300,7 +1300,7 @@ static void NamingScreen_CreatePlayerIcon(void)
u8 rivalGfxId;
u8 spriteId;
- rivalGfxId = sub_805C7C8(0, sNamingScreenData->monSpecies);
+ rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, sNamingScreenData->monSpecies);
spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
gSprites[spriteId].oam.priority = 3;
StartSpriteAnim(&gSprites[spriteId], 4);
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
index 959370398..78bc6b7a4 100644
--- a/src/new_menu_helpers.c
+++ b/src/new_menu_helpers.c
@@ -457,7 +457,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
void LoadStdWindowFrameGfx(void)
{
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
@@ -495,8 +495,8 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
ClearWindowTilemap(windowId);
if (copyToVram == TRUE)
CopyWindowToVram(windowId, 3);
- if (gQuestLogState == 2)
- sub_8111134();
+ if (gQuestLogState == QL_STATE_2)
+ CommitQuestLogWindow1();
}
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram)
@@ -527,7 +527,7 @@ static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u
static void WindowFunc_DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
{
- if (!IsMsgSignPost() || gQuestLogState == 2)
+ if (!IsMsgSignPost() || gQuestLogState == QL_STATE_2)
{
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 0, tilemapLeft - 2, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 1, tilemapLeft - 1, tilemapTop - 1, 1, 1, DLG_WINDOW_PALETTE_NUM);
@@ -611,7 +611,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram)
void sub_80F7768(u8 windowId, bool8 copyToVram)
{
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
{
gTextFlags.autoScroll = 1;
TextWindow_LoadTilesStdFrame1(0, DLG_WINDOW_BASE_TILE_NUM);
diff --git a/src/option_menu.c b/src/option_menu.c
index 56a4ec877..62e90c33b 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -509,7 +509,7 @@ static void BufferOptionMenuString(u8 selection)
static void CloseAndSaveOptionMenu(u8 taskId)
{
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
SetMainCallback2(gMain.savedCallback);
FreeAllWindowBuffers();
gSaveBlock2Ptr->optionsTextSpeed = sOptionMenuPtr->option[MENUITEM_TEXTSPEED];
diff --git a/src/quest_log.c b/src/quest_log.c
index bc8e67a6b..21a05f407 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -43,6 +43,7 @@
#include "constants/species.h"
#include "constants/items.h"
#include "constants/field_weather.h"
+#include "constants/event_object_movement.h"
u8 gUnknown_3005E88;
@@ -69,7 +70,7 @@ struct UnkStruct_203AE94
u8 unk_3;
};
-struct UnkStruct_203AE98
+struct QuestLogEntry
{
u8 unk_0;
u8 unk_1;
@@ -94,9 +95,9 @@ struct UnkStruct_203B044
};
u8 gUnknown_3005E88;
-u16 sNumQuestLogs;
+u16 sNumEventsInLogEntry;
struct UnkStruct_3005E90 gUnknown_3005E90;
-struct UnkStruct_203AE98 * gUnknown_3005E94;
+struct QuestLogEntry * sCurQuestLogEntry;
static struct UnkStruct_300201C * sFlagOrVarRecords;
static u16 sNumFlagsOrVars;
@@ -105,44 +106,44 @@ static EWRAM_DATA u8 sCurrentSceneNum = 0;
static EWRAM_DATA u8 sNumScenes = 0;
EWRAM_DATA u8 gQuestLogState = 0;
static EWRAM_DATA u16 gUnknown_203ADFC = 0;
-static EWRAM_DATA u8 gUnknown_203ADFE[3] = {0};
+static EWRAM_DATA u8 sQuestLogHeaderWindowIds[3] = {0};
static EWRAM_DATA u16 *gUnknown_203AE04 = NULL;
static EWRAM_DATA u16 *gUnknown_203AE08 = NULL;
static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL};
static EWRAM_DATA void (* sQuestLogCB)(void) = NULL;
static EWRAM_DATA u16 *gUnknown_203AE90 = NULL;
static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0};
-static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0};
-static EWRAM_DATA u16 sQuestLogIdx = 0;
+static EWRAM_DATA struct QuestLogEntry sQuestLogSceneRecordBuffer[32] = {0};
+static EWRAM_DATA u16 sQuestLogCursor = 0;
static EWRAM_DATA u8 sMovementScripts[64][2] = {{0}};
-static EWRAM_DATA u16 gUnknown_203B01A = 0;
+static EWRAM_DATA u16 sNextStepDelay = 0;
static EWRAM_DATA u16 gUnknown_203B01C = 0;
static EWRAM_DATA u16 sFlagOrVarPlayhead = 0;
static EWRAM_DATA u8 sHelpMessageWindowId = 0;
static EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0};
static EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0};
static EWRAM_DATA u8 gUnknown_203B048 = 0;
-static EWRAM_DATA u8 gUnknown_203B049 = 0;
+static EWRAM_DATA bool8 sNewlyEnteredMap = FALSE;
static EWRAM_DATA u8 gUnknown_203B04A = 0;
-static EWRAM_DATA bool8 gUnknown_203B04B = 0;
+static EWRAM_DATA bool8 gUnknown_203B04B = FALSE;
static void sub_8110A00(void);
static void sub_8110A3C(void);
-static void sub_8110BB0(u8);
-static void sub_8110BE8(u8);
+static void SetPlayerInitialCoordsAtScene(u8);
+static void SetNPCInitialCoordsAtScene(u8);
static void sub_8110E3C(void);
-static void sub_8110D94(void);
-static void sub_8110E20(void);
-static void sub_8110D48(u8);
-static u8 sub_8110E68(struct UnkStruct_203AE98 *);
+static void BackUpTrainerRematchesToVars(void);
+static void BackUpMapLayoutToVar(void);
+static void SetGameStateAtScene(u8);
+static u8 TryRecordQuestLogEntrySequence(struct QuestLogEntry *);
static void sub_8110F90(u8);
-static void sub_8111150(u8);
+static void QuestLogPlaybackSetObjectEventTemplates(u8);
static void sub_8111368(void);
static void QuestLog_GetSaneMonCounts(void);
static u16 QuestLog_GetSanePartyCount(void);
static u16 QuestLog_GetSaneBoxCount(void);
static void sub_8111688(void);
-static void sub_811175C(u8, struct UnkStruct_203AE98 *);
+static void sub_811175C(u8, struct QuestLogEntry *);
static void sub_81118F4(s8);
static void QuestLog_AdvancePlayhead(void);
static void QuestLog_StartFinalScene(void);
@@ -163,9 +164,9 @@ static void Task_EndQuestLog(u8);
static bool8 sub_81121D8(u8);
static void sub_811229C(void);
static void sub_8112888(u8);
-static void sub_8112940(u8, struct UnkStruct_203AE98 *, u16);
+static void SetUpQuestLogEntry(u8, struct QuestLogEntry *, u16);
static bool8 sub_8112CEC(void);
-static bool8 sub_8112D1C(void);
+static bool8 RecordHeadAtEndOfEntry(void);
static void TryLoseFansFromPlayTimeAfterLinkBattle(struct TrainerFanClub *);
static void UpdateTrainerFanClubGameClear(struct TrainerFanClub *);
static u8 PlayerGainRandomTrainerFan(struct TrainerFanClub *);
@@ -194,13 +195,13 @@ static void sub_8113B88(void);
static void sub_8113B94(u16);
static void sub_8113BD8(void);
static u16 *sub_8113BF4(u16 *);
-static u16 *sub_8113C20(u16 *, struct UnkStruct_203AE98 *);
+static u16 *sub_8113C20(u16 *, struct QuestLogEntry *);
static u16 *sub_8113C5C(u16 *, u16);
-static u16 *sub_8113C8C(u16 *, struct UnkStruct_203AE98 *);
-static u16 *sub_8113CC8(u16 *, struct UnkStruct_203AE98 *);
-static u16 *sub_8113D08(u16 *, struct UnkStruct_203AE98 *);
-static u16 *sub_8113D48(u16 *, struct UnkStruct_203AE98 *);
-static u16 *sub_8113D94(u16 *, struct UnkStruct_203AE98 *);
+static u16 *sub_8113C8C(u16 *, struct QuestLogEntry *);
+static u16 *sub_8113CC8(u16 *, struct QuestLogEntry *);
+static u16 *sub_8113D08(u16 *, struct QuestLogEntry *);
+static u16 *sub_8113D48(u16 *, struct QuestLogEntry *);
+static u16 *sub_8113D94(u16 *, struct QuestLogEntry *);
static u16 *BufferQuestLogData_SwitchedPartyOrder(u16 *, const u16 *);
static u16 *BufferQuestLogData_UsedItem(u16 *, const u16 *);
static u16 *BufferQuestLogData_GaveHeldItemFromPartyMenu(u16 *, const u16 *);
@@ -282,7 +283,7 @@ static bool8 sub_81153A8(u16, const u16 *);
static bool8 sub_81153E4(u16, const u16 *);
static void BufferLinkPartnersName(u8 *);
-static const struct WindowTemplate gUnknown_845661C[3] = {
+static const struct WindowTemplate sQuestLogHeaderWindowTemplates[3] = {
{ 0, 0, 0, 30, 2, 15, 0x0e9 },
{ 0, 0, 18, 30, 2, 15, 0x0ad },
{ 0, 0, 14, 30, 6, 15, 0x14c }
@@ -303,7 +304,7 @@ void sub_8110840(void * oldPointer)
{
if (gUnknown_203AE08)
gUnknown_203AE08 = (void *)gUnknown_203AE08 + offset;
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
{
int r3;
for (r3 = 0; r3 < (int)NELEMS(gUnknown_203AE0C); r3++)
@@ -325,7 +326,7 @@ void ResetQuestLog(void)
sub_81138F8();
}
-void sub_81108F0(u8 a0)
+static void DestroySav1QuestLogEntry(u8 a0)
{
memset(gSaveBlock1Ptr->questLog + a0, 0, sizeof(struct QuestLog));
gUnknown_203AE04 = NULL;
@@ -373,7 +374,7 @@ static void SetQuestLogState(u8 state)
static void sub_8110A00(void)
{
- if (sub_8110E68(gUnknown_203AE98) != 1)
+ if (TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer) != 1)
{
gUnknown_3005E88 = 0;
sub_8110E3C();
@@ -389,7 +390,7 @@ static void sub_8110A3C(void)
if (gUnknown_203AE94.unk_0_6 == 0)
{
- if (gUnknown_3005E88 || gUnknown_203AE94.unk_0_0 == 1 || (gUnknown_203AE94.unk_1 < 32 && gUnknown_203AE0C[gUnknown_203AE94.unk_1]))
+ if (gUnknown_3005E88 || gUnknown_203AE94.unk_0_0 == 1 || (gUnknown_203AE94.unk_1 < NELEMS(gUnknown_203AE0C) && gUnknown_203AE0C[gUnknown_203AE94.unk_1] != NULL))
sub_8111AD8();
else
{
@@ -410,12 +411,12 @@ u8 sub_8110AC8(void)
return gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000;
}
-void sub_8110AEC(u16 eventId)
+static void StartRecordingQuestLogEntry(u16 eventId)
{
if (sCurrentSceneNum >= QUEST_LOG_SCENE_COUNT)
sCurrentSceneNum = 0;
- sub_81108F0(sCurrentSceneNum);
+ DestroySav1QuestLogEntry(sCurrentSceneNum);
sub_8113B88();
gUnknown_203AE08 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568;
if (IS_LINK_QL_EVENT(eventId) || eventId == QL_EVENT_DEPARTED)
@@ -423,18 +424,18 @@ void sub_8110AEC(u16 eventId)
else
gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000 = 1;
QuestLog_GetSaneMonCounts();
- sub_8110BB0(sCurrentSceneNum);
- sub_8110BE8(sCurrentSceneNum);
- sub_8110D94();
- sub_8110E20();
- sub_8110D48(sCurrentSceneNum);
+ SetPlayerInitialCoordsAtScene(sCurrentSceneNum);
+ SetNPCInitialCoordsAtScene(sCurrentSceneNum);
+ BackUpTrainerRematchesToVars();
+ BackUpMapLayoutToVar();
+ SetGameStateAtScene(sCurrentSceneNum);
gUnknown_203ADFC = 0;
- sub_8112940(2, gUnknown_203AE98, 0x100);
- sub_8110E68(gUnknown_203AE98);
- SetQuestLogState(1);
+ SetUpQuestLogEntry(2, sQuestLogSceneRecordBuffer, 0x100);
+ TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer);
+ SetQuestLogState(QL_STATE_1);
}
-static void sub_8110BB0(u8 sceneNum)
+static void SetPlayerInitialCoordsAtScene(u8 sceneNum)
{
struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[sceneNum];
questLog->mapGroup = gSaveBlock1Ptr->location.mapGroup;
@@ -444,7 +445,7 @@ static void sub_8110BB0(u8 sceneNum)
questLog->y = gSaveBlock1Ptr->pos.y;
}
-static void sub_8110BE8(u8 sceneNum)
+static void SetNPCInitialCoordsAtScene(u8 sceneNum)
{
struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[sceneNum];
u16 i;
@@ -478,7 +479,7 @@ static void sub_8110BE8(u8 sceneNum)
}
}
-static void sub_8110D48(u8 sceneNum)
+static void SetGameStateAtScene(u8 sceneNum)
{
struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[sceneNum];
@@ -486,7 +487,7 @@ static void sub_8110D48(u8 sceneNum)
CpuCopy16(gSaveBlock1Ptr->vars, questLog->vars, VARS_COUNT * sizeof(u16));
}
-static void sub_8110D94(void)
+static void BackUpTrainerRematchesToVars(void)
{
u16 i, j;
u16 sp0[4];
@@ -501,13 +502,13 @@ static void sub_8110D94(void)
sp0[i] += (1 << j);
}
}
- VarSet(VAR_0x40AA + i, sp0[i]);
+ VarSet(VAR_QLBAK_TRAINER_REMATCHES + i, sp0[i]);
}
}
-static void sub_8110E20(void)
+static void BackUpMapLayoutToVar(void)
{
- VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapLayoutId);
+ VarSet(VAR_QLBAK_MAP_LAYOUT, gSaveBlock1Ptr->mapLayoutId);
}
static void sub_8110E3C(void)
@@ -517,22 +518,22 @@ static void sub_8110E3C(void)
sCurrentSceneNum = 0;
}
-static bool8 sub_8110E68(struct UnkStruct_203AE98 * a0)
+static bool8 TryRecordQuestLogEntrySequence(struct QuestLogEntry * entry)
{
u16 i;
- for (i = gUnknown_203ADFC; i < sQuestLogIdx; i++)
+ for (i = gUnknown_203ADFC; i < sQuestLogCursor; i++)
{
if (gUnknown_203AE08 == NULL)
return FALSE;
- switch (a0[i].unk_6)
+ switch (entry[i].unk_6)
{
case 0:
case 1:
- gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &a0[i]);
+ gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &entry[i]);
break;
default:
- gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &a0[i]);
+ gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &entry[i]);
break;
}
if (gUnknown_203AE08 == NULL)
@@ -547,7 +548,7 @@ static bool8 sub_8110E68(struct UnkStruct_203AE98 * a0)
gUnknown_203AE08 = sub_8113BF4(gUnknown_203AE08);
return FALSE;
}
- gUnknown_203ADFC = sQuestLogIdx;
+ gUnknown_203ADFC = sQuestLogCursor;
return TRUE;
}
@@ -589,17 +590,17 @@ static void sub_8110F90(u8 unused)
void sub_8110FCC(void)
{
- sub_811175C(sCurrentSceneNum, gUnknown_203AE98);
+ sub_811175C(sCurrentSceneNum, sQuestLogSceneRecordBuffer);
sub_8113B88();
- sub_8112940(1, gUnknown_203AE98, 0x100);
- sub_8111150(sCurrentSceneNum);
+ SetUpQuestLogEntry(1, sQuestLogSceneRecordBuffer, 0x100);
+ QuestLogPlaybackSetObjectEventTemplates(sCurrentSceneNum);
}
bool8 sub_8111000(void)
{
LoadPalette(stdpal_get(4), 0xF0, 0x20);
- SetQuestLogState(2);
- sub_807DF64();
+ SetQuestLogState(QL_STATE_2);
+ FieldCB_UnionRoomWarp();
gUnknown_203AE94 = (struct UnkStruct_203AE94){};
gUnknown_203AE94.unk_0_0 = 2;
return 1;
@@ -608,7 +609,7 @@ bool8 sub_8111000(void)
bool8 sub_8111038(void)
{
LoadPalette(stdpal_get(4), 0xF0, 0x20);
- SetQuestLogState(2);
+ SetQuestLogState(QL_STATE_2);
sub_807DF7C();
gUnknown_203AE94 = (struct UnkStruct_203AE94){};
gUnknown_203AE94.unk_0_0 = 2;
@@ -619,10 +620,10 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
{
u8 i;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < NELEMS(sQuestLogHeaderWindowTemplates); i++)
{
- gUnknown_203ADFE[i] = AddWindow(&gUnknown_845661C[i]);
- FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8);
+ sQuestLogHeaderWindowIds[i] = AddWindow(&sQuestLogHeaderWindowTemplates[i]);
+ FillWindowPixelRect(sQuestLogHeaderWindowIds[i], 15, 0, 0, sQuestLogHeaderWindowTemplates[i].width * 8, sQuestLogHeaderWindowTemplates[i].height * 8);
}
StringExpandPlaceholders(gStringVar4, gText_QuestLog_PreviouslyOnYourQuest);
@@ -634,21 +635,21 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
StringAppend(gStringVar4, gStringVar1);
}
- AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
- PutWindowTilemap(gUnknown_203ADFE[0]);
- PutWindowTilemap(gUnknown_203ADFE[1]);
- CopyWindowToVram(gUnknown_203ADFE[0], 2);
- CopyWindowToVram(gUnknown_203ADFE[2], 2);
- CopyWindowToVram(gUnknown_203ADFE[1], 3);
+ AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], 2, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
+ PutWindowTilemap(sQuestLogHeaderWindowIds[0]);
+ PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[0], 2);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[2], 2);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[1], 3);
}
-void sub_8111134(void)
+void CommitQuestLogWindow1(void)
{
- PutWindowTilemap(gUnknown_203ADFE[1]);
- CopyWindowToVram(gUnknown_203ADFE[1], 1);
+ PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[1], 1);
}
-static void sub_8111150(u8 sceneNum)
+static void QuestLogPlaybackSetObjectEventTemplates(u8 sceneNum)
{
struct QuestLog *questLog = &gSaveBlock1Ptr->questLog[sceneNum];
u16 i;
@@ -667,7 +668,7 @@ static void sub_8111150(u8 sceneNum)
gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType;
}
- sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates);
+ SetSav1ObjectEventsFromQuestLog(questLog, gSaveBlock1Ptr->objectEventTemplates);
}
void sub_8111274(u8 sceneNum, bool8 a1)
@@ -695,7 +696,7 @@ void sub_8111274(u8 sceneNum, bool8 a1)
static void sub_8111368(void)
{
- gQuestLogState = 2;
+ gQuestLogState = QL_STATE_2;
ResetSpecialVars();
ClearBag();
ClearPCItemSlots();
@@ -847,7 +848,7 @@ static void sub_8111688(void)
for (i = 0; i < 4; i++)
{
- sp0[i] = VarGet(VAR_0x40AA + i);
+ sp0[i] = VarGet(VAR_QLBAK_TRAINER_REMATCHES + i);
for (j = 0; j < 16; j++)
{
@@ -864,7 +865,7 @@ void sub_8111708(void)
{
struct MapHeader sp0;
- gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_0x40AE);
+ gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_QLBAK_MAP_LAYOUT);
if (gSaveBlock1Ptr->mapLayoutId == 0)
{
sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
@@ -872,14 +873,14 @@ void sub_8111708(void)
}
}
-static void sub_811175C(u8 sceneNum, struct UnkStruct_203AE98 * a1)
+static void sub_811175C(u8 sceneNum, struct QuestLogEntry * a1)
{
u16 i;
u16 *r4;
u16 r6 = 0;
u16 r9 = 0;
- memset(a1, 0, 32 * sizeof(struct UnkStruct_203AE98));
+ memset(a1, 0, 32 * sizeof(struct QuestLogEntry));
for (i = 0; i < NELEMS(gUnknown_203AE0C); i++)
{
gUnknown_203AE0C[i] = NULL;
@@ -951,7 +952,7 @@ static void QuestLog_StartFinalScene(void)
SetMainCallback2(sub_8057430);
gFieldCallback2 = sub_8111F60;
FreeAllWindowBuffers();
- gQuestLogState = 3;
+ gQuestLogState = QL_STATE_3;
sQuestLogCB = NULL;
}
@@ -1077,7 +1078,7 @@ static u8 sub_8111BD4(void)
bool8 sub_8111C2C(void)
{
- if (gQuestLogState != 2)
+ if (gQuestLogState != QL_STATE_2)
return FALSE;
if (gUnknown_3005E88 == 0 || gUnknown_203AE94.unk_0_0 == 1 || gUnknown_203AE94.unk_0_0 == 2)
return TRUE;
@@ -1112,7 +1113,7 @@ bool8 sub_8111CD0(void)
void sub_8111CF0(void)
{
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
DrawPreviouslyOnQuestHeader(sNumScenes);
}
@@ -1127,9 +1128,9 @@ static void DrawQuestLogSceneDescription(void)
numLines++;
}
- PutWindowTilemap(gUnknown_203ADFE[2]);
- sub_8111D90(gUnknown_203ADFE[2]);
- AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4);
+ PutWindowTilemap(sQuestLogHeaderWindowIds[2]);
+ sub_8111D90(sQuestLogHeaderWindowIds[2]);
+ AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], 2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4);
ScheduleBgCopyTilemapToVram(0);
}
@@ -1172,11 +1173,11 @@ static void sub_8111D90(u8 a0)
static void QuestLog_CloseTextWindow(void)
{
- ClearWindowTilemap(gUnknown_203ADFE[2]);
- FillWindowPixelRect(gUnknown_203ADFE[2], 15, 0, 0, 0xf0, 0x30);
- CopyWindowToVram(gUnknown_203ADFE[2], 2);
- PutWindowTilemap(gUnknown_203ADFE[1]);
- CopyWindowToVram(gUnknown_203ADFE[1], 1);
+ ClearWindowTilemap(sQuestLogHeaderWindowIds[2]);
+ FillWindowPixelRect(sQuestLogHeaderWindowIds[2], 15, 0, 0, 0xf0, 0x30);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[2], 2);
+ PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[1], 1);
}
static void QuestLog_SkipToEndOfPlayback(s8 delay)
@@ -1194,7 +1195,7 @@ static void QuestLog_WaitFadeAndCancelPlayback(void)
{
if (gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000 == 0)
break;
- sub_811175C(sCurrentSceneNum, gUnknown_203AE98);
+ sub_811175C(sCurrentSceneNum, sQuestLogSceneRecordBuffer);
}
gUnknown_3005E88 = 0;
QuestLog_StartFinalScene();
@@ -1203,7 +1204,7 @@ static void QuestLog_WaitFadeAndCancelPlayback(void)
void sub_8111F14(void)
{
- if (gQuestLogState == 3)
+ if (gQuestLogState == QL_STATE_3)
gUnknown_203AE90 = AllocZeroed(0x200 * sizeof(u16));
}
@@ -1288,7 +1289,7 @@ static void Task_EndQuestLog(u8 taskId)
gDisableMapMusicChangeOnMapLoad = 0;
Overworld_PlaySpecialMapMusic();
sub_811229C();
- FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8);
+ FillWindowPixelRect(sQuestLogHeaderWindowIds[0], 0xF, 0, 0, sQuestLogHeaderWindowTemplates[0].width * 8, sQuestLogHeaderWindowTemplates[0].height * 8);
tState++;
break;
case 1:
@@ -1296,9 +1297,9 @@ static void Task_EndQuestLog(u8 taskId)
{
for (i = 0; i < 3; i++)
{
- ClearWindowTilemap(gUnknown_203ADFE[i]);
- CopyWindowToVram(gUnknown_203ADFE[i], 1);
- RemoveWindow(gUnknown_203ADFE[i]);
+ ClearWindowTilemap(sQuestLogHeaderWindowIds[i]);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[i], 1);
+ RemoveWindow(sQuestLogHeaderWindowIds[i]);
}
tTimer = 0;
tState++;
@@ -1339,10 +1340,10 @@ static bool8 sub_81121D8(u8 taskId)
sub_80716F8(gPlttBufferUnfaded + 0x01, gPlttBufferFaded + 0x01, 0xDF, 0x0F - data[1]);
sub_80716F8(gPlttBufferUnfaded + 0x100, gPlttBufferFaded + 0x100, 0x100, 0x0F - data[1]);
- FillWindowPixelRect(gUnknown_203ADFE[0], 0x00, 0, gUnknown_845661C[0].height * 8 - 1 - data[1], gUnknown_845661C[0].width * 8, 1);
- FillWindowPixelRect(gUnknown_203ADFE[1], 0x00, 0, data[1], gUnknown_845661C[1].width * 8, 1);
- CopyWindowToVram(gUnknown_203ADFE[0], 2);
- CopyWindowToVram(gUnknown_203ADFE[1], 2);
+ FillWindowPixelRect(sQuestLogHeaderWindowIds[0], 0x00, 0, sQuestLogHeaderWindowTemplates[0].height * 8 - 1 - data[1], sQuestLogHeaderWindowTemplates[0].width * 8, 1);
+ FillWindowPixelRect(sQuestLogHeaderWindowIds[1], 0x00, 0, data[1], sQuestLogHeaderWindowTemplates[1].width * 8, 1);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[0], 2);
+ CopyWindowToVram(sQuestLogHeaderWindowIds[1], 2);
data[1]++;
return FALSE;
}
@@ -1362,9 +1363,9 @@ static void sub_811229C(void)
void sub_811231C(void)
{
- if (gQuestLogState == 1)
+ if (gQuestLogState == QL_STATE_1)
{
- sub_8110E68(gUnknown_203AE98);
+ TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer);
sub_8110E3C();
gQuestLogState = 0;
sQuestLogCB = NULL;
@@ -1376,9 +1377,9 @@ void sub_811231C(void)
void sub_8112364(void)
{
- if (gUnknown_3005E88 && gQuestLogState == 1)
+ if (gUnknown_3005E88 && gQuestLogState == QL_STATE_1)
{
- sub_8110E68(gUnknown_203AE98);
+ TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer);
sub_8113A1C(1);
sub_8110E3C();
gUnknown_3005E88 = 0;
@@ -1448,109 +1449,109 @@ void sub_811246C(struct Sprite *sprite)
}
}
-void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3)
+void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 movementActionId)
{
if (!sub_8112CEC())
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = a0;
- gUnknown_3005E94[sQuestLogIdx].unk_1 = a1;
- gUnknown_3005E94[sQuestLogIdx].unk_2 = a2;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a3;
- sQuestLogIdx++;
- gUnknown_203B01A = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = a0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_1 = a1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_2 = a2;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ sQuestLogCursor++;
+ sNextStepDelay = 0;
}
}
-void sub_8112588(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4)
+void sub_8112588(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration)
{
- if (!sub_8112D1C())
+ if (!RecordHeadAtEndOfEntry())
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = a0;
- gUnknown_3005E94[sQuestLogIdx].unk_1 = a1;
- gUnknown_3005E94[sQuestLogIdx].unk_2 = a2;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a3;
- sQuestLogIdx++;
- gUnknown_203B01A = a4;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = localId;
+ sCurQuestLogEntry[sQuestLogCursor].unk_1 = mapNum;
+ sCurQuestLogEntry[sQuestLogCursor].unk_2 = mapGroup;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ sQuestLogCursor++;
+ sNextStepDelay = duration;
}
}
-void sub_8112628(u8 a0)
+void sub_8112628(u8 movementActionId)
{
if (!sub_8112CEC())
{
- if (a0 != gUnknown_3005E94[gUnknown_203B01C].unk_3 || a0 > 3)
+ if (movementActionId != sCurQuestLogEntry[gUnknown_203B01C].unk_3 || movementActionId > MOVEMENT_ACTION_FACE_RIGHT)
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a0;
- gUnknown_203B01C = sQuestLogIdx;
- sQuestLogIdx++;
- gUnknown_203B01A = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ gUnknown_203B01C = sQuestLogCursor;
+ sQuestLogCursor++;
+ sNextStepDelay = 0;
}
}
}
-void sub_81126AC(u8 a0, u8 a1)
+void sub_81126AC(u8 movementActionId, u8 duration)
{
- if (!sub_8112D1C())
+ if (!RecordHeadAtEndOfEntry())
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a0;
- gUnknown_203B01C = sQuestLogIdx;
- sQuestLogIdx++;
- gUnknown_203B01A = a1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ gUnknown_203B01C = sQuestLogCursor;
+ sQuestLogCursor++;
+ sNextStepDelay = duration;
}
}
-void sub_8112720(u8 a0)
+void sub_8112720(u8 movementActionId)
{
- if (!sub_8112D1C())
+ if (!RecordHeadAtEndOfEntry())
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 1;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a0;
- sQuestLogIdx++;
- gUnknown_203B01A = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ sQuestLogCursor++;
+ sNextStepDelay = 0;
}
}
-void sub_811278C(u8 a0, u8 a1)
+void sub_811278C(u8 movementActionId, u8 duration)
{
- if (!sub_8112D1C())
+ if (!RecordHeadAtEndOfEntry())
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 1;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = a0;
- sQuestLogIdx++;
- gUnknown_203B01A = a1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = movementActionId;
+ sQuestLogCursor++;
+ sNextStepDelay = duration;
}
}
void sub_81127F8(struct UnkStruct_3005E90 * a0)
{
- if (sQuestLogIdx < sNumQuestLogs)
+ if (sQuestLogCursor < sNumEventsInLogEntry)
{
u32 r2 = *(u32 *)a0 & 0x00FF00F3;
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 2;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = r2;
- gUnknown_3005E94[sQuestLogIdx].unk_1 = r2 >> 8;
- gUnknown_3005E94[sQuestLogIdx].unk_2 = r2 >> 16;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = r2 >> 24;
- sQuestLogIdx++;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 2;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = r2;
+ sCurQuestLogEntry[sQuestLogCursor].unk_1 = r2 >> 8;
+ sCurQuestLogEntry[sQuestLogCursor].unk_2 = r2 >> 16;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = r2 >> 24;
+ sQuestLogCursor++;
if (ScriptContext2_IsEnabled())
- gUnknown_203B01A = TRUE;
+ sNextStepDelay = TRUE;
else
- gUnknown_203B01A = FALSE;
+ sNextStepDelay = FALSE;
}
}
@@ -1580,10 +1581,10 @@ void sub_81128BC(u8 a0)
gUnknown_3005E88 = 3;
else if (r1 == 2)
{
- gUnknown_3005E94[sQuestLogIdx].unk_4 = gUnknown_203B01A;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 3;
- sQuestLogIdx++;
- gUnknown_203B01A = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = sNextStepDelay;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 3;
+ sQuestLogCursor++;
+ sNextStepDelay = 0;
gUnknown_3005E88 = 4;
}
break;
@@ -1596,68 +1597,68 @@ void sub_81128BC(u8 a0)
}
}
-static void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2)
+static void SetUpQuestLogEntry(u8 kind, struct QuestLogEntry *entry, u16 size)
{
- s32 i;
+ int i;
- switch (a0)
+ switch (kind)
{
default:
gUnknown_3005E88 = 0;
break;
case 1:
- gUnknown_3005E94 = a1;
- sNumQuestLogs = a2 / 8;
- for (i = 0; i < 0x40; i++)
+ sCurQuestLogEntry = entry;
+ sNumEventsInLogEntry = size / sizeof(*sCurQuestLogEntry);
+ for (i = 0; i < (s32)NELEMS(sMovementScripts); i++)
{
sMovementScripts[i][0] |= 0xFF;
sMovementScripts[i][1] |= 0xFF;
}
- sQuestLogIdx = 0;
+ sQuestLogCursor = 0;
gUnknown_203B01C = 0;
gUnknown_3005E90 = (struct UnkStruct_3005E90){};
- gUnknown_203B01A = gUnknown_3005E94[sQuestLogIdx].unk_4;
- sMovementScripts[0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3;
+ sNextStepDelay = sCurQuestLogEntry[sQuestLogCursor].unk_4;
+ sMovementScripts[0][0] = sCurQuestLogEntry[sQuestLogCursor].unk_3;
sMovementScripts[0][1] = 0xFF;
gUnknown_3005E88 = 1;
break;
case 2:
- gUnknown_3005E94 = a1;
- sNumQuestLogs = a2 / 8;
- for (i = 0; i < sNumQuestLogs; i++)
+ sCurQuestLogEntry = entry;
+ sNumEventsInLogEntry = size / sizeof(*sCurQuestLogEntry);
+ for (i = 0; i < sNumEventsInLogEntry; i++)
{
- gUnknown_3005E94[i] = (struct UnkStruct_203AE98){ 0, 0, 0, 0, 0xFFFF, 0xFF };
+ sCurQuestLogEntry[i] = (struct QuestLogEntry){ 0, 0, 0, 0, 0xFFFF, 0xFF };
}
- sQuestLogIdx = 0;
- gUnknown_203B01A = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_4 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
+ sQuestLogCursor = 0;
+ sNextStepDelay = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
switch (GetPlayerFacingDirection())
{
case DIR_NONE:
case DIR_SOUTH:
- gUnknown_3005E94[sQuestLogIdx].unk_3 = DIR_SOUTH - 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = MOVEMENT_ACTION_FACE_DOWN;
break;
case DIR_EAST:
- gUnknown_3005E94[sQuestLogIdx].unk_3 = DIR_EAST - 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = MOVEMENT_ACTION_FACE_RIGHT;
break;
case DIR_NORTH:
- gUnknown_3005E94[sQuestLogIdx].unk_3 = DIR_NORTH - 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = MOVEMENT_ACTION_FACE_UP;
break;
case DIR_WEST:
- gUnknown_3005E94[sQuestLogIdx].unk_3 = DIR_WEST - 1;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = MOVEMENT_ACTION_FACE_LEFT;
break;
}
gUnknown_203B01C = 0;
- sQuestLogIdx++;
- gUnknown_3005E94[sQuestLogIdx].unk_4 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_6 = 2;
- gUnknown_3005E94[sQuestLogIdx].unk_0 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_1 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_2 = 0;
- gUnknown_3005E94[sQuestLogIdx].unk_3 = 0;
- sQuestLogIdx++;
+ sQuestLogCursor++;
+ sCurQuestLogEntry[sQuestLogCursor].unk_4 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_6 = 2;
+ sCurQuestLogEntry[sQuestLogCursor].unk_0 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_1 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_2 = 0;
+ sCurQuestLogEntry[sQuestLogCursor].unk_3 = 0;
+ sQuestLogCursor++;
gUnknown_3005E88 = 2;
break;
}
@@ -1672,22 +1673,22 @@ void sub_8112B3C(void)
case 1:
if (!sub_8112CEC())
{
- if (gUnknown_203B01A != 0)
- gUnknown_203B01A--;
+ if (sNextStepDelay != 0)
+ sNextStepDelay--;
else
{
do
{
- switch (gUnknown_3005E94[sQuestLogIdx].unk_6)
+ switch (sCurQuestLogEntry[sQuestLogCursor].unk_6)
{
case 0:
- sMovementScripts[gUnknown_3005E94[sQuestLogIdx].unk_0][0] = gUnknown_3005E94[sQuestLogIdx].unk_3;
+ sMovementScripts[sCurQuestLogEntry[sQuestLogCursor].unk_0][0] = sCurQuestLogEntry[sQuestLogCursor].unk_3;
break;
case 1:
- sMovementScripts[gUnknown_3005E94[sQuestLogIdx].unk_0][1] = gUnknown_3005E94[sQuestLogIdx].unk_3;
+ sMovementScripts[sCurQuestLogEntry[sQuestLogCursor].unk_0][1] = sCurQuestLogEntry[sQuestLogCursor].unk_3;
break;
case 2:
- *(u32 *)&gUnknown_3005E90 = ((gUnknown_3005E94[sQuestLogIdx].unk_3 << 24) | (gUnknown_3005E94[sQuestLogIdx].unk_2 << 16) | (gUnknown_3005E94[sQuestLogIdx].unk_1 << 8) | (gUnknown_3005E94[sQuestLogIdx].unk_0 << 0));
+ *(u32 *)&gUnknown_3005E90 = ((sCurQuestLogEntry[sQuestLogCursor].unk_3 << 24) | (sCurQuestLogEntry[sQuestLogCursor].unk_2 << 16) | (sCurQuestLogEntry[sQuestLogCursor].unk_1 << 8) | (sCurQuestLogEntry[sQuestLogCursor].unk_0 << 0));
break;
case 3:
gUnknown_3005E88 = 3;
@@ -1700,17 +1701,17 @@ void sub_8112B3C(void)
}
if (gUnknown_3005E88 == 0)
break;
- if (++sQuestLogIdx >= sNumQuestLogs)
+ if (++sQuestLogCursor >= sNumEventsInLogEntry)
{
gUnknown_3005E88 = 0;
break;
}
- gUnknown_203B01A = gUnknown_3005E94[sQuestLogIdx].unk_4;
+ sNextStepDelay = sCurQuestLogEntry[sQuestLogCursor].unk_4;
} while (gUnknown_3005E88 != 3
- && (gUnknown_203B01A == 0 || gUnknown_203B01A == 0xFFFF));
+ && (sNextStepDelay == 0 || sNextStepDelay == 0xFFFF));
}
}
- else if (sQuestLogIdx >= sNumQuestLogs)
+ else if (sQuestLogCursor >= sNumEventsInLogEntry)
{
gUnknown_3005E88 = 0;
}
@@ -1718,8 +1719,8 @@ void sub_8112B3C(void)
case 2:
if (ScriptContext2_IsEnabled() != TRUE)
{
- gUnknown_203B01A++;
- if (sQuestLogIdx >= sNumQuestLogs)
+ sNextStepDelay++;
+ if (sQuestLogCursor >= sNumEventsInLogEntry)
gUnknown_3005E88 = 0;
}
break;
@@ -1732,7 +1733,7 @@ void sub_8112B3C(void)
void sub_8112C9C(void)
{
- gUnknown_203B01A++;
+ sNextStepDelay++;
}
u8 sub_8112CAC(void)
@@ -1753,14 +1754,14 @@ u8 sub_8112CAC(void)
static bool8 sub_8112CEC(void)
{
- if (sQuestLogIdx >= sNumQuestLogs || ScriptContext2_IsEnabled() == TRUE)
+ if (sQuestLogCursor >= sNumEventsInLogEntry || ScriptContext2_IsEnabled() == TRUE)
return TRUE;
return FALSE;
}
-static bool8 sub_8112D1C(void)
+static bool8 RecordHeadAtEndOfEntry(void)
{
- if (sQuestLogIdx >= sNumQuestLogs)
+ if (sQuestLogCursor >= sNumEventsInLogEntry)
return TRUE;
return FALSE;
}
@@ -1774,9 +1775,9 @@ static const struct UnkStruct_300201C gUnknown_84566A4 = {
void * QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx)
{
void * response;
- if (sQuestLogIdx == 0)
+ if (sQuestLogCursor == 0)
return NULL;
- if (sQuestLogIdx >= sNumQuestLogs)
+ if (sQuestLogCursor >= sNumEventsInLogEntry)
return NULL;
if (sFlagOrVarPlayhead >= sNumFlagsOrVars)
return NULL;
@@ -1792,9 +1793,9 @@ void * QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx)
void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value)
{
- if (sQuestLogIdx == 0)
+ if (sQuestLogCursor == 0)
return;
- if (sQuestLogIdx >= sNumQuestLogs)
+ if (sQuestLogCursor >= sNumEventsInLogEntry)
return;
if (sFlagOrVarPlayhead >= sNumFlagsOrVars)
return;
@@ -1817,7 +1818,7 @@ void sub_8112E3C(u8 a0, struct UnkStruct_300201C * a1, u16 a2)
sFlagOrVarPlayhead = 0;
if (a0 == 2)
{
- for (i = 0; i < sNumQuestLogs; i++)
+ for (i = 0; i < sNumEventsInLogEntry; i++)
{
sFlagOrVarRecords[i] = gUnknown_84566A4;
}
@@ -2395,7 +2396,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
return;
}
sub_811381C();
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
return;
if (!IS_VALID_QL_EVENT(eventId))
@@ -2431,7 +2432,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
{
if (sub_81153A8(eventId, eventData) == FALSE)
return;
- sub_8110AEC(eventId);
+ StartRecordingQuestLogEntry(eventId);
}
}
else if (eventId == QL_EVENT_OBTAINED_ITEM)
@@ -2513,10 +2514,10 @@ bool8 sub_8113748(void)
if (InQuestLogDisabledLocation() != TRUE)
return FALSE;
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
return TRUE;
- if (gQuestLogState == 1)
+ if (gQuestLogState == QL_STATE_1)
sub_8112364();
return FALSE;
@@ -2579,7 +2580,7 @@ static u16 *sub_8113828(u16 eventId, const u16 *eventData)
if (sub_81153A8(eventId, eventData) == FALSE)
return NULL;
- sub_8110AEC(eventId);
+ StartRecordingQuestLogEntry(eventId);
sub_8113B94(eventId);
if (eventId == QL_EVENT_DEFEATED_WILD_MON)
@@ -2619,7 +2620,7 @@ void sub_811390C(void)
{
u16 *resp;
gUnknown_203B04A = 0;
- sub_8110AEC(gUnknown_203B024.unk_00);
+ StartRecordingQuestLogEntry(gUnknown_203B024.unk_00);
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04);
gUnknown_203AE08 = resp;
sub_81138F8();
@@ -2651,7 +2652,7 @@ void sub_81139BC(void)
if (gUnknown_3005E88 == 0)
{
gUnknown_203B04A = 0;
- sub_8110AEC(gUnknown_203B024.unk_00);
+ StartRecordingQuestLogEntry(gUnknown_203B024.unk_00);
}
sub_8113B94(gUnknown_203B024.unk_00);
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04);
@@ -2665,7 +2666,7 @@ void sub_81139BC(void)
static void sub_8113A1C(u16 a0)
{
gUnknown_203AE08 = sub_8113C5C(gUnknown_203AE08, a0);
- sQuestLogIdx++;
+ sQuestLogCursor++;
}
static bool8 IsQuestLogEventWithSpecialEncounterSpecies(u16 eventId, const u16 *eventData)
@@ -2806,7 +2807,7 @@ static bool8 sub_8113AE8(const u16 *a0)
const u16 *r0 = a0;
#endif
- if (r0 == NULL || r0[1] > sQuestLogIdx)
+ if (r0 == NULL || r0[1] > sQuestLogCursor)
return FALSE;
sQuestLogEventTextBufferCBs[a0[0] & 0xFFF](a0);
@@ -2836,11 +2837,11 @@ static void sub_8113B88(void)
static void sub_8113B94(u16 eventId)
{
- if (gUnknown_203B044.unk_0 != (u8)eventId || gUnknown_203B044.unk_2 != sQuestLogIdx)
+ if (gUnknown_203B044.unk_0 != (u8)eventId || gUnknown_203B044.unk_2 != sQuestLogCursor)
{
gUnknown_203B044.unk_0 = eventId;
gUnknown_203B044.unk_1 = 0;
- gUnknown_203B044.unk_2 = sQuestLogIdx;
+ gUnknown_203B044.unk_2 = sQuestLogCursor;
}
else if (gUnknown_203B044.unk_1 < 5)
gUnknown_203B044.unk_1++;
@@ -2848,7 +2849,7 @@ static void sub_8113B94(u16 eventId)
static void sub_8113BD8(void)
{
- gUnknown_203B049 = 0;
+ sNewlyEnteredMap = FALSE;
gUnknown_203B04A = 0;
gUnknown_203B04B = FALSE;
}
@@ -2861,7 +2862,7 @@ static u16 *sub_8113BF4(u16 *a0)
return a0 + 1;
}
-static u16 *sub_8113C20(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1)
{
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_39]))
return NULL;
@@ -2883,7 +2884,7 @@ static u16 *sub_8113C5C(u16 *a0, u16 a1)
return a0 + 2;
}
-static u16 *sub_8113C8C(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113C8C(u16 *a0, struct QuestLogEntry * a1)
{
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_41]))
return NULL;
@@ -2896,7 +2897,7 @@ static u16 *sub_8113C8C(u16 *a0, struct UnkStruct_203AE98 * a1)
return a0 + 2;
}
-static u16 *sub_8113CC8(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113CC8(u16 *a0, struct QuestLogEntry * a1)
{
u8 *r6 = (u8 *)a0 + 4;
@@ -2911,7 +2912,7 @@ static u16 *sub_8113CC8(u16 *a0, struct UnkStruct_203AE98 * a1)
return (u16 *)(r6 + 4);
}
-static u16 *sub_8113D08(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113D08(u16 *a0, struct QuestLogEntry * a1)
{
u8 *r6 = (u8 *)a0 + 4;
@@ -2926,7 +2927,7 @@ static u16 *sub_8113D08(u16 *a0, struct UnkStruct_203AE98 * a1)
return (u16 *)(r6 + 4);
}
-static u16 *sub_8113D48(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113D48(u16 *a0, struct QuestLogEntry * a1)
{
u16 *r4 = a0;
u8 *r6 = (u8 *)a0 + 4;
@@ -2945,7 +2946,7 @@ static u16 *sub_8113D48(u16 *a0, struct UnkStruct_203AE98 * a1)
return (u16 *)(r6 + 4);
}
-static u16 *sub_8113D94(u16 *a0, struct UnkStruct_203AE98 * a1)
+static u16 *sub_8113D94(u16 *a0, struct QuestLogEntry * a1)
{
u16 *r5 = a0;
u8 *r6 = (u8 *)a0 + 4;
@@ -2999,7 +3000,7 @@ u16 *sub_8113DE0(u16 eventId, u16 *a1)
r1 = gUnknown_203B044.unk_1;
r5[0] = eventId + (r1 << 12);
- r5[1] = sQuestLogIdx;
+ r5[1] = sQuestLogCursor;
r5 = (void *)r5 + (r1 * cmdSize + 4);
return r5;
}
@@ -3244,7 +3245,7 @@ static u16 *BufferQuestLogData_UsedPkmnCenter(u16 *a0, const u16 *eventData)
return NULL;
r4[0] = QL_EVENT_USED_PKMN_CENTER;
- r4[1] = sQuestLogIdx;
+ r4[1] = sQuestLogCursor;
return r4 + 2;
}
@@ -3260,7 +3261,7 @@ static u16 *BufferQuestLogData_LinkTraded(u16 *a0, const u16 *eventData)
u16 *r4 = a0 + 4;
a0[0] = QL_EVENT_LINK_TRADED;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
a0[2] = eventData[0];
a0[3] = eventData[1];
eventData += 2;
@@ -3305,7 +3306,7 @@ static const u8 *const sBattleOutcomeTexts[] = {
static u16 *BufferQuestLogData_LinkBattledSingle(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_LINK_BATTLED_SINGLE;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
*((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
a0 += 6;
@@ -3329,7 +3330,7 @@ static const u16 *BufferQuestLogText_LinkBattledSingle(const u16 *a0)
static u16 *BufferQuestLogData_LinkBattledDouble(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_LINK_BATTLED_DOUBLE;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
*((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
a0 += 6;
@@ -3353,7 +3354,7 @@ static const u16 *BufferQuestLogText_LinkBattledDouble(const u16 *a0)
static u16 *BufferQuestLogData_LinkBattledMulti(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_LINK_BATTLED_MULTI;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
*((u8 *)a0 + 4) = *((const u8 *)eventData + 0);
memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
memcpy((u8 *)a0 + 12, (const u8 *)eventData + 8, PLAYER_NAME_LENGTH);
@@ -3388,7 +3389,7 @@ static const u16 *BufferQuestLogText_LinkBattledMulti(const u16 *a0)
static u16 *BufferQuestLogData_UsedUnionRoom(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_USED_UNION_ROOM;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
return a0 + 2;
}
@@ -3402,7 +3403,7 @@ static const u16 *BufferQuestLogText_UsedUnionRoom(const u16 *a0)
static u16 *BufferQuestLogData_UsedUnionRoomChat(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_USED_UNION_ROOM_CHAT;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
return a0 + 2;
}
@@ -3417,7 +3418,7 @@ static u16 *BufferQuestLogData_LinkTradedUnionRoom(u16 *a0, const u16 *eventData
{
u8 *r4 = (u8 *)(a0 + 4);
a0[0] = QL_EVENT_LINK_TRADED_UNION;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
a0[2] = eventData[0];
a0[3] = eventData[1];
memcpy(r4, eventData + 2, PLAYER_NAME_LENGTH);
@@ -3441,7 +3442,7 @@ static const u16 *BufferQuestLogText_LinkTradedUnionRoom(const u16 *a0)
static u16 *BufferQuestLogData_LinkBattledUnionRoom(u16 *a0, const u16 *eventData)
{
a0[0] = QL_EVENT_LINK_BATTLED_UNION;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
*(u8 *)&a0[2] = *(const u8 *)&eventData[0];
memcpy((u8 *)a0 + 5, (const u8 *)eventData + 1, PLAYER_NAME_LENGTH);
a0 += 6;
@@ -3743,7 +3744,7 @@ static u16 *BufferQuestLogData_DefeatedWildMon(u16 *a0, const u16 *eventData)
if (r5[0] == 0 && r5[1] == 0)
{
r4[0] = QL_EVENT_DEFEATED_WILD_MON;
- r4[1] = sQuestLogIdx;
+ r4[1] = sQuestLogCursor;
}
if (eventData[0])
r4[2] = eventData[0];
@@ -3847,7 +3848,7 @@ static u16 *BufferQuestLogData_DefeatedChampion(u16 *a0, const u16 *eventData)
if (!sub_8110944(a0, sQuestLogEventCmdSizes[QL_EVENT_DEFEATED_CHAMPION]))
return NULL;
a0[0] = 0x2021;
- a0[1] = sQuestLogIdx;
+ a0[1] = sQuestLogCursor;
a0[2] = eventData[1];
a0[3] = eventData[2];
*((u8 *)a0 + 8) = *((const u8 *)eventData + 6);
@@ -4299,7 +4300,7 @@ void QuestLog_RecordEnteredMap(u16 worldMapFlag)
{
s32 i;
- if (gQuestLogState == 2 || gQuestLogState == 3)
+ if (gQuestLogState == QL_STATE_2 || gQuestLogState == QL_STATE_3)
return;
for (i = 0; i < (int)NELEMS(sQuestLogWorldMapFlags); i++)
@@ -4308,13 +4309,13 @@ void QuestLog_RecordEnteredMap(u16 worldMapFlag)
{
if (!FlagGet(worldMapFlag))
{
- gUnknown_203B049 = TRUE;
+ sNewlyEnteredMap = TRUE;
break;
}
else
{
- gUnknown_203B049 += 0;
- gUnknown_203B049 = FALSE;
+ sNewlyEnteredMap += 0;
+ sNewlyEnteredMap = FALSE;
break;
}
}
@@ -4324,13 +4325,13 @@ void QuestLog_RecordEnteredMap(u16 worldMapFlag)
void sub_8115798(void)
{
u16 sp0;
- if (gQuestLogState != 2 && gQuestLogState != 3)
+ if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
{
- if (gUnknown_203B049)
+ if (sNewlyEnteredMap)
{
sp0 = gMapHeader.regionMapSectionId;
SetQuestLogEvent(QL_EVENT_ARRIVED, &sp0);
- gUnknown_203B049 = FALSE;
+ sNewlyEnteredMap = FALSE;
}
}
}
diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c
index 2c17987e8..64b4b7fe5 100644
--- a/src/quest_log_objects.c
+++ b/src/quest_log_objects.c
@@ -45,7 +45,7 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
}
}
-void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
+void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{
u32 i, j;
const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
@@ -131,7 +131,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
void sub_815A540(void)
{
- if (gQuestLogState == 2)
+ if (gQuestLogState == QL_STATE_2)
{
s16 x, y;
diff --git a/src/quest_log_player.c b/src/quest_log_player.c
index be40042b3..42233999e 100644
--- a/src/quest_log_player.c
+++ b/src/quest_log_player.c
@@ -39,7 +39,7 @@ void sub_8150454(u8 a0)
gUnknown_8471EDC[a0]();
}
-bool8 sub_8150474(u8 a0)
+bool32 sub_8150474(u8 a0)
{
if (gUnknown_3005E88 == 2)
{
@@ -87,7 +87,7 @@ static void sub_8150530(void)
else
{
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
- StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection));
+ StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
}
}
@@ -102,23 +102,23 @@ static void sub_81505C4(u8 taskId)
ObjectEventClearHeldMovementIfActive(objectEvent);
objectEvent->enableAnim = TRUE;
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
- StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection));
+ StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
gTasks[taskId].data[0]++;
gTasks[taskId].data[1] = 0;
break;
case 1:
- sub_805D9C4(sprite);
+ AlignFishingAnimationFrames(sprite);
if (gTasks[taskId].data[1] < 60)
gTasks[taskId].data[1]++;
else
gTasks[taskId].data[0]++;
break;
case 2:
- StartSpriteAnim(sprite, GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
+ StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
gTasks[taskId].data[0]++;
break;
case 3:
- sub_805D9C4(sprite);
+ AlignFishingAnimationFrames(sprite);
if (sprite->animEnded)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
@@ -177,20 +177,20 @@ static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
static void sub_81507CC(void)
{
- sub_805D154(1);
+ CreateStopSurfingTask_NoMusicChange(1);
}
static void sub_81507D8(void)
{
- sub_805D154(2);
+ CreateStopSurfingTask_NoMusicChange(2);
}
static void sub_81507E4(void)
{
- sub_805D154(3);
+ CreateStopSurfingTask_NoMusicChange(3);
}
static void sub_81507F0(void)
{
- sub_805D154(4);
+ CreateStopSurfingTask_NoMusicChange(4);
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 2b5137f9a..af977fbc7 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -802,7 +802,7 @@ bool8 ScrCmd_warpteleport2(struct ScriptContext * ctx)
u16 y = VarGet(ScriptReadHalfword(ctx));
SetWarpDestination(mapGroup, mapNum, warpId, x, y);
- sub_805DAE4(GetPlayerFacingDirection());
+ SavePlayerFacingDirectionForTeleport(GetPlayerFacingDirection());
sub_807E500();
ResetInitialPlayerAvatarState();
return TRUE;
diff --git a/src/seagallop.c b/src/seagallop.c
index 1e2234b9c..fb55e6bd2 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -322,7 +322,7 @@ static void Task_Seagallop_3(void)
SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]);
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
- gFieldCallback = sub_807DF64;
+ gFieldCallback = FieldCB_UnionRoomWarp;
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
ResetInitialPlayerAvatarState();
diff --git a/src/strings.c b/src/strings.c
index faf42c86a..547a36138 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1056,9 +1056,9 @@ const u8 gText_BerryCrush2[] = _("BERRY CRUSH");
const u8 gText_PressingSpeedRankings[] = _("Pressing-Speed Rankings");
const u8 gText_Var1Players[] = _("{STR_VAR_1} PLAYERS");
ALIGNED(4) const u8 gText_Ghost[] = _("GHOST");
-const u8 gUnknown_841D14E[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}");
-const u8 gUnknown_841D169[] = _("Not even a nibble‥{PAUSE_UNTIL_PRESS}");
-const u8 gUnknown_841D17E[] = _("It got away‥{PAUSE_UNTIL_PRESS}");
+const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}");
+const u8 gText_NotEvenANibble[] = _("Not even a nibble‥{PAUSE_UNTIL_PRESS}");
+const u8 gText_ItGotAway[] = _("It got away‥{PAUSE_UNTIL_PRESS}");
const u8 gUnknown_841D18D[] = _("ROOFTOP");
ALIGNED(4) const u8 gString_PokemonFireRed_Staff[] = _("Pokémon FireRed Version\nStaff");
ALIGNED(4) const u8 gString_PokemonLeafGreen_Staff[] = _("Pokémon LeafGreen Version\nStaff");
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 10:39:32 +0000