Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-26 11:57:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '678fdf9' into pret-merge

Browse Source 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
This commit is contained in:
Hedara
2025-05-27 19:22:40 +02:00
parent 5e9b8cdbad 678fdf9979
commit c27930eabf
405 changed files with 3210 additions and 3273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/script.c
View File

@@ -416,7 +416,7 @@ void ClearRamScript(void)
#endif //FREE_MYSTERY_EVENT_BUFFERS
}
bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId)
bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 localId)
{
#if FREE_MYSTERY_EVENT_BUFFERS == FALSE
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
@@ -429,7 +429,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8
scriptData->magic = RAM_SCRIPT_MAGIC;
scriptData->mapGroup = mapGroup;
scriptData->mapNum = mapNum;
scriptData->objectId = objectId;
scriptData->localId = localId;
memcpy(scriptData->script, script, scriptSize);
gSaveBlock1Ptr->ramScript.checksum = CalculateRamScriptChecksum();
return TRUE;
@@ -438,7 +438,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8
#endif //FREE_MYSTERY_EVENT_BUFFERS
}
const u8 *GetRamScript(u8 objectId, const u8 *script)
const u8 *GetRamScript(u8 localId, const u8 *script)
{
#if FREE_MYSTERY_EVENT_BUFFERS == FALSE
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
@@ -449,7 +449,7 @@ const u8 *GetRamScript(u8 objectId, const u8 *script)
return script;
if (scriptData->mapNum != gSaveBlock1Ptr->location.mapNum)
return script;
if (scriptData->objectId != objectId)
if (scriptData->localId != localId)
return script;
if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum)
{
@@ -466,7 +466,7 @@ const u8 *GetRamScript(u8 objectId, const u8 *script)
#endif //FREE_MYSTERY_EVENT_BUFFERS
}
#define NO_OBJECT OBJ_EVENT_ID_PLAYER
#define NO_OBJECT LOCALID_PLAYER
bool32 ValidateSavedRamScript(void)
{
@@ -478,7 +478,7 @@ bool32 ValidateSavedRamScript(void)
return FALSE;
if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED))
return FALSE;
if (scriptData->objectId != NO_OBJECT)
if (scriptData->localId != NO_OBJECT)
return FALSE;
if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum)
return FALSE;
@@ -500,7 +500,7 @@ u8 *GetSavedRamScriptIfValid(void)
return NULL;
if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED))
return NULL;
if (scriptData->objectId != NO_OBJECT)
if (scriptData->localId != NO_OBJECT)
return NULL;
if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum)
{