Skip to content

Commit

Permalink
Cynthia Overworld
Browse files Browse the repository at this point in the history 
Add overworld sprite for Cynthia. Uses pal slot 10 so can't be on screen at the same time as the rival.
  • Loading branch information
@BuffelSaft
BuffelSaft committed Jul 7, 2021
1 parent fd03162 commit 2c8ab8f
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 29 deletions.
19 changes: 19 additions & 0 deletions graphics/object_events/palettes/cynthia.pal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
240 208 120
184 152 88
255 255 255
248 248 192
120 96 72
120 120 144
156 98 74
80 80 96
40 40 48
0 0 0
0 0 0
Binary file added graphics/object_events/pics/people/cynthia.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 16 additions & 15 deletions include/constants/event_objects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,22 +242,23 @@
#define OBJ_EVENT_GFX_HOOH 238
#define OBJ_EVENT_GFX_GOLD_ITEM_BALL 239
#define OBJ_EVENT_GFX_MEGA_STONE 240
#define OBJ_EVENT_GFX_ARTICUNO 241
#define OBJ_EVENT_GFX_ZAPDOS 242
#define OBJ_EVENT_GFX_MOLTRES 243
#define OBJ_EVENT_GFX_MEWTWO 244
#define OBJ_EVENT_GFX_RAIKOU 245
#define OBJ_EVENT_GFX_ENTEI 246
#define OBJ_EVENT_GFX_SUICUNE 247
#define OBJ_EVENT_GFX_CELEBI 248
#define OBJ_EVENT_GFX_JIRACHI 249
#define OBJ_EVENT_GFX_HEATRAN 250
#define OBJ_EVENT_GFX_REGIGIGAS 251
#define OBJ_EVENT_GFX_CARBINK 252
#define OBJ_EVENT_GFX_DIANCIE 253
#define OBJ_EVENT_GFX_CHANSEY 254
#define OBJ_EVENT_GFX_ARTICUNO 241
#define OBJ_EVENT_GFX_ZAPDOS 242
#define OBJ_EVENT_GFX_MOLTRES 243
#define OBJ_EVENT_GFX_MEWTWO 244
#define OBJ_EVENT_GFX_RAIKOU 245
#define OBJ_EVENT_GFX_ENTEI 246
#define OBJ_EVENT_GFX_SUICUNE 247
#define OBJ_EVENT_GFX_CELEBI 248
#define OBJ_EVENT_GFX_JIRACHI 249
#define OBJ_EVENT_GFX_HEATRAN 250
#define OBJ_EVENT_GFX_REGIGIGAS 251
#define OBJ_EVENT_GFX_CARBINK 252
#define OBJ_EVENT_GFX_DIANCIE 253
#define OBJ_EVENT_GFX_CHANSEY 254
#define OBJ_EVENT_GFX_CYNTHIA 255

#define NUM_OBJ_EVENT_GFX 255
#define NUM_OBJ_EVENT_GFX 256


