dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Label in_connection's field in ObjectEventTemplate

Browse Source
This commit is contained in:
GriffinR
2020-05-14 16:29:19 -04:00
parent 543434ea2d
commit ea01b132b2
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+1 -1
View File
@@ -94,7 +94,7 @@ struct ObjectEventTemplate
{ {
/*0x00*/ u8 localId; /*0x00*/ u8 localId;
/*0x01*/ u8 graphicsId; /*0x01*/ u8 graphicsId;
/*0x02*/ u8 unk2; /*0x02*/ u8 inConnection;
/*0x04*/ s16 x; /*0x04*/ s16 x;
/*0x06*/ s16 y; /*0x06*/ s16 y;
/*0x08*/ u8 elevation; /*0x08*/ u8 elevation;
src/event_object_movement.c
+1 -1
View File
@@ -1904,7 +1904,7 @@ int SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8
y -= 7; y -= 7;
objectEventTemplate.localId = localId; objectEventTemplate.localId = localId;
objectEventTemplate.graphicsId = graphicsId; objectEventTemplate.graphicsId = graphicsId;
objectEventTemplate.unk2 = 0; objectEventTemplate.inConnection = 0;
objectEventTemplate.x = x; objectEventTemplate.x = x;
objectEventTemplate.y = y; objectEventTemplate.y = y;
objectEventTemplate.elevation = z; objectEventTemplate.elevation = z;
src/overworld.c
+13 -16
View File
@@ -400,30 +400,27 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey)
// Routines related to object events // Routines related to object events
static void sub_8054F68(void) static void LoadObjEventTemplatesFromHeader(void)
{ {
u8 i, j; u8 i, j;
u8 mapGroup;
u8 mapNum;
u8 localId;
const struct MapHeader * linkedMap;
for (i = 0, j = 0; i < gMapHeader.events->objectEventCount; i++) for (i = 0, j = 0; i < gMapHeader.events->objectEventCount; i++)
{ {
if (gMapHeader.events->objectEvents[i].unk2 == 0xFF) if (gMapHeader.events->objectEvents[i].inConnection == 0xFF)
{ {
localId = gMapHeader.events->objectEvents[i].elevation; // load "in_connection" object from the connecting map
mapNum = gMapHeader.events->objectEvents[i].trainerType; u8 localId = gMapHeader.events->objectEvents[i].elevation;
mapGroup = gMapHeader.events->objectEvents[i].trainerRange_berryTreeId; u8 mapNum = gMapHeader.events->objectEvents[i].trainerType;
linkedMap = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); u8 mapGroup = gMapHeader.events->objectEvents[i].trainerRange_berryTreeId;
gSaveBlock1Ptr->objectEventTemplates[j] = linkedMap->events->objectEvents[localId - 1]; const struct MapHeader * connectionMap = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
gSaveBlock1Ptr->objectEventTemplates[j] = connectionMap->events->objectEvents[localId - 1];
gSaveBlock1Ptr->objectEventTemplates[j].localId = gMapHeader.events->objectEvents[i].localId; gSaveBlock1Ptr->objectEventTemplates[j].localId = gMapHeader.events->objectEvents[i].localId;
gSaveBlock1Ptr->objectEventTemplates[j].x = gMapHeader.events->objectEvents[i].x; gSaveBlock1Ptr->objectEventTemplates[j].x = gMapHeader.events->objectEvents[i].x;
gSaveBlock1Ptr->objectEventTemplates[j].y = gMapHeader.events->objectEvents[i].y; gSaveBlock1Ptr->objectEventTemplates[j].y = gMapHeader.events->objectEvents[i].y;
gSaveBlock1Ptr->objectEventTemplates[j].elevation = localId; gSaveBlock1Ptr->objectEventTemplates[j].elevation = localId;
gSaveBlock1Ptr->objectEventTemplates[j].trainerType = mapNum; gSaveBlock1Ptr->objectEventTemplates[j].trainerType = mapNum;
gSaveBlock1Ptr->objectEventTemplates[j].trainerRange_berryTreeId = mapGroup; gSaveBlock1Ptr->objectEventTemplates[j].trainerRange_berryTreeId = mapGroup;
gSaveBlock1Ptr->objectEventTemplates[j].unk2 = 0xFF; gSaveBlock1Ptr->objectEventTemplates[j].inConnection = 0xFF;
j++; j++;
} }
else else
@@ -758,7 +755,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
Overworld_TryMapConnectionMusicTransition(); Overworld_TryMapConnectionMusicTransition();
ApplyCurrentWarp(); ApplyCurrentWarp();
LoadCurrentMapData(); LoadCurrentMapData();
sub_8054F68(); LoadObjEventTemplatesFromHeader();
TrySetMapSaveWarpStatus(); TrySetMapSaveWarpStatus();
ClearTempFieldEventData(); ClearTempFieldEventData();
ResetCyclingRoadChallengeData(); ResetCyclingRoadChallengeData();
@@ -791,7 +788,7 @@ static void mli0_load_map(bool32 a1)
bool8 isOutdoors; bool8 isOutdoors;
LoadCurrentMapData(); LoadCurrentMapData();
sub_8054F68(); LoadObjEventTemplatesFromHeader();
isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType);
TrySetMapSaveWarpStatus(); TrySetMapSaveWarpStatus();
@@ -818,7 +815,7 @@ static void sub_80559A8(void)
bool8 isOutdoors; bool8 isOutdoors;
LoadCurrentMapData(); LoadCurrentMapData();
sub_8054F68(); LoadObjEventTemplatesFromHeader();
isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType);
TrySetMapSaveWarpStatus(); TrySetMapSaveWarpStatus();
SetSav1WeatherFromCurrMapHeader(); SetSav1WeatherFromCurrMapHeader();