Skip to content

Commit

Permalink
Green OW
Browse files Browse the repository at this point in the history
  • Loading branch information
@Greenphx9
Greenphx9 committed Jan 12, 2025
1 parent e2d00ca commit 42d0834
Show file tree
Hide file tree
Showing 15 changed files with 256 additions and 26 deletions.
19 changes: 19 additions & 0 deletions graphics/object_events/pics/people/player/green/green.pal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
172 123 65
255 197 148
222 148 115
123 65 65
65 65 213
57 57 123
115 164 197
106 41 41
238 238 255
180 180 213
255 106 74
197 57 57
255 222 90
189 156 57
0 0 0
Binary file added graphics/object_events/pics/people/player/green/green_bike.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.
Binary file added graphics/object_events/pics/people/player/green/green_fish.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.
Binary file added graphics/object_events/pics/people/player/green/green_item.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.
Binary file added graphics/object_events/pics/people/player/green/green_normal.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.
Binary file added graphics/object_events/pics/people/player/green/green_surf.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.
Binary file added graphics/object_events/pics/people/player/green/green_surf_run.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.
8 changes: 7 additions & 1 deletion include/constants/event_objects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,16 @@
#define OBJ_EVENT_GFX_RED_SURF 243
#define OBJ_EVENT_GFX_RED_FIELD_MOVE 244
#define OBJ_EVENT_GFX_RED_FISH 245
#define OBJ_EVENT_GFX_GREEN_NORMAL 246
#define OBJ_EVENT_GFX_GREEN_BIKE 247
#define OBJ_EVENT_GFX_GREEN_SURF 248
#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE 249
#define OBJ_EVENT_GFX_GREEN_FISH 250

// NOTE: The maximum amount of object events has been expanded from 255 to 65535.
// Since dynamic graphics ids still require at least 16 free values, the actual limit
// is 65519, but even considering follower Pokémon, this should be more than enough :)
#define NUM_OBJ_EVENT_GFX 246
#define NUM_OBJ_EVENT_GFX 251


// These are dynamic object gfx ids.
Expand Down Expand Up @@ -385,6 +390,7 @@
#define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123
#define OBJ_EVENT_PAL_TAG_DYNAMIC 0x1124
#define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1125
#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1126

#if OW_FOLLOWERS_POKEBALLS
// Vanilla
Expand Down
18 changes: 18 additions & 0 deletions spritesheet_rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4789,4 +4789,22 @@ $(OBJEVENTGFXDIR)/people/player/red/red_surf_run.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4

$(OBJEVENTGFXDIR)/people/player/red/red_surf.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/player/green/green_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/player/green/green_fish.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

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

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

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

$(OBJEVENTGFXDIR)/people/player/green/green_surf.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
7 changes: 7 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 @@ -464,3 +464,10 @@ const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/pe
const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/player/red/red_surf.4bpp");
const u16 gObjectEventPic_RedBike[] = INCBIN_U16("graphics/object_events/pics/people/player/red/red_bike.4bpp");
const u16 gObjectEventPic_RedFish[] = INCBIN_U16("graphics/object_events/pics/people/player/red/red_fish.4bpp");
const u16 gObjectEventPal_Green[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green.gbapal");
const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_normal.4bpp");
const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_surf_run.4bpp");
const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_item.4bpp");
const u16 gObjectEventPic_GreenSurf[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_surf.4bpp");
const u16 gObjectEventPic_GreenBike[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_bike.4bpp");
const u16 gObjectEventPic_GreenFish[] = INCBIN_U16("graphics/object_events/pics/people/player/green/green_fish.4bpp");
95 changes: 95 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 @@ -4767,4 +4767,99 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {
.anims = sAnimTable_Fishing,
.images = sPicTable_RedFish,
.affineAnims = gDummySpriteAffineAnimTable,
};

const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION,
.size = 512,
.width = 16,
.height = 32,
.paletteSlot = PALSLOT_PLAYER,
.shadowSize = SHADOW_SIZE_M,
.inanimate = FALSE,
.compressed = FALSE,
.tracks = TRACKS_FOOT,
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_BrendanMayNormal,
.images = sPicTable_GreenNormal,
.affineAnims = gDummySpriteAffineAnimTable,
};

const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION,
.size = 512,
.width = 32,
.height = 32,
.paletteSlot = PALSLOT_PLAYER,
.shadowSize = SHADOW_SIZE_M,
.inanimate = FALSE,
.compressed = FALSE,
.tracks = TRACKS_BIKE_TIRE,
.oam = &gObjectEventBaseOam_32x32,
.subspriteTables = sOamTables_32x32,
.anims = sAnimTable_Standard,
.images = sPicTable_GreenBike,
.affineAnims = gDummySpriteAffineAnimTable,
};

const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
.size = 256,
.width = 16,
.height = 32,
.paletteSlot = PALSLOT_PLAYER,
.shadowSize = SHADOW_SIZE_M,
.inanimate = FALSE,
.compressed = FALSE,
.tracks = TRACKS_FOOT,
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_Surfing,
.images = sPicTable_GreenSurf,
.affineAnims = gDummySpriteAffineAnimTable,
};

