dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve off-by-one error in evobjmv.c

Browse Source
This commit is contained in:
PikalaxALT
2020-03-26 17:37:14 -04:00
parent b0878acc98
commit 9130579f14
5 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/event_object_movement.h
+3 -3
View File
@@ -119,8 +119,8 @@ bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
void ShiftStillObjectEventCoords(struct ObjectEvent *); void ShiftStillObjectEventCoords(struct ObjectEvent *);
void OverrideMovementTypeForObjectEvent(const struct ObjectEvent *, u8); void OverrideMovementTypeForObjectEvent(const struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8); void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 GetFishingNoCatchDirectionAnimNum(u8 direction); u8 GetFishingDirectionAnimNum(u8 direction);
u8 GetFishingBiteDirectionAnimNum(u8 a0); u8 GetFishingNoCatchDirectionAnimNum(u8 a0);
void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1); void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16); u8 sub_805EB44(u8, u8, s16, s16);
void InitObjectEventPalettes(u8 mode); void InitObjectEventPalettes(u8 mode);
@@ -220,6 +220,6 @@ u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction);
u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction);
u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction); u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction);
u8 sub_80641EC(u32 direction); u8 sub_80641EC(u32 direction);
u8 sub_8063510(u8 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction);
#endif // GUARD_EVENT_OBJECT_MOVEMENT_H #endif // GUARD_EVENT_OBJECT_MOVEMENT_H
include/field_player_avatar.h
+1
View File
@@ -13,6 +13,7 @@ u8 GetPlayerMovementDirection(void);
u8 PlayerGetCopyableMovement(void); u8 PlayerGetCopyableMovement(void);
void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite);
void sub_805C270(void); void sub_805C270(void);
void sub_805C780(void); void sub_805C780(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
src/event_object_movement.c
+22 -26
View File
@@ -153,8 +153,6 @@ static void sub_80632BC(struct Sprite *);
static void sub_80632E0(struct Sprite *); static void sub_80632E0(struct Sprite *);
static void MovementType_WanderAroundDuplicate(struct Sprite *); static void MovementType_WanderAroundDuplicate(struct Sprite *);
extern void MovementType_Player(struct Sprite *);
#define movement_type_def(setup, table) \ #define movement_type_def(setup, table) \
static u8 setup##_callback(struct ObjectEvent *, struct Sprite *); \ static u8 setup##_callback(struct ObjectEvent *, struct Sprite *); \
void setup(struct Sprite *sprite) \ void setup(struct Sprite *sprite) \
@@ -806,7 +804,7 @@ const u8 gAcroEndWheelieDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1D, [DIR_NORTHEAST] = 0x1D,
}; };
const u8 gAcroUnusedActionDirectionAnimNums[] = { const u8 gUnknown_83A6465[] = {
[DIR_NONE] = 0x18, [DIR_NONE] = 0x18,
[DIR_SOUTH] = 0x18, [DIR_SOUTH] = 0x18,
[DIR_NORTH] = 0x19, [DIR_NORTH] = 0x19,
@@ -818,7 +816,7 @@ const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1B, [DIR_NORTHEAST] = 0x1B,
}; };
const u8 gAcroWheeliePedalDirectionAnimNums[] = { const u8 gAcroUnusedActionDirectionAnimNums[] = {
[DIR_NONE] = 0x20, [DIR_NONE] = 0x20,
[DIR_SOUTH] = 0x20, [DIR_SOUTH] = 0x20,
[DIR_NORTH] = 0x21, [DIR_NORTH] = 0x21,
@@ -830,7 +828,7 @@ const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x21, [DIR_NORTHEAST] = 0x21,
}; };
const u8 gFishingDirectionAnimNums[] = { const u8 gAcroWheeliePedalDirectionAnimNums[] = {
[DIR_NONE] = 0x24, [DIR_NONE] = 0x24,
[DIR_SOUTH] = 0x24, [DIR_SOUTH] = 0x24,
[DIR_NORTH] = 0x25, [DIR_NORTH] = 0x25,
@@ -842,7 +840,7 @@ const u8 gFishingDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x25, [DIR_NORTHEAST] = 0x25,
}; };
const u8 gFishingNoCatchDirectionAnimNums[] = { const u8 gFishingDirectionAnimNums[] = {
[DIR_NONE] = 0x0, [DIR_NONE] = 0x0,
[DIR_SOUTH] = 0x0, [DIR_SOUTH] = 0x0,
[DIR_NORTH] = 0x1, [DIR_NORTH] = 0x1,
@@ -854,7 +852,7 @@ const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x1, [DIR_NORTHEAST] = 0x1,
}; };
const u8 gFishingBiteDirectionAnimNums[] = { const u8 gFishingNoCatchDirectionAnimNums[] = {
[DIR_NONE] = 0x4, [DIR_NONE] = 0x4,
[DIR_SOUTH] = 0x4, [DIR_SOUTH] = 0x4,
[DIR_NORTH] = 0x5, [DIR_NORTH] = 0x5,
@@ -866,7 +864,7 @@ const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NORTHEAST] = 0x5, [DIR_NORTHEAST] = 0x5,
}; };
const u8 gUnknown_83A648A[] = { const u8 gFishingBiteDirectionAnimNums[] = {
[DIR_NONE] = 0x8, [DIR_NONE] = 0x8,
[DIR_SOUTH] = 0x8, [DIR_SOUTH] = 0x8,
[DIR_NORTH] = 0x9, [DIR_NORTH] = 0x9,
@@ -4917,8 +4915,6 @@ static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Spr
sprite->data[1] = 0; sprite->data[1] = 0;
} }
// Off by one error
u8 GetFaceDirectionAnimNum(u8 direction) u8 GetFaceDirectionAnimNum(u8 direction)
{ {
return gFaceDirectionAnimNums[direction]; return gFaceDirectionAnimNums[direction];
@@ -4964,6 +4960,11 @@ u8 GetAcroEndWheelieDirectionAnimNum(u8 direction)
return gAcroEndWheelieDirectionAnimNums[direction]; return gAcroEndWheelieDirectionAnimNums[direction];
} }
u8 sub_80634C0(u8 direction)
{
return gUnknown_83A6465[direction];
}
u8 GetAcroUnusedActionDirectionAnimNum(u8 direction) u8 GetAcroUnusedActionDirectionAnimNum(u8 direction)
{ {
return gAcroUnusedActionDirectionAnimNums[direction]; return gAcroUnusedActionDirectionAnimNums[direction];
@@ -4989,11 +4990,6 @@ u8 GetFishingBiteDirectionAnimNum(u8 direction)
return gFishingBiteDirectionAnimNums[direction]; return gFishingBiteDirectionAnimNums[direction];
} }
u8 sub_8063510(u8 direction)
{
return gUnknown_83A648A[direction];
}
u8 GetRunningDirectionAnimNum(u8 direction) u8 GetRunningDirectionAnimNum(u8 direction)
{ {
return gRunningDirectionAnimNums[direction]; return gRunningDirectionAnimNums[direction];
@@ -7539,7 +7535,7 @@ void sub_8066C70(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 dire
{ {
SetObjectEventDirection(objectEvent, direction); SetObjectEventDirection(objectEvent, direction);
ShiftStillObjectEventCoords(objectEvent); ShiftStillObjectEventCoords(objectEvent);
obj_npc_animation_step(objectEvent, sprite, GetFishingDirectionAnimNum(direction)); obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction));
sprite->animPaused = TRUE; sprite->animPaused = TRUE;
sprite->data[2] = 1; sprite->data[2] = 1;
} }
@@ -7618,25 +7614,25 @@ static bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *ob
static bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) 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; return FALSE;
} }
static bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) 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; return FALSE;
} }
static bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) 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; return FALSE;
} }
static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) 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; return FALSE;
} }
@@ -7853,25 +7849,25 @@ static bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objec
static bool8 MovementActionFunc_x88_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) 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); return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
} }
static bool8 MovementActionFunc_x89_0(struct ObjectEvent *objectEvent, struct Sprite *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); return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
} }
static bool8 MovementActionFunc_x8A_0(struct ObjectEvent *objectEvent, struct Sprite *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); return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
} }
static bool8 MovementActionFunc_x8B_0(struct ObjectEvent *objectEvent, struct Sprite *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); return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
} }
@@ -7949,7 +7945,7 @@ static bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *ob
void sub_806751C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) void sub_806751C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{ {
npc_apply_direction(objectEvent, sprite, direction, 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) static bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
@@ -8019,7 +8015,7 @@ static bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objec
void sub_806764C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) void sub_806764C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed)
{ {
npc_apply_direction(objectEvent, sprite, direction, 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); SeekSpriteAnim(sprite, 0);
} }
src/field_player_avatar.c
+3 -3
View File
@@ -1785,7 +1785,7 @@ static bool8 Fishing6(struct Task *task)
} }
else else
{ {
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_8063510(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
} }
return TRUE; return TRUE;
} }
@@ -1887,7 +1887,7 @@ static bool8 Fishing11(struct Task *task)
static bool8 Fishing12(struct Task *task) static bool8 Fishing12(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
task->tStep = FISHING_SHOW_RESULT; task->tStep = FISHING_SHOW_RESULT;
@@ -1898,7 +1898,7 @@ static bool8 Fishing12(struct Task *task)
static bool8 Fishing13(struct Task *task) static bool8 Fishing13(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
task->tStep++; task->tStep++;
return TRUE; return TRUE;
src/quest_log_player.c
+3 -3
View File
@@ -87,7 +87,7 @@ static void sub_8150530(void)
else else
{ {
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4)); sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection)); StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
} }
} }
@@ -102,7 +102,7 @@ static void sub_81505C4(u8 taskId)
ObjectEventClearHeldMovementIfActive(objectEvent); ObjectEventClearHeldMovementIfActive(objectEvent);
objectEvent->enableAnim = TRUE; objectEvent->enableAnim = TRUE;
sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4)); sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(objectEvent->facingDirection)); StartSpriteAnim(sprite, GetFishingDirectionAnimNum(objectEvent->facingDirection));
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
break; break;
@@ -114,7 +114,7 @@ static void sub_81505C4(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 2: case 2:
StartSpriteAnim(sprite, GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(sprite, GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 3: case 3: