Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Eduardo Quezada 2026-03-20 00:58:56 -03:00
parent e06f28401c
commit 4edf9f9fbf
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/config/frlg.h
View File

@ -7,15 +7,17 @@
// IMPORTANT: Run `make clean` after changing any of these settings.
// Settings for Emerald mode
#define FRLG_INCLUDE_OBJECT_EVENTS FALSE // Include data for FRLG's object events
#define FRLG_INCLUDE_KANTO_TILESETS FALSE // Include data for FRLG's tilesets
#define FRLG_INCLUDE_KANTO_MAPS FALSE // Include data for FRLG's maps. IMPORTANT: Requires FRLG_INCLUDE_OBJECT_EVENTS and FRLG_INCLUDE_KANTO_TILESETS!!
// Flags and Vars are not handled, so events may be in a broken state.
#define FRLG_KANTO_MAP_WILD_PKMN FIRE_RED // Wild encounter data to be used when enabling FRLG_INCLUDE_KANTO_MAPS
#define FRLG_INCLUDE_ALL FALSE // Change this to toggle all configs on. You can also individually turn them on by setting each to TRUE.
#define FRLG_INCLUDE_OBJECT_EVENTS FRLG_INCLUDE_ALL // Include data for FRLG's object events
#define FRLG_INCLUDE_KANTO_TILESETS FRLG_INCLUDE_ALL // Include data for FRLG's tilesets
#define FRLG_INCLUDE_KANTO_MAPS FRLG_INCLUDE_ALL // Include data for FRLG's maps. IMPORTANT: Requires FRLG_INCLUDE_OBJECT_EVENTS and FRLG_INCLUDE_KANTO_TILESETS!!
// Flags and Vars are not handled, so events may be in a broken state.
#define FRLG_KANTO_MAP_WILD_PKMN FIRE_RED // Wild encounter data to be used when enabling FRLG_INCLUDE_KANTO_MAPS
// Settings for FRLG mode
#define FRLG_INCLUDE_HOENN_TILESETS FALSE // Include data for Emerald's tilesets.
#define FRLG_INCLUDE_HOENN_MAPS FALSE // Include data for Emerald's maps. IMPORTANT: Requires FRLG_INCLUDE_HOENN_TILESETS!!
// Flags and Vars are not handled, so events may be in a broken state.
#define EM_INCLUDE_ALL FALSE // Change this to toggle all configs on. You can also individually turn them on by setting each to TRUE.
#define EM_INCLUDE_HOENN_TILESETS EM_INCLUDE_ALL // Include data for Emerald's tilesets.
#define EM_INCLUDE_HOENN_MAPS EM_INCLUDE_ALL // Include data for Emerald's maps. IMPORTANT: Requires EM_INCLUDE_HOENN_TILESETS!!
// Flags and Vars are not handled, so events may be in a broken state.
#endif // GUARD_CONFIG_FRLG_H

4
src/data/tilesets/headers.h
View File

@ -28,7 +28,7 @@ const struct Tileset gTileset_SecretBaseRedCave =
const struct Tileset *const gTilesetPointer_SecretBase = &gTileset_SecretBase;
const struct Tileset *const gTilesetPointer_SecretBaseRedCave = &gTileset_SecretBaseRedCave;
#if !IS_FRLG || FRLG_INCLUDE_HOENN_TILESETS
#if !IS_FRLG || EM_INCLUDE_HOENN_TILESETS
const struct Tileset gTileset_General =
{
@ -833,7 +833,7 @@ const struct Tileset gTileset_UnionRoom =
.callback = NULL,
};
#endif // !IS_FRLG || FRLG_INCLUDE_HOENN_TILESETS
#endif // !IS_FRLG || EM_INCLUDE_HOENN_TILESETS
#if IS_FRLG || FRLG_INCLUDE_KANTO_TILESETS

4
src/data/tilesets/metatiles.h
View File