const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION,
.size = 256,
.width = 16,
.height = 32,
.paletteSlot = PALSLOT_PLAYER,
.shadowSize = SHADOW_SIZE_M,
.inanimate = FALSE,
.compressed = FALSE,
.tracks = TRACKS_FOOT,
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_FieldMove,
.images = sPicTable_GreenItem,
.affineAnims = gDummySpriteAffineAnimTable,
};

const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION,
.size = 512,
.width = 32,
.height = 32,
.paletteSlot = PALSLOT_PLAYER,
.shadowSize = SHADOW_SIZE_M,
.inanimate = FALSE,
.compressed = FALSE,
.tracks = TRACKS_FOOT,
.oam = &gObjectEventBaseOam_32x32,
.subspriteTables = sOamTables_32x32,
.anims = sAnimTable_Fishing,
.images = sPicTable_GreenFish,
.affineAnims = gDummySpriteAffineAnimTable,
};
10 changes: 10 additions & 0 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 @@ -254,6 +254,11 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish;

const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = {
[OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal,
Expand Down Expand Up @@ -502,6 +507,11 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_RED_SURF] = &gObjectEventGraphicsInfo_RedSurf,
[OBJ_EVENT_GFX_RED_FIELD_MOVE] = &gObjectEventGraphicsInfo_RedFieldMove,
[OBJ_EVENT_GFX_RED_FISH] = &gObjectEventGraphicsInfo_RedFish,
[OBJ_EVENT_GFX_GREEN_NORMAL] = &gObjectEventGraphicsInfo_GreenNormal,
[OBJ_EVENT_GFX_GREEN_BIKE] = &gObjectEventGraphicsInfo_GreenBike,
[OBJ_EVENT_GFX_GREEN_SURF] = &gObjectEventGraphicsInfo_GreenSurf,
[OBJ_EVENT_GFX_GREEN_FIELD_MOVE] = &gObjectEventGraphicsInfo_GreenFieldMove,
[OBJ_EVENT_GFX_GREEN_FISH] = &gObjectEventGraphicsInfo_GreenFish,
};

const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
Expand Down
77 changes: 77 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 @@ -1432,4 +1432,81 @@ static const struct SpriteFrameImage sPicTable_RedFish[] = {
overworld_frame(gObjectEventPic_RedFish, 4, 4, 9),
overworld_frame(gObjectEventPic_RedFish, 4, 4, 10),
overworld_frame(gObjectEventPic_RedFish, 4, 4, 11),
};

static const struct SpriteFrameImage sPicTable_GreenNormal[] = {
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 2),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 3),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 4),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 5),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 6),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 7),
overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 8),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 3),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 4),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 5),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 6),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 7),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 8),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 9),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 10),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 11),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 12),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 13),
};

