dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize Event Object to Object Event

Browse Source
This commit is contained in:
GriffinR
2019-11-20 22:55:44 -05:00
parent 215bb31d67
commit ec3e86f1d2
606 changed files with 10080 additions and 10080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+1 -1
View File
@@ -765,7 +765,7 @@
.2byte \y .2byte \y
.endm .endm
@ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. @ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
.macro copyobjectxytoperm index:req .macro copyobjectxytoperm index:req
.byte 0x64 .byte 0x64
.2byte \index .2byte \index
common_syms/field_control_avatar.txt
+1 -1
View File
@@ -1 +1 @@
gSelectedEventObject gSelectedObjectEvent
data/maps/ContestHall/scripts.inc
+1 -1
View File
@@ -79,7 +79,7 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834
call ContestHall_EventScript_CreateAudience call ContestHall_EventScript_CreateAudience
end end
@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist) @ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist)
@ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
call ContestHall_EventScript_GetRandomAudienceGfxId call ContestHall_EventScript_GetRandomAudienceGfxId
data/scripts/berry_blender.inc
+1 -1
View File
@@ -682,7 +682,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
specialvar VAR_RESULT, GetLinkPartnerNames specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special SpawnLinkPartnerEventObject special SpawnLinkPartnerObjectEvent
goto BerryBlender_EventScript_LinkPlayersArrived goto BerryBlender_EventScript_LinkPlayersArrived
end end
data/scripts/berry_tree.inc
+16 -16
View File
@@ -1,5 +1,5 @@
BerryTreeScript:: @ 82742F9 BerryTreeScript:: @ 82742F9
special EventObjectInteractionGetBerryTreeData special ObjectEventInteractionGetBerryTreeData
switch VAR_0x8004 switch VAR_0x8004
case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling
case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil
@@ -54,7 +54,7 @@ BerryTree_EventScript_CancelPlanting:: @ 82743AF
BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
lockall lockall
special EventObjectInteractionGetBerryCountString special ObjectEventInteractionGetBerryCountString
message BerryTree_Text_BerryGrowthStage1 message BerryTree_Text_BerryGrowthStage1
waitmessage waitmessage
waitbuttonpress waitbuttonpress
@@ -62,7 +62,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
lockall lockall
special EventObjectInteractionGetBerryName special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage2 message BerryTree_Text_BerryGrowthStage2
waitmessage waitmessage
waitbuttonpress waitbuttonpress
@@ -70,7 +70,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
lockall lockall
special EventObjectInteractionGetBerryName special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage3 message BerryTree_Text_BerryGrowthStage3
waitmessage waitmessage
waitbuttonpress waitbuttonpress
@@ -79,14 +79,14 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
call BerryTree_EventScript_GetCareAdverb call BerryTree_EventScript_GetCareAdverb
lockall lockall
special EventObjectInteractionGetBerryName special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage4 message BerryTree_Text_BerryGrowthStage4
waitmessage waitmessage
waitbuttonpress waitbuttonpress
goto BerryTree_EventScript_WantToWater goto BerryTree_EventScript_WantToWater
@ VAR_0x8005 here is the number of times watered @ VAR_0x8005 here is the number of times watered
@ Buffered by EventObjectInteractionGetBerryTreeData @ Buffered by ObjectEventInteractionGetBerryTreeData
BerryTree_EventScript_GetCareAdverb:: @ 82743F6 BerryTree_EventScript_GetCareAdverb:: @ 82743F6
compare VAR_0x8005, 0 compare VAR_0x8005, 0
goto_if_eq BerryTree_EventScript_SetAdverbPoor goto_if_eq BerryTree_EventScript_SetAdverbPoor
@@ -108,7 +108,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
buffernumberstring 1, VAR_0x8006 buffernumberstring 1, VAR_0x8006
lock lock
faceplayer faceplayer
special EventObjectInteractionGetBerryCountString special ObjectEventInteractionGetBerryCountString
msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_PickBerry goto_if_eq BerryTree_EventScript_PickBerry
@@ -116,11 +116,11 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
goto_if_eq BerryTree_EventScript_CancelPickingBerry goto_if_eq BerryTree_EventScript_CancelPickingBerry
BerryTree_EventScript_PickBerry:: @ 8274448 BerryTree_EventScript_PickBerry:: @ 8274448
special EventObjectInteractionPickBerryTree special ObjectEventInteractionPickBerryTree
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq BerryTree_EventScript_BerryPocketFull goto_if_eq BerryTree_EventScript_BerryPocketFull
special IncrementDailyPickedBerries special IncrementDailyPickedBerries
special EventObjectInteractionRemoveBerryTree special ObjectEventInteractionRemoveBerryTree
message BerryTree_Text_PickedTheBerry message BerryTree_Text_PickedTheBerry
playfanfare MUS_ME_KINOMI playfanfare MUS_ME_KINOMI
waitmessage waitmessage
@@ -148,7 +148,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479
BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482
lockall lockall
special EventObjectInteractionGetBerryTreeData special ObjectEventInteractionGetBerryTreeData
call BerryTree_EventScript_PlantBerry call BerryTree_EventScript_PlantBerry
releaseall releaseall
end end
@@ -157,7 +157,7 @@ BerryTree_EventScript_WantToWater:: @ 827448D
checkitem ITEM_WAILMER_PAIL, 1 checkitem ITEM_WAILMER_PAIL, 1
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BerryTree_EventScript_DontWater goto_if_eq BerryTree_EventScript_DontWater
special EventObjectInteractionGetBerryName special ObjectEventInteractionGetBerryName
msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_WaterBerry goto_if_eq BerryTree_EventScript_WaterBerry
@@ -169,13 +169,13 @@ BerryTree_EventScript_DontWater:: @ 82744BE
end end
BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0
special EventObjectInteractionGetBerryTreeData special ObjectEventInteractionGetBerryTreeData
lockall lockall
BerryTree_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_WaterBerry:: @ 82744C4
special EventObjectInteractionGetBerryName special ObjectEventInteractionGetBerryName
message BerryTree_Text_WateredTheBerry message BerryTree_Text_WateredTheBerry
waitmessage waitmessage
special EventObjectInteractionWaterBerryTree special ObjectEventInteractionWaterBerryTree
special DoWateringBerryTreeAnim special DoWateringBerryTreeAnim
waitstate waitstate
message BerryTree_Text_PlantIsDelighted message BerryTree_Text_PlantIsDelighted
@@ -185,10 +185,10 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4
end end
BerryTree_EventScript_PlantBerry:: @ 82744DD BerryTree_EventScript_PlantBerry:: @ 82744DD
special EventObjectInteractionPlantBerryTree special ObjectEventInteractionPlantBerryTree
incrementgamestat GAME_STAT_PLANTED_BERRIES incrementgamestat GAME_STAT_PLANTED_BERRIES
special IncrementDailyPlantedBerries special IncrementDailyPlantedBerries
special EventObjectInteractionGetBerryCountString special ObjectEventInteractionGetBerryCountString
message BerryTree_Text_PlantedOneBerry message BerryTree_Text_PlantedOneBerry
waitmessage waitmessage
waitbuttonpress waitbuttonpress
data/scripts/contest_hall.inc
+1 -1
View File
@@ -490,7 +490,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
@ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience @ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience
@ The number of hearts to try to display is based on the condition of the presented pokemon and the rank @ The number of hearts to try to display is based on the condition of the presented pokemon and the rank
@ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart @ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart
@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects @ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events
@ and are set to 9 if they havent displayed a heart yet, and 1 if they have @ and are set to 9 if they havent displayed a heart yet, and 1 if they have
ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
special GetContestMonCondition special GetContestMonCondition
data/scripts/gabby_and_ty.inc
+2 -2
View File
@@ -210,7 +210,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
special GabbyAndTyBeforeInterview special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds special GabbyAndTySetScriptVarsToObjectEventLocalIds
compare VAR_FACING, DIR_NORTH compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH compare VAR_FACING, DIR_SOUTH
@@ -241,7 +241,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
special GabbyAndTyBeforeInterview special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds special GabbyAndTySetScriptVarsToObjectEventLocalIds
compare VAR_FACING, DIR_NORTH compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH compare VAR_FACING, DIR_SOUTH
data/specials.inc
+10 -10
View File
@@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64
def_special sub_80B3254 def_special sub_80B3254
def_special TryBerryBlenderLinkup def_special TryBerryBlenderLinkup
def_special GetLinkPartnerNames def_special GetLinkPartnerNames
def_special SpawnLinkPartnerEventObject def_special SpawnLinkPartnerObjectEvent
def_special SavePlayerParty def_special SavePlayerParty
def_special LoadPlayerParty def_special LoadPlayerParty
def_special ChooseHalfPartyForBattle def_special ChooseHalfPartyForBattle
def_special Script_ShowLinkTrainerCard def_special Script_ShowLinkTrainerCard
def_special EventObjectInteractionGetBerryTreeData def_special ObjectEventInteractionGetBerryTreeData
def_special EventObjectInteractionGetBerryName def_special ObjectEventInteractionGetBerryName
def_special EventObjectInteractionGetBerryCountString def_special ObjectEventInteractionGetBerryCountString
def_special Bag_ChooseBerry def_special Bag_ChooseBerry
def_special EventObjectInteractionPlantBerryTree def_special ObjectEventInteractionPlantBerryTree
def_special EventObjectInteractionPickBerryTree def_special ObjectEventInteractionPickBerryTree
def_special EventObjectInteractionRemoveBerryTree def_special ObjectEventInteractionRemoveBerryTree
def_special EventObjectInteractionWaterBerryTree def_special ObjectEventInteractionWaterBerryTree
def_special PlayerHasBerries def_special PlayerHasBerries
def_special IsEnigmaBerryValid def_special IsEnigmaBerryValid
def_special GetTrainerBattleMode def_special GetTrainerBattleMode
@@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64
def_special IsTVShowInSearchOfTrainersAiring def_special IsTVShowInSearchOfTrainersAiring
def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastQuote
def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special GabbyAndTySetScriptVarsToObjectEventLocalIds
def_special GetBattleOutcome def_special GetBattleOutcome
def_special GetDaycareMonNicknames def_special GetDaycareMonNicknames
def_special GetDaycareState def_special GetDaycareState
@@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64
def_special ScriptGetMultiplayerId def_special ScriptGetMultiplayerId
def_special ScriptGetPartyMonSpecies def_special ScriptGetPartyMonSpecies
def_special IsSelectedMonEgg def_special IsSelectedMonEgg
def_special TryInitBattleTowerAwardManEventObject def_special TryInitBattleTowerAwardManObjectEvent
def_special MoveOutOfSecretBaseFromOutside def_special MoveOutOfSecretBaseFromOutside
def_special LoadPlayerBag def_special LoadPlayerBag
def_special Script_FadeOutMapMusic def_special Script_FadeOutMapMusic
include/battle_pyramid.h
+3 -3
View File
@@ -16,9 +16,9 @@ void CopyPyramidTrainerWinSpeech(u16 trainerId);
void CopyPyramidTrainerLoseSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId);
u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId);
void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition);
void LoadBattlePyramidEventObjectTemplates(void); void LoadBattlePyramidObjectEventTemplates(void);
void LoadBattlePyramidFloorEventObjectScripts(void); void LoadBattlePyramidFloorObjectEventScripts(void);
u8 GetNumBattlePyramidEventObjects(void); u8 GetNumBattlePyramidObjectEvents(void);
u16 GetBattlePyramidPickupItemId(void); u16 GetBattlePyramidPickupItemId(void);
#endif // GUARD_BATTLE_PYRAMID_H #endif // GUARD_BATTLE_PYRAMID_H
include/berry.h
+5 -5
View File
@@ -6,7 +6,7 @@ void SetEnigmaBerry(u8 *src);
bool32 IsEnigmaBerryValid(void); bool32 IsEnigmaBerryValid(void);
const struct Berry *GetBerryInfo(u8 berry); const struct Berry *GetBerryInfo(u8 berry);
struct BerryTree *GetBerryTreeInfo(u8 id); struct BerryTree *GetBerryTreeInfo(u8 id);
bool32 EventObjectInteractionWaterBerryTree(void); bool32 ObjectEventInteractionWaterBerryTree(void);
bool8 IsPlayerFacingEmptyBerryTreePatch(void); bool8 IsPlayerFacingEmptyBerryTreePatch(void);
bool8 TryToWaterBerryTree(void); bool8 TryToWaterBerryTree(void);
void ClearBerryTrees(void); void ClearBerryTrees(void);
@@ -19,10 +19,10 @@ u8 ItemIdToBerryType(u16 item);
void GetBerryNameByBerryType(u8 berry, u8 *string); void GetBerryNameByBerryType(u8 berry, u8 *string);
void ResetBerryTreeSparkleFlag(u8 id); void ResetBerryTreeSparkleFlag(u8 id);
void Bag_ChooseBerry(void); void Bag_ChooseBerry(void);
void EventObjectInteractionGetBerryTreeData(void); void ObjectEventInteractionGetBerryTreeData(void);
void EventObjectInteractionPlantBerryTree(void); void ObjectEventInteractionPlantBerryTree(void);
void EventObjectInteractionPickBerryTree(void); void ObjectEventInteractionPickBerryTree(void);
void EventObjectInteractionRemoveBerryTree(void); void ObjectEventInteractionRemoveBerryTree(void);
bool8 PlayerHasBerries(void); bool8 PlayerHasBerries(void);
void ResetBerryTreeSparkleFlags(void); void ResetBerryTreeSparkleFlags(void);
include/constants/vars.h
+1 -1
View File
@@ -25,7 +25,7 @@
// object gfx id vars // object gfx id vars
// These 0x10 vars are used to dynamically control a map object's sprite. // These 0x10 vars are used to dynamically control a map object's sprite.
// For example, the rival's sprite id is dynamically set based on the player's gender. // For example, the rival's sprite id is dynamically set based on the player's gender.
// See VarGetEventObjectGraphicsId(). // See VarGetObjectEventGraphicsId().
#define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_0 0x4010
#define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_1 0x4011
#define VAR_OBJ_GFX_ID_2 0x4012 #define VAR_OBJ_GFX_ID_2 0x4012
include/event_data.h
+1 -1
View File
@@ -24,7 +24,7 @@ bool32 CanResetRTC(void);
u16 *GetVarPointer(u16 id); u16 *GetVarPointer(u16 id);
u16 VarGet(u16 id); u16 VarGet(u16 id);
bool8 VarSet(u16 id, u16 value); bool8 VarSet(u16 id, u16 value);
u8 VarGetEventObjectGraphicsId(u8 id); u8 VarGetObjectEventGraphicsId(u8 id);
u8 *GetFlagPointer(u16 id); u8 *GetFlagPointer(u16 id);
u8 FlagSet(u16 id); u8 FlagSet(u16 id);
u8 FlagClear(u16 id); u8 FlagClear(u16 id);
include/event_obj_lock.h
+3 -3
View File
@@ -2,12 +2,12 @@
#define GUARD_EVENT_OBJ_LOCK_H #define GUARD_EVENT_OBJ_LOCK_H
bool8 sub_80983C4(void); bool8 sub_80983C4(void);
void ScriptFreezeEventObjects(void); void ScriptFreezeObjectEvents(void);
bool8 sub_809847C(void); bool8 sub_809847C(void);
void LockSelectedEventObject(void); void LockSelectedObjectEvent(void);
void sub_8098630(void); void sub_8098630(void);
bool8 sub_8098734(void); bool8 sub_8098734(void);
void ScriptUnfreezeEventObjects(void); void ScriptUnfreezeObjectEvents(void);
void sub_8098524(void); void sub_8098524(void);
#endif // GUARD_EVENT_OBJ_LOCK_H #endif // GUARD_EVENT_OBJ_LOCK_H
include/event_object_movement.h
+204 -204
View File
@@ -52,80 +52,80 @@ struct PairedPalettes
const u16 *data; const u16 *data;
}; };
struct LockedAnimEventObjects struct LockedAnimObjectEvents
{ {
u8 eventObjectIds[EVENT_OBJECTS_COUNT]; u8 objectEventIds[EVENT_OBJECTS_COUNT];
u8 count; u8 count;
}; };
extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[];
extern const struct OamData gEventObjectBaseOam_32x8; extern const struct OamData gObjectEventBaseOam_32x8;
extern const struct OamData gEventObjectBaseOam_32x32; extern const struct OamData gObjectEventBaseOam_32x32;
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern const u8 gReflectionEffectPaletteMap[]; extern const u8 gReflectionEffectPaletteMap[];
extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[];
extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];
extern const u8 *const gBerryTreePaletteSlotTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[];
void ResetEventObjects(void); void ResetObjectEvents(void);
u8 GetMoveDirectionAnimNum(u8); u8 GetMoveDirectionAnimNum(u8);
u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8);
bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *);
u8 GetEventObjectIdByXY(s16, s16); u8 GetObjectEventIdByXY(s16, s16);
void SetEventObjectDirection(struct EventObject *, u8); void SetObjectEventDirection(struct ObjectEvent *, u8);
u8 GetFirstInactiveEventObjectId(void); u8 GetFirstInactiveObjectEventId(void);
void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); void RemoveObjectEventByLocalIdAndMap(u8, u8, u8);
void LoadPlayerObjectReflectionPalette(u16, u8); void LoadPlayerObjectReflectionPalette(u16, u8);
void LoadSpecialObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8);
void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
void PatchObjectPalette(u16, u8); void PatchObjectPalette(u16, u8);
void sub_808E16C(s16, s16); void sub_808E16C(s16, s16);
void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
void sub_8092FF0(s16, s16, s16 *, s16 *); void sub_8092FF0(s16, s16, s16 *, s16 *);
u8 GetFaceDirectionAnimNum(u8); u8 GetFaceDirectionAnimNum(u8);
void sub_80930E0(s16 *, s16 *, s16, s16); void sub_80930E0(s16 *, s16 *, s16, s16);
void EventObjectClearHeldMovement(struct EventObject *); void ObjectEventClearHeldMovement(struct ObjectEvent *);
void EventObjectClearHeldMovementIfActive(struct EventObject *); void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *);
void TrySpawnEventObjects(s16, s16); void TrySpawnObjectEvents(s16, s16);
u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction);
u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 AddPseudoObjectEvent(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority);
u8 TrySpawnEventObject(u8, u8, u8); u8 TrySpawnObjectEvent(u8, u8, u8);
u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z);
u8 SpawnSpecialEventObject(struct EventObjectTemplate *); u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void); void CameraObjectReset1(void);
void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); void ObjectEventSetGraphicsId(struct ObjectEvent *, u8 graphicsId);
void EventObjectTurn(struct EventObject *, u8); void ObjectEventTurn(struct ObjectEvent *, u8);
void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId); const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void FreeAndReserveObjectSpritePalettes(void); void FreeAndReserveObjectSpritePalettes(void);
void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E82C(u8, u8, u8, s16, s16);
void sub_808E7E4(u8, u8, u8); void sub_808E7E4(u8, u8, u8);
void sub_808E78C(u8, u8, u8, u8); void sub_808E78C(u8, u8, u8, u8);
void sub_808E75C(s16, s16); void sub_808E75C(s16, s16);
void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
void ShiftEventObjectCoords(struct EventObject *, s16, s16); void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16);
void MoveEventObjectToMapCoords(struct EventObject *, s16, s16); void MoveObjectEventToMapCoords(struct ObjectEvent *, s16, s16);
void TryOverrideEventObjectTemplateCoords(u8, u8, u8); void TryOverrideObjectEventTemplateCoords(u8, u8, u8);
void InitEventObjectPalettes(u8 palSlot); void InitObjectEventPalettes(u8 palSlot);
void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *));
u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8);
u8 GetOppositeDirection(u8); u8 GetOppositeDirection(u8);
u8 GetWalkInPlaceFastestMovementAction(u32); u8 GetWalkInPlaceFastestMovementAction(u32);
u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32);
u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32);
u8 GetWalkInPlaceSlowMovementAction(u32); u8 GetWalkInPlaceSlowMovementAction(u32);
u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *); void MoveCoords(u8, s16 *, s16 *);
bool8 EventObjectIsHeldMovementActive(struct EventObject *); bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *);
u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType); void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType);
u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction);
const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction); u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction);
u8 GetFaceDirectionMovementAction(u32); u8 GetFaceDirectionMovementAction(u32);
u8 GetWalkNormalMovementAction(u32); u8 GetWalkNormalMovementAction(u32);
u8 GetWalkFastMovementAction(u32); u8 GetWalkFastMovementAction(u32);
@@ -148,56 +148,56 @@ u8 GetFishingDirectionAnimNum(u8 direction);
u8 GetAcroWheelieDirectionAnimNum(u8 direction); u8 GetAcroWheelieDirectionAnimNum(u8 direction);
u8 GetFishingBiteDirectionAnimNum(u8 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction);
u8 GetFishingNoCatchDirectionAnimNum(u8 direction); u8 GetFishingNoCatchDirectionAnimNum(u8 direction);
bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 specialAnimId);
void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId); void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId);
bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent);
u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent);
void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType);
void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent);
void ShiftStillEventObjectCoords(struct EventObject *pObject); void ShiftStillObjectEventCoords(struct ObjectEvent *pObject);
void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
u8 AddCameraObject(u8 linkedSpriteId); u8 AddCameraObject(u8 linkedSpriteId);
void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); void UpdateObjectEventsForCameraUpdate(s16 x, s16 y);
u8 GetWalkSlowMovementAction(u32); u8 GetWalkSlowMovementAction(u32);
u8 GetJumpMovementAction(u32); u8 GetJumpMovementAction(u32);
bool8 AreZCoordsCompatible(u8, u8); bool8 AreZCoordsCompatible(u8, u8);
u8 ZCoordToPriority(u8); u8 ZCoordToPriority(u8);
void EventObjectUpdateZCoord(struct EventObject *pObject); void ObjectEventUpdateZCoord(struct ObjectEvent *pObject);
void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
bool8 IsZCoordMismatchAt(u8, s16, s16); bool8 IsZCoordMismatchAt(u8, s16, s16);
void UnfreezeEventObject(struct EventObject *); void UnfreezeObjectEvent(struct ObjectEvent *);
u8 FindLockedEventObjectIndex(struct EventObject *); u8 FindLockedObjectEventIndex(struct ObjectEvent *);
bool8 obj_npc_ministep(struct Sprite *sprite); bool8 obj_npc_ministep(struct Sprite *sprite);
bool8 sub_80976EC(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite);
void sub_80976DC(struct Sprite *, u8); void sub_80976DC(struct Sprite *, u8);
void sub_809783C(struct Sprite *, u8, u8, u8); void sub_809783C(struct Sprite *, u8, u8, u8);
void DoShadowFieldEffect(struct EventObject *); void DoShadowFieldEffect(struct ObjectEvent *);
u8 sub_809785C(struct Sprite *); u8 sub_809785C(struct Sprite *);
u8 sub_80978E4(struct Sprite *); u8 sub_80978E4(struct Sprite *);
void SetAndStartSpriteAnim(struct Sprite *, u8, u8); void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
bool8 SpriteAnimEnded(struct Sprite *); bool8 SpriteAnimEnded(struct Sprite *);
void sub_8097750(struct Sprite *); void sub_8097750(struct Sprite *);
bool8 sub_8097758(struct Sprite *); bool8 sub_8097758(struct Sprite *);
void CreateLevitateMovementTask(struct EventObject *); void CreateLevitateMovementTask(struct ObjectEvent *);
void DestroyExtraMovementTask(u8); void DestroyExtraMovementTask(u8);
void UnfreezeEventObjects(void); void UnfreezeObjectEvents(void);
void FreezeEventObjectsExceptOne(u8 eventObjectId); void FreezeObjectEventsExceptOne(u8 objectEventId);
void sub_8097B78(u8, u8); void sub_8097B78(u8, u8);
void sub_8098074(u8 var1, u8 var2); void sub_8098074(u8 var1, u8 var2);
void FreezeEventObjects(void); void FreezeObjectEvents(void);
bool8 FreezeEventObject(struct EventObject *eventObject); bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent);
u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFastAnimNum(u8);
u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8);
u8 GetMoveDirectionFastestAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8);
u8 GetLedgeJumpDirection(s16, s16, u8); u8 GetLedgeJumpDirection(s16, s16, u8);
void CameraObjectSetFollowedObjectId(u8 objectId); void CameraObjectSetFollowedObjectId(u8 objectId);
u16 GetObjectPaletteTag(u8 palSlot); u16 GetObjectPaletteTag(u8 palSlot);
void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
s16 sub_809773C(s16 a1); s16 sub_809773C(s16 a1);
s16 sub_8097728(s16 a1); s16 sub_8097728(s16 a1);
void CameraObjectReset2(void); void CameraObjectReset2(void);
u8 EventObjectGetBerryTreeId(u8 eventObjectId); u8 ObjectEventGetBerryTreeId(u8 objectEventId);
void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
bool8 IsBerryTreeSparkling(u8, u8, u8); bool8 IsBerryTreeSparkling(u8, u8, u8);
@@ -262,13 +262,13 @@ u8 GetJumpMovementAction(u32);
u8 GetJump2MovementAction(u32); u8 GetJump2MovementAction(u32);
u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *);
u8 GetVectorDirection(s16, s16, s16, s16); u8 GetVectorDirection(s16, s16, s16, s16);
u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16);
u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16);
@@ -280,143 +280,143 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16);
u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16);
u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16);
u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16);
u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *);
bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *); u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *);
void sub_8097C44(u8 var, bool32 var2); void sub_8097C44(u8 var, bool32 var2);
bool32 sub_8097C8C(u8 var); bool32 sub_8097C8C(u8 var);
void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097BB4(u8 var1, u8 graphicsId);
include/faraway_island.h
+2 -2
View File
@@ -2,9 +2,9 @@
#define GUARD_FARAWAY_ISLAND_H #define GUARD_FARAWAY_ISLAND_H
u32 GetMewMoveDirection(void); u32 GetMewMoveDirection(void);
bool8 sub_81D4A58(struct EventObject*); bool8 sub_81D4A58(struct ObjectEvent*);
void UpdateFarawayIslandStepCounter(void); void UpdateFarawayIslandStepCounter(void);
bool8 EventObjectIsFarawayIslandMew(struct EventObject *); bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
bool8 IsMewPlayingHideAndSeek(void); bool8 IsMewPlayingHideAndSeek(void);
#endif // GUARD_FARAWAY_ISLAND_H #endif // GUARD_FARAWAY_ISLAND_H
include/field_control_avatar.h
+1 -1
View File
@@ -29,7 +29,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8);
void overworld_poison_timer_set(void); void overworld_poison_timer_set(void);
void RestartWildEncounterImmunitySteps(void); void RestartWildEncounterImmunitySteps(void);
u8 *sub_8068E24(struct MapPosition *); u8 *sub_8068E24(struct MapPosition *);
const u8 *GetEventObjectScriptPointerPlayerFacing(void); const u8 *GetObjectEventScriptPointerPlayerFacing(void);
bool8 sub_8068870(u16 a); bool8 sub_8068870(u16 a);
bool8 sub_8068894(void); bool8 sub_8068894(void);
bool8 sub_8068A64(struct MapPosition *, u16); bool8 sub_8068A64(struct MapPosition *, u16);
include/field_effect_helpers.h
+4 -4
View File
@@ -9,11 +9,11 @@
u8 CreateWarpArrowSprite(void); u8 CreateWarpArrowSprite(void);
u8 sub_8155800(u8 oldSpriteId); u8 sub_8155800(u8 oldSpriteId);
void sub_81555AC(u8, u8); void sub_81555AC(u8, u8);
bool8 sub_8155DA0(struct EventObject *); bool8 sub_8155DA0(struct ObjectEvent *);
void sub_8155D78(struct EventObject *); void sub_8155D78(struct ObjectEvent *);
void StartAshFieldEffect(s16, s16, u16, s16); void StartAshFieldEffect(s16, s16, u16, s16);
void SetUpReflection(struct EventObject*, struct Sprite*, u8); void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
u32 StartFieldEffectForEventObject(u8, struct EventObject*); u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
void sub_8155F80(struct Sprite*); void sub_8155F80(struct Sprite*);
void UpdateShadowFieldEffect(struct Sprite*); void UpdateShadowFieldEffect(struct Sprite*);
include/field_player_avatar.h
+1 -1
View File
@@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a);
void PlayerSetAnimId(u8 a, u8 b); void PlayerSetAnimId(u8 a, u8 b);
bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction);
void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e);
u8 PlayerGetZCoord(void); u8 PlayerGetZCoord(void);
void SetPlayerAvatarTransitionFlags(u16 a); void SetPlayerAvatarTransitionFlags(u16 a);
void sub_808BCE8(void); void sub_808BCE8(void);
include/global.fieldmap.h
+8 -8
View File
@@ -50,7 +50,7 @@ struct BackupMapLayout
u16 *map; u16 *map;
}; };
struct EventObjectTemplate struct ObjectEventTemplate
{ {
/*0x00*/ u8 localId; /*0x00*/ u8 localId;
/*0x01*/ u8 graphicsId; /*0x01*/ u8 graphicsId;
@@ -102,11 +102,11 @@ struct BgEvent
struct MapEvents struct MapEvents
{ {
u8 eventObjectCount; u8 objectEventCount;
u8 warpCount; u8 warpCount;
u8 coordEventCount; u8 coordEventCount;
u8 bgEventCount; u8 bgEventCount;
struct EventObjectTemplate *eventObjects; struct ObjectEventTemplate *objectEvents;
struct WarpEvent *warps; struct WarpEvent *warps;
struct CoordEvent *coordEvents; struct CoordEvent *coordEvents;
struct BgEvent *bgEvents; struct BgEvent *bgEvents;
@@ -143,7 +143,7 @@ struct MapHeader
/* 0x1B */ u8 battleType; /* 0x1B */ u8 battleType;
}; };
struct EventObject struct ObjectEvent
{ {
/*0x00*/ u32 active:1; /*0x00*/ u32 active:1;
u32 singleMovementActive:1; u32 singleMovementActive:1;
@@ -206,7 +206,7 @@ struct EventObject
/*size = 0x24*/ /*size = 0x24*/
}; };
struct EventObjectGraphicsInfo struct ObjectEventGraphicsInfo
{ {
/*0x00*/ u16 tileTag; /*0x00*/ u16 tileTag;
/*0x02*/ u16 paletteTag1; /*0x02*/ u16 paletteTag1;
@@ -298,7 +298,7 @@ struct PlayerAvatar
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*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. /*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; /*0x04*/ u8 spriteId;
/*0x05*/ u8 eventObjectId; /*0x05*/ u8 objectEventId;
/*0x06*/ bool8 preventStep; /*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender; /*0x07*/ u8 gender;
/*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -320,8 +320,8 @@ struct Camera
s32 y; s32 y;
}; };
extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT]; extern struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT];
extern u8 gSelectedEventObject; extern u8 gSelectedObjectEvent;
extern struct MapHeader gMapHeader; extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar; extern struct PlayerAvatar gPlayerAvatar;
extern struct Camera gCamera; extern struct Camera gCamera;
include/global.h
+2 -2
View File
@@ -918,8 +918,8 @@ struct SaveBlock1
/*0x9C2*/ u8 field_9C2[6]; /*0x9C2*/ u8 field_9C2[6];
/*0x9C8*/ u16 trainerRematchStepCounter; /*0x9C8*/ u16 trainerRematchStepCounter;
/*0x9CA*/ u8 trainerRematches[100]; /*0x9CA*/ u8 trainerRematches[100];
/*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; /*0xA30*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT];
/*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[EVENT_OBJECT_TEMPLATES_COUNT];
/*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT];
/*0x139C*/ u16 vars[VARS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT];
/*0x159C*/ u32 gameStats[NUM_GAME_STATS]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
include/load_save.h
+2 -2
View File
@@ -22,8 +22,8 @@ void SetContinueGameWarpStatusToDynamicWarp(void);
void ClearContinueGameWarpStatus2(void); void ClearContinueGameWarpStatus2(void);
void SavePlayerParty(void); void SavePlayerParty(void);
void LoadPlayerParty(void); void LoadPlayerParty(void);
void SaveEventObjects(void); void SaveObjectEvents(void);
void LoadEventObjects(void); void LoadObjectEvents(void);
void SaveSerializedGame(void); void SaveSerializedGame(void);
void LoadSerializedGame(void); void LoadSerializedGame(void);
void LoadPlayerBag(void); void LoadPlayerBag(void);
include/overworld.h
+4 -4
View File
@@ -30,17 +30,17 @@ struct InitialPlayerAvatarState
u8 direction; u8 direction;
}; };
struct LinkPlayerEventObject struct LinkPlayerObjectEvent
{ {
u8 active; u8 active;
u8 linkPlayerId; u8 linkPlayerId;
u8 eventObjId; u8 objEventId;
u8 movementMode; u8 movementMode;
}; };
// Exported RAM declarations // Exported RAM declarations
extern struct WarpData gLastUsedWarp; extern struct WarpData gLastUsedWarp;
extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4];
extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers1;
extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers2;
@@ -157,6 +157,6 @@ bool32 sub_8087598(void);
bool32 sub_80875C8(void); bool32 sub_80875C8(void);
bool32 sub_8087634(void); bool32 sub_8087634(void);
bool32 sub_808766C(void); bool32 sub_808766C(void);
void ClearLinkPlayerEventObjects(void); void ClearLinkPlayerObjectEvents(void);
#endif // GUARD_OVERWORLD_H #endif // GUARD_OVERWORLD_H
include/script.h
+1 -1
View File
@@ -59,7 +59,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8
const u8 *GetRamScript(u8 objectId, const u8 *script); const u8 *GetRamScript(u8 objectId, const u8 *script);
bool32 ValidateSavedRamScript(void); bool32 ValidateSavedRamScript(void);
u8 *GetSavedRamScriptIfValid(void); u8 *GetSavedRamScriptIfValid(void);
void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize);
// srccmd.h // srccmd.h
void SetMovingNpcId(u16 npcId); void SetMovingNpcId(u16 npcId);
include/script_movement.h
+1 -1
View File
@@ -3,6 +3,6 @@
bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript); bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript);
bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup); bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup);
void ScriptMovement_UnfreezeEventObjects(void); void ScriptMovement_UnfreezeObjectEvents(void);
#endif // GUARD_SCRIPT_MOVEMENT_H #endif // GUARD_SCRIPT_MOVEMENT_H
include/trainer_hill.h
+3 -3
View File
@@ -60,15 +60,15 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId);
bool8 InTrainerHillChallenge(void); bool8 InTrainerHillChallenge(void);
void nullsub_129(void); void nullsub_129(void);
void PrintOnTrainerHillRecordsWindow(void); void PrintOnTrainerHillRecordsWindow(void);
void LoadTrainerHillEventObjectTemplates(void); void LoadTrainerHillObjectEventTemplates(void);
bool32 LoadTrainerHillFloorEventObjectScripts(void); bool32 LoadTrainerHillFloorObjectEventScripts(void);
void GenerateTrainerHillFloorLayout(u16 *mapArg); void GenerateTrainerHillFloorLayout(u16 *mapArg);
bool32 InTrainerHill(void); bool32 InTrainerHill(void);
u8 GetCurrentTrainerHillMapId(void); u8 GetCurrentTrainerHillMapId(void);
const struct WarpEvent* SetWarpDestinationTrainerHill4F(void); const struct WarpEvent* SetWarpDestinationTrainerHill4F(void);
const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId); const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId);
u16 LocalIdToHillTrainerId(u8 localId); u16 LocalIdToHillTrainerId(u8 localId);
bool8 GetHillTrainerFlag(u8 eventObjectId); bool8 GetHillTrainerFlag(u8 objectEventId);
void SetHillTrainerFlag(void); void SetHillTrainerFlag(void);
const u8 *GetTrainerHillTrainerScript(void); const u8 *GetTrainerHillTrainerScript(void);
void FillHillTrainerParty(void); void FillHillTrainerParty(void);
include/trainer_see.h
+4 -4
View File
@@ -3,7 +3,7 @@
struct ApproachingTrainer struct ApproachingTrainer
{ {
u8 eventObjectId; u8 objectEventId;
u8 radius; // plus 1 u8 radius; // plus 1
const u8 *trainerScriptPtr; const u8 *trainerScriptPtr;
u8 taskId; u8 taskId;
@@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer;
extern u8 gApproachingTrainerId; extern u8 gApproachingTrainerId;
bool8 CheckForTrainersWantingBattle(void); bool8 CheckForTrainersWantingBattle(void);
void sub_80B4578(struct EventObject *var); void sub_80B4578(struct ObjectEvent *var);
void EndTrainerApproach(void); void EndTrainerApproach(void);
void TryPrepareSecondApproachingTrainer(void); void TryPrepareSecondApproachingTrainer(void);
u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_ExclamationMarkIcon(void);
u8 FldEff_QuestionMarkIcon(void); u8 FldEff_QuestionMarkIcon(void);
u8 FldEff_HeartIcon(void); u8 FldEff_HeartIcon(void);
u8 GetCurrentApproachingTrainerEventObjectId(void); u8 GetCurrentApproachingTrainerObjectEventId(void);
u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId);
void PlayerFaceTrainerAfterBattle(void); void PlayerFaceTrainerAfterBattle(void);
#endif // GUARD_TRAINER_SEE_H #endif // GUARD_TRAINER_SEE_H
src/apprentice.c
+1 -1
View File
@@ -1823,7 +1823,7 @@ static void PrintMessage(void)
static void Script_PrintMessage(void) static void Script_PrintMessage(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808B864(); sub_808B864();
sub_808BCF4(); sub_808BCF4();
DrawDialogueFrame(0, 1); DrawDialogueFrame(0, 1);
src/battle_pike.c
+3 -3
View File
@@ -52,7 +52,7 @@ static void SetRoomType(void);
static void GetBattlePikeData(void); static void GetBattlePikeData(void);
static void SetBattlePikeData(void); static void SetBattlePikeData(void);
static void GetInFinalRoom(void); static void GetInFinalRoom(void);
static void SetupRoomEventObjects(void); static void SetupRoomObjectEvents(void);
static void GetRoomType(void); static void GetRoomType(void);
static void sub_81A7400(void); static void sub_81A7400(void);
static void sub_81A740C(void); static void sub_81A740C(void);
@@ -483,7 +483,7 @@ static void (* const sBattlePikeFunctions[])(void) =
GetBattlePikeData, GetBattlePikeData,
SetBattlePikeData, SetBattlePikeData,
GetInFinalRoom, GetInFinalRoom,
SetupRoomEventObjects, SetupRoomObjectEvents,
GetRoomType, GetRoomType,
sub_81A7400, sub_81A7400,
sub_81A740C, sub_81A740C,
@@ -551,7 +551,7 @@ static void SetRoomType(void)
sRoomType = roomType; sRoomType = roomType;
} }
static void SetupRoomEventObjects(void) static void SetupRoomObjectEvents(void)
{ {
bool32 setObjGfx1, setObjGfx2; bool32 setObjGfx1, setObjGfx2;
u32 objGfx1; u32 objGfx1;
src/battle_pyramid.c
+52 -52
View File
@@ -95,8 +95,8 @@ static void GetPyramidEntranceAndExitSquareIds(u8 *, u8 *);
static void SetPyramidObjectPositionsUniformly(u8); static void SetPyramidObjectPositionsUniformly(u8);
static bool8 SetPyramidObjectPositionsInAndNearSquare(u8, u8); static bool8 SetPyramidObjectPositionsInAndNearSquare(u8, u8);
static bool8 SetPyramidObjectPositionsNearSquare(u8, u8); static bool8 SetPyramidObjectPositionsNearSquare(u8, u8);
static bool8 TrySetPyramidEventObjectPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); static bool8 TrySetPyramidObjectEventPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId);
static bool8 TrySetPyramidEventObjectPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); static bool8 TrySetPyramidObjectEventPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId);
// Const rom data. // Const rom data.
#define ABILITY_RANDOM 2 // For wild mons data. #define ABILITY_RANDOM 2 // For wild mons data.
@@ -1008,14 +1008,14 @@ static void SetPickupItem(void)
static void HidePyramidItem(void) static void HidePyramidItem(void)
{ {
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates;
int i = 0; int i = 0;
for (;;) for (;;)
{ {
if (events[i].localId == gSpecialVar_LastTalked) if (events[i].localId == gSpecialVar_LastTalked)
{ {
// Rather than using event flags to hide the item event object, // Rather than using event flags to hide the item object event,
// it moves them far off the map bounds. // it moves them far off the map bounds.
events[i].x = 0x7FFF; events[i].x = 0x7FFF;
events[i].y = 0x7FFF; events[i].y = 0x7FFF;
@@ -1039,8 +1039,8 @@ static void ShowPostBattleHintText(void)
u8 id; u8 id;
int textGroup = 0; int textGroup = 0;
int textIndex = 0; int textIndex = 0;
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates;
u16 trainerId = LocalIdToPyramidTrainerId(gEventObjects[gSelectedEventObject].localId); u16 trainerId = LocalIdToPyramidTrainerId(gObjectEvents[gSelectedObjectEvent].localId);
for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++) for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++)
{ {
@@ -1051,7 +1051,7 @@ static void ShowPostBattleHintText(void)
} }
} }
hintType = sHintTextTypes[gEventObjects[gSelectedEventObject].localId - 1]; hintType = sHintTextTypes[gObjectEvents[gSelectedObjectEvent].localId - 1];
i = 0; i = 0;
while (!i) while (!i)
{ {
@@ -1062,7 +1062,7 @@ static void ShowPostBattleHintText(void)
i = 1; i = 1;
break; break;
case HINT_REMAINING_ITEMS: case HINT_REMAINING_ITEMS:
for (i = 0; i < GetNumBattlePyramidEventObjects(); i++) for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++)
{ {
if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF)
textIndex++; textIndex++;
@@ -1241,8 +1241,8 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx
{ {
if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE) if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE)
{ {
x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; x += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.x;
y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; y += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.y;
if (x >= minDistanceForExitHint if (x >= minDistanceForExitHint
|| x <= -minDistanceForExitHint || x <= -minDistanceForExitHint
|| y >= minDistanceForExitHint || y >= minDistanceForExitHint
@@ -1309,7 +1309,7 @@ u16 LocalIdToPyramidTrainerId(u8 localId)
bool8 GetBattlePyramidTrainerFlag(u8 eventId) bool8 GetBattlePyramidTrainerFlag(u8 eventId)
{ {
return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gObjectEvents[eventId].localId - 1];
} }
void MarkApproachingPyramidTrainersAsBattled(void) void MarkApproachingPyramidTrainersAsBattled(void)
@@ -1317,7 +1317,7 @@ void MarkApproachingPyramidTrainersAsBattled(void)
MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A); MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A);
if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{ {
gSelectedEventObject = GetChosenApproachingTrainerEventObjectId(1); gSelectedObjectEvent = GetChosenApproachingTrainerObjectEventId(1);
MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B); MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B);
} }
} }
@@ -1332,10 +1332,10 @@ static void MarkPyramidTrainerAsBattled(u16 trainerId)
gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i];
} }
gEventObjects[gSelectedEventObject].movementType = MOVEMENT_TYPE_WANDER_AROUND; gObjectEvents[gSelectedObjectEvent].movementType = MOVEMENT_TYPE_WANDER_AROUND;
gSaveBlock1Ptr->eventObjectTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; gSaveBlock1Ptr->objectEventTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND;
gEventObjects[gSelectedEventObject].initialCoords.x = gEventObjects[gSelectedEventObject].currentCoords.x; gObjectEvents[gSelectedObjectEvent].initialCoords.x = gObjectEvents[gSelectedObjectEvent].currentCoords.x;
gEventObjects[gSelectedEventObject].initialCoords.y = gEventObjects[gSelectedEventObject].currentCoords.y; gObjectEvents[gSelectedObjectEvent].initialCoords.y = gObjectEvents[gSelectedObjectEvent].currentCoords.y;
} }
void GenerateBattlePyramidWildMon(void) void GenerateBattlePyramidWildMon(void)
@@ -1478,7 +1478,7 @@ void sub_81A9F80(void)
ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88);
} }
static u16 GetUniqueTrainerId(u8 eventObjectId) static u16 GetUniqueTrainerId(u8 objectEventId)
{ {
int i; int i;
u16 trainerId; u16 trainerId;
@@ -1490,24 +1490,24 @@ static u16 GetUniqueTrainerId(u8 eventObjectId)
do do
{ {
trainerId = sub_8162548(challengeNum + 1, battleNum); trainerId = sub_8162548(challengeNum + 1, battleNum);
for (i = 0; i < eventObjectId; i++) for (i = 0; i < objectEventId; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break; break;
} }
} while (i != eventObjectId); } while (i != objectEventId);
} }
else else
{ {
do do
{ {
trainerId = sub_8162548(challengeNum, battleNum); trainerId = sub_8162548(challengeNum, battleNum);
for (i = 0; i < eventObjectId; i++) for (i = 0; i < objectEventId; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break; break;
} }
} while (i != eventObjectId); } while (i != objectEventId);
} }
return trainerId; return trainerId;
@@ -1566,7 +1566,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
free(floorLayoutOffsets); free(floorLayoutOffsets);
} }
void LoadBattlePyramidEventObjectTemplates(void) void LoadBattlePyramidObjectEventTemplates(void)
{ {
int i; int i;
u8 id; u8 id;
@@ -1577,7 +1577,7 @@ void LoadBattlePyramidEventObjectTemplates(void)
id = GetPyramidFloorTemplateId(); id = GetPyramidFloorTemplateId();
GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId);
CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates));
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
u8 objectPositionsType; u8 objectPositionsType;
@@ -1612,10 +1612,10 @@ void LoadBattlePyramidEventObjectTemplates(void)
} }
} }
void LoadBattlePyramidFloorEventObjectScripts(void) void LoadBattlePyramidFloorObjectEventScripts(void)
{ {
int i; int i;
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{ {
@@ -1689,7 +1689,7 @@ static void SetPyramidObjectPositionsUniformly(u8 objType)
} }
} while (!(bits & 2)); } while (!(bits & 2));
} while (!(bits & 4) && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); } while (!(bits & 4) && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i));
bits &= 1; bits &= 1;
} }
free(floorLayoutOffsets); free(floorLayoutOffsets);
@@ -1722,14 +1722,14 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId)
{ {
if (r7 == 0) if (r7 == 0)
{ {
if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i))
r7 = 1; r7 = 1;
else else
numPlacedObjects++; numPlacedObjects++;
} }
if (r7 & 1) if (r7 & 1)
{ {
if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i))
{ {
do do
{ {
@@ -1737,7 +1737,7 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId)
if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4)
borderedIndex = 0; borderedIndex = 0;
r7 += 2; r7 += 2;
} while (r7 >> 1 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); } while (r7 >> 1 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i));
numPlacedObjects++; numPlacedObjects++;
} }
else else
@@ -1784,7 +1784,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId)
for (i = 0; i < numObjects; i++) for (i = 0; i < numObjects; i++)
{ {
if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i))
{ {
do do
{ {
@@ -1792,7 +1792,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId)
if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4)
borderOffset = 0; borderOffset = 0;
r8++; r8++;
} while (r8 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); } while (r8 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i));
numPlacedObjects++; numPlacedObjects++;
} }
else else
@@ -1811,7 +1811,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId)
return (numObjects / 2) > numPlacedObjects; return (numObjects / 2) > numPlacedObjects;
} }
static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) static bool8 TrySetPyramidObjectEventPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId)
{ {
int x, y; int x, y;
@@ -1821,7 +1821,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou
{ {
for (x = 7; x > -1; x--) for (x = 7; x > -1; x--)
{ {
if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId))
return FALSE; return FALSE;
} }
} }
@@ -1832,7 +1832,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou
{ {
for (x = 0; x < 8; x++) for (x = 0; x < 8; x++)
{ {
if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId))
return FALSE; return FALSE;
} }
} }
@@ -1841,42 +1841,42 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou
return TRUE; return TRUE;
} }
static bool8 TrySetPyramidEventObjectPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId)
{ {
int i, j; int i, j;
const struct MapHeader *mapHeader; const struct MapHeader *mapHeader;
struct EventObjectTemplate *floorEvents = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *floorEvents = gSaveBlock1Ptr->objectEventTemplates;
mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01));
for (i = 0; i < mapHeader->events->eventObjectCount; i++) for (i = 0; i < mapHeader->events->objectEventCount; i++)
{ {
if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y)
continue; continue;
if (objType != OBJ_TRAINERS || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL)
{ {
if (objType != OBJ_ITEMS || mapHeader->events->eventObjects[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL)
continue; continue;
} }
// Ensure an object wasn't previously placed in the exact same position. // Ensure an object wasn't previously placed in the exact same position.
for (j = 0; j < eventObjectId; j++) for (j = 0; j < objectEventId; j++)
{ {
if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8)) if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8))
break; break;
} }
if (j == eventObjectId) if (j == objectEventId)
{ {
floorEvents[eventObjectId] = mapHeader->events->eventObjects[i]; floorEvents[objectEventId] = mapHeader->events->objectEvents[i];
floorEvents[eventObjectId].x += (squareId % 4) * 8; floorEvents[objectEventId].x += (squareId % 4) * 8;
floorEvents[eventObjectId].y += (squareId / 4) * 8; floorEvents[objectEventId].y += (squareId / 4) * 8;
floorEvents[eventObjectId].localId = eventObjectId + 1; floorEvents[objectEventId].localId = objectEventId + 1;
if (floorEvents[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) if (floorEvents[objectEventId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL)
{ {
i = GetUniqueTrainerId(eventObjectId); i = GetUniqueTrainerId(objectEventId);
floorEvents[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i);
gSaveBlock2Ptr->frontier.trainerIds[eventObjectId] = i; gSaveBlock2Ptr->frontier.trainerIds[objectEventId] = i;
} }
return FALSE; return FALSE;
} }
@@ -1917,10 +1917,10 @@ static u8 GetPyramidFloorTemplateId(void)
return 0; return 0;
} }
u8 GetNumBattlePyramidEventObjects(void) u8 GetNumBattlePyramidObjectEvents(void)
{ {
u8 i; u8 i;
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
src/battle_setup.c
+26 -26
View File
@@ -91,7 +91,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0;
EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0;
EWRAM_DATA u16 gPartnerTrainerId = 0; EWRAM_DATA u16 gPartnerTrainerId = 0;
EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0;
EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL;
EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL;
EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL;
@@ -145,7 +145,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -158,7 +158,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -171,7 +171,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -184,7 +184,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -197,7 +197,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -210,7 +210,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] =
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -223,7 +223,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[]
{ {
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -384,7 +384,7 @@ void BattleSetup_StartBattlePikeWildBattle(void)
static void DoStandardWildBattle(void) static void DoStandardWildBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808BCF4(); sub_808BCF4();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
@@ -403,7 +403,7 @@ static void DoStandardWildBattle(void)
void BattleSetup_StartRoamerBattle(void) void BattleSetup_StartRoamerBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808BCF4(); sub_808BCF4();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER; gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -417,7 +417,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void) static void DoSafariBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808BCF4(); sub_808BCF4();
gMain.savedCallback = CB2_EndSafariBattle; gMain.savedCallback = CB2_EndSafariBattle;
gBattleTypeFlags = BATTLE_TYPE_SAFARI; gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -427,7 +427,7 @@ static void DoSafariBattle(void)
static void DoBattlePikeWildBattle(void) static void DoBattlePikeWildBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808BCF4(); sub_808BCF4();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_PIKE; gBattleTypeFlags = BATTLE_TYPE_PIKE;
@@ -1008,7 +1008,7 @@ static void InitTrainerBattleVariables(void)
sTrainerBDefeatSpeech = NULL; sTrainerBDefeatSpeech = NULL;
sTrainerBBattleScriptRetAddr = NULL; sTrainerBBattleScriptRetAddr = NULL;
} }
sTrainerEventObjectLocalId = 0; sTrainerObjectEventLocalId = 0;
sTrainerVictorySpeech = NULL; sTrainerVictorySpeech = NULL;
sTrainerCannotBattleSpeech = NULL; sTrainerCannotBattleSpeech = NULL;
sTrainerBattleEndScript = NULL; sTrainerBattleEndScript = NULL;
@@ -1071,10 +1071,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
void SetMapVarsToTrainer(void) void SetMapVarsToTrainer(void)
{ {
if (sTrainerEventObjectLocalId != 0) if (sTrainerObjectEventLocalId != 0)
{ {
gSpecialVar_LastTalked = sTrainerEventObjectLocalId; gSpecialVar_LastTalked = sTrainerObjectEventLocalId;
gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
} }
} }
@@ -1170,8 +1170,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript)
{ {
gSelectedEventObject = trainerEventObjId; gSelectedObjectEvent = trainerEventObjId;
gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1); BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(EventScript_271354); ScriptContext1_SetupScript(EventScript_271354);
ScriptContext2_Enable(); ScriptContext2_Enable();
@@ -1179,8 +1179,8 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc
void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript)
{ {
gSelectedEventObject = trainerEventObjId; gSelectedObjectEvent = trainerEventObjId;
gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1); BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
} }
@@ -1198,9 +1198,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
void SetUpTrainerMovement(void) void SetUpTrainerMovement(void)
{ {
struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
} }
u8 GetTrainerBattleMode(void) u8 GetTrainerBattleMode(void)
@@ -1211,9 +1211,9 @@ u8 GetTrainerBattleMode(void)
bool8 GetTrainerFlag(void) bool8 GetTrainerFlag(void)
{ {
if (InBattlePyramid()) if (InBattlePyramid())
return GetBattlePyramidTrainerFlag(gSelectedEventObject); return GetBattlePyramidTrainerFlag(gSelectedObjectEvent);
else if (InTrainerHill()) else if (InTrainerHill())
return GetHillTrainerFlag(gSelectedEventObject); return GetHillTrainerFlag(gSelectedObjectEvent);
else else
return FlagGet(GetTrainerAFlag()); return FlagGet(GetTrainerAFlag());
} }
@@ -1358,7 +1358,7 @@ void ShowTrainerIntroSpeech(void)
if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gSpecialVar_LastTalked)); CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gSpecialVar_LastTalked));
else else
CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId));
sub_80982B8(); sub_80982B8();
} }
@@ -1367,7 +1367,7 @@ void ShowTrainerIntroSpeech(void)
if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked));
else else
CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId));
sub_80982B8(); sub_80982B8();
} }
src/battle_tower.c
+5 -5
View File
@@ -2508,9 +2508,9 @@ static void sub_81642A0(void)
s32 challengeNum; s32 challengeNum;
u32 species1, species2; u32 species1, species2;
u32 level; u32 level;
struct EventObjectTemplate *eventObjTemplates; struct ObjectEventTemplate *objEventTemplates;
eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; objEventTemplates = gSaveBlock1Ptr->objectEventTemplates;
lvlMode = gSaveBlock2Ptr->frontier.lvlMode; lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7; challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7;
@@ -2540,7 +2540,7 @@ static void sub_81642A0(void)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
trainerId = gSaveBlock2Ptr->frontier.trainerIds[i]; trainerId = gSaveBlock2Ptr->frontier.trainerIds[i];
eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); objEventTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId);
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
while (1) while (1)
@@ -2594,7 +2594,7 @@ static void sub_81642A0(void)
if (r10 != 0) if (r10 != 0)
{ {
gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10];
eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); objEventTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]);
FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1);
sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]);
} }
@@ -2637,7 +2637,7 @@ static void sub_81642A0(void)
if (r10 != 0) if (r10 != 0)
{ {
gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10];
eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); objEventTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]);
FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2);
sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]);
} }
src/battle_transition.c
+1 -1
View File
@@ -750,7 +750,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 4105, .paletteTag = 4105,
.oam = &gEventObjectBaseOam_32x32, .oam = &gObjectEventBaseOam_32x32,
.anims = sSpriteAnimTable_85C8E3C, .anims = sSpriteAnimTable_85C8E3C,
.images = sSpriteImageTable_85C8E2C, .images = sSpriteImageTable_85C8E2C,
.affineAnims = sSpriteAffineAnimTable_85C8E60, .affineAnims = sSpriteAffineAnimTable_85C8E60,
src/berry.c
+23 -23
View File
@@ -995,9 +995,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id)
return &gSaveBlock1Ptr->berryTrees[id]; return &gSaveBlock1Ptr->berryTrees[id];
} }
bool32 EventObjectInteractionWaterBerryTree(void) bool32 ObjectEventInteractionWaterBerryTree(void)
{ {
struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
switch (tree->stage) switch (tree->stage)
{ {
@@ -1021,8 +1021,8 @@ bool32 EventObjectInteractionWaterBerryTree(void)
bool8 IsPlayerFacingEmptyBerryTreePatch(void) bool8 IsPlayerFacingEmptyBerryTreePatch(void)
{ {
if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript if (GetObjectEventScriptPointerPlayerFacing() == BerryTreeScript
&& GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
@@ -1030,10 +1030,10 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void)
bool8 TryToWaterBerryTree(void) bool8 TryToWaterBerryTree(void)
{ {
if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript) if (GetObjectEventScriptPointerPlayerFacing() != BerryTreeScript)
return FALSE; return FALSE;
else else
return EventObjectInteractionWaterBerryTree(); return ObjectEventInteractionWaterBerryTree();
} }
void ClearBerryTrees(void) void ClearBerryTrees(void)
@@ -1242,7 +1242,7 @@ static u16 GetStageDurationByBerryType(u8 berry)
return GetBerryInfo(berry)->stageDuration * 60; return GetBerryInfo(berry)->stageDuration * 60;
} }
void EventObjectInteractionGetBerryTreeData(void) void ObjectEventInteractionGetBerryTreeData(void)
{ {
u8 id; u8 id;
u8 berry; u8 berry;
@@ -1250,7 +1250,7 @@ void EventObjectInteractionGetBerryTreeData(void)
u8 group; u8 group;
u8 num; u8 num;
id = EventObjectGetBerryTreeId(gSelectedEventObject); id = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
berry = GetBerryTypeByBerryTreeId(id); berry = GetBerryTypeByBerryTreeId(id);
ResetBerryTreeSparkleFlag(id); ResetBerryTreeSparkleFlag(id);
localId = gSpecialVar_LastTalked; localId = gSpecialVar_LastTalked;
@@ -1265,15 +1265,15 @@ void EventObjectInteractionGetBerryTreeData(void)
GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006); GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006);
} }
void EventObjectInteractionGetBerryName(void) void ObjectEventInteractionGetBerryName(void)
{ {
u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)); u8 berryType = GetBerryTypeByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
GetBerryNameByBerryType(berryType, gStringVar1); GetBerryNameByBerryType(berryType, gStringVar1);
} }
void EventObjectInteractionGetBerryCountString(void) void ObjectEventInteractionGetBerryCountString(void)
{ {
u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject); u8 treeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 berry = GetBerryTypeByBerryTreeId(treeId);
u8 count = GetBerryCountByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId);
GetBerryCountStringByBerryType(berry, gStringVar1, count); GetBerryCountStringByBerryType(berry, gStringVar1, count);
@@ -1284,25 +1284,25 @@ void Bag_ChooseBerry(void)
SetMainCallback2(CB2_ChooseBerry); SetMainCallback2(CB2_ChooseBerry);
} }
void EventObjectInteractionPlantBerryTree(void) void ObjectEventInteractionPlantBerryTree(void)
{ {
u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE);
EventObjectInteractionGetBerryTreeData(); ObjectEventInteractionGetBerryTreeData();
} }
void EventObjectInteractionPickBerryTree(void) void ObjectEventInteractionPickBerryTree(void)
{ {
u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
u8 berry = GetBerryTypeByBerryTreeId(id); u8 berry = GetBerryTypeByBerryTreeId(id);
gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id));
} }
void EventObjectInteractionRemoveBerryTree(void) void ObjectEventInteractionRemoveBerryTree(void)
{ {
RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
} }
@@ -1328,12 +1328,12 @@ void ResetBerryTreeSparkleFlags(void)
bottom = top + 8; bottom = top + 8;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
{ {
if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH)
{ {
cam_left = gEventObjects[i].currentCoords.x; cam_left = gObjectEvents[i].currentCoords.x;
cam_top = gEventObjects[i].currentCoords.y; cam_top = gObjectEvents[i].currentCoords.y;
if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom)
ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId); ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId);
} }
} }
} }
src/bike.c
+27 -27
View File
@@ -46,7 +46,7 @@ static void Bike_UpdateDirTimerHistory(u8);
static void Bike_UpdateABStartSelectHistory(u8); static void Bike_UpdateABStartSelectHistory(u8);
static u8 Bike_DPadToDirection(u16); static u8 Bike_DPadToDirection(u16);
static u8 GetBikeCollision(u8); static u8 GetBikeCollision(u8);
static u8 GetBikeCollisionAt(struct EventObject *, s16, s16, u8, u8); static u8 GetBikeCollisionAt(struct ObjectEvent *, s16, s16, u8, u8);
static bool8 IsRunningDisallowedByMetatile(u8); static bool8 IsRunningDisallowedByMetatile(u8);
static void Bike_TryAdvanceCyclingRoadCollisions(); static void Bike_TryAdvanceCyclingRoadCollisions();
static u8 CanBikeFaceDirOnMetatile(u8, u8); static u8 CanBikeFaceDirOnMetatile(u8, u8);
@@ -186,7 +186,7 @@ static void MachBikeTransition_FaceDirection(u8 direction)
static void MachBikeTransition_TurnDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior))
{ {
@@ -201,7 +201,7 @@ static void MachBikeTransition_TurnDirection(u8 direction)
static void MachBikeTransition_TrySpeedUp(u8 direction) static void MachBikeTransition_TrySpeedUp(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
u8 collision; u8 collision;
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE)
@@ -366,10 +366,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys
static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys)
{ {
u8 direction; u8 direction;
struct EventObject *playerEventObj; struct ObjectEvent *playerEventObj;
direction = GetPlayerMovementDirection(); direction = GetPlayerMovementDirection();
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.runningState = NOT_MOVING;
if (heldKeys & B_BUTTON) if (heldKeys & B_BUTTON)
@@ -413,10 +413,10 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys)
{ {
u8 direction; u8 direction;
struct EventObject *playerEventObj; struct ObjectEvent *playerEventObj;
direction = GetPlayerMovementDirection(); direction = GetPlayerMovementDirection();
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!(heldKeys & B_BUTTON)) if (!(heldKeys & B_BUTTON))
{ {
// B button was released // B button was released
@@ -460,10 +460,10 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey
static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys)
{ {
u8 direction; u8 direction;
struct EventObject *playerEventObj; struct ObjectEvent *playerEventObj;
direction = GetPlayerFacingDirection(); direction = GetPlayerFacingDirection();
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!(heldKeys & B_BUTTON)) if (!(heldKeys & B_BUTTON))
{ {
// we were moving on a wheelie, but we let go while moving. reset bike still status // we were moving on a wheelie, but we let go while moving. reset bike still status
@@ -514,10 +514,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he
static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
playerEventObj->facingDirectionLocked = 0; playerEventObj->facingDirectionLocked = 0;
SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection);
gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); return CheckMovementInputAcroBike(ptr, newKeys, heldKeys);
} }
@@ -535,7 +535,7 @@ static void AcroBikeTransition_FaceDirection(u8 direction)
static void AcroBikeTransition_TurnDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
direction = playerEventObj->movementDirection; direction = playerEventObj->movementDirection;
@@ -545,7 +545,7 @@ static void AcroBikeTransition_TurnDirection(u8 direction)
static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_Moving(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
{ {
@@ -570,7 +570,7 @@ static void AcroBikeTransition_Moving(u8 direction)
static void AcroBikeTransition_NormalToWheelie(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
direction = playerEventObj->movementDirection; direction = playerEventObj->movementDirection;
@@ -579,7 +579,7 @@ static void AcroBikeTransition_NormalToWheelie(u8 direction)
static void AcroBikeTransition_WheelieToNormal(u8 direction) static void AcroBikeTransition_WheelieToNormal(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
direction = playerEventObj->movementDirection; direction = playerEventObj->movementDirection;
@@ -588,7 +588,7 @@ static void AcroBikeTransition_WheelieToNormal(u8 direction)
static void AcroBikeTransition_WheelieIdle(u8 direction) static void AcroBikeTransition_WheelieIdle(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
direction = playerEventObj->movementDirection; direction = playerEventObj->movementDirection;
@@ -597,7 +597,7 @@ static void AcroBikeTransition_WheelieIdle(u8 direction)
static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) static void AcroBikeTransition_WheelieHoppingStanding(u8 direction)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
direction = playerEventObj->movementDirection; direction = playerEventObj->movementDirection;
@@ -607,7 +607,7 @@ static void AcroBikeTransition_WheelieHoppingStanding(u8 direction)
static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
{ {
@@ -641,7 +641,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
static void AcroBikeTransition_SideJump(u8 direction) static void AcroBikeTransition_SideJump(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj; struct ObjectEvent *playerEventObj;
collision = GetBikeCollision(direction); collision = GetBikeCollision(direction);
if (collision) if (collision)
@@ -659,7 +659,7 @@ static void AcroBikeTransition_SideJump(u8 direction)
return; return;
} }
} }
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
PlaySE(SE_JITE_PYOKO); PlaySE(SE_JITE_PYOKO);
playerEventObj->facingDirectionLocked = 1; playerEventObj->facingDirectionLocked = 1;
PlayerSetAnimId(GetJumpMovementAction(direction), 2); PlayerSetAnimId(GetJumpMovementAction(direction), 2);
@@ -673,7 +673,7 @@ static void AcroBikeTransition_TurnJump(u8 direction)
static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
{ {
@@ -707,7 +707,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
{ {
@@ -741,7 +741,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
{ {
u8 collision; u8 collision;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
{ {
@@ -868,7 +868,7 @@ static u8 Bike_DPadToDirection(u16 heldKeys)
static u8 GetBikeCollision(u8 direction) static u8 GetBikeCollision(u8 direction)
{ {
u8 metatitleBehavior; u8 metatitleBehavior;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
s16 x = playerEventObj->currentCoords.x; s16 x = playerEventObj->currentCoords.x;
s16 y = playerEventObj->currentCoords.y; s16 y = playerEventObj->currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
@@ -876,9 +876,9 @@ static u8 GetBikeCollision(u8 direction)
return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior); return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior);
} }
static u8 GetBikeCollisionAt(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
{ {
u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior);
if (collision > COLLISION_EVENT_OBJECT) if (collision > COLLISION_EVENT_OBJECT)
return collision; return collision;
@@ -966,7 +966,7 @@ bool8 IsBikingDisallowedByPlayer(void)
bool8 player_should_look_direction_be_enforced_upon_movement(void) bool8 player_should_look_direction_be_enforced_upon_movement(void)
{ {
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE)
return FALSE; return FALSE;
else else
return TRUE; return TRUE;
src/cable_car.c
+3 -3
View File
@@ -797,7 +797,7 @@ static void LoadCableCarSprites(void)
{ {
case 0: case 0:
default: default:
spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = 2; gSprites[spriteId].oam.priority = 2;
@@ -821,7 +821,7 @@ static void LoadCableCarSprites(void)
break; break;
case 1: case 1:
CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17);
spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = 2; gSprites[spriteId].oam.priority = 2;
@@ -852,7 +852,7 @@ static void LoadCableCarSprites(void)
} }
if ((rval % 64) == 0) if ((rval % 64) == 0)
{ {
spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = 2; gSprites[spriteId].oam.priority = 2;
src/data/field_event_obj/base_oam.h → src/data/event_object/base_oam.h
+8 -8
View File
@@ -1,46 +1,46 @@
const struct OamData gEventObjectBaseOam_8x8 = { const struct OamData gObjectEventBaseOam_8x8 = {
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.size = SPRITE_SIZE(8x8), .size = SPRITE_SIZE(8x8),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_16x8 = { const struct OamData gObjectEventBaseOam_16x8 = {
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.size = SPRITE_SIZE(16x8), .size = SPRITE_SIZE(16x8),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_16x16 = { const struct OamData gObjectEventBaseOam_16x16 = {
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.size = SPRITE_SIZE(16x16), .size = SPRITE_SIZE(16x16),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_32x8 = { const struct OamData gObjectEventBaseOam_32x8 = {
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8), .size = SPRITE_SIZE(32x8),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_64x32 = { const struct OamData gObjectEventBaseOam_64x32 = {
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32), .size = SPRITE_SIZE(64x32),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_16x32 = { const struct OamData gObjectEventBaseOam_16x32 = {
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.size = SPRITE_SIZE(16x32), .size = SPRITE_SIZE(16x32),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_32x32 = { const struct OamData gObjectEventBaseOam_32x32 = {
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.size = SPRITE_SIZE(32x32), .size = SPRITE_SIZE(32x32),
.priority = 2 .priority = 2
}; };
const struct OamData gEventObjectBaseOam_64x64 = { const struct OamData gObjectEventBaseOam_64x64 = {
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.size = SPRITE_SIZE(64x64), .size = SPRITE_SIZE(64x64),
.priority = 2 .priority = 2
src/data/event_object/berry_tree_graphics_tables.h
Executable
+565
View File
@@ -0,0 +1,565 @@
const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_KelpsyBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_WepearBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_IapapaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_CheriBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_FigyBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_MagoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_LumBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_RazzBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_GrepaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_RabutaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_NomelBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_LeppaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_LiechiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_HondewBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
const struct SpriteFrameImage gObjectEventPicTable_AguavBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_WikiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_PomegBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_RawstBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_SpelonBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_ChestoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_OranBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_PersimBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_SitrusBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_AspearBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gObjectEventPicTable_PamtreBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_CornnBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_LansatBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gObjectEventPicTable_DurinBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
const u8 gBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CheriBerryTree,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ChestoBerryTree,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PechaBerryTree,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RawstBerryTree,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AspearBerryTree,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LeppaBerryTree,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_OranBerryTree,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PersimBerryTree,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LumBerryTree,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SitrusBerryTree,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_FigyBerryTree,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WikiBerryTree,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KelpsyBerryTree,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TamatoBerryTree,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_NomelBerryTree,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SpelonBerryTree,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PamtreBerryTree,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LiechiBerryTree,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree,
};
const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
};
const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
// 3 unused berries.
[ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
};
src/data/event_object/event_object_anims.h
Executable
+1171
View File
File diff suppressed because it is too large Load Diff
src/data/field_event_obj/event_object_graphics.h → src/data/event_object/event_object_graphics.h
+289 -289
View File
@@ -1,9 +1,9 @@
const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp");
const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp");
const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal");
const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp");
const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp");
const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal");
const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A38[16] = {};
const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A58[16] = {};
const u16 NullPalette_8499A78[16] = {}; const u16 NullPalette_8499A78[16] = {};
@@ -19,27 +19,27 @@ const u16 NullPalette_8499B98[16] = {};
const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BB8[16] = {};
const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BD8[16] = {};
const u16 NullPalette_8499BF8[16] = {}; const u16 NullPalette_8499BF8[16] = {};
const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal");
const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal");
const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp");
const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp");
const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp");
const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp");
const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp");
const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp");
const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp");
const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp");
const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp");
const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp");
const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal");
const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp");
const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp");
const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal");
const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal");
const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp");
const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp");
const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal");
const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal");
const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A54F8[16] = {};
const u16 NullPalette_84A5518[16] = {}; const u16 NullPalette_84A5518[16] = {};
const u16 NullPalette_84A5538[16] = {}; const u16 NullPalette_84A5538[16] = {};
@@ -54,241 +54,241 @@ const u16 NullPalette_84A5638[16] = {};
const u16 NullPalette_84A5658[16] = {}; const u16 NullPalette_84A5658[16] = {};
const u16 NullPalette_84A5678[16] = {}; const u16 NullPalette_84A5678[16] = {};
const u16 NullPalette_84A5698[16] = {}; const u16 NullPalette_84A5698[16] = {};
const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp");
const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp");
const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp");
const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp");
const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp");
const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp");
const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal");
const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal");
const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal");
const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal");
const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal");
const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal");
const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal");
const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal");
const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp");
const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp");
const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp");
const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp");
const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp");
const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp");
const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp");
const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp");
const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp");
const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp");
const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp");
const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp");
const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp");
const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp");
const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp");
const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");
const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp");
const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp");
const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp");
const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp");
const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp");
const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp");
const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp");
const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp");
const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp");
const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp");
const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp");
const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp");
const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp");
const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp");
const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp");
const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp");
const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp");
const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp");
const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp");
const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp");
const u32 gEventObjectPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp");
const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp");
const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp");
const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp");
const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp");
const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp");
const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp");
const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp");
const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp");
const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp");
const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp");
const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp");
const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp");
const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp");
const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp");
const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp");
const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp");
const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp");
const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp");
const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp");
const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp");
const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp");
const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp");
const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp");
const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp");
const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp");
const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp");
const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp");
const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp");
const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp");
const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp");
const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp");
const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp");
const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp");
const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp");
const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp");
const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp");
const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp");
const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp");
const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp");
const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp");
const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp");
const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp");
const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp");
const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp");
const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp");
const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp");
const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp");
const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp");
const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp");
const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp");
const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp");
const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp");
const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp");
const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp");
const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp");
const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp");
const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp");
const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");
const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp");
const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp");
const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp");
const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp");
const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp");
const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp");
const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp");
const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp");
const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp");
const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp");
const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp");
const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp");
const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal");
const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal");
const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal");
const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal");
const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp");
const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp");
const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp");
const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp");
const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp");
const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp");
const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp");
const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp");
const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp");
const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp");
const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp");
const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp");
const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp");
const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp");
const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp");
const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp");
const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp");
const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp");
const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp");
const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp");
const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp");
const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp");
const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp");
const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp");
const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp");
const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp");
const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp");
const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp");
const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp");
const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp");
const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp");
const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp");
const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp");
const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp");
const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp");
const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp");
const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp");
const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp");
const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp");
const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp");
const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp");
const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp");
const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp");
const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp");
const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp");
const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp");
const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp");
const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp");
const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp");
const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp");
const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp");
const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp");
const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp");
const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp");
const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp");
const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp");
const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp");
const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal");
const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp");
const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal");
const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp");
const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal");
const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp");
const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp");
const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal");
const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp");
const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal");
const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp");
const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal");
const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp");
const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal");
const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp");
const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp");
const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp");
const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp");
const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp");
const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp");
const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp");
const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp");
const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp");
const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp");
const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp");
const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp");
const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp");
const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp");
const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp");
const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp");
const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp");
const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp");
const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp");
const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp");
const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp");
const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp");
const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp");
const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp");
const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp");
const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp");
const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp");
const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp");
const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp");
const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp");
const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp");
const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp");
const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp");
const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp");
const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal");
const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal");
const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp");
const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp");
const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp");
@@ -331,32 +331,32 @@ const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/p
const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp");
const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp");
const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp");
const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp");
const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp");
const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp");
const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp");
const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp");
const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp");
const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp");
const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal");
const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp");
const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp");
const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal");
const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp");
const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp");
const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal");
const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp");
const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal");
const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp");
const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp");
const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp");
const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp");
const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp");
const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp");
const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp");
const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp");
const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp");
const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal");
const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp");
const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal");
src/data/event_object/event_object_graphics_info.h
Executable
+245
View File
@@ -0,0 +1,245 @@
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable};
src/data/event_object/event_object_graphics_info_pointers.h
Executable
+499
View File
@@ -0,0 +1,499 @@
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2;
const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = {
[EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal,
[EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike,
[EVENT_OBJ_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing,
[EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove,
[EVENT_OBJ_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump,
[EVENT_OBJ_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy,
[EVENT_OBJ_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin,
[EVENT_OBJ_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1,
[EVENT_OBJ_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1,
[EVENT_OBJ_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2,
[EVENT_OBJ_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2,
[EVENT_OBJ_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy,
[EVENT_OBJ_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl,
[EVENT_OBJ_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3,
[EVENT_OBJ_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3,
[EVENT_OBJ_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy,
[EVENT_OBJ_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1,
[EVENT_OBJ_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan,
[EVENT_OBJ_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF,
[EVENT_OBJ_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1,
[EVENT_OBJ_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2,
[EVENT_OBJ_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM,
[EVENT_OBJ_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF,
[EVENT_OBJ_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2,
[EVENT_OBJ_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3,
[EVENT_OBJ_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM,
[EVENT_OBJ_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4,
[EVENT_OBJ_GFX_COOK] = &gObjectEventGraphicsInfo_Cook,
[EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist,
[EVENT_OBJ_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan,
[EVENT_OBJ_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman,
[EVENT_OBJ_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper,
[EVENT_OBJ_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker,
[EVENT_OBJ_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3,
[EVENT_OBJ_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5,
[EVENT_OBJ_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster,
[EVENT_OBJ_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher,
[EVENT_OBJ_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM,
[EVENT_OBJ_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM,
[EVENT_OBJ_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac,
[EVENT_OBJ_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac,
[EVENT_OBJ_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1,
[EVENT_OBJ_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM,
[EVENT_OBJ_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF,
[EVENT_OBJ_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt,
[EVENT_OBJ_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty,
[EVENT_OBJ_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1,
[EVENT_OBJ_GFX_LASS] = &gObjectEventGraphicsInfo_Lass,
[EVENT_OBJ_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman,
[EVENT_OBJ_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor,
[EVENT_OBJ_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman,
[EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM,
[EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF,
[EVENT_OBJ_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF,
[EVENT_OBJ_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM,
[EVENT_OBJ_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker,
[EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM,
[EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF,
[EVENT_OBJ_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse,
[EVENT_OBJ_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall,
[EVENT_OBJ_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree,
[EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages,
[EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages,
[EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike,
[EVENT_OBJ_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch,
[EVENT_OBJ_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4,
[EVENT_OBJ_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5,
[EVENT_OBJ_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM,
[EVENT_OBJ_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF,
[EVENT_OBJ_GFX_BARD] = &gObjectEventGraphicsInfo_Bard,
[EVENT_OBJ_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel,
[EVENT_OBJ_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker,
[EVENT_OBJ_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta,
[EVENT_OBJ_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser,
[EVENT_OBJ_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland,
[EVENT_OBJ_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy,
[EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll,
[EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll,
[EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll,
[EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll,
[EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll,
[EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll,
[EVENT_OBJ_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree,
[EVENT_OBJ_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee,
[EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman,
[EVENT_OBJ_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala,
[EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock,
[EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder,
[EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat,
[EVENT_OBJ_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal,
[EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike,
[EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike,
[EVENT_OBJ_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing,
[EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove,
[EVENT_OBJ_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck,
[EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox,
[EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway,
[EVENT_OBJ_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag,
[EVENT_OBJ_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon,
[EVENT_OBJ_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove,
[EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal,
[EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike,
[EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike,
[EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing,
[EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove,
[EVENT_OBJ_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman,
[EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater,
[EVENT_OBJ_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater,
[EVENT_OBJ_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox,
[EVENT_OBJ_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar,
[EVENT_OBJ_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2,
[EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee,
[EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM,
[EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF,
[EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM,
[EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF,
[EVENT_OBJ_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney,
[EVENT_OBJ_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe,
[EVENT_OBJ_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia,
[EVENT_OBJ_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake,
[EVENT_OBJ_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne,
[EVENT_OBJ_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly,
[EVENT_OBJ_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson,
[EVENT_OBJ_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery,
[EVENT_OBJ_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman,
[EVENT_OBJ_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona,
[EVENT_OBJ_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza,
[EVENT_OBJ_GFX_TATE] = &gObjectEventGraphicsInfo_Tate,
[EVENT_OBJ_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace,
[EVENT_OBJ_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven,
[EVENT_OBJ_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally,
[EVENT_OBJ_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy,
[EVENT_OBJ_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing,
[EVENT_OBJ_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing,
[EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman,
[EVENT_OBJ_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal,
[EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow,
[EVENT_OBJ_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll,
[EVENT_OBJ_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll,
[EVENT_OBJ_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll,
[EVENT_OBJ_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll,
[EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll,
[EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll,
[EVENT_OBJ_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll,
[EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll,
[EVENT_OBJ_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll,
[EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll,
[EVENT_OBJ_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll,
[EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll,
[EVENT_OBJ_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll,
[EVENT_OBJ_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll,
[EVENT_OBJ_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll,
[EVENT_OBJ_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll,
[EVENT_OBJ_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll,
[EVENT_OBJ_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll,
[EVENT_OBJ_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll,
[EVENT_OBJ_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll,
[EVENT_OBJ_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll,
[EVENT_OBJ_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll,
[EVENT_OBJ_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll,
[EVENT_OBJ_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll,
[EVENT_OBJ_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll,
[EVENT_OBJ_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion,
[EVENT_OBJ_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion,
[EVENT_OBJ_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion,
[EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion,
[EVENT_OBJ_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion,
[EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion,
[EVENT_OBJ_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion,
[EVENT_OBJ_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion,
[EVENT_OBJ_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion,
[EVENT_OBJ_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion,
[EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll,
[EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll,
[EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll,
[EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll,
[EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll,
[EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll,
[EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll,
[EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll,
[EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll,
[EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll,
[EVENT_OBJ_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias,
[EVENT_OBJ_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios,
[EVENT_OBJ_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid,
[EVENT_OBJ_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge,
[EVENT_OBJ_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering,
[EVENT_OBJ_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering,
[EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating,
[EVENT_OBJ_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating,
[EVENT_OBJ_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie,
[EVENT_OBJ_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie,
[EVENT_OBJ_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1,
[EVENT_OBJ_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1,
[EVENT_OBJ_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil,
[EVENT_OBJ_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock,
[EVENT_OBJ_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice,
[EVENT_OBJ_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel,
[EVENT_OBJ_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty,
[EVENT_OBJ_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1,
[EVENT_OBJ_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2,
[EVENT_OBJ_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2,
[EVENT_OBJ_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2,
[EVENT_OBJ_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon,
[EVENT_OBJ_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu,
[EVENT_OBJ_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill,
[EVENT_OBJ_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull,
[EVENT_OBJ_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2,
[EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming,
[EVENT_OBJ_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill,
[EVENT_OBJ_GFX_MOM] = &gObjectEventGraphicsInfo_Mom,
[EVENT_OBJ_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan,
[EVENT_OBJ_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay,
[EVENT_OBJ_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan,
[EVENT_OBJ_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott,
[EVENT_OBJ_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena,
[EVENT_OBJ_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3,
[EVENT_OBJ_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3,
[EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman,
[EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue,
[EVENT_OBJ_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia,
[EVENT_OBJ_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops,
[EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant,
[EVENT_OBJ_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo,
[EVENT_OBJ_GFX_MEW] = &gObjectEventGraphicsInfo_Mew,
[EVENT_OBJ_GFX_RED] = &gObjectEventGraphicsInfo_Red,
[EVENT_OBJ_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf,
[EVENT_OBJ_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys,
[EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone,
[EVENT_OBJ_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon,
[EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan,
[EVENT_OBJ_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay,
[EVENT_OBJ_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia,
[EVENT_OBJ_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh,
};
const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
[MAUVILLE_MAN_BARD] = &gObjectEventGraphicsInfo_Bard,
[MAUVILLE_MAN_HIPSTER] = &gObjectEventGraphicsInfo_Hipster,
[MAUVILLE_MAN_TRADER] = &gObjectEventGraphicsInfo_Trader,
[MAUVILLE_MAN_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller,
[MAUVILLE_MAN_GIDDY] = &gObjectEventGraphicsInfo_Giddy,
[MAUVILLE_MAN_UNUSED1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1,
[MAUVILLE_MAN_UNUSED2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2,
};
src/data/event_object/event_object_pic_tables.h
Executable
+2174
View File
File diff suppressed because it is too large Load Diff
src/data/field_event_obj/event_object_subsprites.h → src/data/event_object/event_object_subsprites.h
+83 -83
View File
@@ -1,102 +1,102 @@
const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = {
{ -8, -8, 0, 1, 0, 2} { -8, -8, 0, 1, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = {
{ -8, -8, 0, 1, 0, 1} { -8, -8, 0, 1, 0, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = {
{ -8, -8, 1, 0, 0, 2}, { -8, -8, 1, 0, 0, 2},
{ -8, 0, 1, 0, 2, 3} { -8, 0, 1, 0, 2, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = {
{ -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 2},
{ -8, -8, 0, 1, 0, 3} { -8, -8, 0, 1, 0, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = {
{ -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 1},
{ -8, -8, 0, 1, 0, 3} { -8, -8, 0, 1, 0, 3}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = {
{0, NULL}, {0, NULL},
{1, gEventObjectSpriteOamTable_16x16_0}, {1, gObjectEventSpriteOamTable_16x16_0},
{1, gEventObjectSpriteOamTable_16x16_1}, {1, gObjectEventSpriteOamTable_16x16_1},
{2, gEventObjectSpriteOamTable_16x16_2}, {2, gObjectEventSpriteOamTable_16x16_2},
{2, gEventObjectSpriteOamTable_16x16_3}, {2, gObjectEventSpriteOamTable_16x16_3},
{2, gEventObjectSpriteOamTable_16x16_4} {2, gObjectEventSpriteOamTable_16x16_4}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = {
{ -8, -16, 2, 2, 0, 2} { -8, -16, 2, 2, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = {
{ -8, -16, 2, 2, 0, 1} { -8, -16, 2, 2, 0, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = {
{ -8, -16, 0, 1, 0, 2}, { -8, -16, 0, 1, 0, 2},
{ -8, 0, 1, 0, 4, 2}, { -8, 0, 1, 0, 4, 2},
{ -8, 8, 1, 0, 6, 3} { -8, 8, 1, 0, 6, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = {
{ -8, -16, 0, 1, 0, 2}, { -8, -16, 0, 1, 0, 2},
{ -8, 0, 0, 1, 4, 3} { -8, 0, 0, 1, 4, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = {
{ -8, -16, 0, 1, 0, 1}, { -8, -16, 0, 1, 0, 1},
{ -8, 0, 0, 1, 4, 3} { -8, 0, 0, 1, 4, 3}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = {
{0, NULL}, {0, NULL},
{1, gEventObjectSpriteOamTable_16x32_0}, {1, gObjectEventSpriteOamTable_16x32_0},
{1, gEventObjectSpriteOamTable_16x32_1}, {1, gObjectEventSpriteOamTable_16x32_1},
{3, gEventObjectSpriteOamTable_16x32_2}, {3, gObjectEventSpriteOamTable_16x32_2},
{2, gEventObjectSpriteOamTable_16x32_3}, {2, gObjectEventSpriteOamTable_16x32_3},
{2, gEventObjectSpriteOamTable_16x32_4} {2, gObjectEventSpriteOamTable_16x32_4}
}; };
const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = {
{-16, -16, 0, 2, 0, 2} {-16, -16, 0, 2, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = {
{-16, -16, 0, 2, 0, 1} {-16, -16, 0, 2, 0, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = {
{-16, -16, 1, 2, 0, 2}, {-16, -16, 1, 2, 0, 2},
{-16, 0, 1, 1, 8, 2}, {-16, 0, 1, 1, 8, 2},
{-16, 8, 1, 1, 12, 3} {-16, 8, 1, 1, 12, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = {
{-16, -16, 1, 2, 0, 2}, {-16, -16, 1, 2, 0, 2},
{-16, 0, 1, 2, 8, 3} {-16, 0, 1, 2, 8, 3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = {
{-16, -16, 1, 2, 0, 1}, {-16, -16, 1, 2, 0, 1},
{-16, 0, 1, 2, 8, 3} {-16, 0, 1, 2, 8, 3}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = {
{0, NULL}, {0, NULL},
{1, gEventObjectSpriteOamTable_32x32_0}, {1, gObjectEventSpriteOamTable_32x32_0},
{1, gEventObjectSpriteOamTable_32x32_1}, {1, gObjectEventSpriteOamTable_32x32_1},
{3, gEventObjectSpriteOamTable_32x32_2}, {3, gObjectEventSpriteOamTable_32x32_2},
{2, gEventObjectSpriteOamTable_32x32_3}, {2, gObjectEventSpriteOamTable_32x32_3},
{2, gEventObjectSpriteOamTable_32x32_4} {2, gObjectEventSpriteOamTable_32x32_4}
}; };
const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = {
{-24, -24, 1, 1, 0, 2}, {-24, -24, 1, 1, 0, 2},
{ 8, -24, 1, 0, 4, 2}, { 8, -24, 1, 0, 4, 2},
{-24, -16, 1, 1, 6, 2}, {-24, -16, 1, 1, 6, 2},
@@ -111,66 +111,66 @@ const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = {
{ 8, 16, 1, 0, 34, 2} { 8, 16, 1, 0, 34, 2}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = {
{12, gEventObjectSpriteOamTable_Truck_0}, {12, gObjectEventSpriteOamTable_Truck_0},
{12, gEventObjectSpriteOamTable_Truck_0}, {12, gObjectEventSpriteOamTable_Truck_0},
{12, gEventObjectSpriteOamTable_Truck_0}, {12, gObjectEventSpriteOamTable_Truck_0},
{12, gEventObjectSpriteOamTable_Truck_0}, {12, gObjectEventSpriteOamTable_Truck_0},
{12, gEventObjectSpriteOamTable_Truck_0}, {12, gObjectEventSpriteOamTable_Truck_0},
{12, gEventObjectSpriteOamTable_Truck_0} {12, gObjectEventSpriteOamTable_Truck_0}
}; };
const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = {
{-32, -16, 1, 3, 0, 2} {-32, -16, 1, 3, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = {
{-32, -16, 1, 3, 0, 1} {-32, -16, 1, 3, 0, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = {
{-32, -16, 1, 3, 0, 2} {-32, -16, 1, 3, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = {
{-32, -16, 1, 3, 0, 2} {-32, -16, 1, 3, 0, 2}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = {
{0, NULL}, {0, NULL},
{1, gEventObjectSpriteOamTable_Unused_0}, {1, gObjectEventSpriteOamTable_Unused_0},
{1, gEventObjectSpriteOamTable_Unused_1}, {1, gObjectEventSpriteOamTable_Unused_1},
{1, gEventObjectSpriteOamTable_Unused_2}, {1, gObjectEventSpriteOamTable_Unused_2},
{1, gEventObjectSpriteOamTable_Unused_3}, {1, gObjectEventSpriteOamTable_Unused_3},
{1, gEventObjectSpriteOamTable_Unused_3} {1, gObjectEventSpriteOamTable_Unused_3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = {
{-32, -32, 0, 3, 0, 2} {-32, -32, 0, 3, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = {
{-32, -32, 0, 3, 0, 1} {-32, -32, 0, 3, 0, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = {
{-32, -32, 0, 3, 0, 2} {-32, -32, 0, 3, 0, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = {
{-32, -32, 0, 3, 0, 2} {-32, -32, 0, 3, 0, 2}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = {
{0, NULL}, {0, NULL},
{1, gEventObjectSpriteOamTable_64x64_0}, {1, gObjectEventSpriteOamTable_64x64_0},
{1, gEventObjectSpriteOamTable_64x64_1}, {1, gObjectEventSpriteOamTable_64x64_1},
{1, gEventObjectSpriteOamTable_64x64_2}, {1, gObjectEventSpriteOamTable_64x64_2},
{1, gEventObjectSpriteOamTable_64x64_3}, {1, gObjectEventSpriteOamTable_64x64_3},
{1, gEventObjectSpriteOamTable_64x64_3} {1, gObjectEventSpriteOamTable_64x64_3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = {
{-48, -20, 1, 1, 0, 2}, {-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2}, {-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 1, 8, 2}, { 16, -20, 1, 1, 8, 2},
@@ -188,7 +188,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = {
{ 16, 12, 1, 1, 56, 2} { 16, 12, 1, 1, 56, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = {
{-48, -20, 1, 1, 0, 1}, {-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1}, {-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 1, 8, 1}, { 16, -20, 1, 1, 8, 1},
@@ -206,7 +206,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = {
{ 16, 12, 1, 1, 56, 1} { 16, 12, 1, 1, 56, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = {
{-48, -20, 1, 1, 0, 2}, {-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2}, {-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 1, 8, 2}, { 16, -20, 1, 1, 8, 2},
@@ -224,7 +224,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = {
{ 16, 12, 1, 1, 56, 2} { 16, 12, 1, 1, 56, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = {
{-48, -20, 1, 1, 0, 1}, {-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1}, {-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 1, 8, 1}, { 16, -20, 1, 1, 8, 1},
@@ -242,16 +242,16 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = {
{ 16, 12, 1, 1, 56, 2} { 16, 12, 1, 1, 56, 2}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = {
{15, gEventObjectSpriteOamTable_SSTidal_0}, {15, gObjectEventSpriteOamTable_SSTidal_0},
{15, gEventObjectSpriteOamTable_SSTidal_0}, {15, gObjectEventSpriteOamTable_SSTidal_0},
{15, gEventObjectSpriteOamTable_SSTidal_1}, {15, gObjectEventSpriteOamTable_SSTidal_1},
{15, gEventObjectSpriteOamTable_SSTidal_2}, {15, gObjectEventSpriteOamTable_SSTidal_2},
{15, gEventObjectSpriteOamTable_SSTidal_3}, {15, gObjectEventSpriteOamTable_SSTidal_3},
{15, gEventObjectSpriteOamTable_SSTidal_3} {15, gObjectEventSpriteOamTable_SSTidal_3}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = {
{-48, -20, 1, 1, 0, 2}, {-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2}, {-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 0, 8, 2}, { 16, -20, 1, 0, 8, 2},
@@ -270,7 +270,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = {
{ 32, 4, 0, 0, 43, 2} { 32, 4, 0, 0, 43, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = {
{-48, -20, 1, 1, 0, 1}, {-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1}, {-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 0, 8, 1}, { 16, -20, 1, 0, 8, 1},
@@ -289,7 +289,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = {
{ 32, 4, 0, 0, 43, 1} { 32, 4, 0, 0, 43, 1}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = {
{-48, -20, 1, 1, 0, 2}, {-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2}, {-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 0, 8, 2}, { 16, -20, 1, 0, 8, 2},
@@ -308,7 +308,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = {
{ 32, 4, 0, 0, 43, 2} { 32, 4, 0, 0, 43, 2}
}; };
const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = {
{-48, -20, 1, 1, 0, 1}, {-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1}, {-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 0, 8, 1}, { 16, -20, 1, 0, 8, 1},
@@ -327,11 +327,11 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = {
{ 32, 4, 0, 0, 43, 2} { 32, 4, 0, 0, 43, 2}
}; };
const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = {
{16, gEventObjectSpriteOamTable_SubmarineShadow_0}, {16, gObjectEventSpriteOamTable_SubmarineShadow_0},
{16, gEventObjectSpriteOamTable_SubmarineShadow_0}, {16, gObjectEventSpriteOamTable_SubmarineShadow_0},
{16, gEventObjectSpriteOamTable_SubmarineShadow_1}, {16, gObjectEventSpriteOamTable_SubmarineShadow_1},
{16, gEventObjectSpriteOamTable_SubmarineShadow_2}, {16, gObjectEventSpriteOamTable_SubmarineShadow_2},
{16, gEventObjectSpriteOamTable_SubmarineShadow_3}, {16, gObjectEventSpriteOamTable_SubmarineShadow_3},
{16, gEventObjectSpriteOamTable_SubmarineShadow_3} {16, gObjectEventSpriteOamTable_SubmarineShadow_3}
}; };
src/data/field_event_obj/field_effect_object_template_pointers.h → src/data/event_object/field_effect_object_template_pointers.h
View File
src/data/field_event_obj/field_effect_objects.h → src/data/event_object/field_effect_objects.h
+38 -38
View File
@@ -29,13 +29,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = {
obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0),
@@ -60,7 +60,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] =
gFieldEffectObjectImageAnim_850CA84, gFieldEffectObjectImageAnim_850CA84,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0),
@@ -88,7 +88,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] =
gFieldEffectObjectImageAnim_850CAE0, gFieldEffectObjectImageAnim_850CAE0,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0),
@@ -113,7 +113,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] =
gFieldEffectObjectImageAnim_850CB48, gFieldEffectObjectImageAnim_850CB48,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0), overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0),
@@ -153,7 +153,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
gSurfBlobAnim_FaceEast, gSurfBlobAnim_FaceEast,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0),
@@ -202,7 +202,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] =
gFieldEffectObjectImageAnim_850CC40, gFieldEffectObjectImageAnim_850CC40,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = {
overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0),
@@ -223,7 +223,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] =
gFieldEffectObjectImageAnim_850CC8C, gFieldEffectObjectImageAnim_850CC8C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = {
overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0),
@@ -246,7 +246,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] =
gFieldEffectObjectImageAnim_850CCD8, gFieldEffectObjectImageAnim_850CCD8,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = {
overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0),
@@ -286,7 +286,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] =
gFieldEffectObjectImageAnim_850CD30, gFieldEffectObjectImageAnim_850CD30,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = {
overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0),
@@ -326,7 +326,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[]
gFieldEffectObjectImageAnim_850CD8C, gFieldEffectObjectImageAnim_850CD8C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = {
overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0),
@@ -396,7 +396,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] =
gFieldEffectObjectImageAnim_850CE18, gFieldEffectObjectImageAnim_850CE18,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = {
overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0),
@@ -419,7 +419,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] =
gFieldEffectObjectImageAnim_850CE7C, gFieldEffectObjectImageAnim_850CE7C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = {
overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0),
@@ -452,7 +452,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] =
gFieldEffectObjectImageAnim_850CEC8, gFieldEffectObjectImageAnim_850CEC8,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = {
overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0),
@@ -473,7 +473,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[]
gFieldEffectObjectImageAnim_850CF24, gFieldEffectObjectImageAnim_850CF24,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = {
overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0),
@@ -499,7 +499,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] =
gFieldEffectObjectImageAnim_850CF70, gFieldEffectObjectImageAnim_850CF70,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = {
overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0),
@@ -526,7 +526,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] =
gFieldEffectObjectImageAnim_850CFDC, gFieldEffectObjectImageAnim_850CFDC,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6),
@@ -559,7 +559,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] =
gFieldEffectObjectImageAnim_850D05C, gFieldEffectObjectImageAnim_850D05C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = {
overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0),
@@ -584,7 +584,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] =
gFieldEffectObjectImageAnim_850D0C0, gFieldEffectObjectImageAnim_850D0C0,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = {
overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0),
@@ -607,7 +607,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] =
gFieldEffectObjectImageAnim_850D118, gFieldEffectObjectImageAnim_850D118,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = {
overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0),
@@ -628,7 +628,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] =
gFieldEffectObjectImageAnim_850D160, gFieldEffectObjectImageAnim_850D160,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = {
overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0),
@@ -653,7 +653,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] =
gFieldEffectObjectImageAnim_850D1AC, gFieldEffectObjectImageAnim_850D1AC,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] =
{ {
@@ -730,7 +730,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark
gFieldEffectObjectImageAnim_850D2D4, gFieldEffectObjectImageAnim_850D2D4,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0),
@@ -766,7 +766,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] =
gFieldEffectObjectImageAnim_850D384, gFieldEffectObjectImageAnim_850D384,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0),
@@ -802,7 +802,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] =
gFieldEffectObjectImageAnim_850D404, gFieldEffectObjectImageAnim_850D404,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = {
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0),
@@ -814,7 +814,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6),
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = {
obj_frame_tiles(gFieldEffectObjectPic_Bird), obj_frame_tiles(gFieldEffectObjectPic_Bird),
@@ -831,7 +831,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] =
gFieldEffectObjectImageAnim_850D49C, gFieldEffectObjectImageAnim_850D49C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = {
overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0),
@@ -850,7 +850,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] =
gFieldEffectObjectImageAnim_850D4D0, gFieldEffectObjectImageAnim_850D4D0,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = {
obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
@@ -867,7 +867,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] =
gFieldEffectObjectImageAnim_850D500, gFieldEffectObjectImageAnim_850D500,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = {
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0),
@@ -892,7 +892,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
gFieldEffectObjectImageAnim_850D54C, gFieldEffectObjectImageAnim_850D54C,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
@@ -919,7 +919,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
gFieldEffectObjectImageAnim_850D5B0, gFieldEffectObjectImageAnim_850D5B0,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
@@ -950,7 +950,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] =
gFieldEffectObjectImageAnim_850D624, gFieldEffectObjectImageAnim_850D624,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = {
overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0),
@@ -970,7 +970,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] =
gFieldEffectObjectImageAnim_850D674, gFieldEffectObjectImageAnim_850D674,
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect};
const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F};
@@ -984,9 +984,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
}; };
const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = {
overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0),
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011};
src/data/field_event_obj/movement_action_func_tables.h → src/data/event_object/movement_action_func_tables.h
+580 -580
View File
File diff suppressed because it is too large Load Diff
src/data/field_event_obj/movement_type_func_tables.h → src/data/event_object/movement_type_func_tables.h
+52 -52
View File
@@ -1,4 +1,4 @@
u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WanderAround_Step0, MovementType_WanderAround_Step0,
MovementType_WanderAround_Step1, MovementType_WanderAround_Step1,
MovementType_WanderAround_Step2, MovementType_WanderAround_Step2,
@@ -24,7 +24,7 @@ u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = {
GetLimitedVectorDirection_SouthWestEast, GetLimitedVectorDirection_SouthWestEast,
}; };
u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_LookAround[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_LookAround_Step0, MovementType_LookAround_Step0,
MovementType_LookAround_Step1, MovementType_LookAround_Step1,
MovementType_LookAround_Step2, MovementType_LookAround_Step2,
@@ -32,7 +32,7 @@ u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite
MovementType_LookAround_Step4, MovementType_LookAround_Step4,
}; };
u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WanderUpAndDown_Step0, MovementType_WanderUpAndDown_Step0,
MovementType_WanderUpAndDown_Step1, MovementType_WanderUpAndDown_Step1,
MovementType_WanderUpAndDown_Step2, MovementType_WanderUpAndDown_Step2,
@@ -44,7 +44,7 @@ u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sp
const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WanderLeftAndRight_Step0, MovementType_WanderLeftAndRight_Step0,
MovementType_WanderLeftAndRight_Step1, MovementType_WanderLeftAndRight_Step1,
MovementType_WanderLeftAndRight_Step2, MovementType_WanderLeftAndRight_Step2,
@@ -56,13 +56,13 @@ u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct
const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST};
u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDirection_Step0, MovementType_FaceDirection_Step0,
MovementType_FaceDirection_Step1, MovementType_FaceDirection_Step1,
MovementType_FaceDirection_Step2, MovementType_FaceDirection_Step2,
}; };
u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_BerryTreeGrowth_Step0, MovementType_BerryTreeGrowth_Step0,
MovementType_BerryTreeGrowth_Step1, MovementType_BerryTreeGrowth_Step1,
MovementType_BerryTreeGrowth_Step2, MovementType_BerryTreeGrowth_Step2,
@@ -70,7 +70,7 @@ u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sp
MovementType_BerryTreeGrowth_Step4, MovementType_BerryTreeGrowth_Step4,
}; };
u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownAndUp_Step0, MovementType_FaceDownAndUp_Step0,
MovementType_FaceDownAndUp_Step1, MovementType_FaceDownAndUp_Step1,
MovementType_FaceDownAndUp_Step2, MovementType_FaceDownAndUp_Step2,
@@ -78,7 +78,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Spri
MovementType_FaceDownAndUp_Step4, MovementType_FaceDownAndUp_Step4,
}; };
u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceLeftAndRight_Step0, MovementType_FaceLeftAndRight_Step0,
MovementType_FaceLeftAndRight_Step1, MovementType_FaceLeftAndRight_Step1,
MovementType_FaceLeftAndRight_Step2, MovementType_FaceLeftAndRight_Step2,
@@ -86,7 +86,7 @@ u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct S
MovementType_FaceLeftAndRight_Step4, MovementType_FaceLeftAndRight_Step4,
}; };
u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceUpAndLeft_Step0, MovementType_FaceUpAndLeft_Step0,
MovementType_FaceUpAndLeft_Step1, MovementType_FaceUpAndLeft_Step1,
MovementType_FaceUpAndLeft_Step2, MovementType_FaceUpAndLeft_Step2,
@@ -96,7 +96,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Spri
const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceUpAndRight_Step0, MovementType_FaceUpAndRight_Step0,
MovementType_FaceUpAndRight_Step1, MovementType_FaceUpAndRight_Step1,
MovementType_FaceUpAndRight_Step2, MovementType_FaceUpAndRight_Step2,
@@ -106,7 +106,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Spr
const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownAndLeft_Step0, MovementType_FaceDownAndLeft_Step0,
MovementType_FaceDownAndLeft_Step1, MovementType_FaceDownAndLeft_Step1,
MovementType_FaceDownAndLeft_Step2, MovementType_FaceDownAndLeft_Step2,
@@ -116,7 +116,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sp
const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownAndRight_Step0, MovementType_FaceDownAndRight_Step0,
MovementType_FaceDownAndRight_Step1, MovementType_FaceDownAndRight_Step1,
MovementType_FaceDownAndRight_Step2, MovementType_FaceDownAndRight_Step2,
@@ -126,7 +126,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct S
const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownUpAndLeft_Step0, MovementType_FaceDownUpAndLeft_Step0,
MovementType_FaceDownUpAndLeft_Step1, MovementType_FaceDownUpAndLeft_Step1,
MovementType_FaceDownUpAndLeft_Step2, MovementType_FaceDownUpAndLeft_Step2,
@@ -136,7 +136,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct
const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownUpAndRight_Step0, MovementType_FaceDownUpAndRight_Step0,
MovementType_FaceDownUpAndRight_Step1, MovementType_FaceDownUpAndRight_Step1,
MovementType_FaceDownUpAndRight_Step2, MovementType_FaceDownUpAndRight_Step2,
@@ -146,7 +146,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct
const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceUpLeftAndRight_Step0, MovementType_FaceUpLeftAndRight_Step0,
MovementType_FaceUpLeftAndRight_Step1, MovementType_FaceUpLeftAndRight_Step1,
MovementType_FaceUpLeftAndRight_Step2, MovementType_FaceUpLeftAndRight_Step2,
@@ -156,7 +156,7 @@ u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct
const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH};
u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_FaceDownLeftAndRight_Step0, MovementType_FaceDownLeftAndRight_Step0,
MovementType_FaceDownLeftAndRight_Step1, MovementType_FaceDownLeftAndRight_Step1,
MovementType_FaceDownLeftAndRight_Step2, MovementType_FaceDownLeftAndRight_Step2,
@@ -166,7 +166,7 @@ u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, stru
const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_RotateCounterclockwise_Step0, MovementType_RotateCounterclockwise_Step0,
MovementType_RotateCounterclockwise_Step1, MovementType_RotateCounterclockwise_Step1,
MovementType_RotateCounterclockwise_Step2, MovementType_RotateCounterclockwise_Step2,
@@ -175,7 +175,7 @@ u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, st
const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_RotateClockwise_Step0, MovementType_RotateClockwise_Step0,
MovementType_RotateClockwise_Step1, MovementType_RotateClockwise_Step1,
MovementType_RotateClockwise_Step2, MovementType_RotateClockwise_Step2,
@@ -184,14 +184,14 @@ u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sp
const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkBackAndForth_Step0, MovementType_WalkBackAndForth_Step0,
MovementType_WalkBackAndForth_Step1, MovementType_WalkBackAndForth_Step1,
MovementType_WalkBackAndForth_Step2, MovementType_WalkBackAndForth_Step2,
MovementType_WalkBackAndForth_Step3, MovementType_WalkBackAndForth_Step3,
}; };
u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpRightLeftDown_Step1, MovementType_WalkSequenceUpRightLeftDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -199,7 +199,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject
const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightLeftDownUp_Step1, MovementType_WalkSequenceRightLeftDownUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -207,7 +207,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject
const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownUpRightLeft_Step1, MovementType_WalkSequenceDownUpRightLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -215,7 +215,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject
const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftDownUpRight_Step1, MovementType_WalkSequenceLeftDownUpRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -223,7 +223,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject
const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpLeftRightDown_Step1, MovementType_WalkSequenceUpLeftRightDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -231,7 +231,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject
const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftRightDownUp_Step1, MovementType_WalkSequenceLeftRightDownUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -239,13 +239,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject
const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownUpLeftRight_Step1, MovementType_WalkSequenceDownUpLeftRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
}; };
u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightDownUpLeft_Step1, MovementType_WalkSequenceRightDownUpLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -253,7 +253,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject
const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftUpDownRight_Step1, MovementType_WalkSequenceLeftUpDownRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -261,7 +261,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject
const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpDownRightLeft_Step1, MovementType_WalkSequenceUpDownRightLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -269,7 +269,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject
const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightLeftUpDown_Step1, MovementType_WalkSequenceRightLeftUpDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -277,7 +277,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject
const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownRightLeftUp_Step1, MovementType_WalkSequenceDownRightLeftUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -285,7 +285,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject
const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightUpDownLeft_Step1, MovementType_WalkSequenceRightUpDownLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -293,7 +293,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject
const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpDownLeftRight_Step1, MovementType_WalkSequenceUpDownLeftRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -301,7 +301,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject
const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftRightUpDown_Step1, MovementType_WalkSequenceLeftRightUpDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -309,7 +309,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject
const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownLeftRightUp_Step1, MovementType_WalkSequenceDownLeftRightUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -317,7 +317,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject
const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpLeftDownRight_Step1, MovementType_WalkSequenceUpLeftDownRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -325,7 +325,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject
const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownRightUpLeft_Step1, MovementType_WalkSequenceDownRightUpLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -333,7 +333,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject
const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftDownRightUp_Step1, MovementType_WalkSequenceLeftDownRightUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -341,7 +341,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject
const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH};
u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightUpLeftDown_Step1, MovementType_WalkSequenceRightUpLeftDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -349,7 +349,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject
const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceUpRightDownLeft_Step1, MovementType_WalkSequenceUpRightDownLeft_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -357,7 +357,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject
const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceDownLeftUpRight_Step1, MovementType_WalkSequenceDownLeftUpRight_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -365,7 +365,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject
const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST};
u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceLeftUpRightDown_Step1, MovementType_WalkSequenceLeftUpRightDown_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -373,7 +373,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject
const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH};
u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSequence_Step0, MovementType_WalkSequence_Step0,
MovementType_WalkSequenceRightDownLeftUp_Step1, MovementType_WalkSequenceRightDownLeftUp_Step1,
MovementType_WalkSequence_Step2, MovementType_WalkSequence_Step2,
@@ -381,13 +381,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject
const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH};
u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step0,
MovementType_CopyPlayer_Step1, MovementType_CopyPlayer_Step1,
MovementType_CopyPlayer_Step2, MovementType_CopyPlayer_Step2,
}; };
bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { bool8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = {
CopyablePlayerMovement_None, CopyablePlayerMovement_None,
CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_FaceDirection,
CopyablePlayerMovement_GoSpeed0, CopyablePlayerMovement_GoSpeed0,
@@ -401,37 +401,37 @@ bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *,
CopyablePlayerMovement_None, CopyablePlayerMovement_None,
}; };
u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step0,
MovementType_CopyPlayerInGrass_Step1, MovementType_CopyPlayerInGrass_Step1,
MovementType_CopyPlayer_Step2, MovementType_CopyPlayer_Step2,
}; };
u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_Hidden_Step0, MovementType_Hidden_Step0,
}; };
u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkInPlace_Step0, MovementType_WalkInPlace_Step0,
MovementType_MoveInPlace_Step1, MovementType_MoveInPlace_Step1,
}; };
u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_WalkSlowlyInPlace_Step0, MovementType_WalkSlowlyInPlace_Step0,
MovementType_MoveInPlace_Step1, MovementType_MoveInPlace_Step1,
}; };
u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_JogInPlace[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_JogInPlace_Step0, MovementType_JogInPlace_Step0,
MovementType_MoveInPlace_Step1, MovementType_MoveInPlace_Step1,
}; };
u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_RunInPlace[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_RunInPlace_Step0, MovementType_RunInPlace_Step0,
MovementType_MoveInPlace_Step1, MovementType_MoveInPlace_Step1,
}; };
u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *) = {
MovementType_Invisible_Step0, MovementType_Invisible_Step0,
MovementType_Invisible_Step1, MovementType_Invisible_Step1,
MovementType_Invisible_Step2, MovementType_Invisible_Step2,
src/data/field_event_obj/berry_tree_graphics_tables.h
-565
View File
@@ -1,565 +0,0 @@
const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
};
const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
};
const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
[ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
// 3 unused berries.
[ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
[ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
};
src/data/field_event_obj/event_object_anims.h
-1171
View File
File diff suppressed because it is too large Load Diff
src/data/field_event_obj/event_object_graphics_info.h
-245
View File
@@ -1,245 +0,0 @@
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable};
src/data/field_event_obj/event_object_graphics_info_pointers.h
-499
View File
@@ -1,499 +0,0 @@
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2;
const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
[EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_BrendanNormal,
[EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_BrendanMachBike,
[EVENT_OBJ_GFX_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_BrendanSurfing,
[EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_BrendanFieldMove,
[EVENT_OBJ_GFX_QUINTY_PLUMP] = &gEventObjectGraphicsInfo_QuintyPlump,
[EVENT_OBJ_GFX_NINJA_BOY] = &gEventObjectGraphicsInfo_NinjaBoy,
[EVENT_OBJ_GFX_TWIN] = &gEventObjectGraphicsInfo_Twin,
[EVENT_OBJ_GFX_BOY_1] = &gEventObjectGraphicsInfo_Boy1,
[EVENT_OBJ_GFX_GIRL_1] = &gEventObjectGraphicsInfo_Girl1,
[EVENT_OBJ_GFX_BOY_2] = &gEventObjectGraphicsInfo_Boy2,
[EVENT_OBJ_GFX_GIRL_2] = &gEventObjectGraphicsInfo_Girl2,
[EVENT_OBJ_GFX_LITTLE_BOY] = &gEventObjectGraphicsInfo_LittleBoy,
[EVENT_OBJ_GFX_LITTLE_GIRL] = &gEventObjectGraphicsInfo_LittleGirl,
[EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3,
[EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3,
[EVENT_OBJ_GFX_RICH_BOY] = &gEventObjectGraphicsInfo_RichBoy,
[EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1,
[EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan,
[EVENT_OBJ_GFX_POKEFAN_F] = &gEventObjectGraphicsInfo_PokefanF,
[EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1,
[EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2,
[EVENT_OBJ_GFX_EXPERT_M] = &gEventObjectGraphicsInfo_ExpertM,
[EVENT_OBJ_GFX_EXPERT_F] = &gEventObjectGraphicsInfo_ExpertF,
[EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2,
[EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3,
[EVENT_OBJ_GFX_POKEFAN_M] = &gEventObjectGraphicsInfo_PokefanM,
[EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4,
[EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook,
[EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gEventObjectGraphicsInfo_LinkReceptionist,
[EVENT_OBJ_GFX_OLD_MAN] = &gEventObjectGraphicsInfo_OldMan,
[EVENT_OBJ_GFX_OLD_WOMAN] = &gEventObjectGraphicsInfo_OldWoman,
[EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper,
[EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker,
[EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3,
[EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5,
[EVENT_OBJ_GFX_YOUNGSTER] = &gEventObjectGraphicsInfo_Youngster,
[EVENT_OBJ_GFX_BUG_CATCHER] = &gEventObjectGraphicsInfo_BugCatcher,
[EVENT_OBJ_GFX_PSYCHIC_M] = &gEventObjectGraphicsInfo_PsychicM,
[EVENT_OBJ_GFX_SCHOOL_KID_M] = &gEventObjectGraphicsInfo_SchoolKidM,
[EVENT_OBJ_GFX_MANIAC] = &gEventObjectGraphicsInfo_Maniac,
[EVENT_OBJ_GFX_HEX_MANIAC] = &gEventObjectGraphicsInfo_HexManiac,
[EVENT_OBJ_GFX_RAYQUAZA_1] = &gEventObjectGraphicsInfo_Rayquaza1,
[EVENT_OBJ_GFX_SWIMMER_M] = &gEventObjectGraphicsInfo_SwimmerM,
[EVENT_OBJ_GFX_SWIMMER_F] = &gEventObjectGraphicsInfo_SwimmerF,
[EVENT_OBJ_GFX_BLACK_BELT] = &gEventObjectGraphicsInfo_BlackBelt,
[EVENT_OBJ_GFX_BEAUTY] = &gEventObjectGraphicsInfo_Beauty,
[EVENT_OBJ_GFX_SCIENTIST_1] = &gEventObjectGraphicsInfo_Scientist1,
[EVENT_OBJ_GFX_LASS] = &gEventObjectGraphicsInfo_Lass,
[EVENT_OBJ_GFX_GENTLEMAN] = &gEventObjectGraphicsInfo_Gentleman,
[EVENT_OBJ_GFX_SAILOR] = &gEventObjectGraphicsInfo_Sailor,
[EVENT_OBJ_GFX_FISHERMAN] = &gEventObjectGraphicsInfo_Fisherman,
[EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_RunningTriathleteM,
[EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_RunningTriathleteF,
[EVENT_OBJ_GFX_TUBER_F] = &gEventObjectGraphicsInfo_TuberF,
[EVENT_OBJ_GFX_TUBER_M] = &gEventObjectGraphicsInfo_TuberM,
[EVENT_OBJ_GFX_HIKER] = &gEventObjectGraphicsInfo_Hiker,
[EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_CyclingTriathleteM,
[EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_CyclingTriathleteF,
[EVENT_OBJ_GFX_NURSE] = &gEventObjectGraphicsInfo_Nurse,
[EVENT_OBJ_GFX_ITEM_BALL] = &gEventObjectGraphicsInfo_ItemBall,
[EVENT_OBJ_GFX_BERRY_TREE] = &gEventObjectGraphicsInfo_BerryTree,
[EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gEventObjectGraphicsInfo_BerryTreeEarlyStages,
[EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gEventObjectGraphicsInfo_BerryTreeLateStages,
[EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_BrendanAcroBike,
[EVENT_OBJ_GFX_PROF_BIRCH] = &gEventObjectGraphicsInfo_ProfBirch,
[EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4,
[EVENT_OBJ_GFX_MAN_5] = &gEventObjectGraphicsInfo_Man5,
[EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM,
[EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF,
[EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard,
[EVENT_OBJ_GFX_ANABEL] = &gEventObjectGraphicsInfo_Anabel,
[EVENT_OBJ_GFX_TUCKER] = &gEventObjectGraphicsInfo_Tucker,
[EVENT_OBJ_GFX_GRETA] = &gEventObjectGraphicsInfo_Greta,
[EVENT_OBJ_GFX_SPENSER] = &gEventObjectGraphicsInfo_Spenser,
[EVENT_OBJ_GFX_NOLAND] = &gEventObjectGraphicsInfo_Noland,
[EVENT_OBJ_GFX_LUCY] = &gEventObjectGraphicsInfo_Lucy,
[EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gEventObjectGraphicsInfo_UnusedNatuDoll,
[EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
[EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll,
[EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll,
[EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll,
[EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gEventObjectGraphicsInfo_UnusedPorygon2Doll,
[EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree,
[EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee,
[EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gEventObjectGraphicsInfo_RooftopSaleWoman,
[EVENT_OBJ_GFX_TEALA] = &gEventObjectGraphicsInfo_Teala,
[EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gEventObjectGraphicsInfo_BreakableRock,
[EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gEventObjectGraphicsInfo_PushableBoulder,
[EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gEventObjectGraphicsInfo_MrBrineysBoat,
[EVENT_OBJ_GFX_MAY_NORMAL] = &gEventObjectGraphicsInfo_MayNormal,
[EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_MayMachBike,
[EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_MayAcroBike,
[EVENT_OBJ_GFX_MAY_SURFING] = &gEventObjectGraphicsInfo_MaySurfing,
[EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_MayFieldMove,
[EVENT_OBJ_GFX_TRUCK] = &gEventObjectGraphicsInfo_Truck,
[EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gEventObjectGraphicsInfo_VigorothCarryingBox,
[EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gEventObjectGraphicsInfo_VigorothFacingAway,
[EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag,
[EVENT_OBJ_GFX_ZIGZAGOON_1] = &gEventObjectGraphicsInfo_EnemyZigzagoon,
[EVENT_OBJ_GFX_ARTIST] = &gEventObjectGraphicsInfo_Artist,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_RivalBrendanNormal,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanMachBike,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanAcroBike,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_RivalBrendanSurfing,
[EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalBrendanFieldMove,
[EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gEventObjectGraphicsInfo_RivalMayNormal,
[EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalMayMachBike,
[EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalMayAcroBike,
[EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gEventObjectGraphicsInfo_RivalMaySurfing,
[EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalMayFieldMove,
[EVENT_OBJ_GFX_CAMERAMAN] = &gEventObjectGraphicsInfo_Cameraman,
[EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gEventObjectGraphicsInfo_BrendanUnderwater,
[EVENT_OBJ_GFX_MAY_UNDERWATER] = &gEventObjectGraphicsInfo_MayUnderwater,
[EVENT_OBJ_GFX_MOVING_BOX] = &gEventObjectGraphicsInfo_MovingBox,
[EVENT_OBJ_GFX_CABLE_CAR] = &gEventObjectGraphicsInfo_CableCar,
[EVENT_OBJ_GFX_SCIENTIST_2] = &gEventObjectGraphicsInfo_Scientist2,
[EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gEventObjectGraphicsInfo_DevonEmployee,
[EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gEventObjectGraphicsInfo_AquaMemberM,
[EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gEventObjectGraphicsInfo_AquaMemberF,
[EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gEventObjectGraphicsInfo_MagmaMemberM,
[EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gEventObjectGraphicsInfo_MagmaMemberF,
[EVENT_OBJ_GFX_SIDNEY] = &gEventObjectGraphicsInfo_Sidney,
[EVENT_OBJ_GFX_PHOEBE] = &gEventObjectGraphicsInfo_Phoebe,
[EVENT_OBJ_GFX_GLACIA] = &gEventObjectGraphicsInfo_Glacia,
[EVENT_OBJ_GFX_DRAKE] = &gEventObjectGraphicsInfo_Drake,
[EVENT_OBJ_GFX_ROXANNE] = &gEventObjectGraphicsInfo_Roxanne,
[EVENT_OBJ_GFX_BRAWLY] = &gEventObjectGraphicsInfo_Brawly,
[EVENT_OBJ_GFX_WATTSON] = &gEventObjectGraphicsInfo_Wattson,
[EVENT_OBJ_GFX_FLANNERY] = &gEventObjectGraphicsInfo_Flannery,
[EVENT_OBJ_GFX_NORMAN] = &gEventObjectGraphicsInfo_Norman,
[EVENT_OBJ_GFX_WINONA] = &gEventObjectGraphicsInfo_Winona,
[EVENT_OBJ_GFX_LIZA] = &gEventObjectGraphicsInfo_Liza,
[EVENT_OBJ_GFX_TATE] = &gEventObjectGraphicsInfo_Tate,
[EVENT_OBJ_GFX_WALLACE] = &gEventObjectGraphicsInfo_Wallace,
[EVENT_OBJ_GFX_STEVEN] = &gEventObjectGraphicsInfo_Steven,
[EVENT_OBJ_GFX_WALLY] = &gEventObjectGraphicsInfo_Wally,
[EVENT_OBJ_GFX_LITTLE_BOY_3] = &gEventObjectGraphicsInfo_RubySapphireLittleBoy,
[EVENT_OBJ_GFX_BRENDAN_FISHING] = &gEventObjectGraphicsInfo_BrendanFishing,
[EVENT_OBJ_GFX_MAY_FISHING] = &gEventObjectGraphicsInfo_MayFishing,
[EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gEventObjectGraphicsInfo_HotSpringsOldWoman,
[EVENT_OBJ_GFX_SS_TIDAL] = &gEventObjectGraphicsInfo_SSTidal,
[EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gEventObjectGraphicsInfo_SubmarineShadow,
[EVENT_OBJ_GFX_PICHU_DOLL] = &gEventObjectGraphicsInfo_PichuDoll,
[EVENT_OBJ_GFX_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_PikachuDoll,
[EVENT_OBJ_GFX_MARILL_DOLL] = &gEventObjectGraphicsInfo_MarillDoll,
[EVENT_OBJ_GFX_TOGEPI_DOLL] = &gEventObjectGraphicsInfo_TogepiDoll,
[EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gEventObjectGraphicsInfo_CyndaquilDoll,
[EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gEventObjectGraphicsInfo_ChikoritaDoll,
[EVENT_OBJ_GFX_TOTODILE_DOLL] = &gEventObjectGraphicsInfo_TotodileDoll,
[EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gEventObjectGraphicsInfo_JigglypuffDoll,
[EVENT_OBJ_GFX_MEOWTH_DOLL] = &gEventObjectGraphicsInfo_MeowthDoll,
[EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gEventObjectGraphicsInfo_ClefairyDoll,
[EVENT_OBJ_GFX_DITTO_DOLL] = &gEventObjectGraphicsInfo_DittoDoll,
[EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gEventObjectGraphicsInfo_SmoochumDoll,
[EVENT_OBJ_GFX_TREECKO_DOLL] = &gEventObjectGraphicsInfo_TreeckoDoll,
[EVENT_OBJ_GFX_TORCHIC_DOLL] = &gEventObjectGraphicsInfo_TorchicDoll,
[EVENT_OBJ_GFX_MUDKIP_DOLL] = &gEventObjectGraphicsInfo_MudkipDoll,
[EVENT_OBJ_GFX_DUSKULL_DOLL] = &gEventObjectGraphicsInfo_DuskullDoll,
[EVENT_OBJ_GFX_WYNAUT_DOLL] = &gEventObjectGraphicsInfo_WynautDoll,
[EVENT_OBJ_GFX_BALTOY_DOLL] = &gEventObjectGraphicsInfo_BaltoyDoll,
[EVENT_OBJ_GFX_KECLEON_DOLL] = &gEventObjectGraphicsInfo_KecleonDoll,
[EVENT_OBJ_GFX_AZURILL_DOLL] = &gEventObjectGraphicsInfo_AzurillDoll,
[EVENT_OBJ_GFX_SKITTY_DOLL] = &gEventObjectGraphicsInfo_SkittyDoll,
[EVENT_OBJ_GFX_SWABLU_DOLL] = &gEventObjectGraphicsInfo_SwabluDoll,
[EVENT_OBJ_GFX_GULPIN_DOLL] = &gEventObjectGraphicsInfo_GulpinDoll,
[EVENT_OBJ_GFX_LOTAD_DOLL] = &gEventObjectGraphicsInfo_LotadDoll,
[EVENT_OBJ_GFX_SEEDOT_DOLL] = &gEventObjectGraphicsInfo_SeedotDoll,
[EVENT_OBJ_GFX_PIKA_CUSHION] = &gEventObjectGraphicsInfo_PikaCushion,
[EVENT_OBJ_GFX_ROUND_CUSHION] = &gEventObjectGraphicsInfo_RoundCushion,
[EVENT_OBJ_GFX_KISS_CUSHION] = &gEventObjectGraphicsInfo_KissCushion,
[EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gEventObjectGraphicsInfo_ZigzagCushion,
[EVENT_OBJ_GFX_SPIN_CUSHION] = &gEventObjectGraphicsInfo_SpinCushion,
[EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gEventObjectGraphicsInfo_DiamondCushion,
[EVENT_OBJ_GFX_BALL_CUSHION] = &gEventObjectGraphicsInfo_BallCushion,
[EVENT_OBJ_GFX_GRASS_CUSHION] = &gEventObjectGraphicsInfo_GrassCushion,
[EVENT_OBJ_GFX_FIRE_CUSHION] = &gEventObjectGraphicsInfo_FireCushion,
[EVENT_OBJ_GFX_WATER_CUSHION] = &gEventObjectGraphicsInfo_WaterCushion,
[EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gEventObjectGraphicsInfo_BigSnorlaxDoll,
[EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gEventObjectGraphicsInfo_BigRhydonDoll,
[EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gEventObjectGraphicsInfo_BigLaprasDoll,
[EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gEventObjectGraphicsInfo_BigVenusaurDoll,
[EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gEventObjectGraphicsInfo_BigCharizardDoll,
[EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gEventObjectGraphicsInfo_BigBlastoiseDoll,
[EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gEventObjectGraphicsInfo_BigWailmerDoll,
[EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gEventObjectGraphicsInfo_BigRegirockDoll,
[EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gEventObjectGraphicsInfo_BigRegiceDoll,
[EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gEventObjectGraphicsInfo_BigRegisteelDoll,
[EVENT_OBJ_GFX_LATIAS] = &gEventObjectGraphicsInfo_Latias,
[EVENT_OBJ_GFX_LATIOS] = &gEventObjectGraphicsInfo_Latios,
[EVENT_OBJ_GFX_GAMEBOY_KID] = &gEventObjectGraphicsInfo_GameboyKid,
[EVENT_OBJ_GFX_CONTEST_JUDGE] = &gEventObjectGraphicsInfo_ContestJudge,
[EVENT_OBJ_GFX_BRENDAN_WATERING] = &gEventObjectGraphicsInfo_BrendanWatering,
[EVENT_OBJ_GFX_MAY_WATERING] = &gEventObjectGraphicsInfo_MayWatering,
[EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gEventObjectGraphicsInfo_BrendanDecorating,
[EVENT_OBJ_GFX_MAY_DECORATING] = &gEventObjectGraphicsInfo_MayDecorating,
[EVENT_OBJ_GFX_ARCHIE] = &gEventObjectGraphicsInfo_Archie,
[EVENT_OBJ_GFX_MAXIE] = &gEventObjectGraphicsInfo_Maxie,
[EVENT_OBJ_GFX_KYOGRE_1] = &gEventObjectGraphicsInfo_Kyogre1,
[EVENT_OBJ_GFX_GROUDON_1] = &gEventObjectGraphicsInfo_Groudon1,
[EVENT_OBJ_GFX_FOSSIL] = &gEventObjectGraphicsInfo_Fossil,
[EVENT_OBJ_GFX_REGIROCK] = &gEventObjectGraphicsInfo_Regirock,
[EVENT_OBJ_GFX_REGICE] = &gEventObjectGraphicsInfo_Regice,
[EVENT_OBJ_GFX_REGISTEEL] = &gEventObjectGraphicsInfo_Registeel,
[EVENT_OBJ_GFX_SKITTY] = &gEventObjectGraphicsInfo_Skitty,
[EVENT_OBJ_GFX_KECLEON_1] = &gEventObjectGraphicsInfo_Kecleon1,
[EVENT_OBJ_GFX_KYOGRE_2] = &gEventObjectGraphicsInfo_Kyogre2,
[EVENT_OBJ_GFX_GROUDON_2] = &gEventObjectGraphicsInfo_Groudon2,
[EVENT_OBJ_GFX_RAYQUAZA_2] = &gEventObjectGraphicsInfo_Rayquaza2,
[EVENT_OBJ_GFX_ZIGZAGOON_2] = &gEventObjectGraphicsInfo_Zigzagoon,
[EVENT_OBJ_GFX_PIKACHU] = &gEventObjectGraphicsInfo_Pikachu,
[EVENT_OBJ_GFX_AZUMARILL] = &gEventObjectGraphicsInfo_Azumarill,
[EVENT_OBJ_GFX_WINGULL] = &gEventObjectGraphicsInfo_Wingull,
[EVENT_OBJ_GFX_KECLEON_2] = &gEventObjectGraphicsInfo_Kecleon2,
[EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gEventObjectGraphicsInfo_TuberMSwimming,
[EVENT_OBJ_GFX_AZURILL] = &gEventObjectGraphicsInfo_Azurill,
[EVENT_OBJ_GFX_MOM] = &gEventObjectGraphicsInfo_Mom,
[EVENT_OBJ_GFX_LINK_BRENDAN] = &gEventObjectGraphicsInfo_LinkBrendan,
[EVENT_OBJ_GFX_LINK_MAY] = &gEventObjectGraphicsInfo_LinkMay,
[EVENT_OBJ_GFX_JUAN] = &gEventObjectGraphicsInfo_Juan,
[EVENT_OBJ_GFX_SCOTT] = &gEventObjectGraphicsInfo_Scott,
[EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena,
[EVENT_OBJ_GFX_KYOGRE_3] = &gEventObjectGraphicsInfo_Kyogre3,
[EVENT_OBJ_GFX_GROUDON_3] = &gEventObjectGraphicsInfo_Groudon3,
[EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gEventObjectGraphicsInfo_MysteryEventDeliveryman,
[EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gEventObjectGraphicsInfo_Statue,
[EVENT_OBJ_GFX_KIRLIA] = &gEventObjectGraphicsInfo_Kirlia,
[EVENT_OBJ_GFX_DUSCLOPS] = &gEventObjectGraphicsInfo_Dusclops,
[EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gEventObjectGraphicsInfo_UnionRoomAttendant,
[EVENT_OBJ_GFX_SUDOWOODO] = &gEventObjectGraphicsInfo_Sudowoodo,
[EVENT_OBJ_GFX_MEW] = &gEventObjectGraphicsInfo_Mew,
[EVENT_OBJ_GFX_RED] = &gEventObjectGraphicsInfo_Red,
[EVENT_OBJ_GFX_LEAF] = &gEventObjectGraphicsInfo_Leaf,
[EVENT_OBJ_GFX_DEOXYS] = &gEventObjectGraphicsInfo_Deoxys,
[EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gEventObjectGraphicsInfo_BirthIslandStone,
[EVENT_OBJ_GFX_BRANDON] = &gEventObjectGraphicsInfo_Brandon,
[EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gEventObjectGraphicsInfo_RubySapphireBrendan,
[EVENT_OBJ_GFX_LINK_RS_MAY] = &gEventObjectGraphicsInfo_RubySapphireMay,
[EVENT_OBJ_GFX_LUGIA] = &gEventObjectGraphicsInfo_Lugia,
[EVENT_OBJ_GFX_HOOH] = &gEventObjectGraphicsInfo_HoOh,
};
const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
[MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard,
[MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster,
[MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader,
[MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller,
[MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy,
[MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
[MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
};
src/data/field_event_obj/event_object_pic_tables.h
-2174
View File
File diff suppressed because it is too large Load Diff
src/data/trade.h
+1 -1
View File
@@ -5,7 +5,7 @@ static const u32 sUnusedStructSizes[] =
sizeof(struct SaveBlock1), sizeof(struct SaveBlock1),
sizeof(struct MapHeader), sizeof(struct MapHeader),
// 0x00000530, in RS // 0x00000530, in RS
sizeof(struct MailStruct), //or EventObject / EventObjectGraphicsInfo sizeof(struct MailStruct), //or ObjectEvent / ObjectEventGraphicsInfo
sizeof(struct Pokemon), //or TrainerCard sizeof(struct Pokemon), //or TrainerCard
0x00000528 // 0x000004D8, in RS 0x00000528 // 0x000004D8, in RS
}; };
src/decoration.c
+27 -27
View File
@@ -1246,22 +1246,22 @@ void SetDecoration(void)
if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) if (FlagGet(FLAG_DECORATION_1 + i) == TRUE)
{ {
FlagClear(FLAG_DECORATION_1 + i); FlagClear(FLAG_DECORATION_1 + i);
for (j = 0; j < gMapHeader.events->eventObjectCount; j++) for (j = 0; j < gMapHeader.events->objectEventCount; j++)
{ {
if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i) if (gMapHeader.events->objectEvents[j].flagId == FLAG_DECORATION_1 + i)
break; break;
} }
VarSet( VarSet(
VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[j].graphicsId - EVENT_OBJ_GFX_VAR_0), VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - EVENT_OBJ_GFX_VAR_0),
sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId;
gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8006 = sCurDecorMapX;
gSpecialVar_0x8007 = sCurDecorMapY; gSpecialVar_0x8007 = sCurDecorMapY;
TrySpawnEventObject(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TrySpawnObjectEvent(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
TryMoveEventObjectToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); TryMoveObjectEventToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
TryOverrideEventObjectTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TryOverrideObjectEventTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
break; break;
} }
} }
@@ -1365,9 +1365,9 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic
x -= 8; x -= 8;
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0);
else else
sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0);
gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
@@ -1504,7 +1504,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration)
if (!sub_81284AC(taskId, curX, curY, behaviorBy)) if (!sub_81284AC(taskId, curX, curY, behaviorBy))
return FALSE; return FALSE;
behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0);
if (behaviorAt != 0 && behaviorAt != 16) if (behaviorAt != 0 && behaviorAt != 16)
return FALSE; return FALSE;
} }
@@ -1525,7 +1525,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration)
if (!sub_81284AC(taskId, curX, curY, behaviorBy)) if (!sub_81284AC(taskId, curX, curY, behaviorBy))
return FALSE; return FALSE;
if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) if (GetObjectEventIdByXYZ(curX, curY, 0) != 16)
return FALSE; return FALSE;
} }
} }
@@ -1542,7 +1542,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration)
if (!sub_81284AC(taskId, curX, curY, behaviorBy)) if (!sub_81284AC(taskId, curX, curY, behaviorBy))
return FALSE; return FALSE;
behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0);
if (behaviorAt != 0 && behaviorAt != 16) if (behaviorAt != 0 && behaviorAt != 16)
return FALSE; return FALSE;
} }
@@ -1579,7 +1579,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration)
return FALSE; return FALSE;
} }
if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) if (GetObjectEventIdByXYZ(curX, curY, 0) != 16)
return FALSE; return FALSE;
} }
break; break;
@@ -1999,7 +1999,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf
sub_8129048(data); sub_8129048(data);
data->decoration = &gDecorations[decor]; data->decoration = &gDecorations[decor];
if (data->decoration->permission == DECORPERM_SPRITE) if (data->decoration->permission == DECORPERM_SPRITE)
return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); return AddPseudoObjectEvent(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG); FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG);
sub_81291E8(data); sub_81291E8(data);
@@ -2047,7 +2047,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode)
return gDecorIconTable[decor][mode]; return gDecorIconTable[decor][mode];
} }
u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u8 decor)
{ {
u8 spriteId; u8 spriteId;
struct SpriteSheet sheet; struct SpriteSheet sheet;
@@ -2078,7 +2078,7 @@ u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor
} }
else else
{ {
spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); spriteId = AddPseudoObjectEvent(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
} }
return spriteId; return spriteId;
} }
@@ -2098,7 +2098,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
} }
else if (gDecorIconTable[decor][0] == NULL) else if (gDecorIconTable[decor][0] == NULL)
{ {
spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); spriteId = AddDecorationIconObjectFromObjectEvent(tilesTag, paletteTag, decor);
if (spriteId == MAX_SPRITES) if (spriteId == MAX_SPRITES)
return MAX_SPRITES; return MAX_SPRITES;
@@ -2142,11 +2142,11 @@ void sub_8129708(void)
{ {
gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId; gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId;
sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx); sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx);
for (i = 0; i < gMapHeader.events->eventObjectCount; i++) for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{ {
if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8005)
{ {
gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; gSpecialVar_0x8006 = gMapHeader.events->objectEvents[i].localId;
break; break;
} }
} }
@@ -2157,11 +2157,11 @@ void sub_81297AC(void)
{ {
u8 i; u8 i;
for (i = 0; i < gMapHeader.events->eventObjectCount; i++) for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{ {
if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8004)
{ {
gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; gSpecialVar_0x8005 = gMapHeader.events->objectEvents[i].localId;
break; break;
} }
} }
@@ -2250,9 +2250,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void)
sub_812A39C(); sub_812A39C();
gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0); gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0);
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0);
else else
sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0);
gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
@@ -2453,9 +2453,9 @@ void sub_8129F20(void)
yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F; yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F;
for (i = 0; i < 0x40; i++) for (i = 0; i < 0x40; i++)
{ {
if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId)) if (gSaveBlock1Ptr->objectEventTemplates[i].x == xOff && gSaveBlock1Ptr->objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->objectEventTemplates[i].flagId))
{ {
sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId; sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->objectEventTemplates[i].flagId;
break; break;
} }
} }
src/easy_chat.c
+2 -2
View File
@@ -4733,14 +4733,14 @@ static void sub_811E828(void)
if (GetEasyChatScreenFrameId() != 4) if (GetEasyChatScreenFrameId() != 4)
return; return;
spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); spriteId = AddPseudoObjectEvent(graphicsId, SpriteCallbackDummy, 76, 40, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.priority = 0; gSprites[spriteId].oam.priority = 0;
StartSpriteAnim(&gSprites[spriteId], 2); StartSpriteAnim(&gSprites[spriteId], 2);
} }
spriteId = AddPseudoEventObject( spriteId = AddPseudoObjectEvent(
gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL,
SpriteCallbackDummy, SpriteCallbackDummy,
52, 52,
src/event_data.c
+1 -1
View File
@@ -187,7 +187,7 @@ bool8 VarSet(u16 id, u16 value)
return TRUE; return TRUE;
} }
u8 VarGetEventObjectGraphicsId(u8 id) u8 VarGetObjectEventGraphicsId(u8 id)
{ {
return VarGet(VAR_OBJ_GFX_ID_0 + id); return VarGet(VAR_OBJ_GFX_ID_0 + id);
} }
src/event_obj_lock.c
+33 -33
View File
@@ -39,9 +39,9 @@ bool8 sub_80983C4(void)
} }
void ScriptFreezeEventObjects(void) void ScriptFreezeObjectEvents(void)
{ {
FreezeEventObjects(); FreezeObjectEvents();
CreateTask(sub_80983A4, 80); CreateTask(sub_80983A4, 80);
} }
@@ -54,9 +54,9 @@ static void sub_8098400(u8 taskId)
sub_808B864(); sub_808B864();
task->data[0] = 1; task->data[0] = 1;
} }
if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[gSelectedEventObject]); FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
task->data[1] = 1; task->data[1] = 1;
} }
if (task->data[0] && task->data[1]) if (task->data[0] && task->data[1])
@@ -76,61 +76,61 @@ bool8 sub_809847C(void)
} }
} }
void LockSelectedEventObject(void) void LockSelectedObjectEvent(void)
{ {
u8 taskId; u8 taskId;
FreezeEventObjectsExceptOne(gSelectedEventObject); FreezeObjectEventsExceptOne(gSelectedObjectEvent);
taskId = CreateTask(sub_8098400, 80); taskId = CreateTask(sub_8098400, 80);
if (!gEventObjects[gSelectedEventObject].singleMovementActive) if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[gSelectedEventObject]); FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
gTasks[taskId].data[1] = 1; gTasks[taskId].data[1] = 1;
} }
} }
void ScriptUnfreezeEventObjects(void) void ScriptUnfreezeObjectEvents(void)
{ {
u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeEventObjects(); UnfreezeObjectEvents();
} }
void sub_8098524(void) void sub_8098524(void)
{ {
u8 playerObjectId; u8 playerObjectId;
if (gEventObjects[gSelectedEventObject].active) if (gObjectEvents[gSelectedObjectEvent].active)
EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeEventObjects(); UnfreezeObjectEvents();
} }
void Script_FacePlayer(void) void Script_FacePlayer(void)
{ {
EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing);
} }
void Script_ClearHeldMovement(void) void Script_ClearHeldMovement(void)
{ {
EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]);
} }
static void sub_80985BC(u8 taskId) static void sub_80985BC(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
u8 eventObjectId = task->data[2]; u8 objectEventId = task->data[2];
if (!task->data[0] && walkrun_is_standing_still() == TRUE) if (!task->data[0] && walkrun_is_standing_still() == TRUE)
{ {
sub_808B864(); sub_808B864();
task->data[0] = 1; task->data[0] = 1;
} }
if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[eventObjectId]); FreezeObjectEvent(&gObjectEvents[objectEventId]);
task->data[1] = 1; task->data[1] = 1;
} }
if (task->data[0] && task->data[1]) if (task->data[0] && task->data[1])
@@ -140,34 +140,34 @@ static void sub_80985BC(u8 taskId)
void sub_8098630(void) void sub_8098630(void)
{ {
u8 trainerObjectId1, trainerObjectId2, taskId; u8 trainerObjectId1, trainerObjectId2, taskId;
trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0);
if(gNoOfApproachingTrainers == 2) if(gNoOfApproachingTrainers == 2)
{ {
trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1);
sub_8098074(trainerObjectId1, trainerObjectId2); sub_8098074(trainerObjectId1, trainerObjectId2);
taskId = CreateTask(sub_80985BC, 80); taskId = CreateTask(sub_80985BC, 80);
gTasks[taskId].data[2] = trainerObjectId1; gTasks[taskId].data[2] = trainerObjectId1;
if(!gEventObjects[trainerObjectId1].singleMovementActive) if(!gObjectEvents[trainerObjectId1].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[trainerObjectId1]); FreezeObjectEvent(&gObjectEvents[trainerObjectId1]);
gTasks[taskId].data[1] = 1; gTasks[taskId].data[1] = 1;
} }
taskId = CreateTask(sub_80985BC, 81); taskId = CreateTask(sub_80985BC, 81);
gTasks[taskId].data[2] = trainerObjectId2; gTasks[taskId].data[2] = trainerObjectId2;
if(!gEventObjects[trainerObjectId2].singleMovementActive) if(!gObjectEvents[trainerObjectId2].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[trainerObjectId2]); FreezeObjectEvent(&gObjectEvents[trainerObjectId2]);
gTasks[taskId].data[1] = 1; gTasks[taskId].data[1] = 1;
} }
} }
else else
{ {
FreezeEventObjectsExceptOne(trainerObjectId1); FreezeObjectEventsExceptOne(trainerObjectId1);
taskId = CreateTask(sub_80985BC, 80); taskId = CreateTask(sub_80985BC, 80);
gTasks[taskId].data[2] = trainerObjectId1; gTasks[taskId].data[2] = trainerObjectId1;
if(!gEventObjects[trainerObjectId1].singleMovementActive) if(!gObjectEvents[trainerObjectId1].singleMovementActive)
{ {
FreezeEventObject(&gEventObjects[trainerObjectId1]); FreezeObjectEvent(&gObjectEvents[trainerObjectId1]);
gTasks[taskId].data[1] = 1; gTasks[taskId].data[1] = 1;
} }
} }
src/event_object_movement.c
+2179 -2179
View File
File diff suppressed because it is too large Load Diff
src/faraway_island.c
+38 -38
View File
@@ -12,10 +12,10 @@
#include "constants/vars.h" #include "constants/vars.h"
static u8 sub_81D4890(u8); static u8 sub_81D4890(u8);
static bool8 sub_81D4C14(struct EventObject*, u8); static bool8 sub_81D4C14(struct ObjectEvent*, u8);
static u8 sub_81D4C9C(struct EventObject*, u8); static u8 sub_81D4C9C(struct ObjectEvent*, u8);
static u8 sub_81D4C58(struct EventObject*, u8); static u8 sub_81D4C58(struct ObjectEvent*, u8);
static u8 sub_81D4CE0(struct EventObject*, u8); static u8 sub_81D4CE0(struct ObjectEvent*, u8);
static u8 sub_81D4D24(u8); static u8 sub_81D4D24(u8);
static bool8 CanMewWalkToCoords(s16, s16); static bool8 CanMewWalkToCoords(s16, s16);
@@ -36,26 +36,26 @@ static const s16 sFarawayIslandRockCoords[4][2] =
{20, 20}, {20, 20},
}; };
static u8 GetMewEventObjectId(void) static u8 GetMewObjectEventId(void)
{ {
u8 eventObjectId; u8 objectEventId;
TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
return eventObjectId; return objectEventId;
} }
u32 GetMewMoveDirection(void) u32 GetMewMoveDirection(void)
{ {
u8 i; u8 i;
int skip; int skip;
struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()];
sPlayerToMewDeltaX = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x;
sPlayerToMewDeltaY = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; sPlayerToMewDeltaY = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y - mew->currentCoords.y;
for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
sMewDirectionCandidates[i] = DIR_NONE; sMewDirectionCandidates[i] = DIR_NONE;
if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x
&& gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y)
{ {
return DIR_NONE; return DIR_NONE;
} }
@@ -70,10 +70,10 @@ u32 GetMewMoveDirection(void)
for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++)
{ {
if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == sFarawayIslandRockCoords[i][0]) if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0])
{ {
skip = 0; skip = 0;
if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < sFarawayIslandRockCoords[i][1]) if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1])
{ {
if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1])
skip = 1; skip = 1;
@@ -88,7 +88,7 @@ u32 GetMewMoveDirection(void)
{ {
if (sPlayerToMewDeltaX > 0) if (sPlayerToMewDeltaX > 0)
{ {
if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
return DIR_EAST; return DIR_EAST;
@@ -96,14 +96,14 @@ u32 GetMewMoveDirection(void)
} }
else if (sPlayerToMewDeltaX < 0) else if (sPlayerToMewDeltaX < 0)
{ {
if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
return DIR_WEST; return DIR_WEST;
} }
} }
if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) if (mew->currentCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x)
{ {
if (sPlayerToMewDeltaY > 0) if (sPlayerToMewDeltaY > 0)
{ {
@@ -119,10 +119,10 @@ u32 GetMewMoveDirection(void)
} }
} }
if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == sFarawayIslandRockCoords[i][1]) if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1])
{ {
skip = 0; skip = 0;
if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < sFarawayIslandRockCoords[i][0]) if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0])
{ {
if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0])
skip = 1; skip = 1;
@@ -137,7 +137,7 @@ u32 GetMewMoveDirection(void)
{ {
if (sPlayerToMewDeltaY > 0) if (sPlayerToMewDeltaY > 0)
{ {
if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
return DIR_SOUTH; return DIR_SOUTH;
@@ -145,14 +145,14 @@ u32 GetMewMoveDirection(void)
} }
else if (sPlayerToMewDeltaY < 0) else if (sPlayerToMewDeltaY < 0)
{ {
if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
return DIR_NORTH; return DIR_NORTH;
} }
} }
if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) if (mew->currentCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y)
{ {
if (sPlayerToMewDeltaX > 0) if (sPlayerToMewDeltaX > 0)
{ {
@@ -211,13 +211,13 @@ u32 GetMewMoveDirection(void)
if (sPlayerToMewDeltaY == 0) if (sPlayerToMewDeltaY == 0)
{ {
if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
return DIR_NORTH; return DIR_NORTH;
} }
if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
return DIR_SOUTH; return DIR_SOUTH;
@@ -232,13 +232,13 @@ u32 GetMewMoveDirection(void)
if (sPlayerToMewDeltaX == 0) if (sPlayerToMewDeltaX == 0)
{ {
if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
return DIR_WEST; return DIR_WEST;
} }
if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x)
{ {
if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
return DIR_EAST; return DIR_EAST;
@@ -256,8 +256,8 @@ u32 GetMewMoveDirection(void)
static bool8 CanMewWalkToCoords(s16 x, s16 y) static bool8 CanMewWalkToCoords(s16 x, s16 y)
{ {
if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x
&& gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y)
{ {
return FALSE; return FALSE;
} }
@@ -269,7 +269,7 @@ static u8 sub_81D4890(u8 ignoredDir)
{ {
u8 i; u8 i;
u8 count = 0; u8 count = 0;
struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()];
for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
sMewDirectionCandidates[i] = DIR_NONE; sMewDirectionCandidates[i] = DIR_NONE;
@@ -318,12 +318,12 @@ void UpdateFarawayIslandStepCounter(void)
} }
} }
bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent)
{ {
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR)
&& gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR))
{ {
if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) if (objectEvent->graphicsId == EVENT_OBJ_GFX_MEW)
return TRUE; return TRUE;
} }
@@ -342,7 +342,7 @@ bool8 IsMewPlayingHideAndSeek(void)
return FALSE; return FALSE;
} }
bool8 sub_81D4A58(struct EventObject *eventObject) bool8 sub_81D4A58(struct ObjectEvent *objectEvent)
{ {
if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF
&& VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0)
@@ -356,7 +356,7 @@ void sub_81D4A90(void)
s16 x; s16 x;
s16 y; s16 y;
u8 spriteId; u8 spriteId;
struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()];
mew->invisible = 0; mew->invisible = 0;
if (gSpecialVar_0x8004 == 1) if (gSpecialVar_0x8004 == 1)
@@ -396,7 +396,7 @@ void sub_81D4BEC(void)
DestroySprite(&gSprites[sUnknown_0203CF50]); DestroySprite(&gSprites[sUnknown_0203CF50]);
} }
static bool8 sub_81D4C14(struct EventObject *mew, u8 index) static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index)
{ {
if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
{ {
@@ -407,7 +407,7 @@ static bool8 sub_81D4C14(struct EventObject *mew, u8 index)
return FALSE; return FALSE;
} }
static u8 sub_81D4C58(struct EventObject *mew, u8 index) static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index)
{ {
if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
{ {
@@ -418,7 +418,7 @@ static u8 sub_81D4C58(struct EventObject *mew, u8 index)
return FALSE; return FALSE;
} }
static u8 sub_81D4C9C(struct EventObject *mew, u8 index) static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index)
{ {
if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
{ {
@@ -429,7 +429,7 @@ static u8 sub_81D4C9C(struct EventObject *mew, u8 index)
return FALSE; return FALSE;
} }
static u8 sub_81D4CE0(struct EventObject *mew, u8 index) static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index)
{ {
if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
{ {
src/field_camera.c
+3 -3
View File
@@ -299,7 +299,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset)
gBGTilemapBuffers1[offset + 0x20] = metatiles[2]; gBGTilemapBuffers1[offset + 0x20] = metatiles[2];
gBGTilemapBuffers1[offset + 0x21] = metatiles[3]; gBGTilemapBuffers1[offset + 0x21] = metatiles[3];
// Draw metatile's top layer to the top background layer, which covers event object sprites. // Draw metatile's top layer to the top background layer, which covers object event sprites.
gBGTilemapBuffers2[offset] = metatiles[4]; gBGTilemapBuffers2[offset] = metatiles[4];
gBGTilemapBuffers2[offset + 1] = metatiles[5]; gBGTilemapBuffers2[offset + 1] = metatiles[5];
gBGTilemapBuffers2[offset + 0x20] = metatiles[6]; gBGTilemapBuffers2[offset + 0x20] = metatiles[6];
@@ -415,7 +415,7 @@ void CameraUpdate(void)
if (deltaX != 0 || deltaY != 0) if (deltaX != 0 || deltaY != 0)
{ {
CameraMove(deltaX, deltaY); CameraMove(deltaX, deltaY);
UpdateEventObjectsForCameraUpdate(deltaX, deltaY); UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
RotatingGatePuzzleCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
ResetBerryTreeSparkleFlags(); ResetBerryTreeSparkleFlags();
tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
@@ -430,7 +430,7 @@ void CameraUpdate(void)
void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused
{ {
CameraMove(deltaX, deltaY); CameraMove(deltaX, deltaY);
UpdateEventObjectsForCameraUpdate(deltaX, deltaY); UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
DrawWholeMapView(); DrawWholeMapView();
gTotalCameraPixelOffsetX -= deltaX * 16; gTotalCameraPixelOffsetX -= deltaX * 16;
gTotalCameraPixelOffsetY -= deltaY * 16; gTotalCameraPixelOffsetY -= deltaY * 16;
src/field_control_avatar.c
+24 -24
View File
@@ -38,14 +38,14 @@
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
u8 gSelectedEventObject; u8 gSelectedObjectEvent;
static void GetPlayerPosition(struct MapPosition *); static void GetPlayerPosition(struct MapPosition *);
static void GetInFrontOfPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *);
static u16 GetPlayerCurMetatileBehavior(int); static u16 GetPlayerCurMetatileBehavior(int);
static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8);
static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); static const u8 *GetInteractionScript(struct MapPosition*, u8, u8);
static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8);
@@ -138,7 +138,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
u16 metatileBehavior; u16 metatileBehavior;
gSpecialVar_LastTalked = 0; gSpecialVar_LastTalked = 0;
gSelectedEventObject = 0; gSelectedObjectEvent = 0;
playerDirection = GetPlayerFacingDirection(); playerDirection = GetPlayerFacingDirection();
GetPlayerPosition(&position); GetPlayerPosition(&position);
@@ -239,7 +239,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
{ {
const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); const u8 *script = GetInteractedObjectEventScript(position, metatileBehavior, direction);
if (script != NULL) if (script != NULL)
return script; return script;
@@ -260,54 +260,54 @@ static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileB
const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
{ {
u8 eventObjectId; u8 objectEventId;
s32 i; s32 i;
if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y))) if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y)))
eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height);
else else
eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER)
return NULL; return NULL;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId) if (gLinkPlayerObjectEvents[i].active == TRUE && gLinkPlayerObjectEvents[i].objEventId == objectEventId)
return NULL; return NULL;
} }
gSelectedEventObject = eventObjectId; gSelectedObjectEvent = objectEventId;
gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId;
gSpecialVar_Facing = direction; gSpecialVar_Facing = direction;
return GetEventObjectScriptPointerByEventObjectId(eventObjectId); return GetObjectEventScriptPointerByObjectEventId(objectEventId);
} }
static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction)
{ {
u8 eventObjectId; u8 objectEventId;
const u8 *script; const u8 *script;
eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height);
if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER)
{ {
if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE)
return NULL; return NULL;
// Look for an event object on the other side of the counter. // Look for an object event on the other side of the counter.
eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER)
return NULL; return NULL;
} }
gSelectedEventObject = eventObjectId; gSelectedObjectEvent = objectEventId;
gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId;
gSpecialVar_Facing = direction; gSpecialVar_Facing = direction;
if (InTrainerHill() == TRUE) if (InTrainerHill() == TRUE)
script = GetTrainerHillTrainerScript(); script = GetTrainerHillTrainerScript();
else else
script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); script = GetObjectEventScriptPointerByObjectEventId(objectEventId);
script = GetRamScript(gSpecialVar_LastTalked, script); script = GetRamScript(gSpecialVar_LastTalked, script);
return script; return script;
@@ -982,14 +982,14 @@ u8 TrySetDiveWarp(void)
return 0; return 0;
} }
const u8 *GetEventObjectScriptPointerPlayerFacing(void) const u8 *GetObjectEventScriptPointerPlayerFacing(void)
{ {
u8 direction; u8 direction;
struct MapPosition position; struct MapPosition position;
direction = GetPlayerMovementDirection(); direction = GetPlayerMovementDirection();
GetInFrontOfPlayerPosition(&position); GetInFrontOfPlayerPosition(&position);
return GetInteractedEventObjectScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); return GetInteractedObjectEventScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction);
} }
int SetCableClubWarp(void) int SetCableClubWarp(void)
src/field_effect.c
+216 -216
View File
File diff suppressed because it is too large Load Diff
src/field_effect_helpers.c
+161 -161
View File
@@ -16,9 +16,9 @@
#define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c #define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c
static void UpdateObjectReflectionSprite(struct Sprite *); static void UpdateObjectReflectionSprite(struct Sprite *);
static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite); static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static void LoadObjectHighBridgeReflectionPalette(struct EventObject *, u8); static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8);
static void LoadObjectRegularReflectionPalette(struct EventObject *, u8); static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8);
static void sub_81561FC(struct Sprite *, u8, u8); static void sub_81561FC(struct Sprite *, u8, u8);
static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step0(struct Sprite *);
static void FadeFootprintsTireTracks_Step1(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *);
@@ -26,13 +26,13 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *);
static void UpdateAshFieldEffect_Step0(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *);
static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step1(struct Sprite *);
static void UpdateAshFieldEffect_Step2(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *);
static void SynchroniseSurfAnim(struct EventObject *, struct Sprite *); static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *);
static void sub_81556E8(struct EventObject *, struct Sprite *); static void sub_81556E8(struct ObjectEvent *, struct Sprite *);
static void CreateBobbingEffect(struct EventObject *, struct Sprite *, struct Sprite *); static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *);
static void sub_8155850(struct Sprite *); static void sub_8155850(struct Sprite *);
static u32 ShowDisguiseFieldEffect(u8, u8, u8); static u32 ShowDisguiseFieldEffect(u8, u8, u8);
void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection)
{ {
struct Sprite *reflectionSprite; struct Sprite *reflectionSprite;
@@ -47,40 +47,40 @@ void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, boo
reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->affineAnimBeginning = TRUE;
reflectionSprite->subspriteMode = SUBSPRITES_OFF; reflectionSprite->subspriteMode = SUBSPRITES_OFF;
reflectionSprite->data[0] = sprite->data[0]; reflectionSprite->data[0] = sprite->data[0];
reflectionSprite->data[1] = eventObject->localId; reflectionSprite->data[1] = objectEvent->localId;
reflectionSprite->data[7] = stillReflection; reflectionSprite->data[7] = stillReflection;
LoadObjectReflectionPalette(eventObject, reflectionSprite); LoadObjectReflectionPalette(objectEvent, reflectionSprite);
if (!stillReflection) if (!stillReflection)
reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
} }
static s16 GetReflectionVerticalOffset(struct EventObject *eventObject) static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent)
{ {
return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2; return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2;
} }
static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite) static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
u8 bridgeType; u8 bridgeType;
u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 };
sprite->data[2] = 0; sprite->data[2] = 0;
if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior)))) if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior))))
{ {
sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1];
LoadObjectHighBridgeReflectionPalette(eventObject, sprite->oam.paletteNum); LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum);
} }
else else
{ {
LoadObjectRegularReflectionPalette(eventObject, sprite->oam.paletteNum); LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum);
} }
} }
static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, u8 paletteIndex) static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteIndex)
{ {
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE)
{ {
if (graphicsInfo->paletteSlot == 0) if (graphicsInfo->paletteSlot == 0)
@@ -101,11 +101,11 @@ static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject,
// When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color. // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color.
// This is so the sprite blends in with the dark water metatile underneath the bridge. // This is so the sprite blends in with the dark water metatile underneath the bridge.
static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObject, u8 paletteNum) static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteNum)
{ {
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE)
{ {
PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum);
@@ -115,12 +115,12 @@ static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObjec
static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
{ {
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
struct Sprite *mainSprite; struct Sprite *mainSprite;
eventObject = &gEventObjects[reflectionSprite->data[0]]; objectEvent = &gObjectEvents[reflectionSprite->data[0]];
mainSprite = &gSprites[eventObject->spriteId]; mainSprite = &gSprites[objectEvent->spriteId];
if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != reflectionSprite->data[1]) if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1])
{ {
reflectionSprite->inUse = FALSE; reflectionSprite->inUse = FALSE;
} }
@@ -136,14 +136,14 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->invisible = mainSprite->invisible;
reflectionSprite->pos1.x = mainSprite->pos1.x; reflectionSprite->pos1.x = mainSprite->pos1.x;
// reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120
reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(eventObject) + reflectionSprite->data[2]; reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2];
reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX;
reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY;
reflectionSprite->pos2.x = mainSprite->pos2.x; reflectionSprite->pos2.x = mainSprite->pos2.x;
reflectionSprite->pos2.y = -mainSprite->pos2.y; reflectionSprite->pos2.y = -mainSprite->pos2.y;
reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled; reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled;
if (eventObject->hideReflection == TRUE) if (objectEvent->hideReflection == TRUE)
reflectionSprite->invisible = TRUE; reflectionSprite->invisible = TRUE;
// Check if the reflection is not still. // Check if the reflection is not still.
@@ -218,12 +218,12 @@ const u16 gShadowVerticalOffsets[] = {
u32 FldEff_Shadow(void) u32 FldEff_Shadow(void)
{ {
u8 eventObjectId; u8 objectEventId;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
u8 spriteId; u8 spriteId;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
@@ -238,27 +238,27 @@ u32 FldEff_Shadow(void)
void UpdateShadowFieldEffect(struct Sprite *sprite) void UpdateShadowFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId))
{ {
FieldEffectStop(sprite, FLDEFF_SHADOW); FieldEffectStop(sprite, FLDEFF_SHADOW);
} }
else else
{ {
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
linkedSprite = &gSprites[eventObject->spriteId]; linkedSprite = &gSprites[objectEvent->spriteId];
sprite->oam.priority = linkedSprite->oam.priority; sprite->oam.priority = linkedSprite->oam.priority;
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3];
if (!eventObject->active || !eventObject->hasShadow if (!objectEvent->active || !objectEvent->hasShadow
|| MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior)
|| MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior)
|| MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior)
|| MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) || MetatileBehavior_IsReflective(objectEvent->currentMetatileBehavior)
|| MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior)) || MetatileBehavior_IsReflective(objectEvent->previousMetatileBehavior))
{ {
FieldEffectStop(sprite, FLDEFF_SHADOW); FieldEffectStop(sprite, FLDEFF_SHADOW);
} }
@@ -301,8 +301,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite)
u8 mapGroup; u8 mapGroup;
u8 metatileBehavior; u8 metatileBehavior;
u8 localId; u8 localId;
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
mapNum = sprite->data[5] >> 8; mapNum = sprite->data[5] >> 8;
mapGroup = sprite->data[5]; mapGroup = sprite->data[5];
@@ -316,21 +316,21 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite)
mapNum = sprite->data[3]; mapNum = sprite->data[3];
mapGroup = sprite->data[4]; mapGroup = sprite->data[4];
metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
{ {
FieldEffectStop(sprite, FLDEFF_TALL_GRASS); FieldEffectStop(sprite, FLDEFF_TALL_GRASS);
} }
else else
{ {
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2]))
sprite->data[7] = TRUE; sprite->data[7] = TRUE;
metatileBehavior = 0; metatileBehavior = 0;
if (sprite->animCmdIndex == 0) if (sprite->animCmdIndex == 0)
metatileBehavior = 4; metatileBehavior = 4;
UpdateEventObjectSpriteVisibility(sprite, 0); UpdateObjectEventSpriteVisibility(sprite, 0);
sub_81561FC(sprite, sprite->data[0], metatileBehavior); sub_81561FC(sprite, sprite->data[0], metatileBehavior);
} }
} }
@@ -407,8 +407,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite)
u8 mapGroup; u8 mapGroup;
u8 metatileBehavior; u8 metatileBehavior;
u8 localId; u8 localId;
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
mapNum = sprite->data[5] >> 8; mapNum = sprite->data[5] >> 8;
mapGroup = sprite->data[5]; mapGroup = sprite->data[5];
@@ -422,18 +422,18 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite)
mapNum = sprite->data[3]; mapNum = sprite->data[3];
mapGroup = sprite->data[4]; mapGroup = sprite->data[4];
metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
{ {
FieldEffectStop(sprite, FLDEFF_LONG_GRASS); FieldEffectStop(sprite, FLDEFF_LONG_GRASS);
} }
else else
{ {
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2]))
{ {
sprite->data[7] = TRUE; sprite->data[7] = TRUE;
} }
UpdateEventObjectSpriteVisibility(sprite, 0); UpdateObjectEventSpriteVisibility(sprite, 0);
sub_81561FC(sprite, sprite->data[0], 0); sub_81561FC(sprite, sprite->data[0], 0);
} }
} }
@@ -458,44 +458,44 @@ u32 FldEff_JumpLongGrass(void)
u32 FldEff_ShortGrass(void) u32 FldEff_ShortGrass(void)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &(gSprites[spriteId]); sprite = &(gSprites[spriteId]);
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority;
sprite->data[0] = gFieldEffectArguments[0]; sprite->data[0] = gFieldEffectArguments[0];
sprite->data[1] = gFieldEffectArguments[1]; sprite->data[1] = gFieldEffectArguments[1];
sprite->data[2] = gFieldEffectArguments[2]; sprite->data[2] = gFieldEffectArguments[2];
sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
} }
return 0; return 0;
} }
void UpdateShortGrassFieldEffect(struct Sprite *sprite) void UpdateShortGrassFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
s16 x; s16 x;
s16 y; s16 y;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass)
{ {
FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); FieldEffectStop(sprite, FLDEFF_SHORT_GRASS);
} }
else else
{ {
graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
y = linkedSprite->pos1.y; y = linkedSprite->pos1.y;
x = linkedSprite->pos1.x; x = linkedSprite->pos1.x;
if (x != sprite->data[3] || y != sprite->data[4]) if (x != sprite->data[3] || y != sprite->data[4])
@@ -512,7 +512,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite)
sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->pos2.y = (graphicsInfo->height >> 1) - 8;
sprite->subpriority = linkedSprite->subpriority - 1; sprite->subpriority = linkedSprite->subpriority - 1;
sprite->oam.priority = linkedSprite->oam.priority; sprite->oam.priority = linkedSprite->oam.priority;
UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible); UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible);
} }
} }
@@ -586,14 +586,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite)
if (++sprite->data[1] > 40) if (++sprite->data[1] > 40)
sprite->data[0] = 1; sprite->data[0] = 1;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
} }
static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite)
{ {
sprite->invisible ^= 1; sprite->invisible ^= 1;
sprite->data[1]++; sprite->data[1]++;
UpdateEventObjectSpriteVisibility(sprite, sprite->invisible); UpdateObjectEventSpriteVisibility(sprite, sprite->invisible);
if (sprite->data[1] > 56) if (sprite->data[1] > 56)
{ {
FieldEffectStop(sprite, sprite->data[7]); FieldEffectStop(sprite, sprite->data[7]);
@@ -602,22 +602,22 @@ static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite)
u32 FldEff_Splash(void) u32 FldEff_Splash(void)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
linkedSprite = &gSprites[eventObject->spriteId]; linkedSprite = &gSprites[objectEvent->spriteId];
sprite->oam.priority = linkedSprite->oam.priority; sprite->oam.priority = linkedSprite->oam.priority;
sprite->data[0] = gFieldEffectArguments[0]; sprite->data[0] = gFieldEffectArguments[0];
sprite->data[1] = gFieldEffectArguments[1]; sprite->data[1] = gFieldEffectArguments[1];
@@ -630,17 +630,17 @@ u32 FldEff_Splash(void)
void UpdateSplashFieldEffect(struct Sprite *sprite) void UpdateSplashFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) if (sprite->animEnded || TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId))
{ {
FieldEffectStop(sprite, FLDEFF_SPLASH); FieldEffectStop(sprite, FLDEFF_SPLASH);
} }
else else
{ {
sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x;
sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
} }
} }
@@ -682,22 +682,22 @@ u32 FldEff_JumpBigSplash(void)
u32 FldEff_FeetInFlowingWater(void) u32 FldEff_FeetInFlowingWater(void)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->callback = UpdateFeetInFlowingWaterFieldEffect; sprite->callback = UpdateFeetInFlowingWaterFieldEffect;
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority;
sprite->data[0] = gFieldEffectArguments[0]; sprite->data[0] = gFieldEffectArguments[0];
sprite->data[1] = gFieldEffectArguments[1]; sprite->data[1] = gFieldEffectArguments[1];
sprite->data[2] = gFieldEffectArguments[2]; sprite->data[2] = gFieldEffectArguments[2];
@@ -711,26 +711,26 @@ u32 FldEff_FeetInFlowingWater(void)
static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater)
{ {
FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER);
} }
else else
{ {
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
linkedSprite = &gSprites[eventObject->spriteId]; linkedSprite = &gSprites[objectEvent->spriteId];
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = linkedSprite->pos1.y; sprite->pos1.y = linkedSprite->pos1.y;
sprite->subpriority = linkedSprite->subpriority; sprite->subpriority = linkedSprite->subpriority;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4]) if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4])
{ {
sprite->data[3] = eventObject->currentCoords.x; sprite->data[3] = objectEvent->currentCoords.x;
sprite->data[4] = eventObject->currentCoords.y; sprite->data[4] = objectEvent->currentCoords.y;
if (!sprite->invisible) if (!sprite->invisible)
{ {
PlaySE(SE_MIZU); PlaySE(SE_MIZU);
@@ -757,46 +757,46 @@ u32 FldEff_Ripple(void)
u32 FldEff_HotSpringsWater(void) u32 FldEff_HotSpringsWater(void)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority;
sprite->data[0] = gFieldEffectArguments[0]; sprite->data[0] = gFieldEffectArguments[0];
sprite->data[1] = gFieldEffectArguments[1]; sprite->data[1] = gFieldEffectArguments[1];
sprite->data[2] = gFieldEffectArguments[2]; sprite->data[2] = gFieldEffectArguments[2];
sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
} }
return 0; return 0;
} }
void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings)
{ {
FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER);
} }
else else
{ {
graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8;
sprite->subpriority = linkedSprite->subpriority - 1; sprite->subpriority = linkedSprite->subpriority - 1;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
} }
} }
@@ -928,13 +928,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *sprite)
sprite->animPaused = FALSE; sprite->animPaused = FALSE;
MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]);
CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]);
gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE;
sprite->data[0] = 2; sprite->data[0] = 2;
} }
static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) static void UpdateAshFieldEffect_Step2(struct Sprite *sprite)
{ {
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
if (sprite->animEnded) if (sprite->animEnded)
FieldEffectStop(sprite, FLDEFF_ASH); FieldEffectStop(sprite, FLDEFF_ASH);
} }
@@ -993,18 +993,18 @@ static u8 sub_815564C(struct Sprite *sprite)
void UpdateSurfBlobFieldEffect(struct Sprite *sprite) void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
{ {
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
eventObject = &gEventObjects[sprite->data[2]]; objectEvent = &gObjectEvents[sprite->data[2]];
linkedSprite = &gSprites[eventObject->spriteId]; linkedSprite = &gSprites[objectEvent->spriteId];
SynchroniseSurfAnim(eventObject, sprite); SynchroniseSurfAnim(objectEvent, sprite);
sub_81556E8(eventObject, sprite); sub_81556E8(objectEvent, sprite);
CreateBobbingEffect(eventObject, linkedSprite, sprite); CreateBobbingEffect(objectEvent, linkedSprite, sprite);
sprite->oam.priority = linkedSprite->oam.priority; sprite->oam.priority = linkedSprite->oam.priority;
} }
static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
u8 surfBlobDirectionAnims[] = { u8 surfBlobDirectionAnims[] = {
[DIR_NONE] = 0, [DIR_NONE] = 0,
@@ -1019,14 +1019,14 @@ static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *
}; };
if (sub_8155640(sprite) == 0) if (sub_8155640(sprite) == 0)
StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]);
} }
void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
u8 i; u8 i;
s16 x = eventObject->currentCoords.x; s16 x = objectEvent->currentCoords.x;
s16 y = eventObject->currentCoords.y; s16 y = objectEvent->currentCoords.y;
s32 spriteY = sprite->pos2.y; s32 spriteY = sprite->pos2.y;
if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7]))
@@ -1046,7 +1046,7 @@ void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite)
} }
} }
static void CreateBobbingEffect(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite)
{ {
u16 unk_085CDC6A[] = {3, 7}; u16 unk_085CDC6A[] = {3, 7};
u8 v0 = sub_8155638(sprite); u8 v0 = sub_8155638(sprite);
@@ -1121,26 +1121,26 @@ u32 FldEff_Dust(void)
u32 FldEff_SandPile(void) u32 FldEff_SandPile(void)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority;
sprite->data[0] = gFieldEffectArguments[0]; sprite->data[0] = gFieldEffectArguments[0];
sprite->data[1] = gFieldEffectArguments[1]; sprite->data[1] = gFieldEffectArguments[1];
sprite->data[2] = gFieldEffectArguments[2]; sprite->data[2] = gFieldEffectArguments[2];
sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
sprite->pos2.y = (graphicsInfo->height >> 1) - 2; sprite->pos2.y = (graphicsInfo->height >> 1) - 2;
SeekSpriteAnim(sprite, 2); SeekSpriteAnim(sprite, 2);
} }
@@ -1149,18 +1149,18 @@ u32 FldEff_SandPile(void)
void UpdateSandPileFieldEffect(struct Sprite *sprite) void UpdateSandPileFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
s16 x; s16 x;
s16 y; s16 y;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inSandPile)
{ {
FieldEffectStop(sprite, FLDEFF_SAND_PILE); FieldEffectStop(sprite, FLDEFF_SAND_PILE);
} }
else else
{ {
y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y;
x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x;
if (x != sprite->data[3] || y != sprite->data[4]) if (x != sprite->data[3] || y != sprite->data[4])
{ {
sprite->data[3] = x; sprite->data[3] = x;
@@ -1172,8 +1172,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite)
} }
sprite->pos1.x = x; sprite->pos1.x = x;
sprite->pos1.y = y; sprite->pos1.y = y;
sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority; sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
} }
} }
@@ -1198,7 +1198,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite)
sprite->data[0] += 0x80; sprite->data[0] += 0x80;
sprite->data[0] &= 0x100; sprite->data[0] &= 0x100;
sprite->pos1.y -= sprite->data[0] >> 8; sprite->pos1.y -= sprite->data[0] >> 8;
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
if (sprite->invisible || sprite->animEnded) if (sprite->invisible || sprite->animEnded)
{ {
FieldEffectStop(sprite, FLDEFF_BUBBLES); FieldEffectStop(sprite, FLDEFF_BUBBLES);
@@ -1243,7 +1243,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
u8 spriteId; u8 spriteId;
struct Sprite *sprite; struct Sprite *sprite;
if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId))
{ {
FieldEffectActiveListRemove(fldEff); FieldEffectActiveListRemove(fldEff);
return MAX_SPRITES; return MAX_SPRITES;
@@ -1264,17 +1264,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
void UpdateDisguiseFieldEffect(struct Sprite *sprite) void UpdateDisguiseFieldEffect(struct Sprite *sprite)
{ {
u8 eventObjectId; u8 objectEventId;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId)) if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId))
{ {
FieldEffectStop(sprite, sprite->data[1]); FieldEffectStop(sprite, sprite->data[1]);
} }
graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
sprite->invisible = linkedSprite->invisible; sprite->invisible = linkedSprite->invisible;
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16;
@@ -1294,30 +1294,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite)
} }
} }
void sub_8155D78(struct EventObject *eventObject) void sub_8155D78(struct ObjectEvent *objectEvent)
{ {
if (eventObject->directionSequenceIndex == 1) if (objectEvent->directionSequenceIndex == 1)
{ {
gSprites[eventObject->fieldEffectSpriteId].data[0]++; gSprites[objectEvent->fieldEffectSpriteId].data[0]++;
} }
} }
bool8 sub_8155DA0(struct EventObject *eventObject) bool8 sub_8155DA0(struct ObjectEvent *objectEvent)
{ {
struct Sprite *sprite; struct Sprite *sprite;
if (eventObject->directionSequenceIndex == 2) if (objectEvent->directionSequenceIndex == 2)
{ {
return TRUE; return TRUE;
} }
if (eventObject->directionSequenceIndex == 0) if (objectEvent->directionSequenceIndex == 0)
{ {
return TRUE; return TRUE;
} }
sprite = &gSprites[eventObject->fieldEffectSpriteId]; sprite = &gSprites[objectEvent->fieldEffectSpriteId];
if (sprite->data[7]) if (sprite->data[7])
{ {
eventObject->directionSequenceIndex = 2; objectEvent->directionSequenceIndex = 2;
sprite->data[0]++; sprite->data[0]++;
return TRUE; return TRUE;
} }
@@ -1532,7 +1532,7 @@ void sub_8156194(struct Sprite *sprite)
} }
else else
{ {
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0);
} }
} }
@@ -1542,24 +1542,24 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite)
if (sprite->animEnded) if (sprite->animEnded)
FieldEffectStop(sprite, sprite->data[0]); FieldEffectStop(sprite, sprite->data[0]);
else else
UpdateEventObjectSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteVisibility(sprite, FALSE);
} }
static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset)
{ {
u8 i; u8 i;
s16 var, xhi, lyhi, yhi, ylo; s16 var, xhi, lyhi, yhi, ylo;
const struct EventObjectGraphicsInfo *graphicsInfo; // Unused Variable const struct ObjectEventGraphicsInfo *graphicsInfo; // Unused Variable
struct Sprite *linkedSprite; struct Sprite *linkedSprite;
SetObjectSubpriorityByZCoord(z, sprite, offset); SetObjectSubpriorityByZCoord(z, sprite, offset);
for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) for (i = 0; i < EVENT_OBJECTS_COUNT; i ++)
{ {
struct EventObject *eventObject = &gEventObjects[i]; struct ObjectEvent *objectEvent = &gObjectEvents[i];
if (eventObject->active) if (objectEvent->active)
{ {
graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
linkedSprite = &gSprites[eventObject->spriteId]; linkedSprite = &gSprites[objectEvent->spriteId];
xhi = sprite->pos1.x + sprite->centerToCornerVecX; xhi = sprite->pos1.x + sprite->centerToCornerVecX;
var = sprite->pos1.x - sprite->centerToCornerVecX; var = sprite->pos1.x - sprite->centerToCornerVecX;
if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x)
src/field_player_avatar.c
+196 -196
View File
@@ -32,14 +32,14 @@
#include "constants/species.h" #include "constants/species.h"
static EWRAM_DATA u8 gUnknown_0203734C = 0; static EWRAM_DATA u8 gUnknown_0203734C = 0;
EWRAM_DATA struct EventObject gEventObjects[EVENT_OBJECTS_COUNT] = {}; EWRAM_DATA struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT] = {};
EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {};
// static declarations // static declarations
static u8 EventObjectCB2_NoMovement2(); static u8 ObjectEventCB2_NoMovement2();
static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *, u8); static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *, u8);
static void npc_clear_strange_bits(struct EventObject *); static void npc_clear_strange_bits(struct ObjectEvent *);
static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16); static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16);
static void PlayerAllowForcedMovementIfMovingSameDirection(); static void PlayerAllowForcedMovementIfMovingSameDirection();
static bool8 TryDoMetatileBehaviorForcedMovement(); static bool8 TryDoMetatileBehaviorForcedMovement();
@@ -70,20 +70,20 @@ static void PlayerNotOnBikeTurningInPlace(u8, u16);
static void PlayerNotOnBikeMoving(u8, u16); static void PlayerNotOnBikeMoving(u8, u16);
static u8 CheckForPlayerAvatarCollision(u8); static u8 CheckForPlayerAvatarCollision(u8);
static u8 sub_808B028(u8); static u8 sub_808B028(u8);
static u8 sub_808B164(struct EventObject *, s16, s16, u8, u8); static u8 sub_808B164(struct ObjectEvent *, s16, s16, u8, u8);
static bool8 CanStopSurfing(s16, s16, u8); static bool8 CanStopSurfing(s16, s16, u8);
static bool8 ShouldJumpLedge(s16, s16, u8); static bool8 ShouldJumpLedge(s16, s16, u8);
static bool8 TryPushBoulder(s16, s16, u8); static bool8 TryPushBoulder(s16, s16, u8);
static void CheckAcroBikeCollision(s16, s16, u8, u8 *); static void CheckAcroBikeCollision(s16, s16, u8, u8 *);
static void DoPlayerAvatarTransition(void); static void DoPlayerAvatarTransition(void);
static void PlayerAvatarTransition_Dummy(struct EventObject *a); static void PlayerAvatarTransition_Dummy(struct ObjectEvent *a);
static void PlayerAvatarTransition_Normal(struct EventObject *a); static void PlayerAvatarTransition_Normal(struct ObjectEvent *a);
static void PlayerAvatarTransition_MachBike(struct EventObject *a); static void PlayerAvatarTransition_MachBike(struct ObjectEvent *a);
static void PlayerAvatarTransition_AcroBike(struct EventObject *a); static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *a);
static void PlayerAvatarTransition_Surfing(struct EventObject *a); static void PlayerAvatarTransition_Surfing(struct ObjectEvent *a);
static void PlayerAvatarTransition_Underwater(struct EventObject *a); static void PlayerAvatarTransition_Underwater(struct ObjectEvent *a);
static void PlayerAvatarTransition_ReturnToField(struct EventObject *a); static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *a);
static bool8 player_is_anim_in_certain_ranges(void); static bool8 player_is_anim_in_certain_ranges(void);
static bool8 sub_808B618(void); static bool8 sub_808B618(void);
@@ -96,24 +96,24 @@ static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
static void PlayCollisionSoundIfNotFacingWarp(u8 a); static void PlayCollisionSoundIfNotFacingWarp(u8 a);
static void sub_808C280(struct EventObject *); static void sub_808C280(struct ObjectEvent *);
static void StartStrengthAnim(u8, u8); static void StartStrengthAnim(u8, u8);
static void Task_BumpBoulder(u8 taskId); static void Task_BumpBoulder(u8 taskId);
static u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
static u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
static u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
static void DoPlayerMatJump(void); static void DoPlayerMatJump(void);
static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent);
static void DoPlayerMatSpin(void); static void DoPlayerMatSpin(void);
static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId);
static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent);
static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent);
static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent);
static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent);
static void CreateStopSurfingTask(u8); static void CreateStopSurfingTask(u8);
static void Task_StopSurfingInit(u8 taskId); static void Task_StopSurfingInit(u8 taskId);
@@ -138,7 +138,7 @@ static u8 Fishing15(struct Task *task);
static u8 Fishing16(struct Task *task); static u8 Fishing16(struct Task *task);
static void AlignFishingAnimationFrames(void); static void AlignFishingAnimationFrames(void);
static u8 sub_808D38C(struct EventObject *object, s16 *a1); static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1);
// .rodata // .rodata
@@ -211,7 +211,7 @@ static const u8 sAcroBikeTrickCollisionTypes[] = {
COLLISION_HORIZONTAL_RAIL, COLLISION_HORIZONTAL_RAIL,
}; };
static void (*const gUnknown_084974B8[])(struct EventObject *) = static void (*const gUnknown_084974B8[])(struct ObjectEvent *) =
{ {
PlayerAvatarTransition_Normal, PlayerAvatarTransition_Normal,
PlayerAvatarTransition_MachBike, PlayerAvatarTransition_MachBike,
@@ -287,19 +287,19 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of
MetatileBehavior_IsEastArrowWarp, MetatileBehavior_IsEastArrowWarp,
}; };
static bool8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) = static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) =
{ {
sub_808C3A4, sub_808C3A4,
do_boulder_dust, do_boulder_dust,
sub_808C484, sub_808C484,
}; };
static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) =
{ {
PlayerAvatar_DoSecretBaseMatJump, PlayerAvatar_DoSecretBaseMatJump,
}; };
static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) =
{ {
PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep0,
PlayerAvatar_SecretBaseMatSpinStep1, PlayerAvatar_SecretBaseMatSpinStep1,
@@ -311,23 +311,23 @@ static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct Eve
void MovementType_Player(struct Sprite *sprite) void MovementType_Player(struct Sprite *sprite)
{ {
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2);
} }
static u8 EventObjectCB2_NoMovement2(void) static u8 ObjectEventCB2_NoMovement2(void)
{ {
return 0; return 0;
} }
void player_step(u8 direction, u16 newKeys, u16 heldKeys) void player_step(u8 direction, u16 newKeys, u16 heldKeys)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
sub_808C280(playerEventObj); sub_808C280(playerEventObj);
if (gPlayerAvatar.preventStep == FALSE) if (gPlayerAvatar.preventStep == FALSE)
{ {
Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys);
if (TryInterruptEventObjectSpecialAnim(playerEventObj, direction) == 0) if (TryInterruptObjectEventSpecialAnim(playerEventObj, direction) == 0)
{ {
npc_clear_strange_bits(playerEventObj); npc_clear_strange_bits(playerEventObj);
DoPlayerAvatarTransition(); DoPlayerAvatarTransition();
@@ -340,16 +340,16 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys)
} }
} }
static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerEventObj, u8 direction)
{ {
u8 r5 = direction; u8 r5 = direction;
u8 r6 = direction; u8 r6 = direction;
r6++; r6--; r6++; r6--;
if (EventObjectIsMovementOverridden(playerEventObj) if (ObjectEventIsMovementOverridden(playerEventObj)
&& !EventObjectClearHeldMovementIfFinished(playerEventObj)) && !ObjectEventClearHeldMovementIfFinished(playerEventObj))
{ {
u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerEventObj);
if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN) if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN)
{ {
if (direction == DIR_NONE) if (direction == DIR_NONE)
@@ -359,13 +359,13 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
if (playerEventObj->movementDirection != r5) if (playerEventObj->movementDirection != r5)
{ {
EventObjectClearHeldMovement(playerEventObj); ObjectEventClearHeldMovement(playerEventObj);
return FALSE; return FALSE;
} }
if (!sub_808B028(r6)) if (!sub_808B028(r6))
{ {
EventObjectClearHeldMovement(playerEventObj); ObjectEventClearHeldMovement(playerEventObj);
return FALSE; return FALSE;
} }
} }
@@ -376,11 +376,11 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
return FALSE; return FALSE;
} }
static void npc_clear_strange_bits(struct EventObject *eventObj) static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
{ {
eventObj->inanimate = 0; objEvent->inanimate = 0;
eventObj->disableAnim = 0; objEvent->disableAnim = 0;
eventObj->facingDirectionLocked = 0; objEvent->facingDirectionLocked = 0;
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH;
} }
@@ -410,7 +410,7 @@ static u8 GetForcedMovementByMetatileBehavior(void)
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5))
{ {
u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior;
for (i = 0; i < 18; i++) for (i = 0; i < 18; i++)
{ {
@@ -425,11 +425,11 @@ static bool8 ForcedMovement_None(void)
{ {
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
playerEventObj->facingDirectionLocked = 0; playerEventObj->facingDirectionLocked = 0;
playerEventObj->enableAnim = 1; playerEventObj->enableAnim = 1;
SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection);
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6;
} }
return FALSE; return FALSE;
@@ -467,7 +467,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8))
static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
playerEventObj->disableAnim = 1; playerEventObj->disableAnim = 1;
return DoForcedMovement(playerEventObj->movementDirection, a); return DoForcedMovement(playerEventObj->movementDirection, a);
@@ -520,7 +520,7 @@ static bool8 ForcedMovement_PushedEastByCurrent(void)
u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
playerEventObj->disableAnim = 1; playerEventObj->disableAnim = 1;
playerEventObj->facingDirectionLocked = 1; playerEventObj->facingDirectionLocked = 1;
@@ -561,7 +561,7 @@ static bool8 ForcedMovement_0xBC(void)
static bool8 ForcedMovement_MuddySlope(void) static bool8 ForcedMovement_MuddySlope(void)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3)
{ {
@@ -642,7 +642,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
} }
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH)
&& IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0) && IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) == 0)
{ {
PlayerRun(direction); PlayerRun(direction);
gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
@@ -657,18 +657,18 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
static u8 CheckForPlayerAvatarCollision(u8 direction) static u8 CheckForPlayerAvatarCollision(u8 direction)
{ {
s16 x, y; s16 x, y;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
x = playerEventObj->currentCoords.x; x = playerEventObj->currentCoords.x;
y = playerEventObj->currentCoords.y; y = playerEventObj->currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); return CheckForObjectEventCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
} }
static u8 sub_808B028(u8 direction) static u8 sub_808B028(u8 direction)
{ {
s16 x, y; s16 x, y;
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
x = playerEventObj->currentCoords.x; x = playerEventObj->currentCoords.x;
y = playerEventObj->currentCoords.y; y = playerEventObj->currentCoords.y;
@@ -676,9 +676,9 @@ static u8 sub_808B028(u8 direction)
return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
} }
u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior)
{ {
u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction);
if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction)) if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction))
return COLLISION_STOP_SURFING; return COLLISION_STOP_SURFING;
@@ -699,9 +699,9 @@ u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u
return collision; return collision;
} }
static u8 sub_808B164(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) static u8 sub_808B164(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior)
{ {
u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction);
if (collision == COLLISION_NONE) if (collision == COLLISION_NONE)
{ {
@@ -716,7 +716,7 @@ static bool8 CanStopSurfing(s16 x, s16 y, u8 direction)
{ {
if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
&& MapGridGetZCoordAt(x, y) == 3 && MapGridGetZCoordAt(x, y) == 3
&& GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) && GetObjectEventIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT)
{ {
CreateStopSurfingTask(direction); CreateStopSurfingTask(direction);
return TRUE; return TRUE;
@@ -739,17 +739,17 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
{ {
if (FlagGet(FLAG_SYS_USE_STRENGTH)) if (FlagGet(FLAG_SYS_USE_STRENGTH))
{ {
u8 eventObjectId = GetEventObjectIdByXY(x, y); u8 objectEventId = GetObjectEventIdByXY(x, y);
if (eventObjectId != 16 && gEventObjects[eventObjectId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER)
{ {
x = gEventObjects[eventObjectId].currentCoords.x; x = gObjectEvents[objectEventId].currentCoords.x;
y = gEventObjects[eventObjectId].currentCoords.y; y = gObjectEvents[objectEventId].currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == COLLISION_NONE if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE
&& MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0)
{ {
StartStrengthAnim(eventObjectId, direction); StartStrengthAnim(objectEventId, direction);
return TRUE; return TRUE;
} }
} }
@@ -774,21 +774,21 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis
bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
{ {
u8 mewObjectId; u8 mewObjectId;
struct EventObject *object; struct ObjectEvent *object;
s16 playerX; s16 playerX;
s16 playerY; s16 playerY;
s16 mewPrevX; s16 mewPrevX;
object = &gEventObjects[gPlayerAvatar.eventObjectId]; object = &gObjectEvents[gPlayerAvatar.objectEventId];
playerX = object->currentCoords.x; playerX = object->currentCoords.x;
playerY = object->currentCoords.y; playerY = object->currentCoords.y;
MoveCoords(direction, &playerX, &playerY); MoveCoords(direction, &playerX, &playerY);
mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); mewObjectId = GetObjectEventIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR));
if (mewObjectId == EVENT_OBJECTS_COUNT) if (mewObjectId == EVENT_OBJECTS_COUNT)
return FALSE; return FALSE;
object = &gEventObjects[mewObjectId]; object = &gObjectEvents[mewObjectId];
mewPrevX = object->previousCoords.x; mewPrevX = object->previousCoords.x;
if (mewPrevX == playerX) if (mewPrevX == playerX)
@@ -821,65 +821,65 @@ static void DoPlayerAvatarTransition(void)
for (i = 0; i < 8; i++, flags >>= 1) for (i = 0; i < 8; i++, flags >>= 1)
{ {
if (flags & 1) if (flags & 1)
gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
} }
gPlayerAvatar.unk1 = 0; gPlayerAvatar.unk1 = 0;
} }
} }
static void PlayerAvatarTransition_Dummy(struct EventObject *eventObj) static void PlayerAvatarTransition_Dummy(struct ObjectEvent *objEvent)
{ {
} }
static void PlayerAvatarTransition_Normal(struct EventObject *eventObj) static void PlayerAvatarTransition_Normal(struct ObjectEvent *objEvent)
{ {
EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
EventObjectTurn(eventObj, eventObj->movementDirection); ObjectEventTurn(objEvent, objEvent->movementDirection);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
} }
static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj) static void PlayerAvatarTransition_MachBike(struct ObjectEvent *objEvent)
{ {
EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE));
EventObjectTurn(eventObj, eventObj->movementDirection); ObjectEventTurn(objEvent, objEvent->movementDirection);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
BikeClearState(0, 0); BikeClearState(0, 0);
} }
static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj) static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *objEvent)
{ {
EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
EventObjectTurn(eventObj, eventObj->movementDirection); ObjectEventTurn(objEvent, objEvent->movementDirection);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE);
BikeClearState(0, 0); BikeClearState(0, 0);
Bike_HandleBumpySlopeJump(); Bike_HandleBumpySlopeJump();
} }
static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj) static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent)
{ {
u8 spriteId; u8 spriteId;
EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
EventObjectTurn(eventObj, eventObj->movementDirection); ObjectEventTurn(objEvent, objEvent->movementDirection);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[0] = objEvent->currentCoords.x;
gFieldEffectArguments[1] = eventObj->currentCoords.y; gFieldEffectArguments[1] = objEvent->currentCoords.y;
gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
spriteId = FieldEffectStart(FLDEFF_SURF_BLOB); spriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
eventObj->fieldEffectSpriteId = spriteId; objEvent->fieldEffectSpriteId = spriteId;
sub_81555AC(spriteId, 1); sub_81555AC(spriteId, 1);
} }
static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj) static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent)
{ {
EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER));
EventObjectTurn(eventObj, eventObj->movementDirection); ObjectEventTurn(objEvent, objEvent->movementDirection);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER);
eventObj->fieldEffectSpriteId = sub_8155800(eventObj->spriteId); objEvent->fieldEffectSpriteId = sub_8155800(objEvent->spriteId);
} }
static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent)
{ {
gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5;
} }
@@ -904,7 +904,7 @@ void sub_808B578(void)
static bool8 player_is_anim_in_certain_ranges(void) static bool8 player_is_anim_in_certain_ranges(void)
{ {
u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId;
if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT
|| (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16)
@@ -926,27 +926,27 @@ static bool8 sub_808B618(void)
static bool8 PlayerIsAnimActive(void) static bool8 PlayerIsAnimActive(void)
{ {
return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]); return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]);
} }
static bool8 PlayerCheckIfAnimFinishedOrInactive(void) static bool8 PlayerCheckIfAnimFinishedOrInactive(void)
{ {
return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]); return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]);
} }
static void PlayerSetCopyableMovement(u8 a) static void PlayerSetCopyableMovement(u8 a)
{ {
gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a; gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a;
} }
u8 PlayerGetCopyableMovement(void) u8 PlayerGetCopyableMovement(void)
{ {
return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement; return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement;
} }
static void sub_808B6BC(u8 a) static void sub_808B6BC(u8 a)
{ {
EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a);
} }
void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
@@ -954,7 +954,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
if (!PlayerIsAnimActive()) if (!PlayerIsAnimActive())
{ {
PlayerSetCopyableMovement(copyableMovement); PlayerSetCopyableMovement(copyableMovement);
EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId);
} }
} }
@@ -1029,7 +1029,7 @@ void sub_808B864(void)
if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
{ {
if (player_should_look_direction_be_enforced_upon_movement()) if (player_should_look_direction_be_enforced_upon_movement())
sub_808B6BC(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); sub_808B6BC(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection));
} }
} }
@@ -1103,7 +1103,7 @@ void sub_808B9D4(u8 direction)
static void PlayCollisionSoundIfNotFacingWarp(u8 a) static void PlayCollisionSoundIfNotFacingWarp(u8 a)
{ {
s16 x, y; s16 x, y;
u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior;
if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior))
{ {
@@ -1120,20 +1120,20 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a)
void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y)
{ {
*x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x;
*y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
MoveCoords(GetPlayerFacingDirection(), x, y); MoveCoords(GetPlayerFacingDirection(), x, y);
} }
void PlayerGetDestCoords(s16 *x, s16 *y) void PlayerGetDestCoords(s16 *x, s16 *y)
{ {
*x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x;
*y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
} }
u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
{ {
struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
{ {
@@ -1168,22 +1168,22 @@ u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
u8 GetPlayerFacingDirection(void) u8 GetPlayerFacingDirection(void)
{ {
return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection; return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection;
} }
u8 GetPlayerMovementDirection(void) u8 GetPlayerMovementDirection(void)
{ {
return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection; return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection;
} }
u8 PlayerGetZCoord(void) u8 PlayerGetZCoord(void)
{ {
return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation; return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation;
} }
void sub_808BC90(s16 x, s16 y) void sub_808BC90(s16 x, s16 y)
{ {
MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y); MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y);
} }
u8 TestPlayerAvatarFlags(u8 a) u8 TestPlayerAvatarFlags(u8 a)
@@ -1208,10 +1208,10 @@ void sub_808BCE8(void)
void sub_808BCF4(void) void sub_808BCF4(void)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
npc_clear_strange_bits(playerEventObj); npc_clear_strange_bits(playerEventObj);
SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection);
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
{ {
Bike_HandleBumpySlopeJump(); Bike_HandleBumpySlopeJump();
@@ -1307,7 +1307,7 @@ bool8 IsPlayerSurfingNorth(void)
bool8 IsPlayerFacingSurfableFishableWater(void) bool8 IsPlayerFacingSurfableFishableWater(void)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
s16 x = playerEventObj->currentCoords.x; s16 x = playerEventObj->currentCoords.x;
s16 y = playerEventObj->currentCoords.y; s16 y = playerEventObj->currentCoords.y;
@@ -1366,9 +1366,9 @@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
{ {
struct EventObjectTemplate playerEventObjTemplate; struct ObjectEventTemplate playerEventObjTemplate;
u8 eventObjectId; u8 objectEventId;
struct EventObject *eventObject; struct ObjectEvent *objectEvent;
playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER;
playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
@@ -1382,71 +1382,71 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
playerEventObjTemplate.trainerRange_berryTreeId = 0; playerEventObjTemplate.trainerRange_berryTreeId = 0;
playerEventObjTemplate.script = NULL; playerEventObjTemplate.script = NULL;
playerEventObjTemplate.flagId = 0; playerEventObjTemplate.flagId = 0;
eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate); objectEventId = SpawnSpecialObjectEvent(&playerEventObjTemplate);
eventObject = &gEventObjects[eventObjectId]; objectEvent = &gObjectEvents[objectEventId];
eventObject->isPlayer = 1; objectEvent->isPlayer = 1;
eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); objectEvent->warpArrowSpriteId = CreateWarpArrowSprite();
EventObjectTurn(eventObject, direction); ObjectEventTurn(objectEvent, direction);
ClearPlayerAvatarInfo(); ClearPlayerAvatarInfo();
gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.runningState = NOT_MOVING;
gPlayerAvatar.tileTransitionState = T_NOT_MOVING; gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
gPlayerAvatar.eventObjectId = eventObjectId; gPlayerAvatar.objectEventId = objectEventId;
gPlayerAvatar.spriteId = eventObject->spriteId; gPlayerAvatar.spriteId = objectEvent->spriteId;
gPlayerAvatar.gender = gender; gPlayerAvatar.gender = gender;
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT);
} }
void sub_808C0A8(u8 a) void sub_808C0A8(u8 a)
{ {
gEventObjects[gPlayerAvatar.eventObjectId].invisible = a; gObjectEvents[gPlayerAvatar.objectEventId].invisible = a;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a; gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = a;
} }
void sub_808C114(void) void sub_808C114(void)
{ {
EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
} }
void sub_808C15C(u8 direction) void sub_808C15C(u8 direction)
{ {
EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction));
} }
void sub_808C1B4(u8 direction) void sub_808C1B4(u8 direction)
{ {
EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction));
SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1);
} }
void sub_808C228(u8 direction) void sub_808C228(u8 direction)
{ {
EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction));
} }
static void sub_808C280(struct EventObject *eventObject) static void sub_808C280(struct ObjectEvent *objectEvent)
{ {
s16 x; s16 x;
s16 y; s16 y;
u8 direction; u8 direction;
u8 metatileBehavior = eventObject->currentMetatileBehavior; u8 metatileBehavior = objectEvent->currentMetatileBehavior;
for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++)
{ {
if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection) if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection)
{ {
x = eventObject->currentCoords.x; x = objectEvent->currentCoords.x;
y = eventObject->currentCoords.y; y = objectEvent->currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y); ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y);
return; return;
} }
} }
SetSpriteInvisible(eventObject->warpArrowSpriteId); SetSpriteInvisible(objectEvent->warpArrowSpriteId);
} }
/* Strength */ /* Strength */
@@ -1463,12 +1463,12 @@ static void StartStrengthAnim(u8 a, u8 b)
static void Task_BumpBoulder(u8 taskId) static void Task_BumpBoulder(u8 taskId)
{ {
while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId], while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId],
&gEventObjects[gPlayerAvatar.eventObjectId], &gObjectEvents[gPlayerAvatar.objectEventId],
&gEventObjects[gTasks[taskId].data[1]])) &gObjectEvents[gTasks[taskId].data[1]]))
; ;
} }
static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
@@ -1476,25 +1476,25 @@ static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, st
return FALSE; return FALSE;
} }
static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{ {
if (EventObjectIsHeldMovementActive(playerObject)) if (ObjectEventIsHeldMovementActive(playerObject))
{ {
EventObjectClearHeldMovementIfFinished(playerObject); ObjectEventClearHeldMovementIfFinished(playerObject);
} }
if (EventObjectIsHeldMovementActive(strengthObject)) if (ObjectEventIsHeldMovementActive(strengthObject))
{ {
EventObjectClearHeldMovementIfFinished(strengthObject); ObjectEventClearHeldMovementIfFinished(strengthObject);
} }
if (!EventObjectIsMovementOverridden(playerObject) if (!ObjectEventIsMovementOverridden(playerObject)
&& !EventObjectIsMovementOverridden(strengthObject)) && !ObjectEventIsMovementOverridden(strengthObject))
{ {
EventObjectClearHeldMovementIfFinished(playerObject); ObjectEventClearHeldMovementIfFinished(playerObject);
EventObjectClearHeldMovementIfFinished(strengthObject); ObjectEventClearHeldMovementIfFinished(strengthObject);
EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); ObjectEventSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); ObjectEventSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2]));
gFieldEffectArguments[0] = strengthObject->currentCoords.x; gFieldEffectArguments[0] = strengthObject->currentCoords.x;
gFieldEffectArguments[1] = strengthObject->currentCoords.y; gFieldEffectArguments[1] = strengthObject->currentCoords.y;
gFieldEffectArguments[2] = strengthObject->previousElevation; gFieldEffectArguments[2] = strengthObject->previousElevation;
@@ -1506,13 +1506,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject
return FALSE; return FALSE;
} }
static bool8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{ {
if (EventObjectCheckHeldMovementStatus(playerObject) if (ObjectEventCheckHeldMovementStatus(playerObject)
&& EventObjectCheckHeldMovementStatus(strengthObject)) && ObjectEventCheckHeldMovementStatus(strengthObject))
{ {
EventObjectClearHeldMovementIfFinished(playerObject); ObjectEventClearHeldMovementIfFinished(playerObject);
EventObjectClearHeldMovementIfFinished(strengthObject); ObjectEventClearHeldMovementIfFinished(strengthObject);
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
@@ -1529,18 +1529,18 @@ static void DoPlayerMatJump(void)
static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) static void DoPlayerAvatarSecretBaseMatJump(u8 taskId)
{ {
while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) 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. // 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 u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject) static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent)
{ {
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
if (EventObjectClearHeldMovementIfFinished(eventObject)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
PlaySE(SE_DANSA); PlaySE(SE_DANSA);
EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection)); ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection));
task->data[1]++; task->data[1]++;
if (task->data[1] > 1) if (task->data[1] > 1)
{ {
@@ -1563,29 +1563,29 @@ static void DoPlayerMatSpin(void)
static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId) static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId)
{ {
while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]))
; ;
} }
static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject) static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent)
{ {
task->data[0]++; task->data[0]++;
task->data[1] = eventObject->movementDirection; task->data[1] = objectEvent->movementDirection;
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
ScriptContext2_Enable(); ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN); PlaySE(SE_TK_WARPIN);
return TRUE; return TRUE;
} }
static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject) static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent)
{ {
u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
if (EventObjectClearHeldMovementIfFinished(eventObject)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
u8 direction; u8 direction;
EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1])); ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1]));
if (direction == (u8)task->data[1]) if (direction == (u8)task->data[1])
task->data[2]++; task->data[2]++;
task->data[0]++; task->data[0]++;
@@ -1595,7 +1595,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct Event
return FALSE; return FALSE;
} }
static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject) static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent)
{ {
const u8 actions[] = { const u8 actions[] = {
MOVEMENT_ACTION_DELAY_1, MOVEMENT_ACTION_DELAY_1,
@@ -1605,19 +1605,19 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct Event
MOVEMENT_ACTION_DELAY_8, MOVEMENT_ACTION_DELAY_8,
}; };
if (EventObjectClearHeldMovementIfFinished(eventObject)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
EventObjectSetHeldMovement(eventObject, actions[task->data[2]]); ObjectEventSetHeldMovement(objectEvent, actions[task->data[2]]);
task->data[0] = 1; task->data[0] = 1;
} }
return FALSE; return FALSE;
} }
static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject) static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent)
{ {
if (EventObjectClearHeldMovementIfFinished(eventObject)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
ScriptContext2_Disable(); ScriptContext2_Disable();
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
@@ -1642,26 +1642,26 @@ static void CreateStopSurfingTask(u8 direction)
static void Task_StopSurfingInit(u8 taskId) static void Task_StopSurfingInit(u8 taskId)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (EventObjectIsMovementOverridden(playerEventObj)) if (ObjectEventIsMovementOverridden(playerEventObj))
{ {
if (!EventObjectClearHeldMovementIfFinished(playerEventObj)) if (!ObjectEventClearHeldMovementIfFinished(playerEventObj))
return; return;
} }
sub_81555AC(playerEventObj->fieldEffectSpriteId, 2); sub_81555AC(playerEventObj->fieldEffectSpriteId, 2);
EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); ObjectEventSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0]));
gTasks[taskId].func = Task_WaitStopSurfing; gTasks[taskId].func = Task_WaitStopSurfing;
} }
static void Task_WaitStopSurfing(u8 taskId) static void Task_WaitStopSurfing(u8 taskId)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (EventObjectClearHeldMovementIfFinished(playerEventObj)) if (ObjectEventClearHeldMovementIfFinished(playerEventObj))
{ {
EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); ObjectEventSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); ObjectEventSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection));
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]);
@@ -1729,15 +1729,15 @@ static bool8 Fishing1(struct Task *task)
static bool8 Fishing2(struct Task *task) static bool8 Fishing2(struct Task *task)
{ {
struct EventObject *playerEventObj; struct ObjectEvent *playerEventObj;
const s16 arr1[] = {1, 1, 1}; const s16 arr1[] = {1, 1, 1};
const s16 arr2[] = {1, 3, 6}; const s16 arr2[] = {1, 3, 6};
task->tRoundsPlayed = 0; task->tRoundsPlayed = 0;
task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId; task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId;
playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
EventObjectClearHeldMovementIfActive(playerEventObj); ObjectEventClearHeldMovementIfActive(playerEventObj);
playerEventObj->enableAnim = 1; playerEventObj->enableAnim = 1;
sub_808C15C(playerEventObj->facingDirection); sub_808C15C(playerEventObj->facingDirection);
task->tStep++; task->tStep++;
@@ -1928,12 +1928,12 @@ static bool8 Fishing11(struct Task *task)
{ {
if (!IsTextPrinterActive(0)) if (!IsTextPrinterActive(0))
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId);
EventObjectTurn(playerEventObj, playerEventObj->movementDirection); ObjectEventTurn(playerEventObj, playerEventObj->movementDirection);
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
gSprites[gPlayerAvatar.spriteId].pos2.y = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
ClearDialogWindowAndFrame(0, TRUE); ClearDialogWindowAndFrame(0, TRUE);
@@ -1988,12 +1988,12 @@ static bool8 Fishing15(struct Task *task)
AlignFishingAnimationFrames(); AlignFishingAnimationFrames();
if (gSprites[gPlayerAvatar.spriteId].animEnded) if (gSprites[gPlayerAvatar.spriteId].animEnded)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId);
EventObjectTurn(playerEventObj, playerEventObj->movementDirection); ObjectEventTurn(playerEventObj, playerEventObj->movementDirection);
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
gSprites[gPlayerAvatar.spriteId].pos2.y = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
task->tStep++; task->tStep++;
@@ -2008,7 +2008,7 @@ static bool8 Fishing16(struct Task *task)
{ {
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable(); ScriptContext2_Disable();
UnfreezeEventObjects(); UnfreezeObjectEvents();
ClearDialogWindowAndFrame(0, TRUE); ClearDialogWindowAndFrame(0, TRUE);
sub_80ED950(0); sub_80ED950(0);
DestroyTask(FindTaskIdByFunc(Task_Fishing)); DestroyTask(FindTaskIdByFunc(Task_Fishing));
@@ -2052,7 +2052,7 @@ static void AlignFishingAnimationFrames(void)
if (animType == 10 || animType == 11) if (animType == 10 || animType == 11)
playerSprite->pos2.y = 8; playerSprite->pos2.y = 8;
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
} }
void sub_808D074(u8 a0) void sub_808D074(u8 a0)
@@ -2071,14 +2071,14 @@ static u8 sub_808D080(void)
static void sub_808D094(u8 taskId) static void sub_808D094(u8 taskId)
{ {
struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
struct Sprite *sprite = &gSprites[object->spriteId]; struct Sprite *sprite = &gSprites[object->spriteId];
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
switch (data[0]) switch (data[0])
{ {
case 0: case 0:
if (!EventObjectClearHeldMovementIfFinished(object)) if (!ObjectEventClearHeldMovementIfFinished(object))
{ {
return; return;
} }
@@ -2136,7 +2136,7 @@ static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH,
static void sub_808D1FC(u8 taskId) static void sub_808D1FC(u8 taskId)
{ {
struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId];
struct Sprite *sprite = &gSprites[object->spriteId]; struct Sprite *sprite = &gSprites[object->spriteId];
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
@@ -2144,7 +2144,7 @@ static void sub_808D1FC(u8 taskId)
{ {
case 0: case 0:
data[5] = sub_808D080(); data[5] = sub_808D080();
EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]]));
data[1] = 0; data[1] = 0;
data[2] = 116; data[2] = 116;
data[4] = sprite->pos1.y; data[4] = sprite->pos1.y;
@@ -2195,19 +2195,19 @@ static void sub_808D1FC(u8 taskId)
} }
} }
static u8 sub_808D38C(struct EventObject *object, s16 *a1) static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1)
{ {
if (*a1 < 8 && ++(*a1) < 8) if (*a1 < 8 && ++(*a1) < 8)
{ {
return object->facingDirection; return object->facingDirection;
} }
if (!EventObjectCheckHeldMovementStatus(object)) if (!ObjectEventCheckHeldMovementStatus(object))
{ {
return object->facingDirection; return object->facingDirection;
} }
EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection]));
*a1 = 0; *a1 = 0;
return gUnknown_084975BC[object->facingDirection]; return gUnknown_084975BC[object->facingDirection];
} }
src/field_screen_effect.c
+31 -31
View File
@@ -327,7 +327,7 @@ static void sub_80AF438(u8 taskId)
{ {
case 0: case 0:
sub_80AF0F4(0); sub_80AF0F4(0);
FreezeEventObjects(); FreezeObjectEvents();
PlayerGetDestCoords(x, y); PlayerGetDestCoords(x, y);
FieldSetDoorOpened(*x, *y); FieldSetDoorOpened(*x, *y);
task->data[0] = 1; task->data[0] = 1;
@@ -335,27 +335,27 @@ static void sub_80AF438(u8 taskId)
case 1: case 1:
if (WaitForWeatherFadeIn()) if (WaitForWeatherFadeIn())
{ {
u8 eventObjId; u8 objEventId;
sub_80AF0F4(1); sub_80AF0F4(1);
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 2; task->data[0] = 2;
} }
break; break;
case 2: case 2:
if (walkrun_is_standing_still()) if (walkrun_is_standing_still())
{ {
u8 eventObjId; u8 objEventId;
task->data[1] = FieldAnimateDoorClose(*x, *y); task->data[1] = FieldAnimateDoorClose(*x, *y);
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
task->data[0] = 3; task->data[0] = 3;
} }
break; break;
case 3: case 3:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{ {
UnfreezeEventObjects(); UnfreezeObjectEvents();
task->data[0] = 4; task->data[0] = 4;
} }
break; break;
@@ -376,24 +376,24 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
{ {
case 0: case 0:
sub_80AF0F4(0); sub_80AF0F4(0);
FreezeEventObjects(); FreezeObjectEvents();
PlayerGetDestCoords(x, y); PlayerGetDestCoords(x, y);
task->data[0] = 1; task->data[0] = 1;
break; break;
case 1: case 1:
if (WaitForWeatherFadeIn()) if (WaitForWeatherFadeIn())
{ {
u8 eventObjId; u8 objEventId;
sub_80AF0F4(1); sub_80AF0F4(1);
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2; task->data[0] = 2;
} }
break; break;
case 2: case 2:
if (walkrun_is_standing_still()) if (walkrun_is_standing_still())
{ {
UnfreezeEventObjects(); UnfreezeObjectEvents();
task->data[0] = 3; task->data[0] = 3;
} }
break; break;
@@ -409,14 +409,14 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
ScriptContext2_Enable(); ScriptContext2_Enable();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 1: case 1:
if (WaitForWeatherFadeIn()) if (WaitForWeatherFadeIn())
{ {
UnfreezeEventObjects(); UnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -452,7 +452,7 @@ static void task_mpl_807E3C8(u8 taskId)
{ {
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
} }
} }
@@ -560,7 +560,7 @@ void DoMossdeepGymWarp(void)
{ {
sub_8085540(1); sub_8085540(1);
ScriptContext2_Enable(); ScriptContext2_Enable();
SaveEventObjects(); SaveObjectEvents();
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeScreen(); WarpFadeScreen();
PlaySE(SE_TK_WARPIN); PlaySE(SE_TK_WARPIN);
@@ -650,7 +650,7 @@ static void sub_80AFA0C(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
ScriptContext2_Enable(); ScriptContext2_Enable();
task->data[0]++; task->data[0]++;
break; break;
@@ -683,7 +683,7 @@ static void sub_80AFA88(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
PlayerGetDestCoords(x, y); PlayerGetDestCoords(x, y);
PlaySE(GetDoorSoundEffect(*x, *y - 1)); PlaySE(GetDoorSoundEffect(*x, *y - 1));
task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
@@ -692,21 +692,21 @@ static void sub_80AFA88(u8 taskId)
case 1: case 1:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{ {
u8 eventObjId; u8 objEventId;
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]);
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP);
task->data[0] = 2; task->data[0] = 2;
} }
break; break;
case 2: case 2:
if (walkrun_is_standing_still()) if (walkrun_is_standing_still())
{ {
u8 eventObjId; u8 objEventId;
task->data[1] = FieldAnimateDoorClose(*x, *y - 1); task->data[1] = FieldAnimateDoorClose(*x, *y - 1);
eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
sub_80AF0F4(0); sub_80AF0F4(0);
task->data[0] = 3; task->data[0] = 3;
} }
@@ -734,7 +734,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
ScriptContext2_Enable(); ScriptContext2_Enable();
task->data[0]++; task->data[0]++;
break; break;
@@ -1001,7 +1001,7 @@ static void task0A_mpl_807E31C(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
ScriptContext2_Enable(); ScriptContext2_Enable();
sub_808D194(); sub_808D194();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
@@ -1009,7 +1009,7 @@ static void task0A_mpl_807E31C(u8 taskId)
case 1: case 1:
if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE)
{ {
UnfreezeEventObjects(); UnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -1024,7 +1024,7 @@ static void sub_80B01BC(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
FreezeEventObjects(); FreezeObjectEvents();
ScriptContext2_Enable(); ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN); PlaySE(SE_TK_WARPIN);
sub_808D1C8(); sub_808D1C8();
src/field_special_scene.c
+2 -2
View File
@@ -326,7 +326,7 @@ void Task_HandlePorthole(u8 taskId)
static void ShowSSTidalWhileSailing(void) static void ShowSSTidalWhileSailing(void)
{ {
u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); u8 spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0);
gSprites[spriteId].coordOffsetEnabled = FALSE; gSprites[spriteId].coordOffsetEnabled = FALSE;
@@ -339,7 +339,7 @@ static void ShowSSTidalWhileSailing(void)
void sub_80FB768(void) void sub_80FB768(void)
{ {
ShowSSTidalWhileSailing(); ShowSSTidalWhileSailing();
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
pal_fill_black(); pal_fill_black();
CreateTask(Task_HandlePorthole, 80); CreateTask(Task_HandlePorthole, 80);
ScriptContext2_Enable(); ScriptContext2_Enable();
src/field_specials.c
+23 -23
View File
@@ -87,17 +87,17 @@ static EWRAM_DATA u32 sUnknown_0203AB70 = 0;
struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate;
extern const u16 gEventObjectPalette8[]; extern const u16 gObjectEventPalette8[];
extern const u16 gEventObjectPalette17[]; extern const u16 gObjectEventPalette17[];
extern const u16 gEventObjectPalette33[]; extern const u16 gObjectEventPalette33[];
extern const u16 gEventObjectPalette34[]; extern const u16 gObjectEventPalette34[];
void TryLoseFansFromPlayTime(void); void TryLoseFansFromPlayTime(void);
void SetPlayerGotFirstFans(void); void SetPlayerGotFirstFans(void);
u16 GetNumFansOfPlayerInTrainerFanClub(void); u16 GetNumFansOfPlayerInTrainerFanClub(void);
static void RecordCyclingRoadResults(u32, u8); static void RecordCyclingRoadResults(u32, u8);
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum);
static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId);
static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId);
static void Task_PCTurnOnEffect(u8); static void Task_PCTurnOnEffect(u8);
@@ -521,7 +521,7 @@ u8 GetLinkPartnerNames(void)
return nLinkPlayers; return nLinkPlayers;
} }
void SpawnLinkPartnerEventObject(void) void SpawnLinkPartnerObjectEvent(void)
{ {
u8 j = 0; u8 j = 0;
s16 x = 0; s16 x = 0;
@@ -592,8 +592,8 @@ void SpawnLinkPartnerEventObject(void)
linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL;
break; break;
} }
SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0);
LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i); LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i);
j++; j++;
if (j == MAX_LINK_PLAYERS) if (j == MAX_LINK_PLAYERS)
{ {
@@ -603,7 +603,7 @@ void SpawnLinkPartnerEventObject(void)
} }
} }
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum)
{ {
u8 adjustedPaletteNum; u8 adjustedPaletteNum;
// Note: This temp var is necessary; paletteNum += 6 doesn't match. // Note: This temp var is necessary; paletteNum += 6 doesn't match.
@@ -613,26 +613,26 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent
graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL ||
graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL)
{ {
u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (obj != EVENT_OBJECTS_COUNT) if (obj != EVENT_OBJECTS_COUNT)
{ {
u8 spriteId = gEventObjects[obj].spriteId; u8 spriteId = gObjectEvents[obj].spriteId;
struct Sprite *sprite = &gSprites[spriteId]; struct Sprite *sprite = &gSprites[spriteId];
sprite->oam.paletteNum = adjustedPaletteNum; sprite->oam.paletteNum = adjustedPaletteNum;
switch (graphicsId) switch (graphicsId)
{ {
case EVENT_OBJ_GFX_LINK_RS_BRENDAN: case EVENT_OBJ_GFX_LINK_RS_BRENDAN:
LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20);
break; break;
case EVENT_OBJ_GFX_LINK_RS_MAY: case EVENT_OBJ_GFX_LINK_RS_MAY:
LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20);
break; break;
case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL:
LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20);
break; break;
case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20);
break; break;
} }
} }
@@ -1304,15 +1304,15 @@ void IsGrassTypeInParty(void)
void SpawnCameraObject(void) void SpawnCameraObject(void)
{ {
u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); u8 obj = SpawnSpecialObjectEventParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
gEventObjects[obj].invisible = TRUE; gObjectEvents[obj].invisible = TRUE;
CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId);
} }
void RemoveCameraObject(void) void RemoveCameraObject(void)
{ {
CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); RemoveObjectEventByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
} }
u8 GetPokeblockNameByMonNature(void) u8 GetPokeblockNameByMonNature(void)
@@ -1585,9 +1585,9 @@ u16 ScriptGetPartyMonSpecies(void)
} }
// Removed for Emerald // Removed for Emerald
void TryInitBattleTowerAwardManEventObject(void) void TryInitBattleTowerAwardManObjectEvent(void)
{ {
//TryInitLocalEventObject(6); //TryInitLocalObjectEvent(6);
} }
u16 GetDaysUntilPacifidlogTMAvailable(void) u16 GetDaysUntilPacifidlogTMAvailable(void)
@@ -3433,9 +3433,9 @@ static void Task_DeoxysRockInteraction(u8 taskId)
static void ChangeDeoxysRockLevel(u8 rockLevel) static void ChangeDeoxysRockLevel(u8 rockLevel)
{ {
u8 eventObjectId; u8 objectEventId;
LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8);
TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
if (rockLevel == 0) if (rockLevel == 0)
PlaySE(SE_W109); PlaySE(SE_W109);
src/fldeff_cut.c
+1 -1
View File
@@ -580,7 +580,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS);
FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr); FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
if (IsMewPlayingHideAndSeek() == TRUE) if (IsMewPlayingHideAndSeek() == TRUE)
src/fldeff_misc.c
+10 -10
View File
@@ -317,7 +317,7 @@ static const struct SpriteTemplate gUnknown_0858E880 =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0x1000, .paletteTag = 0x1000,
.oam = &gEventObjectBaseOam_32x8, .oam = &gObjectEventBaseOam_32x8,
.anims = gSpriteAnimTable_858E87C, .anims = gSpriteAnimTable_858E87C,
.images = gUnknown_0858E84C, .images = gUnknown_0858E84C,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@@ -1002,8 +1002,8 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite)
void DoSecretBaseGlitterMatSparkle(void) void DoSecretBaseGlitterMatSparkle(void)
{ {
s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; s16 x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x;
s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y;
u8 spriteId; u8 spriteId;
sub_80930E0(&x, &y, 8, 4); sub_80930E0(&x, &y, 8, 4);
@@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId)
static void Task_WateringBerryTreeAnim_1(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!EventObjectIsMovementOverridden(playerEventObj) if (!ObjectEventIsMovementOverridden(playerEventObj)
|| EventObjectClearHeldMovementIfFinished(playerEventObj)) || ObjectEventClearHeldMovementIfFinished(playerEventObj))
{ {
sub_808C228(GetPlayerFacingDirection()); sub_808C228(GetPlayerFacingDirection());
EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
gTasks[taskId].func = Task_WateringBerryTreeAnim_2; gTasks[taskId].func = Task_WateringBerryTreeAnim_2;
} }
} }
static void Task_WateringBerryTreeAnim_2(u8 taskId) static void Task_WateringBerryTreeAnim_2(u8 taskId)
{ {
struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (EventObjectClearHeldMovementIfFinished(playerEventObj)) if (ObjectEventClearHeldMovementIfFinished(playerEventObj))
{ {
s16 value = gTasks[taskId].data[1]++; s16 value = gTasks[taskId].data[1]++;
if (value < 10) if (value < 10)
EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
else else
gTasks[taskId].func = Task_WateringBerryTreeAnim_3; gTasks[taskId].func = Task_WateringBerryTreeAnim_3;
src/fldeff_rocksmash.c
+11 -11
View File
@@ -30,18 +30,18 @@ static void sub_8135714(void);
// text // text
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
{ {
u8 eventObjId; u8 objEventId;
GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
gPlayerFacingPosition.height = PlayerGetZCoord(); gPlayerFacingPosition.height = PlayerGetZCoord();
eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); objEventId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
if (gEventObjects[eventObjId].graphicsId != graphicsId) if (gObjectEvents[objEventId].graphicsId != graphicsId)
{ {
return FALSE; return FALSE;
} }
else else
{ {
gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; gSpecialVar_LastTalked = gObjectEvents[objEventId].localId;
return TRUE; return TRUE;
} }
} }
@@ -54,13 +54,13 @@ u8 oei_task_add(void)
static void task08_080C9820(u8 taskId) static void task08_080C9820(u8 taskId)
{ {
u8 eventObjId; u8 objEventId;
ScriptContext2_Enable(); ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
eventObjId = gPlayerAvatar.eventObjectId; objEventId = gPlayerAvatar.objectEventId;
if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId])
|| EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]))
{ {
if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
{ {
@@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId)
else else
{ {
sub_808C114(); sub_808C114();
EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
gTasks[taskId].func = sub_813552C; gTasks[taskId].func = sub_813552C;
} }
} }
@@ -78,7 +78,7 @@ static void task08_080C9820(u8 taskId)
static void sub_813552C(u8 taskId) static void sub_813552C(u8 taskId)
{ {
if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE)
{ {
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
gTasks[taskId].func = sub_8135578; gTasks[taskId].func = sub_8135578;
@@ -98,7 +98,7 @@ static void sub_8135578(u8 taskId)
gFieldEffectArguments[2] = 2; gFieldEffectArguments[2] = 2;
if (gFieldEffectArguments[1] == 4) if (gFieldEffectArguments[1] == 4)
gFieldEffectArguments[2] = 3; gFieldEffectArguments[2] = 3;
EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState());
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
FieldEffectActiveListRemove(6); FieldEffectActiveListRemove(6);
gTasks[taskId].func = sub_813561C; gTasks[taskId].func = sub_813561C;
src/frontier_util.c
+3 -3
View File
@@ -71,7 +71,7 @@ static void sub_81A43A8(void);
static void sub_81A4410(void); static void sub_81A4410(void);
static void BufferFrontierTrainerName(void); static void BufferFrontierTrainerName(void);
static void sub_81A447C(void); static void sub_81A447C(void);
static void SetFacilityBrainEventObject(void); static void SetFacilityBrainObjectEvent(void);
static void ShowTowerResultsWindow(u8); static void ShowTowerResultsWindow(u8);
static void ShowDomeResultsWindow(u8); static void ShowDomeResultsWindow(u8);
static void ShowPalaceResultsWindow(u8); static void ShowPalaceResultsWindow(u8);
@@ -626,7 +626,7 @@ static void (* const sFrontierUtilFuncs[])(void) =
[FRONTIER_UTIL_FUNC_19] = sub_81A4410, [FRONTIER_UTIL_FUNC_19] = sub_81A4410,
[FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName,
[FRONTIER_UTIL_FUNC_21] = sub_81A447C, [FRONTIER_UTIL_FUNC_21] = sub_81A447C,
[FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainObjectEvent,
}; };
static const struct WindowTemplate gUnknown_08611C74 = static const struct WindowTemplate gUnknown_08611C74 =
@@ -2199,7 +2199,7 @@ static void sub_81A447C(void)
} }
} }
static void SetFacilityBrainEventObject(void) static void SetFacilityBrainObjectEvent(void)
{ {
SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY));
} }
src/item_menu.c
+1 -1
View File
@@ -1891,7 +1891,7 @@ bool8 UseRegisteredKeyItemOnField(void)
if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE) if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808B864(); sub_808B864();
sub_808BCF4(); sub_808BCF4();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
src/item_use.c
+10 -10
View File
@@ -176,7 +176,7 @@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId)
{ {
ClearDialogWindowAndFrame(0, 1); ClearDialogWindowAndFrame(0, 1);
DestroyTask(taskId); DestroyTask(taskId);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
} }
@@ -231,7 +231,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId)
GetOnOffBike(2); GetOnOffBike(2);
else else
GetOnOffBike(4); GetOnOffBike(4);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -337,7 +337,7 @@ void sub_80FD504(u8 taskId)
void sub_80FD5CC(u8 taskId) void sub_80FD5CC(u8 taskId)
{ {
ClearDialogWindowAndFrame(0, 1); ClearDialogWindowAndFrame(0, 1);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -558,15 +558,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY)
void sub_80FDA24(u8 direction) void sub_80FDA24(u8 direction)
{ {
EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]);
EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]);
UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]);
PlayerTurnInPlace(direction); PlayerTurnInPlace(direction);
} }
void sub_80FDA94(u8 taskId) void sub_80FDA94(u8 taskId)
{ {
if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE)
DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC);
} }
@@ -574,7 +574,7 @@ void sub_80FDADC(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE
|| data[2] == FALSE) || data[2] == FALSE)
{ {
sub_80FDA24(gUnknown_085920E4[data[5]]); sub_80FDA24(gUnknown_085920E4[data[5]]);
@@ -706,8 +706,8 @@ bool8 TryToWaterSudowoodo(void)
u8 objId; u8 objId;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y); GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
z = PlayerGetZCoord(); z = PlayerGetZCoord();
objId = GetEventObjectIdByXYZ(x, y, z); objId = GetObjectEventIdByXYZ(x, y, z);
if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) if (objId == EVENT_OBJECTS_COUNT || gObjectEvents[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO)
return FALSE; return FALSE;
else else
return TRUE; return TRUE;
src/load_save.c
+6 -6
View File
@@ -181,32 +181,32 @@ void LoadPlayerParty(void)
gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
} }
void SaveEventObjects(void) void SaveObjectEvents(void)
{ {
int i; int i;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i]; gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
} }
void LoadEventObjects(void) void LoadObjectEvents(void)
{ {
int i; int i;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i]; gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
} }
void SaveSerializedGame(void) void SaveSerializedGame(void)
{ {
SavePlayerParty(); SavePlayerParty();
SaveEventObjects(); SaveObjectEvents();
} }
void LoadSerializedGame(void) void LoadSerializedGame(void)
{ {
LoadPlayerParty(); LoadPlayerParty();
LoadEventObjects(); LoadObjectEvents();
} }
void LoadPlayerBag(void) void LoadPlayerBag(void)
src/match_call.c
+5 -5
View File
@@ -1114,7 +1114,7 @@ static void StartMatchCall(void)
if (!gMatchCallState.triggeredFromScript) if (!gMatchCallState.triggeredFromScript)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeObjectEvents();
sub_808B864(); sub_808B864();
sub_808BCF4(); sub_808BCF4();
} }
@@ -1288,10 +1288,10 @@ static bool32 sub_81963F0(u8 taskId)
if (!gMatchCallState.triggeredFromScript) if (!gMatchCallState.triggeredFromScript)
{ {
sub_81973A4(); sub_81973A4();
playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeEventObjects(); UnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
} }
src/mevent_client.c
+1 -1
View File
@@ -216,7 +216,7 @@ static u32 mainseq_4(struct mevent_client * svr)
sub_801B508(svr->recvBuffer); sub_801B508(svr->recvBuffer);
break; break;
case 17: case 17:
InitRamScript_NoEventObject(svr->recvBuffer, 1000); InitRamScript_NoObjectEvent(svr->recvBuffer, 1000);
break; break;
case 18: case 18:
memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc); memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc);
src/mirage_tower.c
+9 -9
View File
@@ -346,16 +346,16 @@ void StartPlayerDescendMirageTower(void)
static void PlayerDescendMirageTower(u8 taskId) static void PlayerDescendMirageTower(u8 taskId)
{ {
u8 eventObjectId; u8 objectEventId;
struct EventObject *fakePlayerEventObject; struct ObjectEvent *fakePlayerObjectEvent;
struct EventObject *playerEventObject; struct ObjectEvent *playerObjectEvent;
TryGetEventObjectIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); TryGetObjectEventIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
fakePlayerEventObject = &gEventObjects[eventObjectId]; fakePlayerObjectEvent = &gObjectEvents[objectEventId];
gSprites[fakePlayerEventObject->spriteId].pos2.y += 4; gSprites[fakePlayerObjectEvent->spriteId].pos2.y += 4;
playerEventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; playerObjectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if ((gSprites[fakePlayerEventObject->spriteId].pos1.y + gSprites[fakePlayerEventObject->spriteId].pos2.y) >= if ((gSprites[fakePlayerObjectEvent->spriteId].pos1.y + gSprites[fakePlayerObjectEvent->spriteId].pos2.y) >=
(gSprites[playerEventObject->spriteId].pos1.y + gSprites[playerEventObject->spriteId].pos2.y)) (gSprites[playerObjectEvent->spriteId].pos1.y + gSprites[playerObjectEvent->spriteId].pos2.y))
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); EnableBothScriptContexts();
src/naming_screen.c
+2 -2
View File
@@ -1172,7 +1172,7 @@ static void NamingScreen_CreatePlayerIcon(void)
u8 spriteId; u8 spriteId;
rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies);
spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
gSprites[spriteId].oam.priority = 3; gSprites[spriteId].oam.priority = 3;
StartSpriteAnim(&gSprites[spriteId], 4); StartSpriteAnim(&gSprites[spriteId], 4);
} }
@@ -1199,7 +1199,7 @@ static void NamingScreen_CreateWandaDadIcon(void)
{ {
u8 spriteId; u8 spriteId;
spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0);
gSprites[spriteId].oam.priority = 3; gSprites[spriteId].oam.priority = 3;
StartSpriteAnim(&gSprites[spriteId], 4); StartSpriteAnim(&gSprites[spriteId], 4);
} }
src/overworld.c
+148 -148
View File
@@ -149,15 +149,15 @@ static u8 GetLinkPlayerElevation(u8 linkPlayerId);
static s32 sub_80878E4(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId);
static u8 GetLinkPlayerIdAt(s16 x, s16 y); static u8 GetLinkPlayerIdAt(s16 x, s16 y);
static void SetPlayerFacingDirection(u8 linkPlayerId, u8 a2); static void SetPlayerFacingDirection(u8 linkPlayerId, u8 a2);
static void ZeroEventObject(struct EventObject *eventObj); static void ZeroObjectEvent(struct ObjectEvent *objEvent);
static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4);
static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y);
static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_80877DC(u8 linkPlayerId, u8 a2);
static void sub_808780C(u8 linkPlayerId); static void sub_808780C(u8 linkPlayerId);
static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId);
static void sub_8087584(void); static void sub_8087584(void);
static u32 GetLinkSendQueueLength(void); static u32 GetLinkSendQueueLength(void);
static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj);
static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1);
static u16 GetDirectionForEventScript(const u8 *script); static u16 GetDirectionForEventScript(const u8 *script);
static void sub_8087510(void); static void sub_8087510(void);
@@ -217,7 +217,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0;
EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0}; EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0};
EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static u16 sAmbientCrySpecies = 0;
EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0};
// const rom data // const rom data
static const struct WarpData sDummyWarpData = static const struct WarpData sDummyWarpData =
@@ -338,23 +338,23 @@ static const struct ScanlineEffectParams sFlashEffectParams =
0, 0,
}; };
static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) =
{ {
MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE
MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN
MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED
}; };
static u8 FacingHandler_DoNothing(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
static u8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8);
// These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise.
static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) =
{ {
FacingHandler_DoNothing, FacingHandler_DoNothing,
FacingHandler_DpadMovement, FacingHandler_DpadMovement,
@@ -369,11 +369,11 @@ static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *
FacingHandler_ForcedFacingChange, FacingHandler_ForcedFacingChange,
}; };
static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *, struct EventObject *); static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *, struct ObjectEvent *);
static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *, struct EventObject *); static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *, struct ObjectEvent *);
// These handlers are run after an attempted movement. // These handlers are run after an attempted movement.
static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, struct EventObject *) = static void (*const gMovementStatusHandler[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) =
{ {
// FALSE: // FALSE:
MovementStatusHandler_EnterFreeMode, MovementStatusHandler_EnterFreeMode,
@@ -496,18 +496,18 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey)
void LoadEventObjTemplatesFromHeader(void) void LoadEventObjTemplatesFromHeader(void)
{ {
// Clear map object templates // Clear map object templates
CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates));
// Copy map header events to save block // Copy map header events to save block
CpuCopy32(gMapHeader.events->eventObjects, CpuCopy32(gMapHeader.events->objectEvents,
gSaveBlock1Ptr->eventObjectTemplates, gSaveBlock1Ptr->objectEventTemplates,
gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate));
} }
void LoadSaveblockEventObjScripts(void) void LoadSaveblockEventObjScripts(void)
{ {
struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects; struct ObjectEventTemplate *mapHeaderObjTemplates = gMapHeader.events->objectEvents;
struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates;
s32 i; s32 i;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
@@ -517,15 +517,15 @@ void LoadSaveblockEventObjScripts(void)
void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y)
{ {
s32 i; s32 i;
struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{ {
struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i];
if (eventObjectTemplate->localId == localId) if (objectEventTemplate->localId == localId)
{ {
eventObjectTemplate->x = x; objectEventTemplate->x = x;
eventObjectTemplate->y = y; objectEventTemplate->y = y;
return; return;
} }
} }
@@ -535,13 +535,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType)
{ {
s32 i; s32 i;
struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{ {
struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i];
if (eventObjectTemplate->localId == localId) if (objectEventTemplate->localId == localId)
{ {
eventObjectTemplate->movementType = movementType; objectEventTemplate->movementType = movementType;
return; return;
} }
} }
@@ -853,9 +853,9 @@ static void mli0_load_map(u32 a1)
if (!(sUnknown_020322D8 & 1)) if (!(sUnknown_020322D8 & 1))
{ {
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
LoadBattlePyramidEventObjectTemplates(); LoadBattlePyramidObjectEventTemplates();
else if (InTrainerHill()) else if (InTrainerHill())
LoadTrainerHillEventObjectTemplates(); LoadTrainerHillObjectEventTemplates();
else else
LoadEventObjTemplatesFromHeader(); LoadEventObjTemplatesFromHeader();
} }
@@ -1721,13 +1721,13 @@ void CB2_ContinueSavedGame(void)
ClearDiveAndHoleWarps(); ClearDiveAndHoleWarps();
trainerHillMapId = GetCurrentTrainerHillMapId(); trainerHillMapId = GetCurrentTrainerHillMapId();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
LoadBattlePyramidFloorEventObjectScripts(); LoadBattlePyramidFloorObjectEventScripts();
else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE)
LoadTrainerHillFloorEventObjectScripts(); LoadTrainerHillFloorObjectEventScripts();
else else
LoadSaveblockEventObjScripts(); LoadSaveblockEventObjScripts();
UnfreezeEventObjects(); UnfreezeObjectEvents();
DoTimeBasedEvents(); DoTimeBasedEvents();
sub_8084788(); sub_8084788();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
@@ -2143,9 +2143,9 @@ static void sub_8086988(u32 a1)
ResetCameraUpdateInfo(); ResetCameraUpdateInfo();
InstallCameraPanAheadCallback(); InstallCameraPanAheadCallback();
if (!a1) if (!a1)
InitEventObjectPalettes(0); InitObjectEventPalettes(0);
else else
InitEventObjectPalettes(1); InitObjectEventPalettes(1);
FieldEffectActiveListClear(); FieldEffectActiveListClear();
StartWeather(); StartWeather();
@@ -2160,8 +2160,8 @@ static void sub_80869DC(void)
{ {
gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetX = 0;
gTotalCameraPixelOffsetY = 0; gTotalCameraPixelOffsetY = 0;
ResetEventObjects(); ResetObjectEvents();
TrySpawnEventObjects(0, 0); TrySpawnObjectEvents(0, 0);
TryRunOnWarpIntoMapScript(); TryRunOnWarpIntoMapScript();
} }
@@ -2172,13 +2172,13 @@ static void mli4_mapscripts_and_other(void)
gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetX = 0;
gTotalCameraPixelOffsetY = 0; gTotalCameraPixelOffsetY = 0;
ResetEventObjects(); ResetObjectEvents();
GetCameraFocusCoords(&x, &y); GetCameraFocusCoords(&x, &y);
player = GetInitialPlayerAvatarState(); player = GetInitialPlayerAvatarState();
InitPlayerAvatar(x, y, player->direction, gSaveBlock2Ptr->playerGender); InitPlayerAvatar(x, y, player->direction, gSaveBlock2Ptr->playerGender);
SetPlayerAvatarTransitionFlags(player->transitionFlags); SetPlayerAvatarTransitionFlags(player->transitionFlags);
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
TrySpawnEventObjects(0, 0); TrySpawnObjectEvents(0, 0);
TryRunOnWarpIntoMapScript(); TryRunOnWarpIntoMapScript();
} }
@@ -2191,7 +2191,7 @@ static void sub_8086A68(void)
static void sub_8086A80(void) static void sub_8086A80(void)
{ {
gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1;
InitCameraUpdateCallback(gPlayerAvatar.spriteId); InitCameraUpdateCallback(gPlayerAvatar.spriteId);
} }
@@ -2226,7 +2226,7 @@ static void sub_8086B14(void)
for (i = 0; i < gFieldLinkPlayerCount; i++) for (i = 0; i < gFieldLinkPlayerCount; i++)
{ {
SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); SpawnLinkPlayerObjectEvent(i, i + x, y, gLinkPlayers[i].gender);
CreateLinkPlayerSprite(i, gLinkPlayers[i].version); CreateLinkPlayerSprite(i, gLinkPlayers[i].version);
} }
@@ -2702,7 +2702,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo
trainer->playerId = linkPlayerId; trainer->playerId = linkPlayerId;
trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0; trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0;
trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; trainer->c = gLinkPlayerObjectEvents[linkPlayerId].movementMode;
trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId);
GetLinkPlayerCoords(linkPlayerId, &x, &y); GetLinkPlayerCoords(linkPlayerId, &x, &y);
trainer->pos.x = x; trainer->pos.x = x;
@@ -2918,110 +2918,110 @@ static u32 GetLinkSendQueueLength(void)
return gLink.sendQueue.count; return gLink.sendQueue.count;
} }
static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj)
{ {
memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerObjectEvent));
} }
void ClearLinkPlayerEventObjects(void) void ClearLinkPlayerObjectEvents(void)
{ {
memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); memset(gLinkPlayerObjectEvents, 0, sizeof(gLinkPlayerObjectEvents));
} }
static void ZeroEventObject(struct EventObject *eventObj) static void ZeroObjectEvent(struct ObjectEvent *objEvent)
{ {
memset(eventObj, 0, sizeof(struct EventObject)); memset(objEvent, 0, sizeof(struct ObjectEvent));
} }
static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4)
{ {
u8 eventObjId = GetFirstInactiveEventObjectId(); u8 objEventId = GetFirstInactiveObjectEventId();
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId];
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
ZeroLinkPlayerEventObject(linkPlayerEventObj); ZeroLinkPlayerObjectEvent(linkPlayerEventObj);
ZeroEventObject(eventObj); ZeroObjectEvent(objEvent);
linkPlayerEventObj->active = 1; linkPlayerEventObj->active = 1;
linkPlayerEventObj->linkPlayerId = linkPlayerId; linkPlayerEventObj->linkPlayerId = linkPlayerId;
linkPlayerEventObj->eventObjId = eventObjId; linkPlayerEventObj->objEventId = objEventId;
linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE;
eventObj->active = 1; objEvent->active = 1;
eventObj->singleMovementActive = a4; objEvent->singleMovementActive = a4;
eventObj->range.as_byte = 2; objEvent->range.as_byte = 2;
eventObj->spriteId = 64; objEvent->spriteId = 64;
InitLinkPlayerEventObjectPos(eventObj, x, y); InitLinkPlayerObjectEventPos(objEvent, x, y);
} }
static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y)
{ {
eventObj->currentCoords.x = x; objEvent->currentCoords.x = x;
eventObj->currentCoords.y = y; objEvent->currentCoords.y = y;
eventObj->previousCoords.x = x; objEvent->previousCoords.x = x;
eventObj->previousCoords.y = y; objEvent->previousCoords.y = y;
SetSpritePosToMapCoords(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); SetSpritePosToMapCoords(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y);
eventObj->initialCoords.x += 8; objEvent->initialCoords.x += 8;
EventObjectUpdateZCoord(eventObj); ObjectEventUpdateZCoord(objEvent);
} }
static void sub_80877DC(u8 linkPlayerId, u8 a2) static void sub_80877DC(u8 linkPlayerId, u8 a2)
{ {
if (gLinkPlayerEventObjects[linkPlayerId].active) if (gLinkPlayerObjectEvents[linkPlayerId].active)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
eventObj->range.as_byte = a2; objEvent->range.as_byte = a2;
} }
} }
static void sub_808780C(u8 linkPlayerId) static void sub_808780C(u8 linkPlayerId)
{ {
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId];
u8 eventObjId = linkPlayerEventObj->eventObjId; u8 objEventId = linkPlayerEventObj->objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
if (eventObj->spriteId != MAX_SPRITES) if (objEvent->spriteId != MAX_SPRITES)
DestroySprite(&gSprites[eventObj->spriteId]); DestroySprite(&gSprites[objEvent->spriteId]);
linkPlayerEventObj->active = 0; linkPlayerEventObj->active = 0;
eventObj->active = 0; objEvent->active = 0;
} }
// Returns the spriteId corresponding to this player. // Returns the spriteId corresponding to this player.
static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
return eventObj->spriteId; return objEvent->spriteId;
} }
static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y) static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
*x = eventObj->currentCoords.x; *x = objEvent->currentCoords.x;
*y = eventObj->currentCoords.y; *y = objEvent->currentCoords.y;
} }
static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId) static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
return eventObj->range.as_byte; return objEvent->range.as_byte;
} }
static u8 GetLinkPlayerElevation(u8 linkPlayerId) static u8 GetLinkPlayerElevation(u8 linkPlayerId)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
return eventObj->currentElevation; return objEvent->currentElevation;
} }
static s32 sub_80878E4(u8 linkPlayerId) static s32 sub_80878E4(u8 linkPlayerId)
{ {
u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
return 16 - (s8)eventObj->directionSequenceIndex; return 16 - (s8)objEvent->directionSequenceIndex;
} }
static u8 GetLinkPlayerIdAt(s16 x, s16 y) static u8 GetLinkPlayerIdAt(s16 x, s16 y)
@@ -3029,11 +3029,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y)
u8 i; u8 i;
for (i = 0; i < MAX_LINK_PLAYERS; i++) for (i = 0; i < MAX_LINK_PLAYERS; i++)
{ {
if (gLinkPlayerEventObjects[i].active if (gLinkPlayerObjectEvents[i].active
&& (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) && (gLinkPlayerObjectEvents[i].movementMode == 0 || gLinkPlayerObjectEvents[i].movementMode == 2))
{ {
struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[gLinkPlayerObjectEvents[i].objEventId];
if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) if (objEvent->currentCoords.x == x && objEvent->currentCoords.y == y)
return i; return i;
} }
} }
@@ -3042,23 +3042,23 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y)
static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing)
{ {
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId];
u8 eventObjId = linkPlayerEventObj->eventObjId; u8 objEventId = linkPlayerEventObj->objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
if (linkPlayerEventObj->active) if (linkPlayerEventObj->active)
{ {
if (facing > FACING_FORCED_RIGHT) if (facing > FACING_FORCED_RIGHT)
{ {
eventObj->triggerGroundEffectsOnMove = 1; objEvent->triggerGroundEffectsOnMove = 1;
} }
else else
{ {
// This is a hack to split this code onto two separate lines, without declaring a local variable. // This is a hack to split this code onto two separate lines, without declaring a local variable.
// C++ style inline variables would be nice here. // C++ style inline variables would be nice here.
#define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, eventObj, facing) #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, objEvent, facing)
gMovementStatusHandler[TEMP](linkPlayerEventObj, eventObj); gMovementStatusHandler[TEMP](linkPlayerEventObj, objEvent);
// Clean up the hack. // Clean up the hack.
#undef TEMP #undef TEMP
@@ -3067,67 +3067,67 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing)
} }
static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3);
} }
static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
return FACING_UP; return FACING_UP;
} }
// Duplicate Function // Duplicate Function
static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3);
} }
static bool8 FacingHandler_DoNothing(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
return FALSE; return FALSE;
} }
static bool8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
s16 x, y; s16 x, y;
eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte);
EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y);
if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) if (LinkPlayerDetectCollision(linkPlayerEventObj->objEventId, objEvent->range.as_byte, x, y))
{ {
return FALSE; return FALSE;
} }
else else
{ {
eventObj->directionSequenceIndex = 16; objEvent->directionSequenceIndex = 16;
ShiftEventObjectCoords(eventObj, x, y); ShiftObjectEventCoords(objEvent, x, y);
EventObjectUpdateZCoord(eventObj); ObjectEventUpdateZCoord(objEvent);
return TRUE; return TRUE;
} }
} }
static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3)
{ {
eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte);
return FALSE; return FALSE;
} }
// This is called every time a free movement happens. Most of the time it's a No-Op. // This is called every time a free movement happens. Most of the time it's a No-Op.
static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent)
{ {
linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE;
} }
static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent)
{ {
eventObj->directionSequenceIndex--; objEvent->directionSequenceIndex--;
linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN;
MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y);
if (!eventObj->directionSequenceIndex) if (!objEvent->directionSequenceIndex)
{ {
ShiftStillEventObjectCoords(eventObj); ShiftStillObjectEventCoords(objEvent);
linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED;
} }
} }
@@ -3162,8 +3162,8 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y)
{ {
if (i != selfEventObjId) if (i != selfEventObjId)
{ {
if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y)
|| (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y))
{ {
return 1; return 1;
} }
@@ -3174,9 +3174,9 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y)
static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
{ {
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId];
u8 eventObjId = linkPlayerEventObj->eventObjId; u8 objEventId = linkPlayerEventObj->objEventId;
struct EventObject *eventObj = &gEventObjects[eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId];
struct Sprite *sprite; struct Sprite *sprite;
if (linkPlayerEventObj->active) if (linkPlayerEventObj->active)
@@ -3185,40 +3185,40 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
{ {
case VERSION_FIRE_RED: case VERSION_FIRE_RED:
case VERSION_LEAF_GREEN: case VERSION_LEAF_GREEN:
eventObj->spriteId = AddPseudoEventObject(GetFRLGAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); objEvent->spriteId = AddPseudoObjectEvent(GetFRLGAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
break; break;
case VERSION_RUBY: case VERSION_RUBY:
case VERSION_SAPPHIRE: case VERSION_SAPPHIRE:
eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); objEvent->spriteId = AddPseudoObjectEvent(GetRSAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
break; break;
case VERSION_EMERALD: case VERSION_EMERALD:
eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); objEvent->spriteId = AddPseudoObjectEvent(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
break; break;
} }
sprite = &gSprites[eventObj->spriteId]; sprite = &gSprites[objEvent->spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->data[0] = linkPlayerId; sprite->data[0] = linkPlayerId;
eventObj->triggerGroundEffectsOnMove = 0; objEvent->triggerGroundEffectsOnMove = 0;
} }
} }
static void SpriteCB_LinkPlayer(struct Sprite *sprite) static void SpriteCB_LinkPlayer(struct Sprite *sprite)
{ {
struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[sprite->data[0]];
struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerEventObj->objEventId];
sprite->pos1.x = eventObj->initialCoords.x; sprite->pos1.x = objEvent->initialCoords.x;
sprite->pos1.y = eventObj->initialCoords.y; sprite->pos1.y = objEvent->initialCoords.y;
SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1);
sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation);
if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE)
StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte));
else else
StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte));
UpdateEventObjectSpriteVisibility(sprite, 0); UpdateObjectEventSpriteVisibility(sprite, 0);
if (eventObj->triggerGroundEffectsOnMove) if (objEvent->triggerGroundEffectsOnMove)
{ {
sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->invisible = ((sprite->data[7] & 4) >> 2);
sprite->data[7]++; sprite->data[7]++;
src/rotating_tile_puzzle.c
+40 -40
View File
@@ -57,23 +57,23 @@ void FreeRotatingTilePuzzle(void)
if (sRotatingTilePuzzle != NULL) if (sRotatingTilePuzzle != NULL)
FREE_AND_SET_NULL(sRotatingTilePuzzle); FREE_AND_SET_NULL(sRotatingTilePuzzle);
id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); id = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
} }
u16 MoveRotatingTileObjects(u8 puzzleNumber) u16 MoveRotatingTileObjects(u8 puzzleNumber)
{ {
u8 i; u8 i;
struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates;
u16 localId = 0; u16 localId = 0;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{ {
s32 puzzleTileStart; s32 puzzleTileStart;
u8 puzzleTileNum; u8 puzzleTileNum;
s16 x = eventObjects[i].x + 7; s16 x = objectEvents[i].x + 7;
s16 y = eventObjects[i].y + 7; s16 y = objectEvents[i].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y); u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!sRotatingTilePuzzle->isTrickHouse) if (!sRotatingTilePuzzle->isTrickHouse)
@@ -125,12 +125,12 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber)
continue; continue;
} }
eventObjects[i].x += x; objectEvents[i].x += x;
eventObjects[i].y += y; objectEvents[i].y += y;
if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT)
{ {
SaveRotatingTileObject(i, puzzleTileNum); SaveRotatingTileObject(i, puzzleTileNum);
localId = eventObjects[i].localId; localId = objectEvents[i].localId;
ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript);
} }
// Never reached in normal gameplay // Never reached in normal gameplay
@@ -148,7 +148,7 @@ void TurnRotatingTileObjects(void)
{ {
u8 i; u8 i;
s32 puzzleTileStart; s32 puzzleTileStart;
struct EventObjectTemplate *eventObjects; struct ObjectEventTemplate *objectEvents;
if (sRotatingTilePuzzle == NULL) if (sRotatingTilePuzzle == NULL)
return; return;
@@ -158,14 +158,14 @@ void TurnRotatingTileObjects(void)
else else
puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right;
eventObjects = gSaveBlock1Ptr->eventObjectTemplates; objectEvents = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < sRotatingTilePuzzle->numObjects; i++) for (i = 0; i < sRotatingTilePuzzle->numObjects; i++)
{ {
s32 rotation; s32 rotation;
s8 tileDifference; s8 tileDifference;
u8 eventObjectId; u8 objectEventId;
s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; s16 x = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7;
s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; s16 y = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y); u16 metatile = MapGridGetMetatileIdAt(x, y);
// NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE // NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE
@@ -194,35 +194,35 @@ void TurnRotatingTileObjects(void)
rotation = ROTATE_NONE; rotation = ROTATE_NONE;
} }
eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); objectEventId = GetObjectEventIdByLocalIdAndMap(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (eventObjectId != EVENT_OBJECTS_COUNT) if (objectEventId != EVENT_OBJECTS_COUNT)
{ {
const u8 *movementScript; const u8 *movementScript;
u8 direction = gEventObjects[eventObjectId].facingDirection; u8 direction = gObjectEvents[objectEventId].facingDirection;
if (rotation == ROTATE_COUNTERCLOCKWISE) if (rotation == ROTATE_COUNTERCLOCKWISE)
{ {
switch (direction) switch (direction)
{ {
case DIR_EAST: case DIR_EAST:
movementScript = RotatingTilePuzzle_Movement_FaceUp; movementScript = RotatingTilePuzzle_Movement_FaceUp;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break; break;
case DIR_SOUTH: case DIR_SOUTH:
movementScript = RotatingTilePuzzle_Movement_FaceRight; movementScript = RotatingTilePuzzle_Movement_FaceRight;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break; break;
case DIR_WEST: case DIR_WEST:
movementScript = RotatingTilePuzzle_Movement_FaceDown; movementScript = RotatingTilePuzzle_Movement_FaceDown;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break; break;
case DIR_NORTH: case DIR_NORTH:
movementScript = RotatingTilePuzzle_Movement_FaceLeft; movementScript = RotatingTilePuzzle_Movement_FaceLeft;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break; break;
default: default:
continue; continue;
} }
ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapGroup,
movementScript); movementScript);
@@ -234,24 +234,24 @@ void TurnRotatingTileObjects(void)
{ {
case DIR_EAST: case DIR_EAST:
movementScript = RotatingTilePuzzle_Movement_FaceDown; movementScript = RotatingTilePuzzle_Movement_FaceDown;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break; break;
case DIR_SOUTH: case DIR_SOUTH:
movementScript = RotatingTilePuzzle_Movement_FaceLeft; movementScript = RotatingTilePuzzle_Movement_FaceLeft;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break; break;
case DIR_WEST: case DIR_WEST:
movementScript = RotatingTilePuzzle_Movement_FaceUp; movementScript = RotatingTilePuzzle_Movement_FaceUp;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break; break;
case DIR_NORTH: case DIR_NORTH:
movementScript = RotatingTilePuzzle_Movement_FaceRight; movementScript = RotatingTilePuzzle_Movement_FaceRight;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break; break;
default: default:
continue; continue;
} }
ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapGroup,
movementScript); movementScript);
@@ -274,9 +274,9 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum)
s32 rotation; s32 rotation;
s32 puzzleTileStart; s32 puzzleTileStart;
u16 movementType; u16 movementType;
struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates;
s16 x = eventObjects[eventTemplateId].x + 7; s16 x = objectEvents[eventTemplateId].x + 7;
s16 y = eventObjects[eventTemplateId].y + 7; s16 y = objectEvents[eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y); u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!sRotatingTilePuzzle->isTrickHouse) if (!sRotatingTilePuzzle->isTrickHouse)
@@ -294,22 +294,22 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum)
else else
rotation = ROTATE_NONE; rotation = ROTATE_NONE;
movementType = eventObjects[eventTemplateId].movementType; movementType = objectEvents[eventTemplateId].movementType;
if (rotation == ROTATE_COUNTERCLOCKWISE) if (rotation == ROTATE_COUNTERCLOCKWISE)
{ {
switch (movementType) switch (movementType)
{ {
case MOVEMENT_TYPE_FACE_RIGHT: case MOVEMENT_TYPE_FACE_RIGHT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break; break;
case MOVEMENT_TYPE_FACE_DOWN: case MOVEMENT_TYPE_FACE_DOWN:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break; break;
case MOVEMENT_TYPE_FACE_LEFT: case MOVEMENT_TYPE_FACE_LEFT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break; break;
case MOVEMENT_TYPE_FACE_UP: case MOVEMENT_TYPE_FACE_UP:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break; break;
default: default:
break; break;
@@ -320,16 +320,16 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum)
switch (movementType) switch (movementType)
{ {
case MOVEMENT_TYPE_FACE_RIGHT: case MOVEMENT_TYPE_FACE_RIGHT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break; break;
case MOVEMENT_TYPE_FACE_DOWN: case MOVEMENT_TYPE_FACE_DOWN:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break; break;
case MOVEMENT_TYPE_FACE_LEFT: case MOVEMENT_TYPE_FACE_LEFT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break; break;
case MOVEMENT_TYPE_FACE_UP: case MOVEMENT_TYPE_FACE_UP:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break; break;
default: default:
break; break;
src/scrcmd.c
+25 -25
View File
@@ -1052,7 +1052,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx)
{ {
u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 localId = VarGet(ScriptReadHalfword(ctx));
RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
return FALSE; return FALSE;
} }
@@ -1062,7 +1062,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx); u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx);
RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup);
return FALSE; return FALSE;
} }
@@ -1070,7 +1070,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx)
{ {
u16 objectId = VarGet(ScriptReadHalfword(ctx)); u16 objectId = VarGet(ScriptReadHalfword(ctx));
TrySpawnEventObject(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
return FALSE; return FALSE;
} }
@@ -1080,7 +1080,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx); u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx);
TrySpawnEventObject(objectId, mapNum, mapGroup); TrySpawnObjectEvent(objectId, mapNum, mapGroup);
return FALSE; return FALSE;
} }
@@ -1090,7 +1090,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx)
u16 x = VarGet(ScriptReadHalfword(ctx)); u16 x = VarGet(ScriptReadHalfword(ctx));
u16 y = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx));
TryMoveEventObjectToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y);
return FALSE; return FALSE;
} }
@@ -1108,7 +1108,7 @@ bool8 ScrCmd_copyobjectxytoperm(struct ScriptContext *ctx)
{ {
u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 localId = VarGet(ScriptReadHalfword(ctx));
TryOverrideEventObjectTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TryOverrideObjectEventTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
return FALSE; return FALSE;
} }
@@ -1155,9 +1155,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
{ {
if (gEventObjects[gSelectedEventObject].active) if (gObjectEvents[gSelectedObjectEvent].active)
{ {
EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent],
GetPlayerFacingDirection()); GetPlayerFacingDirection());
} }
return FALSE; return FALSE;
@@ -1168,7 +1168,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx)
u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 direction = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx);
EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
return FALSE; return FALSE;
} }
@@ -1211,7 +1211,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
} }
else else
{ {
ScriptFreezeEventObjects(); ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_80983C4); SetupNativeScript(ctx, sub_80983C4);
return TRUE; return TRUE;
} }
@@ -1225,14 +1225,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
} }
else else
{ {
if (gEventObjects[gSelectedEventObject].active) if (gObjectEvents[gSelectedObjectEvent].active)
{ {
LockSelectedEventObject(); LockSelectedObjectEvent();
SetupNativeScript(ctx, sub_809847C); SetupNativeScript(ctx, sub_809847C);
} }
else else
{ {
ScriptFreezeEventObjects(); ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_80983C4); SetupNativeScript(ctx, sub_80983C4);
} }
return TRUE; return TRUE;
@@ -1244,10 +1244,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
u8 playerObjectId; u8 playerObjectId;
HideFieldMessageBox(); HideFieldMessageBox();
playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeEventObjects(); UnfreezeObjectEvents();
return FALSE; return FALSE;
} }
@@ -1256,12 +1256,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
u8 playerObjectId; u8 playerObjectId;
HideFieldMessageBox(); HideFieldMessageBox();
if (gEventObjects[gSelectedEventObject].active) if (gObjectEvents[gSelectedObjectEvent].active)
EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeEventObjects(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeEventObjects(); UnfreezeObjectEvents();
return FALSE; return FALSE;
} }
@@ -2178,7 +2178,7 @@ bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx)
bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
{ {
gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId(); gSelectedObjectEvent = GetCurrentApproachingTrainerObjectEventId();
return FALSE; return FALSE;
} }
@@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
} }
else else
{ {
if (gEventObjects[gSelectedEventObject].active) if (gObjectEvents[gSelectedObjectEvent].active)
{ {
sub_8098630(); sub_8098630();
SetupNativeScript(ctx, sub_8098734); SetupNativeScript(ctx, sub_8098734);
src/script.c
+1 -1
View File
@@ -426,7 +426,7 @@ u8 *GetSavedRamScriptIfValid(void)
} }
} }
void InitRamScript_NoEventObject(u8 *script, u16 scriptSize) void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize)
{ {
if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script))
scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script);
src/script_movement.c
+37 -37
View File
@@ -9,13 +9,13 @@
// static functions // static functions
static void ScriptMovement_StartMoveObjects(u8 priority); static void ScriptMovement_StartMoveObjects(u8 priority);
static u8 GetMoveObjectsTaskId(void); static u8 GetMoveObjectsTaskId(void);
static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript); static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript);
static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId); static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId);
static bool8 IsMovementScriptFinished(u8 taskId, u8 moveScrId); static bool8 IsMovementScriptFinished(u8 taskId, u8 moveScrId);
static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript);
static void ScriptMovement_UnfreezeActiveObjects(u8 taskId); static void ScriptMovement_UnfreezeActiveObjects(u8 taskId);
static void ScriptMovement_MoveObjects(u8 taskId); static void ScriptMovement_MoveObjects(u8 taskId);
static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript);
// EWRAM_DATA // EWRAM_DATA
static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0};
@@ -23,31 +23,31 @@ static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0};
// text // text
bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript)
{ {
u8 eventObjId; u8 objEventId;
if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId))
return TRUE; return TRUE;
if (!FuncIsActiveTask(ScriptMovement_MoveObjects)) if (!FuncIsActiveTask(ScriptMovement_MoveObjects))
ScriptMovement_StartMoveObjects(50); ScriptMovement_StartMoveObjects(50);
return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), eventObjId, movementScript); return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), objEventId, movementScript);
} }
bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup) bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup)
{ {
u8 eventObjId; u8 objEventId;
u8 taskId; u8 taskId;
u8 moveScrId; u8 moveScrId;
if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId))
return TRUE; return TRUE;
taskId = GetMoveObjectsTaskId(); taskId = GetMoveObjectsTaskId();
moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId);
if (moveScrId == EVENT_OBJECTS_COUNT) if (moveScrId == EVENT_OBJECTS_COUNT)
return TRUE; return TRUE;
return IsMovementScriptFinished(taskId, moveScrId); return IsMovementScriptFinished(taskId, moveScrId);
} }
void ScriptMovement_UnfreezeEventObjects(void) void ScriptMovement_UnfreezeObjectEvents(void)
{ {
u8 taskId; u8 taskId;
@@ -75,11 +75,11 @@ static u8 GetMoveObjectsTaskId(void)
return FindTaskIdByFunc(ScriptMovement_MoveObjects); return FindTaskIdByFunc(ScriptMovement_MoveObjects);
} }
static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript) static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript)
{ {
u8 moveScrId; u8 moveScrId;
moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId);
if (moveScrId != EVENT_OBJECTS_COUNT) if (moveScrId != EVENT_OBJECTS_COUNT)
{ {
if (IsMovementScriptFinished(taskId, moveScrId) == 0) if (IsMovementScriptFinished(taskId, moveScrId) == 0)
@@ -88,23 +88,23 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8
} }
else else
{ {
ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript);
return FALSE; return FALSE;
} }
} }
moveScrId = GetMovementScriptIdFromEventObjectId(taskId, EVENT_OBJ_ID_PLAYER); moveScrId = GetMovementScriptIdFromObjectEventId(taskId, EVENT_OBJ_ID_PLAYER);
if (moveScrId == EVENT_OBJECTS_COUNT) if (moveScrId == EVENT_OBJECTS_COUNT)
{ {
return TRUE; return TRUE;
} }
else else
{ {
ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript);
return FALSE; return FALSE;
} }
} }
static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId)
{ {
u8 *moveScriptId; u8 *moveScriptId;
u8 i; u8 i;
@@ -112,13 +112,13 @@ static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId)
moveScriptId = (u8 *)&gTasks[taskId].data[1]; moveScriptId = (u8 *)&gTasks[taskId].data[1];
for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++)
{ {
if (*moveScriptId == eventObjId) if (*moveScriptId == objEventId)
return i; return i;
} }
return EVENT_OBJECTS_COUNT; return EVENT_OBJECTS_COUNT;
} }
static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId)
{ {
u8 i; u8 i;
@@ -127,20 +127,20 @@ static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 *
; ;
} }
static void SetEventObjectIdAtMovementScript(u8 taskId, u8 moveScrId, u8 eventObjId) static void SetObjectEventIdAtMovementScript(u8 taskId, u8 moveScrId, u8 objEventId)
{ {
u8 *ptr; u8 *ptr;
LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr);
*ptr = eventObjId; *ptr = objEventId;
} }
static void LoadEventObjectIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *eventObjId) static void LoadObjectEventIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *objEventId)
{ {
u8 *ptr; u8 *ptr;
LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr);
*eventObjId = *ptr; *objEventId = *ptr;
} }
static void ClearMovementScriptFinished(u8 taskId, u8 moveScrId) static void ClearMovementScriptFinished(u8 taskId, u8 moveScrId)
@@ -175,11 +175,11 @@ static const u8 *GetMovementScript(u8 moveScrId)
return gMovementScripts[moveScrId]; return gMovementScripts[moveScrId];
} }
static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript)
{ {
ClearMovementScriptFinished(taskId, moveScrId); ClearMovementScriptFinished(taskId, moveScrId);
SetMovementScript(moveScrId, movementScript); SetMovementScript(moveScrId, movementScript);
SetEventObjectIdAtMovementScript(taskId, moveScrId, eventObjId); SetObjectEventIdAtMovementScript(taskId, moveScrId, objEventId);
} }
static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) static void ScriptMovement_UnfreezeActiveObjects(u8 taskId)
@@ -191,40 +191,40 @@ static void ScriptMovement_UnfreezeActiveObjects(u8 taskId)
for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++)
{ {
if (*pEventObjId != 0xFF) if (*pEventObjId != 0xFF)
UnfreezeEventObject(&gEventObjects[*pEventObjId]); UnfreezeObjectEvent(&gObjectEvents[*pEventObjId]);
} }
} }
static void ScriptMovement_MoveObjects(u8 taskId) static void ScriptMovement_MoveObjects(u8 taskId)
{ {
u8 i; u8 i;
u8 eventObjId; u8 objEventId;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++) for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
{ {
LoadEventObjectIdFromMovementScript(taskId, i, &eventObjId); LoadObjectEventIdFromMovementScript(taskId, i, &objEventId);
if (eventObjId != 0xFF) if (objEventId != 0xFF)
ScriptMovement_TakeStep(taskId, i, eventObjId, GetMovementScript(i)); ScriptMovement_TakeStep(taskId, i, objEventId, GetMovementScript(i));
} }
} }
static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript)
{ {
u8 nextMoveActionId; u8 nextMoveActionId;
if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId])
&& !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]))
return; return;
nextMoveActionId = *movementScript; nextMoveActionId = *movementScript;
if (nextMoveActionId == MOVEMENT_ACTION_STEP_END) if (nextMoveActionId == MOVEMENT_ACTION_STEP_END)
{ {
SetMovementScriptFinished(taskId, moveScrId); SetMovementScriptFinished(taskId, moveScrId);
FreezeEventObject(&gEventObjects[eventObjId]); FreezeObjectEvent(&gObjectEvents[objEventId]);
} }
else else
{ {
if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], nextMoveActionId)) if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], nextMoveActionId))
{ {
movementScript++; movementScript++;
SetMovementScript(moveScrId, movementScript); SetMovementScript(moveScrId, movementScript);
src/script_pokemon_util_80F87D8.c
+11 -11
View File
@@ -33,10 +33,10 @@
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
extern const u16 gEventObjectPalette8[]; extern const u16 gObjectEventPalette8[];
extern const u16 gEventObjectPalette17[]; extern const u16 gObjectEventPalette17[];
extern const u16 gEventObjectPalette33[]; extern const u16 gObjectEventPalette33[];
extern const u16 gEventObjectPalette34[]; extern const u16 gObjectEventPalette34[];
static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
@@ -263,7 +263,7 @@ void SetLinkContestPlayerGfx(void)
void LoadLinkContestPlayerPalettes(void) void LoadLinkContestPlayerPalettes(void)
{ {
int i; int i;
u8 eventObjectId; u8 objectEventId;
int version; int version;
struct Sprite *sprite; struct Sprite *sprite;
@@ -272,23 +272,23 @@ void LoadLinkContestPlayerPalettes(void)
{ {
for (i = 0; i < gNumLinkContestPlayers; i++) for (i = 0; i < gNumLinkContestPlayers; i++)
{ {
eventObjectId = GetEventObjectIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); objectEventId = GetObjectEventIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; sprite = &gSprites[gObjectEvents[objectEventId].spriteId];
sprite->oam.paletteNum = 6 + i; sprite->oam.paletteNum = 6 + i;
version = (u8)gLinkPlayers[i].version; version = (u8)gLinkPlayers[i].version;
if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE)
{ {
if (gLinkPlayers[i].gender == MALE) if (gLinkPlayers[i].gender == MALE)
LoadPalette(gEventObjectPalette33, 0x160 + i * 0x10, 0x20); LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20);
else else
LoadPalette(gEventObjectPalette34, 0x160 + i * 0x10, 0x20); LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20);
} }
else else
{ {
if (gLinkPlayers[i].gender == MALE) if (gLinkPlayers[i].gender == MALE)
LoadPalette(gEventObjectPalette8, 0x160 + i * 0x10, 0x20); LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20);
else else
LoadPalette(gEventObjectPalette17, 0x160 + i * 0x10, 0x20); LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20);
} }
} }
} }
src/secret_base.c
+16 -16
View File
@@ -437,7 +437,7 @@ bool8 SecretBaseMapPopupEnabled(void)
static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId) static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId)
{ {
EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH);
if (IsWeatherNotFadingIn() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
{ {
EnableBothScriptContexts(); EnableBothScriptContexts();
@@ -531,13 +531,13 @@ void InitSecretBaseDecorationSprites(void)
u8 i; u8 i;
u8 *decorations; u8 *decorations;
u8 *decorationPositions; u8 *decorationPositions;
u8 eventObjectId; u8 objectEventId;
u8 metatileBehavior; u8 metatileBehavior;
u8 category; u8 category;
u8 permission; u8 permission;
u8 numDecorations; u8 numDecorations;
eventObjectId = 0; objectEventId = 0;
if (!CurMapIsSecretBase()) if (!CurMapIsSecretBase())
{ {
decorations = gSaveBlock1Ptr->playerRoomDecor; decorations = gSaveBlock1Ptr->playerRoomDecor;
@@ -561,13 +561,13 @@ void InitSecretBaseDecorationSprites(void)
category = gDecorations[decorations[i]].category; category = gDecorations[decorations[i]].category;
if (permission == DECORPERM_SPRITE) if (permission == DECORPERM_SPRITE)
{ {
for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++)
{ {
if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) if (gMapHeader.events->objectEvents[objectEventId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004)
break; break;
} }
if (eventObjectId == gMapHeader.events->eventObjectCount) if (objectEventId == gMapHeader.events->objectEventCount)
continue; continue;
gSpecialVar_0x8006 = decorationPositions[i] >> 4; gSpecialVar_0x8006 = decorationPositions[i] >> 4;
@@ -576,13 +576,13 @@ void InitSecretBaseDecorationSprites(void)
if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE
|| MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE)
{ {
gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].graphicsId - EVENT_OBJ_GFX_VAR_0); gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - EVENT_OBJ_GFX_VAR_0);
VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]); VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]);
gSpecialVar_Result = gMapHeader.events->eventObjects[eventObjectId].localId; gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId;
FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004);
TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TrySpawnObjectEvent(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); TryMoveObjectEventToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TryOverrideObjectEventTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0) if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0)
{ {
if (category == DECORCAT_DOLL) if (category == DECORCAT_DOLL)
@@ -611,16 +611,16 @@ void InitSecretBaseDecorationSprites(void)
void HideSecretBaseDecorationSprites(void) void HideSecretBaseDecorationSprites(void)
{ {
u8 eventObjectId; u8 objectEventId;
u16 flag; u16 flag;
for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++)
{ {
flag = gMapHeader.events->eventObjects[eventObjectId].flagId; flag = gMapHeader.events->objectEvents[objectEventId].flagId;
if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14) if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14)
{ {
RemoveEventObjectByLocalIdAndMap( RemoveObjectEventByLocalIdAndMap(
gMapHeader.events->eventObjects[eventObjectId].localId, gMapHeader.events->objectEvents[objectEventId].localId,
gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup); gSaveBlock1Ptr->location.mapGroup);
FlagSet(flag); FlagSet(flag);
src/shop.c
+17 -17
View File
@@ -67,13 +67,13 @@ static void BuyMenuRemoveItemIcon(u16, u8);
static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet); static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet);
static void BuyMenuDrawMapGraphics(void); static void BuyMenuDrawMapGraphics(void);
static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void); static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void);
static void BuyMenuCollectEventObjectData(void); static void BuyMenuCollectObjectEventData(void);
static void BuyMenuDrawEventObjects(void); static void BuyMenuDrawObjectEvents(void);
static void BuyMenuDrawMapBg(void); static void BuyMenuDrawMapBg(void);
static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int); static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int);
static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8); static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8);
static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src); static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *); static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *);
static void ExitBuyMenu(u8 taskId); static void ExitBuyMenu(u8 taskId);
static void Task_ExitBuyMenu(u8 taskId); static void Task_ExitBuyMenu(u8 taskId);
static void BuyMenuTryMakePurchase(u8 taskId); static void BuyMenuTryMakePurchase(u8 taskId);
@@ -714,8 +714,8 @@ static void BuyMenuDrawGraphics(void)
static void BuyMenuDrawMapGraphics(void) static void BuyMenuDrawMapGraphics(void)
{ {
BuyMenuCollectEventObjectData(); BuyMenuCollectObjectEventData();
BuyMenuDrawEventObjects(); BuyMenuDrawObjectEvents();
BuyMenuDrawMapBg(); BuyMenuDrawMapBg();
} }
@@ -787,7 +787,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con
dest[offset1 + offset2 + 33] = src[3]; // bottom right dest[offset1 + offset2 + 33] = src[3]; // bottom right
} }
static void BuyMenuCollectEventObjectData(void) static void BuyMenuCollectObjectEventData(void)
{ {
s16 facingX; s16 facingX;
s16 facingY; s16 facingY;
@@ -802,16 +802,16 @@ static void BuyMenuCollectEventObjectData(void)
{ {
for (x = 0; x < 7; x++) for (x = 0; x < 7; x++)
{ {
u8 eventObjId = GetEventObjectIdByXY(facingX - 4 + x, facingY - 2 + y); u8 objEventId = GetObjectEventIdByXY(facingX - 4 + x, facingY - 2 + y);
if (eventObjId != 16) if (objEventId != 16)
{ {
gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = eventObjId; gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = objEventId;
gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][X_COORD] = x;
gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][Y_COORD] = y;
gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y);
switch (gEventObjects[eventObjId].facingDirection) switch (gObjectEvents[objEventId].facingDirection)
{ {
case DIR_SOUTH: case DIR_SOUTH:
gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0; gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0;
@@ -833,27 +833,27 @@ static void BuyMenuCollectEventObjectData(void)
} }
} }
static void BuyMenuDrawEventObjects(void) static void BuyMenuDrawObjectEvents(void)
{ {
u8 i; u8 i;
u8 spriteId; u8 spriteId;
const struct EventObjectGraphicsInfo *graphicsInfo; const struct ObjectEventGraphicsInfo *graphicsInfo;
for (i = 0; i < 16; i++) // max objects? for (i = 0; i < 16; i++) // max objects?
{ {
if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16)
continue; continue;
graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId);
spriteId = AddPseudoEventObject( spriteId = AddPseudoObjectEvent(
gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId,
SpriteCallbackDummy, SpriteCallbackDummy,
(u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8,
(u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
2); 2);
if (BuyMenuCheckIfEventObjectOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE)
{ {
gSprites[spriteId].subspriteTableNum = 4; gSprites[spriteId].subspriteTableNum = 4;
gSprites[spriteId].subspriteMode = 1; gSprites[spriteId].subspriteMode = 1;
@@ -863,7 +863,7 @@ static void BuyMenuDrawEventObjects(void)
} }
} }
static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *object) static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *object)
{ {
if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL) if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL)
{ {
src/start_menu.c
+5 -5
View File
@@ -543,7 +543,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
{ {
if (!IsUpdateLinkStateCBActive()) if (!IsUpdateLinkStateCBActive())
{ {
FreezeEventObjects(); FreezeObjectEvents();
sub_808B864(); sub_808B864();
sub_808BCF4(); sub_808BCF4();
} }
@@ -746,7 +746,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void)
void sub_809FDD4(void) void sub_809FDD4(void)
{ {
ClearDialogWindowAndFrameToTransparent(0, FALSE); ClearDialogWindowAndFrameToTransparent(0, FALSE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
CreateStartMenuTask(sub_809FA34); CreateStartMenuTask(sub_809FA34);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
@@ -788,7 +788,7 @@ static bool8 SaveCallback(void)
case SAVE_SUCCESS: case SAVE_SUCCESS:
case SAVE_ERROR: // Close start menu case SAVE_ERROR: // Close start menu
ClearDialogWindowAndFrameToTransparent(0, TRUE); ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
SoftResetInBattlePyramid(); SoftResetInBattlePyramid();
return TRUE; return TRUE;
@@ -825,7 +825,7 @@ static bool8 BattlePyramidRetireCallback(void)
return FALSE; return FALSE;
case SAVE_CANCELED: // Yes (Retire from battle pyramid) case SAVE_CANCELED: // Yes (Retire from battle pyramid)
ClearDialogWindowAndFrameToTransparent(0, TRUE); ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88);
return TRUE; return TRUE;
@@ -1382,7 +1382,7 @@ static void HideStartMenuWindow(void)
{ {
ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE);
RemoveStartMenuWindow(); RemoveStartMenuWindow();
ScriptUnfreezeEventObjects(); ScriptUnfreezeObjectEvents();
ScriptContext2_Disable(); ScriptContext2_Disable();
} }
src/trainer_hill.c
+9 -9
View File
@@ -251,7 +251,7 @@ static const u8 *const sTagMatchStrings[] =
gText_ExpertTagMatch, gText_ExpertTagMatch,
}; };
static const struct EventObjectTemplate sTrainerEventObjectTemplate = static const struct ObjectEventTemplate sTrainerObjectEventTemplate =
{ {
.graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
.elevation = 3, .elevation = 3,
@@ -629,25 +629,25 @@ static void SetTimerValue(u32 *dst, u32 val)
*dst = val; *dst = val;
} }
void LoadTrainerHillEventObjectTemplates(void) void LoadTrainerHillObjectEventTemplates(void)
{ {
u8 i, floorId; u8 i, floorId;
struct EventObjectTemplate *eventTemplates = gSaveBlock1Ptr->eventObjectTemplates; struct ObjectEventTemplate *eventTemplates = gSaveBlock1Ptr->objectEventTemplates;
if (!LoadTrainerHillFloorEventObjectScripts()) if (!LoadTrainerHillFloorObjectEventScripts())
return; return;
SetUpDataStruct(); SetUpDataStruct();
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF;
CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates));
floorId = GetFloorId(); floorId = GetFloorId();
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
u8 bits; u8 bits;
eventTemplates[i] = sTrainerEventObjectTemplate; eventTemplates[i] = sTrainerObjectEventTemplate;
eventTemplates[i].localId = i + 1; eventTemplates[i].localId = i + 1;
eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass); eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass);
eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF; eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF;
@@ -662,7 +662,7 @@ void LoadTrainerHillEventObjectTemplates(void)
FreeDataStruct(); FreeDataStruct();
} }
bool32 LoadTrainerHillFloorEventObjectScripts(void) bool32 LoadTrainerHillFloorObjectEventScripts(void)
{ {
SetUpDataStruct(); SetUpDataStruct();
// Something may have been dummied here // Something may have been dummied here
@@ -860,10 +860,10 @@ u16 LocalIdToHillTrainerId(u8 localId)
return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; return gSaveBlock2Ptr->frontier.trainerIds[localId - 1];
} }
bool8 GetHillTrainerFlag(u8 eventObjectId) bool8 GetHillTrainerFlag(u8 objectEventId)
{ {
u32 floorId = GetFloorId() * 2; u32 floorId = GetFloorId() * 2;
u8 bitId = gEventObjects[eventObjectId].localId - 1 + floorId; u8 bitId = gObjectEvents[objectEventId].localId - 1 + floorId;
return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId]; return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId];
} }
src/trainer_see.c
+111 -111
View File
@@ -19,31 +19,31 @@
#include "constants/field_effects.h" #include "constants/field_effects.h"
// this file's functions // this file's functions
static u8 CheckTrainer(u8 eventObjectId); static u8 CheckTrainer(u8 objectEventId);
static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj);
static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction);
static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range); static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range);
static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_RunTrainerSeeFuncList(u8 taskId);
static void Task_DestroyTrainerApproachTask(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId);
static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static void SpriteCB_TrainerIcons(struct Sprite *sprite); static void SpriteCB_TrainerIcons(struct Sprite *sprite);
@@ -62,7 +62,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion
static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) = static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) =
{ {
GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceSouth,
GetTrainerApproachDistanceNorth, GetTrainerApproachDistanceNorth,
@@ -70,7 +70,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train
GetTrainerApproachDistanceEast, GetTrainerApproachDistanceEast,
}; };
static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
{ {
sub_80B4178, sub_80B4178,
TrainerExclamationMark, TrainerExclamationMark,
@@ -86,7 +86,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct
WaitRevealHiddenTrainer, WaitRevealHiddenTrainer,
}; };
static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
{ {
RevealHiddenTrainer, RevealHiddenTrainer,
PopOutOfAshHiddenTrainer, PopOutOfAshHiddenTrainer,
@@ -183,9 +183,9 @@ bool8 CheckForTrainersWantingBattle(void)
{ {
u8 retVal; u8 retVal;
if (!gEventObjects[i].active) if (!gObjectEvents[i].active)
continue; continue;
if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3) if (gObjectEvents[i].trainerType != 1 && gObjectEvents[i].trainerType != 3)
continue; continue;
retVal = CheckTrainer(i); retVal = CheckTrainer(i);
@@ -204,7 +204,7 @@ bool8 CheckForTrainersWantingBattle(void)
if (gNoOfApproachingTrainers == 1) if (gNoOfApproachingTrainers == 1)
{ {
ResetTrainerOpponentIds(); ResetTrainerOpponentIds();
ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId,
gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr);
gTrainerApproachedPlayer = TRUE; gTrainerApproachedPlayer = TRUE;
return TRUE; return TRUE;
@@ -214,7 +214,7 @@ bool8 CheckForTrainersWantingBattle(void)
ResetTrainerOpponentIds(); ResetTrainerOpponentIds();
for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++)
{ {
ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId, ConfigureTwoTrainersBattle(gApproachingTrainers[i].objectEventId,
gApproachingTrainers[i].trainerScriptPtr); gApproachingTrainers[i].trainerScriptPtr);
} }
SetUpTwoTrainersBattle(); SetUpTwoTrainersBattle();
@@ -229,7 +229,7 @@ bool8 CheckForTrainersWantingBattle(void)
} }
} }
static u8 CheckTrainer(u8 eventObjectId) static u8 CheckTrainer(u8 objectEventId)
{ {
const u8 *scriptPtr; const u8 *scriptPtr;
u8 ret = 1; u8 ret = 1;
@@ -238,16 +238,16 @@ static u8 CheckTrainer(u8 eventObjectId)
if (InTrainerHill() == TRUE) if (InTrainerHill() == TRUE)
scriptPtr = GetTrainerHillTrainerScript(); scriptPtr = GetTrainerHillTrainerScript();
else else
scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId); scriptPtr = GetObjectEventScriptPointerByObjectEventId(objectEventId);
if (InBattlePyramid()) if (InBattlePyramid())
{ {
if (GetBattlePyramidTrainerFlag(eventObjectId)) if (GetBattlePyramidTrainerFlag(objectEventId))
return 0; return 0;
} }
else if (InTrainerHill() == TRUE) else if (InTrainerHill() == TRUE)
{ {
if (GetHillTrainerFlag(eventObjectId)) if (GetHillTrainerFlag(objectEventId))
return 0; return 0;
} }
else else
@@ -256,7 +256,7 @@ static u8 CheckTrainer(u8 eventObjectId)
return 0; return 0;
} }
approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]); approachDistance = GetTrainerApproachDistance(&gObjectEvents[objectEventId]);
if (approachDistance != 0) if (approachDistance != 0)
{ {
@@ -270,10 +270,10 @@ static u8 CheckTrainer(u8 eventObjectId)
ret = 2; ret = 2;
} }
gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId; gApproachingTrainers[gNoOfApproachingTrainers].objectEventId = objectEventId;
gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr;
gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance;
TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1); TrainerApproachPlayer(&gObjectEvents[objectEventId], approachDistance - 1);
gNoOfApproachingTrainers++; gNoOfApproachingTrainers++;
return ret; return ret;
@@ -282,7 +282,7 @@ static u8 CheckTrainer(u8 eventObjectId)
return 0; return 0;
} }
static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj)
{ {
s16 x, y; s16 x, y;
u8 i; u8 i;
@@ -308,7 +308,7 @@ static u8 GetTrainerApproachDistance(struct EventObject *trainerObj)
} }
// Returns how far south the player is from trainer. 0 if out of trainer's sight. // Returns how far south the player is from trainer. 0 if out of trainer's sight.
static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y)
{ {
if (trainerObj->currentCoords.x == x if (trainerObj->currentCoords.x == x
&& y > trainerObj->currentCoords.y && y > trainerObj->currentCoords.y
@@ -319,7 +319,7 @@ static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 ra
} }
// Returns how far north the player is from trainer. 0 if out of trainer's sight. // Returns how far north the player is from trainer. 0 if out of trainer's sight.
static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y)
{ {
if (trainerObj->currentCoords.x == x if (trainerObj->currentCoords.x == x
&& y < trainerObj->currentCoords.y && y < trainerObj->currentCoords.y
@@ -330,7 +330,7 @@ static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 ra
} }
// Returns how far west the player is from trainer. 0 if out of trainer's sight. // Returns how far west the player is from trainer. 0 if out of trainer's sight.
static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y)
{ {
if (trainerObj->currentCoords.y == y if (trainerObj->currentCoords.y == y
&& x < trainerObj->currentCoords.x && x < trainerObj->currentCoords.x
@@ -341,7 +341,7 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran
} }
// Returns how far east the player is from trainer. 0 if out of trainer's sight. // Returns how far east the player is from trainer. 0 if out of trainer's sight.
static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y)
{ {
if (trainerObj->currentCoords.y == y if (trainerObj->currentCoords.y == y
&& x > trainerObj->currentCoords.x && x > trainerObj->currentCoords.x
@@ -353,7 +353,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran
#define COLLISION_MASK (~1) #define COLLISION_MASK (~1)
static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction)
{ {
s16 x, y; s16 x, y;
u8 unk19_temp; u8 unk19_temp;
@@ -394,16 +394,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap
#define tFuncId data[0] #define tFuncId data[0]
#define tTrainerRange data[3] #define tTrainerRange data[3]
#define tOutOfAshSpriteId data[4] #define tOutOfAshSpriteId data[4]
#define tTrainerEventObjectId data[7] #define tTrainerObjectEventId data[7]
static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range) static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range)
{ {
struct Task *task; struct Task *task;
gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50);
task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId];
task->tTrainerRange = range; task->tTrainerRange = range;
task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId; task->tTrainerObjectEventId = gApproachingTrainers[gNoOfApproachingTrainers].objectEventId;
} }
static void sub_80B40C8(TaskFunc followupFunc) static void sub_80B40C8(TaskFunc followupFunc)
@@ -425,7 +425,7 @@ static void sub_80B40C8(TaskFunc followupFunc)
static void Task_RunTrainerSeeFuncList(u8 taskId) static void Task_RunTrainerSeeFuncList(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId]; struct ObjectEvent *trainerObj = &gObjectEvents[task->tTrainerObjectEventId];
if (!trainerObj->active) if (!trainerObj->active)
{ {
@@ -437,24 +437,24 @@ static void Task_RunTrainerSeeFuncList(u8 taskId)
} }
} }
static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
return FALSE; return FALSE;
} }
static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
u8 direction; u8 direction;
EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); ObjectEventGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
EventObjectSetHeldMovement(trainerObj, direction); ObjectEventSetHeldMovement(trainerObj, direction);
task->tFuncId++; task->tFuncId++;
return TRUE; return TRUE;
} }
static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
{ {
@@ -471,88 +471,88 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Eve
} }
} }
static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj))
{ {
if (task->tTrainerRange) if (task->tTrainerRange)
{ {
EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection));
task->tTrainerRange--; task->tTrainerRange--;
} }
else else
{ {
EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->tFuncId++; task->tFuncId++;
} }
} }
return FALSE; return FALSE;
} }
static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
struct EventObject *playerObj; struct ObjectEvent *playerObj;
if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj))
return FALSE; return FALSE;
SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
OverrideTemplateCoordsForEventObject(trainerObj); OverrideTemplateCoordsForObjectEvent(trainerObj);
playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj))
return FALSE; return FALSE;
sub_808BCE8(); sub_808BCE8();
EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
task->tFuncId++; task->tFuncId++;
return FALSE; return FALSE;
} }
static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!EventObjectIsMovementOverridden(playerObj) if (!ObjectEventIsMovementOverridden(playerObj)
|| EventObjectClearHeldMovementIfFinished(playerObj)) || ObjectEventClearHeldMovementIfFinished(playerObj))
SwitchTaskToFollowupFunc(taskId); SwitchTaskToFollowupFunc(taskId);
return FALSE; return FALSE;
} }
static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (!EventObjectIsMovementOverridden(trainerObj) if (!ObjectEventIsMovementOverridden(trainerObj)
|| EventObjectClearHeldMovementIfFinished(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj))
{ {
EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
task->tFuncId++; task->tFuncId++;
} }
return FALSE; return FALSE;
} }
static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (EventObjectClearHeldMovementIfFinished(trainerObj)) if (ObjectEventClearHeldMovementIfFinished(trainerObj))
task->tFuncId = 3; task->tFuncId = 3;
return FALSE; return FALSE;
} }
static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (!EventObjectIsMovementOverridden(trainerObj) if (!ObjectEventIsMovementOverridden(trainerObj)
|| EventObjectClearHeldMovementIfFinished(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj))
{ {
EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->tFuncId++; task->tFuncId++;
} }
return FALSE; return FALSE;
} }
static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (EventObjectCheckHeldMovementStatus(trainerObj)) if (ObjectEventCheckHeldMovementStatus(trainerObj))
{ {
gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[0] = trainerObj->currentCoords.x;
gFieldEffectArguments[1] = trainerObj->currentCoords.y; gFieldEffectArguments[1] = trainerObj->currentCoords.y;
@@ -564,7 +564,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Event
return FALSE; return FALSE;
} }
static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
struct Sprite *sprite; struct Sprite *sprite;
@@ -575,15 +575,15 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Event
sprite = &gSprites[trainerObj->spriteId]; sprite = &gSprites[trainerObj->spriteId];
sprite->oam.priority = 2; sprite->oam.priority = 2;
EventObjectClearHeldMovementIfFinished(trainerObj); ObjectEventClearHeldMovementIfFinished(trainerObj);
EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection));
task->tFuncId++; task->tFuncId++;
} }
return FALSE; return FALSE;
} }
static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{ {
if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
task->tFuncId = 3; task->tFuncId = 3;
@@ -594,34 +594,34 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO
#undef tFuncId #undef tFuncId
#undef tTrainerRange #undef tTrainerRange
#undef tOutOfAshSpriteId #undef tOutOfAshSpriteId
#undef tTrainerEventObjectId #undef tTrainerObjectEventId
static void sub_80B44C8(u8 taskId) static void sub_80B44C8(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct EventObject *eventObj; struct ObjectEvent *objEvent;
// another eventObj loaded into by loadword? // another objEvent loaded into by loadword?
LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent);
if (!task->data[7]) if (!task->data[7])
{ {
EventObjectClearHeldMovement(eventObj); ObjectEventClearHeldMovement(objEvent);
task->data[7]++; task->data[7]++;
} }
sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent);
if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
{ {
SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
DestroyTask(taskId); DestroyTask(taskId);
} }
else else
{ {
eventObj->heldMovementFinished = 0; objEvent->heldMovementFinished = 0;
} }
} }
void sub_80B4578(struct EventObject *var) void sub_80B4578(struct ObjectEvent *var)
{ {
StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
} }
@@ -645,8 +645,8 @@ void TryPrepareSecondApproachingTrainer(void)
{ {
gApproachingTrainerId++; gApproachingTrainerId++;
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
UnfreezeEventObjects(); UnfreezeObjectEvents();
FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); FreezeObjectEventsExceptOne(gApproachingTrainers[1].objectEventId);
} }
else else
{ {
@@ -718,21 +718,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim
static void SpriteCB_TrainerIcons(struct Sprite *sprite) static void SpriteCB_TrainerIcons(struct Sprite *sprite)
{ {
u8 eventObjId; u8 objEventId;
if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId) if (TryGetObjectEventIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &objEventId)
|| sprite->animEnded) || sprite->animEnded)
{ {
FieldEffectStop(sprite, sprite->sFldEffId); FieldEffectStop(sprite, sprite->sFldEffId);
} }
else else
{ {
struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId];
sprite->sData4 += sprite->sData3; sprite->sData4 += sprite->sData3;
sprite->pos1.x = eventObjSprite->pos1.x; sprite->pos1.x = objEventSprite->pos1.x;
sprite->pos1.y = eventObjSprite->pos1.y - 16; sprite->pos1.y = objEventSprite->pos1.y - 16;
sprite->pos2.x = eventObjSprite->pos2.x; sprite->pos2.x = objEventSprite->pos2.x;
sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4; sprite->pos2.y = objEventSprite->pos2.y + sprite->sData4;
if (sprite->sData4) if (sprite->sData4)
sprite->sData3++; sprite->sData3++;
else else
@@ -747,39 +747,39 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite)
#undef sData4 #undef sData4
#undef sFldEffId #undef sFldEffId
u8 GetCurrentApproachingTrainerEventObjectId(void) u8 GetCurrentApproachingTrainerObjectEventId(void)
{ {
if (gApproachingTrainerId == 0) if (gApproachingTrainerId == 0)
return gApproachingTrainers[0].eventObjectId; return gApproachingTrainers[0].objectEventId;
else else
return gApproachingTrainers[1].eventObjectId; return gApproachingTrainers[1].objectEventId;
} }
u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId)
{ {
if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) if (arrayId >= ARRAY_COUNT(gApproachingTrainers))
return 0; return 0;
else if (arrayId == 0) else if (arrayId == 0)
return gApproachingTrainers[0].eventObjectId; return gApproachingTrainers[0].objectEventId;
else else
return gApproachingTrainers[1].eventObjectId; return gApproachingTrainers[1].objectEventId;
} }
void PlayerFaceTrainerAfterBattle(void) void PlayerFaceTrainerAfterBattle(void)
{ {
struct EventObject *eventObj; struct ObjectEvent *objEvent;
if (gTrainerApproachedPlayer == TRUE) if (gTrainerApproachedPlayer == TRUE)
{ {
eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId]; objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId];
gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection)); gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection));
gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
} }
else else
{ {
eventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; objEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection); gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection);
gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END;
ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript);
} }
src/tv.c
+2 -2
View File
@@ -1034,7 +1034,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void)
return 0; return 0;
} }
void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) void GabbyAndTySetScriptVarsToObjectEventLocalIds(void)
{ {
switch (GabbyAndTyGetBattleNum()) switch (GabbyAndTyGetBattleNum())
{ {
@@ -3593,7 +3593,7 @@ void GetMomOrDadStringForTVMessage(void)
void sub_80F01B8(void) void sub_80F01B8(void)
{ {
VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0);
RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER);
} }
src/union_room.c
+1 -1
View File
@@ -4249,7 +4249,7 @@ void sub_801818C(bool32 arg0)
void sub_80181CC(void) void sub_80181CC(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
ScriptFreezeEventObjects(); ScriptFreezeObjectEvents();
} }
u8 sub_80181DC(struct UnkStruct_URoom *arg0) u8 sub_80181DC(struct UnkStruct_URoom *arg0)
src/union_room_player_avatar.c
+19 -19
View File
@@ -124,30 +124,30 @@ static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId)
VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId); VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId);
} }
static void CreateUnionRoomPlayerEventObject(u32 playerIdx) static void CreateUnionRoomPlayerObjectEvent(u32 playerIdx)
{ {
TrySpawnEventObject(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); TrySpawnObjectEvent(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
} }
static void RemoveUnionRoomPlayerEventObject(u32 playerIdx) static void RemoveUnionRoomPlayerObjectEvent(u32 playerIdx)
{ {
RemoveEventObjectByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); RemoveObjectEventByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
} }
static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement) static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement)
{ {
u8 objectId; u8 objectId;
struct EventObject * object; struct ObjectEvent * object;
if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
{ {
return FALSE; return FALSE;
} }
object = &gEventObjects[objectId]; object = &gObjectEvents[objectId];
if (EventObjectIsMovementOverridden(object)) if (ObjectEventIsMovementOverridden(object))
{ {
return FALSE; return FALSE;
} }
if (EventObjectSetHeldMovement(object, *movement)) if (ObjectEventSetHeldMovement(object, *movement))
{ {
return FALSE; return FALSE;
} }
@@ -157,23 +157,23 @@ static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * move
static bool32 sub_8019B3C(u32 playerIdx) static bool32 sub_8019B3C(u32 playerIdx)
{ {
u8 objectId; u8 objectId;
struct EventObject * object; struct ObjectEvent * object;
if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
{ {
return TRUE; return TRUE;
} }
object = &gEventObjects[objectId]; object = &gObjectEvents[objectId];
if (!EventObjectClearHeldMovementIfFinished(object)) if (!ObjectEventClearHeldMovementIfFinished(object))
{ {
return FALSE; return FALSE;
} }
if (!ScriptContext2_IsEnabled()) if (!ScriptContext2_IsEnabled())
{ {
UnfreezeEventObject(object); UnfreezeObjectEvent(object);
} }
else else
{ {
FreezeEventObject(object); FreezeObjectEvent(object);
} }
return TRUE; return TRUE;
} }
@@ -208,7 +208,7 @@ static bool32 sub_8019BDC(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr
case 1: case 1:
if (sub_8019B3C(playerIdx)) if (sub_8019B3C(playerIdx))
{ {
RemoveUnionRoomPlayerEventObject(playerIdx); RemoveUnionRoomPlayerObjectEvent(playerIdx);
HideUnionRoomPlayer(playerIdx); HideUnionRoomPlayer(playerIdx);
*a0 = 0; *a0 = 0;
return TRUE; return TRUE;
@@ -240,7 +240,7 @@ static bool32 sub_8019C38(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr
break; break;
} }
SetUnionRoomPlayerGfx(playerIdx, ptr->field_1); SetUnionRoomPlayerGfx(playerIdx, ptr->field_1);
CreateUnionRoomPlayerEventObject(playerIdx); CreateUnionRoomPlayerObjectEvent(playerIdx);
ShowUnionRoomPlayer(playerIdx); ShowUnionRoomPlayer(playerIdx);
(*a0)++; (*a0)++;
// fallthrough // fallthrough
@@ -310,7 +310,7 @@ static void sub_8019D44(u32 playerIdx, struct UnkStruct_8019BA8 * ptr)
{ {
ptr->field_0 = 0; ptr->field_0 = 0;
ptr->field_2 = 0; ptr->field_2 = 0;
RemoveUnionRoomPlayerEventObject(playerIdx); RemoveUnionRoomPlayerObjectEvent(playerIdx);
HideUnionRoomPlayer(playerIdx); HideUnionRoomPlayer(playerIdx);
} }
else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1) else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1)
@@ -376,7 +376,7 @@ void sub_8019E3C(void)
{ {
if (!IsUnionRoomPlayerHidden(i)) if (!IsUnionRoomPlayerHidden(i))
{ {
RemoveUnionRoomPlayerEventObject(i); RemoveUnionRoomPlayerObjectEvent(i);
HideUnionRoomPlayer(i); HideUnionRoomPlayer(i);
} }
} }
tools/mapjson/mapjson.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ string generate_map_events_text(Json map_data) {
string objects_label, warps_label, coords_label, bgs_label; string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) { if (map_data["object_events"].array_items().size() > 0) {
objects_label = map_data["name"].string_value() + "_EventObjects"; objects_label = map_data["name"].string_value() + "_ObjectEvents";
text << objects_label << ":\n"; text << objects_label << ":\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i]; auto obj_event = map_data["object_events"].array_items()[i];