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

Sync map macro change with pokeemerald

Browse Source
This commit is contained in:
GriffinR
2024-08-27 13:57:07 -04:00
parent f155bf5419
commit 5e464c2091
32 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+4 -4
View File
@@ -1207,8 +1207,8 @@ static void ClearObjectEvent(struct ObjectEvent *objectEvent)
{
*objectEvent = (struct ObjectEvent){};
objectEvent->localId = 0xFF;
objectEvent->mapNum = MAP_NUM(UNDEFINED);
objectEvent->mapGroup = MAP_GROUP(UNDEFINED);
objectEvent->mapNum = MAP_NUM(MAP_UNDEFINED);
objectEvent->mapGroup = MAP_GROUP(MAP_UNDEFINED);
objectEvent->movementActionId = MOVEMENT_ACTION_NONE;
}
@@ -7989,8 +7989,8 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct
x2 = graphicsInfo->width + (s16)x;
y2 = graphicsInfo->height + (s16)y;
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SSANNE_EXTERIOR)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SSANNE_EXTERIOR)
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SSANNE_EXTERIOR)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SSANNE_EXTERIOR)
&& objectEvent->localId == 1)
{
var = -32;