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

Move object event graphics info pointers to src

Browse Source
This commit is contained in:
GriffinR
2020-03-25 00:46:27 -04:00
parent d50ce48776
commit 970717ee2c
4 changed files with 314 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+4 -4
View File
@@ -123,8 +123,8 @@ EWRAM_DATA u8 sCurrentReflectionType = 0;
EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0;
extern const u8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES];
extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES];
extern void (*const sMovementTypeCallbacks[])(struct Sprite *);
extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES];
extern const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX];
extern const struct SpritePalette sObjectEventSpritePalettes[];
extern const struct PairedPalettes gPlayerReflectionPaletteSets[];
@@ -884,7 +884,7 @@ extern const u32 gUnknown_8394E28[];
#define OBJ_EVENT_PAL_TAG_34 0x1123
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
/*#include "data/object_events/object_event_graphics_info_pointers.h"*/
#include "data/object_events/object_event_graphics_info_pointers.h"
#include "data/field_effects/field_effect_object_template_pointers.h"
#include "data/object_events/object_event_pic_tables.h"
#include "data/object_events/object_event_anims.h"
@@ -2719,8 +2719,8 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId)
if (graphicsId >= OBJ_EVENT_GFX_VARS)
graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS);
if (graphicsId >= 152)
graphicsId = 16;
if (graphicsId >= NUM_OBJ_EVENT_GFX)
graphicsId = OBJ_EVENT_GFX_LITTLE_BOY;
return gObjectEventGraphicsInfoPointers[graphicsId];
}