summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml4
-rw-r--r--include/field_player_avatar.h2
-rw-r--r--include/global.fieldmap.h2
-rw-r--r--src/battle_main.c4
-rw-r--r--src/battle_script_commands.c4
-rw-r--r--src/event_object_movement.c2
-rw-r--r--src/field_player_avatar.c130
-rw-r--r--src/fldeff_misc.c2
-rwxr-xr-xsrc/item_use.c4
9 files changed, 78 insertions, 76 deletions
diff --git a/.travis.yml b/.travis.yml
index e9964105e..8d39be503 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,10 @@ cache:
apt: true
install:
- pushd $HOME
- - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r50/devkitARM_r50-linux.tar.xz
+ - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz
- tar xJf devkitARM*.tar.xz
+ - travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz
+ - tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM
- travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
- popd
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 5e5a2361f..1dbe171bc 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -48,7 +48,7 @@ bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerFacingSurfableFishableWater(void);
bool8 IsPlayerSurfingNorth(void);
void sub_808C228(u8 direction);
-u8 sub_808BCD0(void);
+u8 GetPlayerAvatarFlags(void);
void sub_808B578(void);
u8 GetFRLGAvatarGraphicsIdByGender(u8);
u8 GetRSAvatarGraphicsIdByGender(u8);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index af2be9c77..2e451a368 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -304,7 +304,7 @@ enum
struct PlayerAvatar
{
/*0x00*/ u8 flags;
- /*0x01*/ u8 unk1; // used to be named bike, but its definitely not that. seems to be some transition flags
+ /*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
diff --git a/src/battle_main.c b/src/battle_main.c
index 0f6ec40a4..e3eea60d0 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4425,7 +4425,7 @@ static void HandleTurnActionSelectionState(void)
RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
*(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
- gBattleBufferB[gActiveBattler][1] = 0;
+ gBattleBufferB[gActiveBattler][1] = B_ACTION_USE_MOVE;
*(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_WAIT_ACTION_CHOSEN;
return;
}
@@ -4553,7 +4553,7 @@ static void HandleTurnActionSelectionState(void)
case STATE_SELECTION_SCRIPT_MAY_RUN:
if (*(gBattleStruct->selectionScriptFinished + gActiveBattler))
{
- if (gBattleBufferB[gActiveBattler][1] == 13)
+ if (gBattleBufferB[gActiveBattler][1] == B_ACTION_NOTHING_FAINTED)
{
gHitMarker |= HITMARKER_RUN;
gChosenActionByBattler[gActiveBattler] = B_ACTION_RUN;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 729cce0c9..84f2b1f4d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8925,7 +8925,7 @@ static void Cmd_jumpifnopursuitswitchdmg(void)
for (i = 0; i < gBattlersCount; i++)
{
if (gBattlerByTurnOrder[i] == gBattlerTarget)
- gActionsByTurnOrder[i] = 11;
+ gActionsByTurnOrder[i] = B_ACTION_TRY_FINISH;
}
gCurrentMove = MOVE_PURSUIT;
@@ -10005,7 +10005,7 @@ static void Cmd_pursuitrelated(void)
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
&& !(gAbsentBattlerFlags & gBitTable[gActiveBattler])
- && gChosenActionByBattler[gActiveBattler] == 0
+ && gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_MOVE
&& gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT)
{
gActionsByTurnOrder[gActiveBattler] = 11;
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 464e6acec..09cdd94cd 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1754,7 +1754,7 @@ static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteI
gPlayerAvatar.objectEventId = objectEventId;
gPlayerAvatar.spriteId = spriteId;
gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId);
- SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20);
+ SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, PLAYER_AVATAR_FLAG_5);
}
void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId)
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index ebab51ed8..35bbb1e03 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -59,8 +59,8 @@ 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 bool8 ForcedMovement_MatJump(void);
+static bool8 ForcedMovement_MatSpin(void);
static bool8 ForcedMovement_MuddySlope(void);
static void MovePlayerNotOnBike(u8, u16);
@@ -99,10 +99,10 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a);
static void sub_808C280(struct ObjectEvent *);
static void StartStrengthAnim(u8, u8);
-static void Task_BumpBoulder(u8 taskId);
-static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static void Task_PushBoulder(u8 taskId);
+static u8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static u8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static u8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
static void DoPlayerMatJump(void);
static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
@@ -182,8 +182,8 @@ static bool8 (*const sForcedMovementFuncs[])(void) =
ForcedMovement_SlideWest,
ForcedMovement_SlideEast,
ForcedMovement_PushedSouthByCurrent,
- ForcedMovement_0xBB,
- ForcedMovement_0xBC,
+ ForcedMovement_MatJump,
+ ForcedMovement_MatSpin,
ForcedMovement_MuddySlope,
};
@@ -211,16 +211,16 @@ static const u8 sAcroBikeTrickCollisionTypes[] = {
COLLISION_HORIZONTAL_RAIL,
};
-static void (*const gUnknown_084974B8[])(struct ObjectEvent *) =
+static void (*const sPlayerAvatarTransitionFuncs[])(struct ObjectEvent *) =
{
- PlayerAvatarTransition_Normal,
- PlayerAvatarTransition_MachBike,
- PlayerAvatarTransition_AcroBike,
- PlayerAvatarTransition_Surfing,
- PlayerAvatarTransition_Underwater,
- PlayerAvatarTransition_ReturnToField,
- PlayerAvatarTransition_Dummy,
- PlayerAvatarTransition_Dummy,
+ [PLAYER_AVATAR_STATE_NORMAL] = PlayerAvatarTransition_Normal,
+ [PLAYER_AVATAR_STATE_MACH_BIKE] = PlayerAvatarTransition_MachBike,
+ [PLAYER_AVATAR_STATE_ACRO_BIKE] = PlayerAvatarTransition_AcroBike,
+ [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 bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
@@ -259,23 +259,23 @@ static const u8 sFRLGAvatarGfxIds[] = {OBJ_EVENT_GFX_RED, OBJ_EVENT_GFX_LEAF};
static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GFX_LINK_RS_MAY};
-static const u8 gUnknown_0849750C[2][5][2] =
+static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] =
{
- //male
+ [MALE] =
{
- {OBJ_EVENT_GFX_BRENDAN_NORMAL, 1},
- {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, 2},
- {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, 4},
- {OBJ_EVENT_GFX_BRENDAN_SURFING, 8},
- {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, 16},
+ {OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
+ {OBJ_EVENT_GFX_BRENDAN_SURFING, PLAYER_AVATAR_FLAG_SURFING},
+ {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
},
- //female
+ [FEMALE] =
{
- {OBJ_EVENT_GFX_MAY_NORMAL, 1},
- {OBJ_EVENT_GFX_MAY_MACH_BIKE, 2},
- {OBJ_EVENT_GFX_MAY_ACRO_BIKE, 4},
- {OBJ_EVENT_GFX_MAY_SURFING, 8},
- {OBJ_EVENT_GFX_MAY_UNDERWATER, 16},
+ {OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_MAY_ACRO_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
+ {OBJ_EVENT_GFX_MAY_SURFING, PLAYER_AVATAR_FLAG_SURFING},
+ {OBJ_EVENT_GFX_MAY_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
}
};
@@ -287,11 +287,11 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of
MetatileBehavior_IsEastArrowWarp,
};
-static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) =
+static bool8 (*const sPushBoulderFuncs[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) =
{
- sub_808C3A4,
- do_boulder_dust,
- sub_808C484,
+ PushBoulder_Start,
+ PushBoulder_Move,
+ PushBoulder_End,
};
static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) =
@@ -547,13 +547,13 @@ static bool8 ForcedMovement_SlideEast(void)
return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2);
}
-static bool8 ForcedMovement_0xBB(void)
+static bool8 ForcedMovement_MatJump(void)
{
DoPlayerMatJump();
return TRUE;
}
-static bool8 ForcedMovement_0xBC(void)
+static bool8 ForcedMovement_MatSpin(void)
{
DoPlayerMatSpin();
return TRUE;
@@ -807,23 +807,23 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
{
- gPlayerAvatar.unk1 |= transitionFlags;
+ gPlayerAvatar.transitionFlags |= transitionFlags;
DoPlayerAvatarTransition();
}
static void DoPlayerAvatarTransition(void)
{
u8 i;
- u8 flags = gPlayerAvatar.unk1;
+ u8 flags = gPlayerAvatar.transitionFlags;
if (flags != 0)
{
- for (i = 0; i < 8; i++, flags >>= 1)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarTransitionFuncs); i++, flags >>= 1)
{
if (flags & 1)
- gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
+ sPlayerAvatarTransitionFuncs[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
}
- gPlayerAvatar.unk1 = 0;
+ gPlayerAvatar.transitionFlags = 0;
}
}
@@ -1186,12 +1186,12 @@ void sub_808BC90(s16 x, s16 y)
MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y);
}
-u8 TestPlayerAvatarFlags(u8 a)
+u8 TestPlayerAvatarFlags(u8 flag)
{
- return gPlayerAvatar.flags & a;
+ return gPlayerAvatar.flags & flag;
}
-u8 sub_808BCD0(void)
+u8 GetPlayerAvatarFlags(void)
{
return gPlayerAvatar.flags;
}
@@ -1335,32 +1335,32 @@ static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
{
u8 i;
- for (i = 0; i < 5; i++)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
- if (gUnknown_0849750C[gender][i][0] == graphicsId)
- return gUnknown_0849750C[gender][i][1];
+ if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId)
+ return sPlayerAvatarGfxToStateFlag[gender][i][1];
}
- return 1;
+ return PLAYER_AVATAR_FLAG_ON_FOOT;
}
u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
{
u8 i;
- u8 r5 = gPlayerAvatar.flags;
+ u8 flags = gPlayerAvatar.flags;
- for (i = 0; i < 5; i++)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
- if (gUnknown_0849750C[gPlayerAvatar.gender][i][1] & r5)
- return gUnknown_0849750C[gPlayerAvatar.gender][i][0];
+ if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & flags)
+ return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0];
}
return 0;
}
-void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
+void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 transitionFlag)
{
- u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
+ u8 stateFlag = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
- gPlayerAvatar.unk1 |= unk | b;
+ gPlayerAvatar.transitionFlags |= stateFlag | transitionFlag;
DoPlayerAvatarTransition();
}
@@ -1384,7 +1384,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
playerObjEventTemplate.flagId = 0;
objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate);
objectEvent = &gObjectEvents[objectEventId];
- objectEvent->isPlayer = 1;
+ objectEvent->isPlayer = TRUE;
objectEvent->warpArrowSpriteId = CreateWarpArrowSprite();
ObjectEventTurn(objectEvent, direction);
ClearPlayerAvatarInfo();
@@ -1453,22 +1453,22 @@ static void sub_808C280(struct ObjectEvent *objectEvent)
static void StartStrengthAnim(u8 a, u8 b)
{
- u8 taskId = CreateTask(Task_BumpBoulder, 0xFF);
+ u8 taskId = CreateTask(Task_PushBoulder, 0xFF);
gTasks[taskId].data[1] = a;
gTasks[taskId].data[2] = b;
- Task_BumpBoulder(taskId);
+ Task_PushBoulder(taskId);
}
-static void Task_BumpBoulder(u8 taskId)
+static void Task_PushBoulder(u8 taskId)
{
- while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId],
+ while (sPushBoulderFuncs[gTasks[taskId].data[0]](&gTasks[taskId],
&gObjectEvents[gPlayerAvatar.objectEventId],
&gObjectEvents[gTasks[taskId].data[1]]))
;
}
-static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE;
@@ -1476,7 +1476,7 @@ static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, st
return FALSE;
}
-static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
if (ObjectEventIsHeldMovementActive(playerObject))
{
@@ -1506,7 +1506,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject
return FALSE;
}
-static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
if (ObjectEventCheckHeldMovementStatus(playerObject)
&& ObjectEventCheckHeldMovementStatus(strengthObject))
@@ -1515,7 +1515,7 @@ static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, st
ObjectEventClearHeldMovementIfFinished(strengthObject);
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
- DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
+ DestroyTask(FindTaskIdByFunc(Task_PushBoulder));
}
return FALSE;
}
@@ -1545,7 +1545,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent
if (task->data[1] > 1)
{
gPlayerAvatar.preventStep = FALSE;
- gPlayerAvatar.unk1 |= 0x20;
+ gPlayerAvatar.transitionFlags |= PLAYER_AVATAR_FLAG_5;
DestroyTask(FindTaskIdByFunc(DoPlayerAvatarSecretBaseMatJump));
}
}
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 60d1ea072..def86ab1b 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -1260,7 +1260,7 @@ static void Task_WateringBerryTreeAnim_2(u8 taskId)
static void Task_WateringBerryTreeAnim_3(u8 taskId)
{
- SetPlayerAvatarTransitionFlags(sub_808BCD0());
+ SetPlayerAvatarTransitionFlags(GetPlayerAvatarFlags());
DestroyTask(taskId);
EnableBothScriptContexts();
}
diff --git a/src/item_use.c b/src/item_use.c
index 954d4b26f..73d6f6ffe 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -221,9 +221,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
static void ItemUseOnFieldCB_Bike(u8 taskId)
{
if (!ItemId_GetSecondaryId(gSpecialVar_ItemId))
- GetOnOffBike(2);
+ GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE);
else
- GetOnOffBike(4);
+ GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
ScriptUnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 15:56:00 +0000