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

Merge pull request #488 from GriffinRichards/map-constants

Browse Source 
Sync roamer.c, add missing map constant usage
This commit is contained in:
GriffinR
2022-02-14 21:17:44 -05:00
committed by GitHub
parent 8d85ff1683 59695b8221
commit 759f373d31
9 changed files with 147 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+6 -3
View File
@@ -15,6 +15,7 @@
#include "script.h"
#include "trainer_see.h"
#include "trig.h"
#include "constants/maps.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/trainer_types.h"
@@ -1215,8 +1216,8 @@ static void ClearObjectEvent(struct ObjectEvent *objectEvent)
{
*objectEvent = (struct ObjectEvent){};
objectEvent->localId = 0xFF;
objectEvent->mapNum = 0xFF;
objectEvent->mapGroup = 0xFF;
objectEvent->mapNum = MAP_NUM(UNDEFINED);
objectEvent->mapGroup = MAP_GROUP(UNDEFINED);
objectEvent->movementActionId = 0xFF;
}
@@ -8037,7 +8038,9 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct
x2 = graphicsInfo->width + (s16)x;
y2 = graphicsInfo->height + (s16)y;
if (gSaveBlock1Ptr->location.mapGroup == 1 && gSaveBlock1Ptr->location.mapNum == 4 && objectEvent->localId == 1)
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SSANNE_EXTERIOR)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SSANNE_EXTERIOR)
&& objectEvent->localId == 1)
{
var = -32;
}