dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo, remove old size check

Browse Source
This commit is contained in:
GriffinR
2024-10-12 03:30:35 -04:00
parent 9f31b0fe90
commit a2a3255bdd
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/event_objects.h
View File

@@ -296,7 +296,7 @@
// Each object event template gets an ID that can be used to refer to it in scripts and elsewhere. // Each object event template gets an ID that can be used to refer to it in scripts and elsewhere.
// This is referred to as the "local id" (and it's really just 1 + its index in the templates array). // This is referred to as the "local id" (and it's really just 1 + its index in the templates array).
// There are a few special IDs reserved for objects that don't have a templates in the map data -- one for the player // There are a few special IDs reserved for objects that don't have templates in the map data -- one for the player
// in regular offline play, five for linked players while playing Berry Blender, and one for an invisible object that // in regular offline play, five for linked players while playing Berry Blender, and one for an invisible object that
// can be spawned for the camera to track instead of the player. Additionally, the value 0 is reserved as an "empty" indicator. // can be spawned for the camera to track instead of the player. Additionally, the value 0 is reserved as an "empty" indicator.
#define LOCALID_NONE 0 #define LOCALID_NONE 0

10
tools/mapjson/mapjson.cpp
View File

@@ -422,12 +422,10 @@ void process_event_constants(const vector<string> &map_filepaths, string output_
} }
// Get IDs from the warp events. // Get IDs from the warp events.
auto warp_events = map_data["warp_events"].array_items(); auto warp_events = map_data["warp_events"].array_items();
if (warp_events.size()) { for (unsigned int i = 0; i < warp_events.size(); i++) {
for (unsigned int i = 0; i < warp_events.size(); i++) { auto warp_event = warp_events[i];
auto warp_event = warp_events[i]; if (warp_event.object_items().find("warp_id") != warp_event.object_items().end())
if (warp_event.object_items().find("warp_id") != warp_event.object_items().end()) map_ids_text << "#define " << json_to_string(warp_event, "warp_id") << " " << i << "\n";
map_ids_text << "#define " << json_to_string(warp_event, "warp_id") << " " << i << "\n";
}
} }
// Only output if we found any IDs // Only output if we found any IDs
string temp = map_ids_text.str(); string temp = map_ids_text.str();