atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'romhack' into lighting

Browse source
This commit is contained in:
Ariel A 2022-04-24 02:57:06 -04:00
commit 2ecddee1cc
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/event_object_movement.c
View file

@ -34,6 +34,7 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/mauville_old_man.h" #include "constants/mauville_old_man.h"
#include "constants/rgb.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trainer_types.h" #include "constants/trainer_types.h"
#include "constants/union_room.h" #include "constants/union_room.h"
@ -1489,7 +1490,13 @@ TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate,
shiny = gObjectEvents[objectEventId].extra.mon.shiny; shiny = gObjectEvents[objectEventId].extra.mon.shiny;
FollowerSetGraphics(&gObjectEvents[objectEventId], species, form, shiny, TRUE); FollowerSetGraphics(&gObjectEvents[objectEventId], species, form, shiny, TRUE);
} }
// Set runtime species based on VAR_TEMP_4, if template has a dynamic graphics ID
} else if (objectEventTemplate->graphicsId >= OBJ_EVENT_GFX_VARS && VarGetObjectEventGraphicsId(objectEventTemplate->graphicsId - OBJ_EVENT_GFX_VARS) == OBJ_EVENT_GFX_OW_MON) {
gObjectEvents[objectEventId].extra.asU16 = VarGet(VAR_TEMP_4);
FollowerSetGraphics(&gObjectEvents[objectEventId],
gObjectEvents[objectEventId].extra.mon.species,
gObjectEvents[objectEventId].extra.mon.form,
gObjectEvents[objectEventId].extra.mon.form, TRUE);
} }
return objectEventId; return objectEventId;
@ -6477,7 +6484,7 @@ bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent,
static u8 LoadWhiteFlashPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) { static u8 LoadWhiteFlashPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) {
u16 paletteData[16]; u16 paletteData[16];
struct SpritePalette dynamicPalette = {.tag = OBJ_EVENT_PAL_TAG_NONE-1, .data = paletteData}; // TODO: Use a proper palette tag here struct SpritePalette dynamicPalette = {.tag = OBJ_EVENT_PAL_TAG_NONE-1, .data = paletteData}; // TODO: Use a proper palette tag here
CpuFill16(0xFFFF, &paletteData[1], 30); CpuFill16(RGB_WHITE, paletteData, 32);
return UpdateSpritePalette(&dynamicPalette, sprite); return UpdateSpritePalette(&dynamicPalette, sprite);
} }