static const struct SpriteFrameImage sPicTable_GreenBike[] = {
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 0),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 1),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 2),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 3),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 4),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 5),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 6),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 7),
overworld_frame(gObjectEventPic_GreenBike, 4, 4, 8),
};

static const struct SpriteFrameImage sPicTable_GreenSurf[] = {
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2),
};

static const struct SpriteFrameImage sPicTable_GreenItem[] = {
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 0),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 1),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 2),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 3),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 4),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 5),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 6),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 7),
overworld_frame(gObjectEventPic_GreenItem, 2, 4, 8),
};

static const struct SpriteFrameImage sPicTable_GreenFish[] = {
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 0),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 1),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 2),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 3),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 4),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 5),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 6),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 7),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 8),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 9),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 10),
overworld_frame(gObjectEventPic_GreenFish, 4, 4, 11),
};
7 changes: 4 additions & 3 deletions src/event_object_movement.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
{gObjectEventPal_Substitute, OBJ_EVENT_PAL_TAG_SUBSTITUTE},
{gObjectEventPaletteEmotes, OBJ_EVENT_PAL_TAG_EMOTES},
{gObjectEventPal_Red, OBJ_EVENT_PAL_TAG_PLAYER_RED},
{gObjectEventPal_Green, OBJ_EVENT_PAL_TAG_PLAYER_GREEN},
#ifdef BUGFIX
{NULL, OBJ_EVENT_PAL_TAG_NONE},
#else
Expand Down Expand Up @@ -573,7 +574,7 @@ static const u16 sReflectionPaletteTags_PlayerUnderwater[] = {

static const struct PairedPalettes sPlayerReflectionPaletteSets[] = {
{OBJ_EVENT_PAL_TAG_PLAYER_RED, sReflectionPaletteTags_Brendan},
{OBJ_EVENT_PAL_TAG_MAY, sReflectionPaletteTags_May},
{OBJ_EVENT_PAL_TAG_PLAYER_GREEN, sReflectionPaletteTags_May},
{OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, sReflectionPaletteTags_PlayerUnderwater},
{OBJ_EVENT_PAL_TAG_NONE, NULL},
};
Expand Down Expand Up @@ -657,7 +658,7 @@ static const u16 sReflectionPaletteTags_RedLeaf[] = {

static const struct PairedPalettes sSpecialObjectReflectionPaletteSets[] = {
{OBJ_EVENT_PAL_TAG_PLAYER_RED, sReflectionPaletteTags_Brendan},
{OBJ_EVENT_PAL_TAG_MAY, sReflectionPaletteTags_May},
{OBJ_EVENT_PAL_TAG_PLAYER_GREEN, sReflectionPaletteTags_May},
{OBJ_EVENT_PAL_TAG_QUINTY_PLUMP, sReflectionPaletteTags_QuintyPlump},
{OBJ_EVENT_PAL_TAG_TRUCK, sReflectionPaletteTags_Truck},
{OBJ_EVENT_PAL_TAG_VIGOROTH, sReflectionPaletteTags_VigorothMover},
Expand Down Expand Up @@ -3016,7 +3017,7 @@ u8 LoadPlayerObjectEventPalette(u8 gender)
paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_RED;
break;
case FEMALE:
paletteTag = OBJ_EVENT_PAL_TAG_MAY;
paletteTag = OBJ_EVENT_PAL_TAG_PLAYER_GREEN;
break;
}
return LoadObjectEventPalette(paletteTag);
Expand Down
41 changes: 19 additions & 22 deletions src/field_player_avatar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,15 @@ static const u8 sRivalAvatarGfxIds[][2] =

static const u8 sPlayerAvatarGfxIds[][2] =
{
[PLAYER_AVATAR_STATE_NORMAL] = {OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_MAY_NORMAL},
[PLAYER_AVATAR_STATE_MACH_BIKE] = {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_MAY_MACH_BIKE},
[PLAYER_AVATAR_STATE_ACRO_BIKE] = {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_MAY_ACRO_BIKE},
[PLAYER_AVATAR_STATE_SURFING] = {OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_MAY_SURFING},
[PLAYER_AVATAR_STATE_NORMAL] = {OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL},
[PLAYER_AVATAR_STATE_MACH_BIKE] = {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE},
[PLAYER_AVATAR_STATE_ACRO_BIKE] = {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE},
[PLAYER_AVATAR_STATE_SURFING] = {OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF},
[PLAYER_AVATAR_STATE_UNDERWATER] = {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER},
[PLAYER_AVATAR_STATE_FIELD_MOVE] = {OBJ_EVENT_GFX_RED_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE},
[PLAYER_AVATAR_STATE_FISHING] = {OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_MAY_FISHING},
[PLAYER_AVATAR_STATE_FIELD_MOVE] = {OBJ_EVENT_GFX_RED_FIELD_MOVE, OBJ_EVENT_GFX_GREEN_FIELD_MOVE},
[PLAYER_AVATAR_STATE_FISHING] = {OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH},
[PLAYER_AVATAR_STATE_WATERING] = {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING},
[PLAYER_AVATAR_STATE_VSSEEKER] = {OBJ_EVENT_GFX_RED_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE},
[PLAYER_AVATAR_STATE_VSSEEKER] = {OBJ_EVENT_GFX_RED_FIELD_MOVE, OBJ_EVENT_GFX_GREEN_FIELD_MOVE},
};

static const u8 sFRLGAvatarGfxIds[GENDER_COUNT] =
Expand All @@ -293,17 +293,17 @@ static const u8 sPlayerAvatarGfxToStateFlag[GENDER_COUNT][5][2] =
[MALE] =
{
{OBJ_EVENT_GFX_RED_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
{OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
{OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
{OBJ_EVENT_GFX_RED_SURF, PLAYER_AVATAR_FLAG_SURFING},
{OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
{OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
{OBJ_EVENT_GFX_RED_SURF, PLAYER_AVATAR_FLAG_SURFING},
{OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
},
[FEMALE] =
{
{OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
{OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
{OBJ_EVENT_GFX_MAY_ACRO_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
{OBJ_EVENT_GFX_MAY_SURFING, PLAYER_AVATAR_FLAG_SURFING},
{OBJ_EVENT_GFX_GREEN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
{OBJ_EVENT_GFX_GREEN_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
{OBJ_EVENT_GFX_GREEN_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
{OBJ_EVENT_GFX_GREEN_SURF, PLAYER_AVATAR_FLAG_SURFING},
{OBJ_EVENT_GFX_MAY_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
}
};
Expand Down Expand Up @@ -1303,14 +1303,11 @@ u8 GetPlayerAvatarGenderByGraphicsId(u16 gfxId)
{
switch (gfxId)
{
case OBJ_EVENT_GFX_MAY_NORMAL:
case OBJ_EVENT_GFX_MAY_MACH_BIKE:
case OBJ_EVENT_GFX_MAY_ACRO_BIKE:
case OBJ_EVENT_GFX_MAY_SURFING:
case OBJ_EVENT_GFX_MAY_FIELD_MOVE:
case OBJ_EVENT_GFX_MAY_UNDERWATER:
case OBJ_EVENT_GFX_MAY_FISHING:
case OBJ_EVENT_GFX_MAY_WATERING:
case OBJ_EVENT_GFX_GREEN_NORMAL:
case OBJ_EVENT_GFX_GREEN_BIKE:
case OBJ_EVENT_GFX_GREEN_SURF:
case OBJ_EVENT_GFX_GREEN_FIELD_MOVE:
case OBJ_EVENT_GFX_GREEN_FISH:
return FEMALE;
default:
return MALE;
Expand Down

0 comments on commit 42d0834

Please sign in to comment.