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

Improved saving & loading expanded OWs.

Browse source
This commit is contained in:
Ariel A 2023-01-11 21:55:39 -05:00
parent 3a0dc0f4f6
commit 7b40e481ce
4 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
asm/macros/map.inc
View file

@ -21,8 +21,9 @@
@ Defines an object event template for map data. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h @ Defines an object event template for map data. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
.macro object_event index:req, gfx:req, inConnection:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req .macro object_event index:req, gfx:req, inConnection:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index, \inConnection .byte \index
.2byte \gfx .2byte \gfx
.byte \inConnection
.2byte \x, \y .2byte \x, \y
.byte \elevation .byte \elevation
.byte \movement_type .byte \movement_type

11
include/global.fieldmap.h
View file

@ -63,22 +63,24 @@ struct BackupMapLayout
u16 *map; u16 *map;
}; };
struct ObjectEventTemplate struct __attribute__((packed)) ObjectEventTemplate
{ {
/*0x00*/ u8 localId; /*0x00*/ u8 localId;
/*0x02*/ u16 graphicsId; /*0x01*/ u16 graphicsId;
// /*0x02*/ u8 inConnection; // Leftover from FRLG /*0x03*/ u8 inConnection; // Leftover from FRLG
/*0x04*/ s16 x; /*0x04*/ s16 x;
/*0x06*/ s16 y; /*0x06*/ s16 y;
/*0x08*/ u8 elevation; /*0x08*/ u8 elevation;
/*0x09*/ u8 movementType; /*0x09*/ u8 movementType;
/*0x0A*/ u16 movementRangeX:4; /*0x0A*/ u16 movementRangeX:4;
u16 movementRangeY:4; u16 movementRangeY:4;
u16 unused:8;
/*0x0C*/ u16 trainerType; /*0x0C*/ u16 trainerType;
/*0x0E*/ u16 trainerRange_berryTreeId; /*0x0E*/ u16 trainerRange_berryTreeId;
/*0x10*/ const u8 *script; /*0x10*/ const u8 *script;
/*0x14*/ u16 flagId; /*0x14*/ u16 flagId;
}; /*0x16*/ u16 filler;
}; // size = 0x18
struct WarpEvent struct WarpEvent
{ {
@ -193,6 +195,7 @@ struct ObjectEvent
u32 fixedPriority:1; u32 fixedPriority:1;
u32 hideReflection:1; u32 hideReflection:1;
u32 shiny:1; // OW mon shininess u32 shiny:1; // OW mon shininess
u32 expanded:1; // 0 for vanilla, 1 for expanded OWs
/*0x04*/ u16 graphicsId; // 11 bits for species; high 5 bits for form /*0x04*/ u16 graphicsId; // 11 bits for species; high 5 bits for form
/*0x06*/ u8 movementType; /*0x06*/ u8 movementType;
/*0x07*/ u8 trainerType; /*0x07*/ u8 trainerType;

3
src/event_object_movement.c
View file

@ -1317,6 +1317,7 @@ static u8 InitObjectEventStateFromTemplate(const struct ObjectEventTemplate *tem
y = template->y + MAP_OFFSET; y = template->y + MAP_OFFSET;
objectEvent->active = TRUE; objectEvent->active = TRUE;
objectEvent->triggerGroundEffectsOnMove = TRUE; objectEvent->triggerGroundEffectsOnMove = TRUE;
objectEvent->expanded = TRUE;
objectEvent->graphicsId = PackGraphicsId(template); objectEvent->graphicsId = PackGraphicsId(template);
if (objectEvent->graphicsId >= OBJ_EVENT_GFX_MON_BASE) { if (objectEvent->graphicsId >= OBJ_EVENT_GFX_MON_BASE) {
if (template->script && template->script[0] == 0x7d) if (template->script && template->script[0] == 0x7d)
@ -1506,8 +1507,6 @@ static u8 TrySetupObjectEventSprite(const struct ObjectEventTemplate *objectEven
static u16 PackGraphicsId(const struct ObjectEventTemplate *template) { static u16 PackGraphicsId(const struct ObjectEventTemplate *template) {
u16 graphicsId = template->graphicsId; u16 graphicsId = template->graphicsId;
u32 form = 0; u32 form = 0;
if (!template)
return 0;
// set form based on template's script, // set form based on template's script,
// if first command is bufferspeciesname // if first command is bufferspeciesname
if (graphicsId >= OBJ_EVENT_GFX_MON_BASE) { if (graphicsId >= OBJ_EVENT_GFX_MON_BASE) {

14
src/load_save.c
View file

@ -181,9 +181,15 @@ void LoadPlayerParty(void)
void SaveObjectEvents(void) void SaveObjectEvents(void)
{ {
int i; int i;
u16 graphicsId;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { for (i = 0; i < OBJECT_EVENTS_COUNT; i++) {
gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
// Swap graphicsId bytes when saving and loading
// This keeps compatibility with vanilla,
// since the lower graphicsIds will be in the same place as vanilla
graphicsId = gObjectEvents[i].graphicsId;
gSaveBlock1Ptr->objectEvents[i].graphicsId = (graphicsId >> 8) | (graphicsId << 8);
// To avoid crash on vanilla, save follower as inactive // To avoid crash on vanilla, save follower as inactive
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER) if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER)
gSaveBlock1Ptr->objectEvents[i].active = FALSE; gSaveBlock1Ptr->objectEvents[i].active = FALSE;
@ -193,9 +199,17 @@ void SaveObjectEvents(void)
void LoadObjectEvents(void) void LoadObjectEvents(void)
{ {
int i; int i;
u16 graphicsId;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { for (i = 0; i < OBJECT_EVENTS_COUNT; i++) {
gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
// Swap graphicsId bytes when saving and loading
// This keeps compatibility with vanilla,
// since the lower graphicsIds will be in the same place as vanilla
graphicsId = gObjectEvents[i].graphicsId;
gObjectEvents[i].graphicsId = (graphicsId >> 8) | (graphicsId << 8);
if (!gObjectEvents[i].expanded)
gObjectEvents[i].graphicsId &= 0xFF;
// Try to restore saved inactive follower // Try to restore saved inactive follower
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER && if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER &&
!gObjectEvents[i].active && !gObjectEvents[i].active &&