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

Prelim names for mvmt actions; merge field_ground_effect into evobjmv

Browse Source
This commit is contained in:
PikalaxALT
2020-02-21 13:41:18 -05:00
parent 14a599bbc2
commit 69d8833b31
21 changed files with 3935 additions and 3933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_setup.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include "strings.h"
#include "string_util.h"
#include "event_data.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "metatile_behavior.h"
#include "event_scripts.h"
#include "fldeff.h"
src/event_object_80688E4.c
+2 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_movement.h"
#include "field_effect.h"
#include "field_ground_effect.h"
@@ -204,6 +204,7 @@ void sub_8068BBC(struct Sprite *sprite, u8 direction)
sprite->tStepNo = 0;
}
// used by an_walk_any_2
bool8 sub_8068BCC(struct Sprite *sprite)
{
if (!(sprite->tDelay & 1))
src/event_object_lock.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "field_player_avatar.h"
#include "event_object_movement.h"
#include "script_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_data.h"
#include "event_object_lock.h"
src/field_fadetransition.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include "metatile_behavior.h"
#include "quest_log.h"
#include "link.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
src/item_menu.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "berry_pouch.h"
#include "decompress.h"
#include "event_scripts.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "graphics.h"
#include "help_system.h"
src/item_use.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "mail.h"
#include "main.h"
#include "malloc.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "new_menu_helpers.h"
src/quest_log.c
+1 -1
View File
@@ -18,7 +18,7 @@
#include "field_fadetransition.h"
#include "field_weather.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
src/rfu_union_tool.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_8097404.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
src/start_menu.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "field_fadetransition.h"
#include "field_player_avatar.h"
#include "new_menu_helpers.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
src/trainer_see.c
+11 -11
View File
@@ -12,8 +12,8 @@
#include "constants/event_objects.h"
#include "constants/object_events.h"
typedef u8 (*trainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
typedef bool8 (*trainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
typedef u8 (*TrainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
typedef bool8 (*TrainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
static bool8 CheckTrainer(u8 trainerObjId);
static u8 GetTrainerApproachDistance(struct ObjectEvent * trainerObj);
@@ -50,7 +50,7 @@ static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/object_events/emoticons
// x and y are the player's coordinates
// Returns distance to walk if trainer has unobstructed view of player
// Returns 0 if trainer can't see player
static const trainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
static const TrainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
GetTrainerApproachDistanceSouth,
GetTrainerApproachDistanceNorth,
GetTrainerApproachDistanceWest,
@@ -60,7 +60,7 @@ static const trainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
// bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
// Returns TRUE to run the next func immediately
// Returns FALSE to delay the next func to the next frame
static const trainerSeeFunc sTrainerSeeFuncList[] = {
static const TrainerSeeFunc sTrainerSeeFuncList[] = {
TrainerSeeFunc_Dummy,
TrainerSeeFunc_StartExclMark,
TrainerSeeFunc_WaitExclMark,
@@ -78,7 +78,7 @@ static const trainerSeeFunc sTrainerSeeFuncList[] = {
TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown
};
static const trainerSeeFunc sTrainerSeeFuncList2[] = {
static const TrainerSeeFunc sTrainerSeeFuncList2[] = {
TrainerSeeFunc_TrainerInAshFacesPlayer,
TrainerSeeFunc_BeginJumpOutOfAsh,
TrainerSeeFunc_WaitJumpOutOfAsh,
@@ -299,7 +299,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct
else
{
ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
action = GetFaceDirectionMovementAction(trainerObj->facingDirection);
ObjectEventSetHeldMovement(trainerObj, action);
task->tFuncId++;
@@ -309,7 +309,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct
static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
{
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
{
return FALSE;
}
@@ -475,7 +475,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru
else
{
ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
task->tData5 = 0;
task->tFuncId++;
}
@@ -487,7 +487,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st
u8 specialObjectId;
TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
return FALSE;
if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId]))
@@ -661,7 +661,7 @@ u8 FldEff_ExclamationMarkIcon1(void)
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Emoticons, 0, 0, 0x53);
if (spriteId != MAX_SPRITES)
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0);
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0);
return 0;
}
@@ -701,7 +701,7 @@ u8 FldEff_QuestionMarkIcon(void)
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Emoticons, 0, 0, 0x52);
if (spriteId != MAX_SPRITES)
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 4);
SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 4);
return 0;
}
src/vs_seeker.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "random.h"
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_8097404.h"
#include "vs_seeker.h"
#include "constants/movement_commands.h"