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

Move/rename gfx start/end vars

Browse Source
This commit is contained in:
GriffinR
2020-01-17 18:34:37 -05:00
committed by huderlem
parent aa631825fc
commit a40f054900
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/event_objects.h
+19 -17
View File
@@ -240,27 +240,29 @@
#define EVENT_OBJ_GFX_LINK_RS_MAY 236 #define EVENT_OBJ_GFX_LINK_RS_MAY 236
#define EVENT_OBJ_GFX_LUGIA 237 #define EVENT_OBJ_GFX_LUGIA 237
#define EVENT_OBJ_GFX_HOOH 238 #define EVENT_OBJ_GFX_HOOH 238
#define EVENT_OBJ_GFX_BARD_2 239
#define NUM_OBJ_EVENT_GFX 239
// These are dynamic object gfx ids. // These are dynamic object gfx ids.
// They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
// More info about them in include/constants/vars.h // More info about them in include/constants/vars.h
#define EVENT_OBJ_GFX_VAR_0 240 #define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1)
#define EVENT_OBJ_GFX_VAR_1 241 #define EVENT_OBJ_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) // 240
#define EVENT_OBJ_GFX_VAR_2 242 #define EVENT_OBJ_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1)
#define EVENT_OBJ_GFX_VAR_3 243 #define EVENT_OBJ_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2)
#define EVENT_OBJ_GFX_VAR_4 244 #define EVENT_OBJ_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3)
#define EVENT_OBJ_GFX_VAR_5 245 #define EVENT_OBJ_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4)
#define EVENT_OBJ_GFX_VAR_6 246 #define EVENT_OBJ_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5)
#define EVENT_OBJ_GFX_VAR_7 247 #define EVENT_OBJ_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6)
#define EVENT_OBJ_GFX_VAR_8 248 #define EVENT_OBJ_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7)
#define EVENT_OBJ_GFX_VAR_9 249 #define EVENT_OBJ_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8)
#define EVENT_OBJ_GFX_VAR_A 250 #define EVENT_OBJ_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9)
#define EVENT_OBJ_GFX_VAR_B 251 #define EVENT_OBJ_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA)
#define EVENT_OBJ_GFX_VAR_C 252 #define EVENT_OBJ_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB)
#define EVENT_OBJ_GFX_VAR_D 253 #define EVENT_OBJ_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC)
#define EVENT_OBJ_GFX_VAR_E 254 #define EVENT_OBJ_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD)
#define EVENT_OBJ_GFX_VAR_F 255 #define EVENT_OBJ_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE)
#define EVENT_OBJ_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255
#define SHADOW_SIZE_S 0 #define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1 #define SHADOW_SIZE_M 1
include/event_object_movement.h
-3
View File
@@ -1,9 +1,6 @@
#ifndef GUARD_FIELD_EVENT_OBJ_H #ifndef GUARD_FIELD_EVENT_OBJ_H
#define GUARD_FIELD_EVENT_OBJ_H #define GUARD_FIELD_EVENT_OBJ_H
#define NUM_OBJECT_GRAPHICS_INFO 239
#define SPRITE_VAR 240
enum SpinnerRunnerFollowPatterns enum SpinnerRunnerFollowPatterns
{ {
RUNFOLLOW_ANY, RUNFOLLOW_ANY,
src/event_object_movement.c
+8 -5
View File
@@ -1861,27 +1861,30 @@ const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId)
{ {
u8 bard; u8 bard;
if (graphicsId >= SPRITE_VAR) if (graphicsId >= OBJ_EVENT_GFX_VARS)
{ {
graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR); graphicsId = VarGetEventObjectGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS);
} }
if (graphicsId == EVENT_OBJ_GFX_BARD) if (graphicsId == EVENT_OBJ_GFX_BARD)
{ {
bard = GetCurrentMauvilleOldMan(); bard = GetCurrentMauvilleOldMan();
return gMauvilleOldManGraphicsInfoPointers[bard]; return gMauvilleOldManGraphicsInfoPointers[bard];
} }
if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO)
if (graphicsId >= NUM_OBJ_EVENT_GFX)
{ {
graphicsId = EVENT_OBJ_GFX_NINJA_BOY; graphicsId = EVENT_OBJ_GFX_NINJA_BOY;
} }
return gEventObjectGraphicsInfoPointers[graphicsId]; return gEventObjectGraphicsInfoPointers[graphicsId];
} }
static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject)
{ {
if (eventObject->graphicsId >= SPRITE_VAR) if (eventObject->graphicsId >= OBJ_EVENT_GFX_VARS)
{ {
eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR); eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - OBJ_EVENT_GFX_VARS);
} }
} }