From 9fc7e37c736f50c295f98c411a4ff48765f6342c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 21 May 2024 19:38:42 -0400 Subject: [PATCH] Comment updates --- include/constants/event_objects.h | 14 ++++---------- src/trainer_see.c | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 9e37a3277c..16a1c1bf46 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -243,16 +243,10 @@ #define OBJ_EVENT_GFX_POKE_BALL 239 #define OBJ_EVENT_GFX_OW_MON 240 -// NOTE: By default, the max value for NUM_OBJ_EVENT_GFX is 239. -// -// Object event graphics ids are 1 byte in size (max value of 255), and the dynamic -// graphics ids that start after NUM_OBJ_EVENT_GFX reach this limit. No graphics id -// uses the value 239 itself, so removing the "+ 1" in OBJ_EVENT_GFX_VARS would -// allow increasing NUM_OBJ_EVENT_GFX to 240. There are also a handful of unused -// object graphics that can be removed. If more graphics are needed, anything that -// stores graphics ids will need to be increased in size. See wiki entry below: -// https://github.com/pret/pokeemerald/wiki/Feature-Branches#overworld-expansion -#define NUM_OBJ_EVENT_GFX 256 +// 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 241 // These are dynamic object gfx ids. diff --git a/src/trainer_see.c b/src/trainer_see.c index 2836756a6b..1a50ceb777 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -64,7 +64,7 @@ static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/field_effects/p static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_heart.4bpp"); static const u8 sEmotion_DoubleExclamationMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_double_exclamation.4bpp"); static const u8 sEmotion_XGfx[] = INCBIN_U8("graphics/field_effects/pics/emote_x.4bpp"); -// TODO: Credit https://www.spriters-resource.com/ds_dsi/pokemonheartgoldsoulsilver/sheet/30497/ +// HGSS emote graphics ripped by Lemon on The Spriters Resource: https://www.spriters-resource.com/ds_dsi/pokemonheartgoldsoulsilver/sheet/30497/ static const u8 sEmotion_Gfx[] = INCBIN_U8("graphics/misc/emotes.4bpp"); static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) =