ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix event constant file names

Browse Source
This commit is contained in:
GriffinR 2019-11-21 14:03:35 -05:00
parent 86c08330c4
commit 4c52cf9ed1
21 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/event_scripts.s
View File

@ -13,7 +13,7 @@
#include "constants/decorations.h"
#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
#include "constants/field_poison.h"
#include "constants/field_specials.h"

4
data/map_events.s
View File

@ -1,5 +1,5 @@
#include "constants/bg_event_constants.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_bg.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/items.h"

6
include/constants/bg_event_constants.h → include/constants/event_bg.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_CONSTANTS_BG_EVENT_H
#define GUARD_CONSTANTS_BG_EVENT_H
#ifndef GUARD_CONSTANTS_EVENT_BG_H
#define GUARD_CONSTANTS_EVENT_BG_H
#define BG_EVENT_PLAYER_FACING_ANY 0
#define BG_EVENT_PLAYER_FACING_NORTH 1
@ -10,4 +10,4 @@
#define BG_EVENT_HIDDEN_ITEM 7
#define BG_EVENT_SECRET_BASE 8
#endif // GUARD_CONSTANTS_BG_EVENT_H
#endif // GUARD_CONSTANTS_EVENT_BG_H

0
include/constants/event_object_movement_constants.h → include/constants/event_object_movement.h
View File

2
src/battle_pyramid.c
View File

@ -29,7 +29,7 @@
#include "constants/battle_frontier.h"
#include "constants/battle_pyramid.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/items.h"
#include "constants/layouts.h"
#include "constants/maps.h"

2
src/berry.c
View File

@ -12,7 +12,7 @@
#include "string_util.h"
#include "text.h"
#include "constants/berry.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/items.h"
static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);

2
src/event_object_movement.c
View File

@ -22,7 +22,7 @@
#include "trainer_see.h"
#include "trainer_hill.h"
#include "util.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/field_effects.h"
#include "constants/items.h"

2
src/field_control_avatar.c
View File

@ -28,7 +28,7 @@
#include "trainer_see.h"
#include "trainer_hill.h"
#include "wild_encounter.h"
#include "constants/bg_event_constants.h"
#include "constants/event_bg.h"
#include "constants/event_objects.h"
#include "constants/map_types.h"
#include "constants/maps.h"

2
src/field_effect.c
View File

@ -27,7 +27,7 @@
#include "trig.h"
#include "util.h"
#include "constants/field_effects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/rgb.h"
#include "constants/songs.h"

2
src/field_player_avatar.c
View File

@ -23,7 +23,7 @@
#include "wild_encounter.h"
#include "constants/abilities.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
#include "constants/flags.h"
#include "constants/maps.h"

2
src/field_screen_effect.c
View File

@ -27,7 +27,7 @@
#include "start_menu.h"
#include "task.h"
#include "text.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/songs.h"
#include "constants/rgb.h"
#include "trainer_hill.h"

2
src/field_special_scene.c
View File

@ -14,7 +14,7 @@
#include "sprite.h"
#include "task.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_specials.h"
#include "constants/songs.h"
#include "constants/vars.h"

2
src/field_specials.c
View File

@ -48,7 +48,7 @@
#include "constants/battle_frontier.h"
#include "constants/decorations.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
#include "constants/field_specials.h"
#include "constants/items.h"

2
src/fldeff_rocksmash.c
View File

@ -13,7 +13,7 @@
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/field_effects.h"
#include "constants/map_types.h"

2
src/item_use.c
View File

@ -34,7 +34,7 @@
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "constants/bg_event_constants.h"
#include "constants/event_bg.h"
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/item_effects.h"

2
src/rotating_tile_puzzle.c
View File

@ -4,7 +4,7 @@
#include "malloc.h"
#include "rotating_tile_puzzle.h"
#include "script_movement.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/metatile_labels.h"

2
src/script_movement.c
View File

@ -4,7 +4,7 @@
#include "task.h"
#include "util.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
// static functions
static void ScriptMovement_StartMoveObjects(u8 priority);

2
src/secret_base.c
View File

@ -33,7 +33,7 @@
#include "task.h"
#include "tv.h"
#include "window.h"
#include "constants/bg_event_constants.h"
#include "constants/event_bg.h"
#include "constants/decorations.h"
#include "constants/event_objects.h"
#include "constants/items.h"

2
src/trainer_hill.c
View File

@ -23,7 +23,7 @@
#include "window.h"
#include "util.h"
#include "constants/battle_ai.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/items.h"
#include "constants/layouts.h"

2
src/trainer_see.c
View File

@ -15,7 +15,7 @@
#include "battle_pyramid.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
// this file's functions

2
src/union_room_player_avatar.c
View File

@ -7,7 +7,7 @@
#include "task.h"
#include "union_room.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/flags.h"
EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL;