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

Get rid of headers in src/data

Browse Source
This commit is contained in:
DizzyEggg
2018-12-03 16:10:41 +01:00
parent a83fc52a7e
commit 846b5d79e4
43 changed files with 3858 additions and 3323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field_event_obj/base_oam.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_BASE_OAM_H
#define GUARD_BASE_OAM_H
const struct OamData gEventObjectBaseOam_8x8 = {
.shape = 0,
.size = 0,
@@ -48,5 +45,3 @@ const struct OamData gEventObjectBaseOam_64x64 = {
.size = 3,
.priority = 2
};
#endif //GUARD_BASE_OAM_H
src/data/field_event_obj/berry_tree_graphics_tables.h
-6
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H
#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
@@ -565,6 +562,3 @@ const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
gBerryTreeEventObjectGraphicsIdTable,
gBerryTreeEventObjectGraphicsIdTable,
};
#endif //GUARD_BERRY_TREE_GRAPHICS_TABLES_H
src/data/field_event_obj/event_object_anims.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_ANIMS_H
#define GUARD_EVENT_OBJECT_ANIMS_H
const union AnimCmd gEventObjectImageAnim_StayStill[] =
{
ANIMCMD_FRAME(0, 8),
@@ -1172,5 +1169,3 @@ const struct UnkStruct_085094AC gUnknown_085094AC[] = {
{0, 0, 0, 0},
},
};
#endif //GUARD_EVENT_OBJECT_ANIMS_H
src/data/field_event_obj/event_object_graphics.h
+1 -6
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_GFX_H
#define GUARD_EVENT_OBJECT_GFX_H
const u32 gEventObjectPic_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 u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal");
@@ -307,7 +304,7 @@ const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/pale
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal");
const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp");
const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp");
const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp");
const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp");
const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp");
const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp");
const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp");
@@ -363,5 +360,3 @@ const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/poke
const u16 gEventObjectPalette32[] = 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 u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal");
#endif //GUARD_EVENT_OBJECT_GFX_H
src/data/field_event_obj/event_object_graphics_info.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
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};
@@ -246,5 +243,3 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrenda
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};
#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
src/data/field_event_obj/event_object_graphics_info_pointers.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
@@ -500,5 +497,3 @@ const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[
&gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
&gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
};
#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
src/data/field_event_obj/event_object_pic_tables.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H
#define GUARD_EVENT_OBJECT_PIC_TABLES_H
const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = {
overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0),
overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1),
@@ -2175,5 +2172,3 @@ const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = {
overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7),
overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8),
};
#endif //GUARD_EVENT_OBJECT_PIC_TABLES_H
src/data/field_event_obj/event_object_subsprites.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H
#define GUARD_EVENT_OBJECT_SUBSPRITES_H
const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = {
{ -8, -8, 0, 1, 0, 2}
};
@@ -338,5 +335,3 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = {
{16, gEventObjectSpriteOamTable_SubmarineShadow_3},
{16, gEventObjectSpriteOamTable_SubmarineShadow_3}
};
#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H
src/data/field_event_obj/field_effect_object_template_pointers.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
#define GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall;
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium;
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge;
@@ -78,5 +75,3 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
&gFieldEffectObjectTemplate_Unknown35,
&gFieldEffectObjectTemplate_Rayquaza,
};
#endif //GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
src/data/field_event_obj/field_effect_objects.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_FIELD_EFFECT_OBJECTS_H
#define GUARD_FIELD_EFFECT_OBJECTS_H
const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004};
const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005};
@@ -993,5 +990,3 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = {
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011};
#endif //GUARD_FIELD_EFFECT_OBJECTS_H
src/data/field_event_obj/movement_action_func_tables.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
#define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *);
@@ -1514,5 +1511,3 @@ u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *,
MovementAction_DestroyExtraTaskIfAtTop_Step0,
MovementAction_Finish,
};
#endif //GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
src/data/field_event_obj/movement_type_func_tables.h
-5
View File
@@ -1,6 +1,3 @@
#ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
#define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = {
MovementType_WanderAround_Step0,
MovementType_WanderAround_Step1,
@@ -439,5 +436,3 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *
MovementType_Invisible_Step1,
MovementType_Invisible_Step2,
};
#endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H