@ -4,7 +4,7 @@ const u16 gMetatileAttributes_SecretBasePrimary[] = INCBIN_U16("data/tilesets/pr
const u16 gMetatiles_SecretBaseSecondary[] = INCBIN_U16("data/tilesets/secondary/secret_base/metatiles.bin");
const u16 gMetatileAttributes_SecretBaseSecondary[] = INCBIN_U16("data/tilesets/secondary/secret_base/metatile_attributes.bin");
#if !IS_FRLG || FRLG_INCLUDE_HOENN_TILESETS
#if !IS_FRLG || EM_INCLUDE_HOENN_TILESETS
const u16 gMetatiles_General[] = INCBIN_U16("data/tilesets/primary/general/metatiles.bin");
const u16 gMetatileAttributes_General[] = INCBIN_U16("data/tilesets/primary/general/metatile_attributes.bin");
@ -210,7 +210,7 @@ const u16 gMetatileAttributes_MysteryEventsHouse[] = INCBIN_U16("data/tilesets/s
const u16 gMetatiles_UnionRoom[] = INCBIN_U16("data/tilesets/secondary/union_room/metatiles.bin");
const u16 gMetatileAttributes_UnionRoom[] = INCBIN_U16("data/tilesets/secondary/union_room/metatile_attributes.bin");
#endif // !IS_FRLG || FRLG_INCLUDE_HOENN_TILESETS
#endif // !IS_FRLG || EM_INCLUDE_HOENN_TILESETS
#if IS_FRLG || FRLG_INCLUDE_KANTO_TILESETS

9
tools/mapjson/mapjson.cpp
View File

@ -742,7 +742,7 @@ void process_groups(string groups_filepath, vector<string> &map_filepaths, strin
string map_name = json_to_string(map_data, "name");
if ((version == "emerald" && region != "REGION_HOENN" && !FRLG_INCLUDE_KANTO_MAPS)
|| (version == "firered" && region != "REGION_KANTO" && !FRLG_INCLUDE_HOENN_MAPS)) {
|| (version == "firered" && region != "REGION_KANTO" && !EM_INCLUDE_HOENN_MAPS)) {
invalid_maps.push_back(map_name);
}
}
@ -779,7 +779,7 @@ string generate_layout_headers_text(Json layouts_data) {
layout_version = "emerald";
}
if ((version == "emerald" && layout_version != "emerald" && !FRLG_INCLUDE_KANTO_MAPS)
|| (version == "firered" && layout_version != "frlg" && !FRLG_INCLUDE_HOENN_MAPS))
|| (version == "firered" && layout_version != "frlg" && !EM_INCLUDE_HOENN_MAPS))
continue;
string layoutName = json_to_string(layout, "name");
string border_label = layoutName + "_Border";
@ -834,10 +834,9 @@ string generate_layouts_table_text(Json layouts_data) {
layout_version = "emerald";
}
if ((version == "emerald" && layout_version != "emerald" && !FRLG_INCLUDE_KANTO_MAPS)
|| (version == "firered" && layout_version != "frlg" && !FRLG_INCLUDE_HOENN_MAPS)) {
|| (version == "firered" && layout_version != "frlg" && !EM_INCLUDE_HOENN_MAPS)) {
text << "\t.4byte NULL\n";
} else
{
} else {
string layout_name = json_to_string(layout, "name", true);
if (layout_name.empty()) layout_name = "NULL";
text << "\t.4byte " << layout_name << "\n";

4
tools/wild_encounters/wild_encounters_to_header.py
View File

@ -181,7 +181,7 @@ class WildEncounterAssembler:
map_group = map_data["mapGroup"]
map_num = map_data["mapNum"]
defined = '#if defined(EMERALD) || FRLG_INCLUDE_HOENN_MAPS'
defined = '#if defined(EMERALD) || EM_INCLUDE_HOENN_MAPS'
if "FireRed" in shared_label:
defined = '#if defined(FIRERED)'
if self.config.use_firered_wild == 'FIRE_RED':
@ -258,7 +258,7 @@ class WildEncounterAssembler:
headers["data"][shared_label]["mapGroup"] = map_group
headers["data"][shared_label]["mapNum"] = map_num
defined = '#if defined(EMERALD) || FRLG_INCLUDE_HOENN_MAPS'
defined = '#if defined(EMERALD) || EM_INCLUDE_HOENN_MAPS'
if "FireRed" in shared_label:
defined = '#if defined(FIRERED)'
if self.config.use_firered_wild == 'FIRE_RED':