// These are dynamic object gfx ids.
Expand Down
2 changes: 2 additions & 0 deletions spritesheet_rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ $(OBJEVENTGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4

$(OBJEVENTGFXDIR)/people/cynthia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4


$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
Expand Down
3 changes: 3 additions & 0 deletions src/data/object_events/object_event_graphics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,11 @@ const u32 gObjectEventPic_Regigigas[] = INCBIN_U32("graphics/object_events/pics/
const u32 gObjectEventPic_Carbink[] = INCBIN_U32("graphics/object_events/pics/pokemon/carbink.4bpp");
const u32 gObjectEventPic_Diancie[] = INCBIN_U32("graphics/object_events/pics/pokemon/diancie.4bpp");
const u32 gObjectEventPic_Chansey[] = INCBIN_U32("graphics/object_events/pics/pokemon/chansey.4bpp");
// People
const u32 gObjectEventPic_Cynthia[] = INCBIN_U32("graphics/object_events/pics/people/cynthia.4bpp");
// New pals
const u16 gObjectEventPaletteCelebi[] = INCBIN_U16("graphics/object_events/palettes/celebi.gbapal");
const u16 gObjectEventPaletteJirachi[] = INCBIN_U16("graphics/object_events/palettes/jirachi.gbapal");
const u16 gObjectEventPaletteHeatran[] = INCBIN_U16("graphics/object_events/palettes/heatran.gbapal");
const u16 gObjectEventPaletteRegigigas[] = INCBIN_U16("graphics/object_events/palettes/regigigas.gbapal");
const u16 gObjectEventPaletteCynthia[] = INCBIN_U16("graphics/object_events/palettes/cynthia.gbapal");
2 changes: 2 additions & 0 deletions src/data/object_events/object_event_graphics_info.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,5 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regigigas = {0xFFF
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Carbink = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Carbink, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Diancie = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Diancie, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Chansey, gDummySpriteAffineAnimTable};
// New People
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cynthia = {0xFFFF, OBJ_EVENT_PAL_TAG_CYNTHIA, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Cynthia, gDummySpriteAffineAnimTable};
28 changes: 15 additions & 13 deletions src/data/object_events/object_event_graphics_info_pointers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regigigas;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Carbink;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Diancie;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cynthia;

const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = {
[OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal,
Expand Down Expand Up @@ -504,19 +505,20 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_GOLD_ITEM_BALL] = &gObjectEventGraphicsInfo_GoldItemBall,
[OBJ_EVENT_GFX_MEGA_STONE] = &gObjectEventGraphicsInfo_MegaStone,
[OBJ_EVENT_GFX_ARTICUNO] = &gObjectEventGraphicsInfo_Articuno,
[OBJ_EVENT_GFX_ZAPDOS] = &gObjectEventGraphicsInfo_Zapdos,
[OBJ_EVENT_GFX_MOLTRES] = &gObjectEventGraphicsInfo_Moltres,
[OBJ_EVENT_GFX_MEWTWO] = &gObjectEventGraphicsInfo_Mewtwo,
[OBJ_EVENT_GFX_RAIKOU] = &gObjectEventGraphicsInfo_Raikou,
[OBJ_EVENT_GFX_ENTEI] = &gObjectEventGraphicsInfo_Entei,
[OBJ_EVENT_GFX_SUICUNE] = &gObjectEventGraphicsInfo_Suicune,
[OBJ_EVENT_GFX_CELEBI] = &gObjectEventGraphicsInfo_Celebi,
[OBJ_EVENT_GFX_JIRACHI] = &gObjectEventGraphicsInfo_Jirachi,
[OBJ_EVENT_GFX_HEATRAN] = &gObjectEventGraphicsInfo_Heatran,
[OBJ_EVENT_GFX_REGIGIGAS] = &gObjectEventGraphicsInfo_Regigigas,
[OBJ_EVENT_GFX_CARBINK] = &gObjectEventGraphicsInfo_Carbink,
[OBJ_EVENT_GFX_DIANCIE] = &gObjectEventGraphicsInfo_Diancie,
[OBJ_EVENT_GFX_CHANSEY] = &gObjectEventGraphicsInfo_Chansey,
[OBJ_EVENT_GFX_ZAPDOS] = &gObjectEventGraphicsInfo_Zapdos,
[OBJ_EVENT_GFX_MOLTRES] = &gObjectEventGraphicsInfo_Moltres,
[OBJ_EVENT_GFX_MEWTWO] = &gObjectEventGraphicsInfo_Mewtwo,
[OBJ_EVENT_GFX_RAIKOU] = &gObjectEventGraphicsInfo_Raikou,
[OBJ_EVENT_GFX_ENTEI] = &gObjectEventGraphicsInfo_Entei,
[OBJ_EVENT_GFX_SUICUNE] = &gObjectEventGraphicsInfo_Suicune,
[OBJ_EVENT_GFX_CELEBI] = &gObjectEventGraphicsInfo_Celebi,
[OBJ_EVENT_GFX_JIRACHI] = &gObjectEventGraphicsInfo_Jirachi,
[OBJ_EVENT_GFX_HEATRAN] = &gObjectEventGraphicsInfo_Heatran,
[OBJ_EVENT_GFX_REGIGIGAS] = &gObjectEventGraphicsInfo_Regigigas,
[OBJ_EVENT_GFX_CARBINK] = &gObjectEventGraphicsInfo_Carbink,
[OBJ_EVENT_GFX_DIANCIE] = &gObjectEventGraphicsInfo_Diancie,
[OBJ_EVENT_GFX_CHANSEY] = &gObjectEventGraphicsInfo_Chansey,
[OBJ_EVENT_GFX_CYNTHIA] = &gObjectEventGraphicsInfo_Cynthia,
};

const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
Expand Down
12 changes: 12 additions & 0 deletions src/data/object_events/object_event_pic_tables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2264,3 +2264,15 @@ const struct SpriteFrameImage sPicTable_Chansey[] = {
overworld_frame(gObjectEventPic_Chansey, 2, 2, 7),
overworld_frame(gObjectEventPic_Chansey, 2, 2, 8),
};

static const struct SpriteFrameImage sPicTable_Cynthia[] = {
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 0),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 1),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 2),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 0),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 0),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 1),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 1),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 2),
overworld_frame(gObjectEventPic_Cynthia, 2, 4, 2),
};
4 changes: 3 additions & 1 deletion src/event_object_movement.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,11 +463,12 @@ const u8 gInitialMovementTypeFacingDirections[] = {
#define OBJ_EVENT_PAL_TAG_LUGIA 0x1121
#define OBJ_EVENT_PAL_TAG_RS_BRENDAN 0x1122
#define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
#define OBJ_EVENT_PAL_TAG_CELEBI 0x1124
#define OBJ_EVENT_PAL_TAG_JIRACHI 0x1125
#define OBJ_EVENT_PAL_TAG_HEATRAN 0x1126
#define OBJ_EVENT_PAL_TAG_REGIGIGAS 0x1127
#define OBJ_EVENT_PAL_TAG_CYNTHIA 0x1128
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF

#include "data/object_events/object_event_graphics_info_pointers.h"
#include "data/field_effects/field_effect_object_template_pointers.h"
Expand Down Expand Up @@ -517,6 +518,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
{gObjectEventPaletteJirachi, OBJ_EVENT_PAL_TAG_JIRACHI},
{gObjectEventPaletteHeatran, OBJ_EVENT_PAL_TAG_HEATRAN},
{gObjectEventPaletteRegigigas, OBJ_EVENT_PAL_TAG_REGIGIGAS},
{gObjectEventPaletteCynthia, OBJ_EVENT_PAL_TAG_CYNTHIA},
{NULL, 0x0000},
};

Expand Down

0 comments on commit 2c8ab8f

Please sign in to comment.