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

Move field effects data and graphics into own directory, and cleanup naming for object events

Browse Source
This commit is contained in:
Marcus Huderle
2020-02-12 17:32:51 -06:00
parent 956090b05f
commit 49421a41b2
98 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/event_object_movement.c
View File

@@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
CameraObject_2,
};
#include "data/object_event/event_object_graphics.h"
#include "data/object_events/object_event_graphics.h"
// movement type callbacks
static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
@@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = {
#define OBJ_EVENT_PAL_TAG_34 0x1123
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
#include "data/object_event/event_object_graphics_info_pointers.h"
#include "data/object_event/field_effect_object_template_pointers.h"
#include "data/object_event/event_object_pic_tables.h"
#include "data/object_event/event_object_anims.h"
#include "data/object_event/base_oam.h"
#include "data/object_event/event_object_subsprites.h"
#include "data/object_event/event_object_graphics_info.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"
#include "data/object_events/base_oam.h"
#include "data/object_events/object_event_subsprites.h"
#include "data/object_events/object_event_graphics_info.h"
const struct SpritePalette sObjectEventSpritePalettes[] = {
{gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0},
@@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = {
gObjectPaletteTags3,
};
#include "data/object_event/berry_tree_graphics_tables.h"
#include "data/object_event/field_effect_objects.h"
#include "data/object_events/berry_tree_graphics_tables.h"
#include "data/field_effects/field_effect_objects.h"
const s16 gMovementDelaysMedium[] = {32, 64, 96, 128};
const s16 gMovementDelaysLong[] = {32, 64, 128, 192};
const s16 gMovementDelaysShort[] = {32, 48, 64, 80};
#include "data/object_event/movement_type_func_tables.h"
#include "data/object_events/movement_type_func_tables.h"
const u8 gFaceDirectionAnimNums[] = {
[DIR_NONE] = 0,
@@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = {
{3, 4, 2, 1}
};
#include "data/object_event/movement_action_func_tables.h"
#include "data/object_events/movement_action_func_tables.h"
// Code