From 94bec0b8db0f2ab5c4c045dd02608e2698fe2c59 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Sun, 14 Oct 2018 16:14:01 -0400 Subject: [PATCH] Fix Double Underscores Whoops. --- .../field_event_obj/event_object_graphics.h | 2 +- .../event_object_graphics_info.h | 2 +- .../event_object_graphics_info_pointers.h | 4 ++-- .../field_event_obj/event_object_pic_tables.h | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 1b2564411..4b65e694f 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -78,7 +78,7 @@ const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/peop const u32 gEventObjectPic_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 gEventObjectPic_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 gEventObjectPic_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 gEventObjectPic_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"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index df6a909d3..ebc324b08 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -14,7 +14,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, E 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_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}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 8e9083216..3f726e30e 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -13,7 +13,7 @@ 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_LittleGirl; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; @@ -262,7 +262,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_Boy2, &gEventObjectGraphicsInfo_Girl2, &gEventObjectGraphicsInfo_LittleBoy, - &gEventObjectGraphicsInfo__LittleGirl, + &gEventObjectGraphicsInfo_LittleGirl, &gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Girl3, &gEventObjectGraphicsInfo_RichBoy, diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index fb0a8ed75..bd1ad1a25 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -193,16 +193,16 @@ const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), }; -const struct SpriteFrameImage gEventObjectPicTable__LittleGirl[] = { - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 0), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 1), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 2), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 3), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 4), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 5), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 6), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 7), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 8), +const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = { + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {