ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125

Browse Source 
# Conflicts:
#	tools/mapjson/mapjson.cpp
This commit is contained in:
Eduardo Quezada 2023-01-25 20:28:55 -03:00
commit 7774c9727d
14 changed files with 248 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/specials.inc
View File

@ -258,7 +258,7 @@ gSpecials::
def_special CallSlateportTentFunction def_special CallSlateportTentFunction
def_special ChoosePartyForBattleFrontier def_special ChoosePartyForBattleFrontier
def_special ValidateEReaderTrainer def_special ValidateEReaderTrainer
def_special GetBestBattleTowerStreak def_special GetBattleTowerSinglesStreak
def_special ReducePlayerPartyToSelectedMons def_special ReducePlayerPartyToSelectedMons
def_special BedroomPC def_special BedroomPC
def_special PlayerPC def_special PlayerPC

108
include/constants/game_stat.h
View File

@ -1,60 +1,60 @@
#ifndef GUARD_CONSTANTS_GAME_STAT_H #ifndef GUARD_CONSTANTS_GAME_STAT_H
#define GUARD_CONSTANTS_GAME_STAT_H #define GUARD_CONSTANTS_GAME_STAT_H
#define GAME_STAT_SAVED_GAME 0 #define GAME_STAT_SAVED_GAME 0
#define GAME_STAT_FIRST_HOF_PLAY_TIME 1 #define GAME_STAT_FIRST_HOF_PLAY_TIME 1
#define GAME_STAT_STARTED_TRENDS 2 #define GAME_STAT_STARTED_TRENDS 2
#define GAME_STAT_PLANTED_BERRIES 3 #define GAME_STAT_PLANTED_BERRIES 3
#define GAME_STAT_TRADED_BIKES 4 #define GAME_STAT_TRADED_BIKES 4
#define GAME_STAT_STEPS 5 #define GAME_STAT_STEPS 5
#define GAME_STAT_GOT_INTERVIEWED 6 #define GAME_STAT_GOT_INTERVIEWED 6
#define GAME_STAT_TOTAL_BATTLES 7 #define GAME_STAT_TOTAL_BATTLES 7
#define GAME_STAT_WILD_BATTLES 8 #define GAME_STAT_WILD_BATTLES 8
#define GAME_STAT_TRAINER_BATTLES 9 #define GAME_STAT_TRAINER_BATTLES 9
#define GAME_STAT_ENTERED_HOF 10 #define GAME_STAT_ENTERED_HOF 10
#define GAME_STAT_POKEMON_CAPTURES 11 #define GAME_STAT_POKEMON_CAPTURES 11
#define GAME_STAT_FISHING_CAPTURES 12 #define GAME_STAT_FISHING_CAPTURES 12
#define GAME_STAT_HATCHED_EGGS 13 #define GAME_STAT_HATCHED_EGGS 13
#define GAME_STAT_EVOLVED_POKEMON 14 #define GAME_STAT_EVOLVED_POKEMON 14
#define GAME_STAT_USED_POKECENTER 15 #define GAME_STAT_USED_POKECENTER 15
#define GAME_STAT_RESTED_AT_HOME 16 #define GAME_STAT_RESTED_AT_HOME 16
#define GAME_STAT_ENTERED_SAFARI_ZONE 17 #define GAME_STAT_ENTERED_SAFARI_ZONE 17
#define GAME_STAT_USED_CUT 18 #define GAME_STAT_USED_CUT 18
#define GAME_STAT_USED_ROCK_SMASH 19 #define GAME_STAT_USED_ROCK_SMASH 19
#define GAME_STAT_MOVED_SECRET_BASE 20 #define GAME_STAT_MOVED_SECRET_BASE 20
#define GAME_STAT_POKEMON_TRADES 21 #define GAME_STAT_POKEMON_TRADES 21
#define GAME_STAT_UNKNOWN_22 22 #define GAME_STAT_UNKNOWN_22 22
#define GAME_STAT_LINK_BATTLE_WINS 23 #define GAME_STAT_LINK_BATTLE_WINS 23
#define GAME_STAT_LINK_BATTLE_LOSSES 24 #define GAME_STAT_LINK_BATTLE_LOSSES 24
#define GAME_STAT_LINK_BATTLE_DRAWS 25 #define GAME_STAT_LINK_BATTLE_DRAWS 25
#define GAME_STAT_USED_SPLASH 26 #define GAME_STAT_USED_SPLASH 26
#define GAME_STAT_USED_STRUGGLE 27 #define GAME_STAT_USED_STRUGGLE 27
#define GAME_STAT_SLOT_JACKPOTS 28 #define GAME_STAT_SLOT_JACKPOTS 28
#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29 #define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29
#define GAME_STAT_ENTERED_BATTLE_TOWER 30 #define GAME_STAT_ENTERED_BATTLE_TOWER 30
#define GAME_STAT_UNKNOWN_31 31 #define GAME_STAT_UNKNOWN_31 31
#define GAME_STAT_BATTLE_TOWER_BEST_STREAK 32 #define GAME_STAT_BATTLE_TOWER_SINGLES_STREAK 32
#define GAME_STAT_POKEBLOCKS 33 #define GAME_STAT_POKEBLOCKS 33
#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34 #define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34
#define GAME_STAT_WON_LINK_CONTEST 35 #define GAME_STAT_WON_LINK_CONTEST 35
#define GAME_STAT_ENTERED_CONTEST 36 #define GAME_STAT_ENTERED_CONTEST 36
#define GAME_STAT_WON_CONTEST 37 #define GAME_STAT_WON_CONTEST 37
#define GAME_STAT_SHOPPED 38 #define GAME_STAT_SHOPPED 38
#define GAME_STAT_USED_ITEMFINDER 39 #define GAME_STAT_USED_ITEMFINDER 39
#define GAME_STAT_GOT_RAINED_ON 40 #define GAME_STAT_GOT_RAINED_ON 40
#define GAME_STAT_CHECKED_POKEDEX 41 #define GAME_STAT_CHECKED_POKEDEX 41
#define GAME_STAT_RECEIVED_RIBBONS 42 #define GAME_STAT_RECEIVED_RIBBONS 42
#define GAME_STAT_JUMPED_DOWN_LEDGES 43 #define GAME_STAT_JUMPED_DOWN_LEDGES 43
#define GAME_STAT_WATCHED_TV 44 #define GAME_STAT_WATCHED_TV 44
#define GAME_STAT_CHECKED_CLOCK 45 #define GAME_STAT_CHECKED_CLOCK 45
#define GAME_STAT_WON_POKEMON_LOTTERY 46 #define GAME_STAT_WON_POKEMON_LOTTERY 46
#define GAME_STAT_USED_DAYCARE 47 #define GAME_STAT_USED_DAYCARE 47
#define GAME_STAT_RODE_CABLE_CAR 48 #define GAME_STAT_RODE_CABLE_CAR 48
#define GAME_STAT_ENTERED_HOT_SPRINGS 49 #define GAME_STAT_ENTERED_HOT_SPRINGS 49
#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50 #define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_PLAYED_BERRY_CRUSH 51 #define GAME_STAT_PLAYED_BERRY_CRUSH 51
#define NUM_USED_GAME_STATS 52 #define NUM_USED_GAME_STATS 52
#define NUM_GAME_STATS 64 #define NUM_GAME_STATS 64
#endif // GUARD_CONSTANTS_GAME_STAT_H #endif // GUARD_CONSTANTS_GAME_STAT_H

2
src/battle_dome.c
View File

@ -4237,7 +4237,7 @@ static u8 Task_GetInfoCardInput(u8 taskId)
#undef tUsingAlternateSlot #undef tUsingAlternateSlot
// allocatedArray below needs to be large enough to hold stat totals for each mon, or totals of each type of move points // allocatedArray below needs to be large enough to hold stat totals for each mon, or totals of each type of move points
#define ALLOC_ARRAY_SIZE (NUM_STATS * FRONTIER_PARTY_SIZE >= NUM_MOVE_POINT_TYPES ? (NUM_STATS * FRONTIER_PARTY_SIZE) : NUM_MOVE_POINT_TYPES) #define ALLOC_ARRAY_SIZE max(NUM_STATS * FRONTIER_PARTY_SIZE, NUM_MOVE_POINT_TYPES)
static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
{ {

6
src/easy_chat.c
View File

@ -867,17 +867,17 @@ static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
static const struct SpriteSheet sSpriteSheets[] = { static const struct SpriteSheet sSpriteSheets[] = {
{ {
.data = sTriangleCursor_Gfx, .data = sTriangleCursor_Gfx,
.size = 0x20, .size = sizeof(sTriangleCursor_Gfx),
.tag = GFXTAG_TRIANGLE_CURSOR .tag = GFXTAG_TRIANGLE_CURSOR
}, },
{ {
.data = sScrollIndicator_Gfx, .data = sScrollIndicator_Gfx,
.size = 0x100, .size = sizeof(sScrollIndicator_Gfx),
.tag = GFXTAG_SCROLL_INDICATOR .tag = GFXTAG_SCROLL_INDICATOR
}, },
{ {
.data = sStartSelectButtons_Gfx, .data = sStartSelectButtons_Gfx,
.size = 0x100, .size = sizeof(sStartSelectButtons_Gfx),
.tag = GFXTAG_START_SELECT_BUTTONS .tag = GFXTAG_START_SELECT_BUTTONS
}, },
{0} {0}

4
src/egg_hatch.c
View File

@ -145,14 +145,14 @@ static const union AnimCmd *const sSpriteAnimTable_Egg[] =
static const struct SpriteSheet sEggHatch_Sheet = static const struct SpriteSheet sEggHatch_Sheet =
{ {
.data = sEggHatchTiles, .data = sEggHatchTiles,
.size = 0x800, .size = sizeof(sEggHatchTiles),
.tag = GFXTAG_EGG, .tag = GFXTAG_EGG,
}; };
static const struct SpriteSheet sEggShards_Sheet = static const struct SpriteSheet sEggShards_Sheet =
{ {
.data = sEggShardTiles, .data = sEggShardTiles,
.size = 0x80, .size = sizeof(sEggShardTiles),
.tag = GFXTAG_EGG_SHARD, .tag = GFXTAG_EGG_SHARD,
}; };

4
src/field_specials.c
View File

@ -1240,9 +1240,9 @@ void GetSecretBaseNearbyMapName(void)
GetMapName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); GetMapName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
} }
u16 GetBestBattleTowerStreak(void) u16 GetBattleTowerSinglesStreak(void)
{ {
return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK); return GetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK);
} }
void BufferEReaderTrainerName(void) void BufferEReaderTrainerName(void)

2
src/frontier_util.c
View File

@ -2068,7 +2068,7 @@ static void IncrementWinStreak(void)
gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]++; gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]++;
if (battleMode == FRONTIER_MODE_SINGLES) if (battleMode == FRONTIER_MODE_SINGLES)
{ {
SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]); SetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]);
gSaveBlock2Ptr->frontier.towerSinglesStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.towerSinglesStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode];
} }
} }

2
src/item_menu_icons.c
View File

@ -205,7 +205,7 @@ static const union AffineAnimCmd *const sRotatingBallAnimCmds_FullRotation[] =
static const struct SpriteSheet sRotatingBallTable = static const struct SpriteSheet sRotatingBallTable =
{ {
sRotatingBall_Gfx, 0x80, TAG_ROTATING_BALL_GFX sRotatingBall_Gfx, sizeof(sRotatingBall_Gfx), TAG_ROTATING_BALL_GFX
}; };
static const struct SpritePalette sRotatingBallPaletteTable = static const struct SpritePalette sRotatingBallPaletteTable =

2
src/mirage_tower.c
View File

@ -96,7 +96,7 @@ static const s16 sCeilingCrumblePositions[][3] =
static const struct SpriteSheet sCeilingCrumbleSpriteSheets[] = static const struct SpriteSheet sCeilingCrumbleSpriteSheets[] =
{ {
{sMirageTowerCrumbles_Gfx, 0x80, TAG_CEILING_CRUMBLE}, {sMirageTowerCrumbles_Gfx, sizeof(sMirageTowerCrumbles_Gfx), TAG_CEILING_CRUMBLE},
{} {}
}; };

43
src/move_relearner.c
View File

@ -145,12 +145,19 @@
// The different versions of hearts are selected using animation // The different versions of hearts are selected using animation
// commands. // commands.
#define APPEAL_HEART_EMPTY 0 enum {
#define APPEAL_HEART_FULL 1 APPEAL_HEART_EMPTY,
#define JAM_HEART_EMPTY 2 APPEAL_HEART_FULL,
#define JAM_HEART_FULL 3 JAM_HEART_EMPTY,
JAM_HEART_FULL,
};
#define MAX_RELEARNER_MOVES (MAX_LEVEL_UP_MOVES > 25 ? MAX_LEVEL_UP_MOVES : 25) #define TAG_MODE_ARROWS 5325
#define TAG_LIST_ARROWS 5425
#define GFXTAG_UI 5525
#define PALTAG_UI 5526
#define MAX_RELEARNER_MOVES max(MAX_LEVEL_UP_MOVES, 25)
static EWRAM_DATA struct static EWRAM_DATA struct
{ {
@ -174,11 +181,11 @@ static EWRAM_DATA struct {
bool8 showContestInfo; bool8 showContestInfo;
} sMoveRelearnerMenuSate = {0}; } sMoveRelearnerMenuSate = {0};
static const u16 sMoveRelearnerPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); static const u16 sUI_Pal[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");
// The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own // The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own
// arrow sprites. // arrow sprites.
static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); static const u8 sUI_Tiles[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp");
static const struct OamData sHeartSpriteOamData = static const struct OamData sHeartSpriteOamData =
{ {
@ -233,15 +240,15 @@ static const struct OamData sUnusedOam2 =
static const struct SpriteSheet sMoveRelearnerSpriteSheet = static const struct SpriteSheet sMoveRelearnerSpriteSheet =
{ {
.data = sMoveRelearnerSpriteSheetData, .data = sUI_Tiles,
.size = 0x180, .size = sizeof(sUI_Tiles),
.tag = 5525 .tag = GFXTAG_UI
}; };
static const struct SpritePalette sMoveRelearnerPalette = static const struct SpritePalette sMoveRelearnerPalette =
{ {
.data = sMoveRelearnerPaletteData, .data = sUI_Pal,
.tag = 5526 .tag = PALTAG_UI
}; };
static const struct ScrollArrowsTemplate sDisplayModeArrowsTemplate = static const struct ScrollArrowsTemplate sDisplayModeArrowsTemplate =
@ -254,8 +261,8 @@ static const struct ScrollArrowsTemplate sDisplayModeArrowsTemplate =
.secondY = 16, .secondY = 16,
.fullyUpThreshold = -1, .fullyUpThreshold = -1,
.fullyDownThreshold = -1, .fullyDownThreshold = -1,
.tileTag = 5325, .tileTag = TAG_MODE_ARROWS,
.palTag = 5325, .palTag = TAG_MODE_ARROWS,
.palNum = 0, .palNum = 0,
}; };
@ -269,8 +276,8 @@ static const struct ScrollArrowsTemplate sMoveListScrollArrowsTemplate =
.secondY = 104, .secondY = 104,
.fullyUpThreshold = 0, .fullyUpThreshold = 0,
.fullyDownThreshold = 0, .fullyDownThreshold = 0,
.tileTag = 5425, .tileTag = TAG_LIST_ARROWS,
.palTag = 5425, .palTag = TAG_LIST_ARROWS,
.palNum = 0, .palNum = 0,
}; };
@ -308,8 +315,8 @@ static const union AnimCmd *const sHeartSpriteAnimationCommands[] =
static const struct SpriteTemplate sConstestMoveHeartSprite = static const struct SpriteTemplate sConstestMoveHeartSprite =
{ {
.tileTag = 5525, .tileTag = GFXTAG_UI,
.paletteTag = 5526, .paletteTag = PALTAG_UI,
.oam = &sHeartSpriteOamData, .oam = &sHeartSpriteOamData,
.anims = sHeartSpriteAnimationCommands, .anims = sHeartSpriteAnimationCommands,
.images = NULL, .images = NULL,

10
src/pokedex_cry_screen.c
View File

@ -27,6 +27,8 @@
#define WAVEFORM_WINDOW_HEIGHT 56 #define WAVEFORM_WINDOW_HEIGHT 56
#define TAG_NEEDLE 0x2000
struct PokedexCryMeterNeedle { struct PokedexCryMeterNeedle {
s8 rotation; s8 rotation;
s8 targetRotation; s8 targetRotation;
@ -202,8 +204,8 @@ static const struct OamData sOamData_CryMeterNeedle =
static const struct SpriteTemplate sCryMeterNeedleSpriteTemplate = static const struct SpriteTemplate sCryMeterNeedleSpriteTemplate =
{ {
.tileTag = 0x2000, .tileTag = TAG_NEEDLE,
.paletteTag = 0x2000, .paletteTag = TAG_NEEDLE,
.oam = &sOamData_CryMeterNeedle, .oam = &sOamData_CryMeterNeedle,
.anims = sSpriteAnimTable_CryMeterNeedle, .anims = sSpriteAnimTable_CryMeterNeedle,
.images = NULL, .images = NULL,
@ -213,13 +215,13 @@ static const struct SpriteTemplate sCryMeterNeedleSpriteTemplate =
static const struct SpriteSheet sCryMeterNeedleSpriteSheets[] = static const struct SpriteSheet sCryMeterNeedleSpriteSheets[] =
{ {
{sCryMeterNeedle_Gfx, 0x800, 0x2000}, {sCryMeterNeedle_Gfx, sizeof(sCryMeterNeedle_Gfx), TAG_NEEDLE},
{} {}
}; };
static const struct SpritePalette sCryMeterNeedleSpritePalettes[] = static const struct SpritePalette sCryMeterNeedleSpritePalettes[] =
{ {
{sCryMeterNeedle_Pal, 0x2000}, {sCryMeterNeedle_Pal, TAG_NEEDLE},
{} {}
}; };

4
src/pokemon_storage_system.c
View File

@ -257,7 +257,7 @@ enum {
// The maximum number of Pokémon icons that can appear on-screen. // The maximum number of Pokémon icons that can appear on-screen.
// By default the limit is 40 (though in practice only 37 can be). // By default the limit is 40 (though in practice only 37 can be).
#define MAX_MON_ICONS (IN_BOX_COUNT + PARTY_SIZE + 1 >= 40 ? IN_BOX_COUNT + PARTY_SIZE + 1 : 40) #define MAX_MON_ICONS max(IN_BOX_COUNT + PARTY_SIZE + 1, 40)
// The maximum number of item icons that can appear on-screen while // The maximum number of item icons that can appear on-screen while
// moving held items. 1 in the cursor, and 2 more while switching // moving held items. 1 in the cursor, and 2 more while switching
@ -1245,7 +1245,7 @@ static const union AffineAnimCmd *const sAffineAnims_ReleaseMon[] =
static const u16 sUnusedColor = RGB(26, 29, 8); static const u16 sUnusedColor = RGB(26, 29, 8);
static const struct SpriteSheet sSpriteSheet_Arrow = {sArrow_Gfx, 0x80, GFXTAG_ARROW}; static const struct SpriteSheet sSpriteSheet_Arrow = {sArrow_Gfx, sizeof(sArrow_Gfx), GFXTAG_ARROW};
static const struct OamData sOamData_BoxTitle = static const struct OamData sOamData_BoxTitle =
{ {

16
src/rotating_gate.c
View File

@ -264,14 +264,14 @@ static const struct OamData sOamData_RotatingGateRegular =
static const struct SpriteSheet sRotatingGatesGraphicsTable[] = static const struct SpriteSheet sRotatingGatesGraphicsTable[] =
{ {
{sRotatingGateTiles_1, 0x200, ROTATING_GATE_TILE_TAG + GATE_SHAPE_L1}, {sRotatingGateTiles_1, sizeof(sRotatingGateTiles_1), ROTATING_GATE_TILE_TAG + GATE_SHAPE_L1},
{sRotatingGateTiles_2, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_L2}, {sRotatingGateTiles_2, sizeof(sRotatingGateTiles_2), ROTATING_GATE_TILE_TAG + GATE_SHAPE_L2},
{sRotatingGateTiles_3, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_L3}, {sRotatingGateTiles_3, sizeof(sRotatingGateTiles_3), ROTATING_GATE_TILE_TAG + GATE_SHAPE_L3},
{sRotatingGateTiles_4, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_L4}, {sRotatingGateTiles_4, sizeof(sRotatingGateTiles_4), ROTATING_GATE_TILE_TAG + GATE_SHAPE_L4},
{sRotatingGateTiles_5, 0x200, ROTATING_GATE_TILE_TAG + GATE_SHAPE_T1}, {sRotatingGateTiles_5, sizeof(sRotatingGateTiles_5), ROTATING_GATE_TILE_TAG + GATE_SHAPE_T1},
{sRotatingGateTiles_6, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_T2}, {sRotatingGateTiles_6, sizeof(sRotatingGateTiles_6), ROTATING_GATE_TILE_TAG + GATE_SHAPE_T2},
{sRotatingGateTiles_7, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_T3}, {sRotatingGateTiles_7, sizeof(sRotatingGateTiles_7), ROTATING_GATE_TILE_TAG + GATE_SHAPE_T3},
{sRotatingGateTiles_8, 0x800, ROTATING_GATE_TILE_TAG + GATE_SHAPE_T4}, {sRotatingGateTiles_8, sizeof(sRotatingGateTiles_8), ROTATING_GATE_TILE_TAG + GATE_SHAPE_T4},
{NULL}, {NULL},
}; };

250
tools/mapjson/mapjson.cpp
View File

@ -60,13 +60,41 @@ void write_text_file(string filepath, string text) {
out_file.close(); out_file.close();
} }
string json_to_string(const Json &data, const string &field = "") {
const Json value = !field.empty() ? data[field] : data;
string output = "";
switch (value.type()) {
case Json::Type::STRING:
output = value.string_value();
break;
case Json::Type::NUMBER:
output = std::to_string(value.int_value());
break;
case Json::Type::BOOL:
output = value.bool_value() ? "TRUE" : "FALSE";
break;
default:{
string s = !field.empty() ? ("Value for '" + field + "'") : "JSON field";
FATAL_ERROR("%s is unexpected type; expected string, number, or bool.\n", s.c_str());
}
}
if (output.empty()){
string s = !field.empty() ? ("Value for '" + field + "'") : "JSON field";
FATAL_ERROR("%s cannot be empty.\n", s.c_str());
}
return output;
}
string generate_map_header_text(Json map_data, Json layouts_data, string version) { string generate_map_header_text(Json map_data, Json layouts_data, string version) {
string map_layout_id = map_data["layout"].string_value(); string map_layout_id = json_to_string(map_data, "layout");
vector<Json> matched; vector<Json> matched;
for (auto &field : layouts_data["layouts"].array_items()) { for (auto &field : layouts_data["layouts"].array_items()) {
if (map_layout_id == field["id"].string_value()) if (map_layout_id == json_to_string(field, "id"))
matched.push_back(field); matched.push_back(field);
} }
@ -77,47 +105,47 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version
ostringstream text; ostringstream text;
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" string mapName = json_to_string(map_data, "name");
<< map_data["name"].string_value()
<< "/map.json\n@\n\n";
text << map_data["name"].string_value() << ":\n" text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n";
<< "\t.4byte " << layout["name"].string_value() << "\n";
text << mapName << ":\n"
<< "\t.4byte " << json_to_string(layout, "name") << "\n";
if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) if (map_data.object_items().find("shared_events_map") != map_data.object_items().end())
text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n"; text << "\t.4byte " << json_to_string(map_data, "shared_events_map") << "_MapEvents\n";
else else
text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n"; text << "\t.4byte " << mapName << "_MapEvents\n";
if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end()) if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end())
text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n"; text << "\t.4byte " << json_to_string(map_data, "shared_scripts_map") << "_MapScripts\n";
else else
text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; text << "\t.4byte " << mapName << "_MapScripts\n";
if (map_data.object_items().find("connections") != map_data.object_items().end() if (map_data.object_items().find("connections") != map_data.object_items().end()
&& map_data["connections"].array_items().size() > 0) && map_data["connections"].array_items().size() > 0)
text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; text << "\t.4byte " << mapName << "_MapConnections\n";
else else
text << "\t.4byte 0x0\n"; text << "\t.4byte 0x0\n";
text << "\t.2byte " << map_data["music"].string_value() << "\n" text << "\t.2byte " << json_to_string(map_data, "music") << "\n"
<< "\t.2byte " << layout["id"].string_value() << "\n" << "\t.2byte " << json_to_string(layout, "id") << "\n"
<< "\t.byte " << map_data["region_map_section"].string_value() << "\n" << "\t.byte " << json_to_string(map_data, "region_map_section") << "\n"
<< "\t.byte " << map_data["requires_flash"].bool_value() << "\n" << "\t.byte " << json_to_string(map_data, "requires_flash") << "\n"
<< "\t.byte " << map_data["weather"].string_value() << "\n" << "\t.byte " << json_to_string(map_data, "weather") << "\n"
<< "\t.byte " << map_data["map_type"].string_value() << "\n" << "\t.byte " << json_to_string(map_data, "map_type") << "\n"
<< "\t.2byte 0\n"; << "\t.2byte 0\n";
if (version == "ruby") if (version == "ruby")
text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; text << "\t.byte " << json_to_string(map_data, "show_map_name") << "\n";
else if (version == "emerald") else if (version == "emerald")
text << "\tmap_header_flags " text << "\tmap_header_flags "
<< "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", " << "allow_cycling=" << json_to_string(map_data, "allow_cycling") << ", "
<< "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", " << "allow_escaping=" << json_to_string(map_data, "allow_escaping") << ", "
<< "allow_running=" << map_data["allow_running"].bool_value() << ", " << "allow_running=" << json_to_string(map_data, "allow_running") << ", "
<< "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; << "show_map_name=" << json_to_string(map_data, "show_map_name") << "\n";
text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; text << "\t.byte " << json_to_string(map_data, "battle_scene") << "\n\n";
return text.str(); return text.str();
} }
@ -128,22 +156,22 @@ string generate_map_connections_text(Json map_data) {
ostringstream text; ostringstream text;
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" string mapName = json_to_string(map_data, "name");
<< map_data["name"].string_value()
<< "/map.json\n@\n\n";
text << map_data["name"].string_value() << "_MapConnectionsList:\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n";
text << mapName << "_MapConnectionsList:\n";
for (auto &connection : map_data["connections"].array_items()) { for (auto &connection : map_data["connections"].array_items()) {
text << "\tconnection " text << "\tconnection "
<< connection["direction"].string_value() << ", " << json_to_string(connection, "direction") << ", "
<< connection["offset"].int_value() << ", " << json_to_string(connection, "offset") << ", "
<< connection["map"].string_value() << "\n"; << json_to_string(connection, "map") << "\n";
} }
text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" text << "\n" << mapName << "_MapConnections:\n"
<< "\t.4byte " << map_data["connections"].array_items().size() << "\n" << "\t.4byte " << map_data["connections"].array_items().size() << "\n"
<< "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; << "\t.4byte " << mapName << "_MapConnectionsList\n\n";
return text.str(); return text.str();
} }
@ -154,29 +182,29 @@ string generate_map_events_text(Json map_data) {
ostringstream text; ostringstream text;
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" string mapName = json_to_string(map_data, "name");
<< map_data["name"].string_value()
<< "/map.json\n@\n\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n";
string objects_label, warps_label, coords_label, bgs_label; string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) { if (map_data["object_events"].array_items().size() > 0) {
objects_label = map_data["name"].string_value() + "_ObjectEvents"; objects_label = mapName + "_ObjectEvents";
text << objects_label << ":\n"; text << objects_label << ":\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i]; auto obj_event = map_data["object_events"].array_items()[i];
text << "\tobject_event " << i + 1 << ", " text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", 0, " << json_to_string(obj_event, "graphics_id") << ", 0, "
<< obj_event["x"].int_value() << ", " << json_to_string(obj_event, "x") << ", "
<< obj_event["y"].int_value() << ", " << json_to_string(obj_event, "y") << ", "
<< obj_event["elevation"].int_value() << ", " << json_to_string(obj_event, "elevation") << ", "
<< obj_event["movement_type"].string_value() << ", " << json_to_string(obj_event, "movement_type") << ", "
<< obj_event["movement_range_x"].int_value() << ", " << json_to_string(obj_event, "movement_range_x") << ", "
<< obj_event["movement_range_y"].int_value() << ", " << json_to_string(obj_event, "movement_range_y") << ", "
<< obj_event["trainer_type"].string_value() << ", " << json_to_string(obj_event, "trainer_type") << ", "
<< obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " << json_to_string(obj_event, "trainer_sight_or_berry_tree_id") << ", "
<< obj_event["script"].string_value() << ", " << json_to_string(obj_event, "script") << ", "
<< obj_event["flag"].string_value() << "\n"; << json_to_string(obj_event, "flag") << "\n";
} }
text << "\n"; text << "\n";
} else { } else {
@ -184,15 +212,15 @@ string generate_map_events_text(Json map_data) {
} }
if (map_data["warp_events"].array_items().size() > 0) { if (map_data["warp_events"].array_items().size() > 0) {
warps_label = map_data["name"].string_value() + "_MapWarps"; warps_label = mapName + "_MapWarps";
text << warps_label << ":\n"; text << warps_label << ":\n";
for (auto &warp_event : map_data["warp_events"].array_items()) { for (auto &warp_event : map_data["warp_events"].array_items()) {
text << "\twarp_def " text << "\twarp_def "
<< warp_event["x"].int_value() << ", " << json_to_string(warp_event, "x") << ", "
<< warp_event["y"].int_value() << ", " << json_to_string(warp_event, "y") << ", "
<< warp_event["elevation"].int_value() << ", " << json_to_string(warp_event, "elevation") << ", "
<< warp_event["dest_warp_id"].string_value() << ", " << json_to_string(warp_event, "dest_warp_id") << ", "
<< warp_event["dest_map"].string_value() << "\n"; << json_to_string(warp_event, "dest_map") << "\n";
} }
text << "\n"; text << "\n";
} else { } else {
@ -200,24 +228,24 @@ string generate_map_events_text(Json map_data) {
} }
if (map_data["coord_events"].array_items().size() > 0) { if (map_data["coord_events"].array_items().size() > 0) {
coords_label = map_data["name"].string_value() + "_MapCoordEvents"; coords_label = mapName + "_MapCoordEvents";
text << coords_label << ":\n"; text << coords_label << ":\n";
for (auto &coord_event : map_data["coord_events"].array_items()) { for (auto &coord_event : map_data["coord_events"].array_items()) {
if (coord_event["type"].string_value() == "trigger") { if (json_to_string(coord_event, "type") == "trigger") {
text << "\tcoord_event " text << "\tcoord_event "
<< coord_event["x"].int_value() << ", " << json_to_string(coord_event, "x") << ", "
<< coord_event["y"].int_value() << ", " << json_to_string(coord_event, "y") << ", "
<< coord_event["elevation"].int_value() << ", " << json_to_string(coord_event, "elevation") << ", "
<< coord_event["var"].string_value() << ", " << json_to_string(coord_event, "var") << ", "
<< coord_event["var_value"].string_value() << ", " << json_to_string(coord_event, "var_value") << ", "
<< coord_event["script"].string_value() << "\n"; << json_to_string(coord_event, "script") << "\n";
} }
else if (coord_event["type"] == "weather") { else if (coord_event["type"] == "weather") {
text << "\tcoord_weather_event " text << "\tcoord_weather_event "
<< coord_event["x"].int_value() << ", " << json_to_string(coord_event, "x") << ", "
<< coord_event["y"].int_value() << ", " << json_to_string(coord_event, "y") << ", "
<< coord_event["elevation"].int_value() << ", " << json_to_string(coord_event, "elevation") << ", "
<< coord_event["weather"].string_value() << "\n"; << json_to_string(coord_event, "weather") << "\n";
} }
} }
text << "\n"; text << "\n";
@ -226,31 +254,31 @@ string generate_map_events_text(Json map_data) {
} }
if (map_data["bg_events"].array_items().size() > 0) { if (map_data["bg_events"].array_items().size() > 0) {
bgs_label = map_data["name"].string_value() + "_MapBGEvents"; bgs_label = mapName + "_MapBGEvents";
text << bgs_label << ":\n"; text << bgs_label << ":\n";
for (auto &bg_event : map_data["bg_events"].array_items()) { for (auto &bg_event : map_data["bg_events"].array_items()) {
if (bg_event["type"] == "sign") { if (bg_event["type"] == "sign") {
text << "\tbg_sign_event " text << "\tbg_sign_event "
<< bg_event["x"].int_value() << ", " << json_to_string(bg_event, "x") << ", "
<< bg_event["y"].int_value() << ", " << json_to_string(bg_event, "y") << ", "
<< bg_event["elevation"].int_value() << ", " << json_to_string(bg_event, "elevation") << ", "
<< bg_event["player_facing_dir"].string_value() << ", " << json_to_string(bg_event, "player_facing_dir") << ", "
<< bg_event["script"].string_value() << "\n"; << json_to_string(bg_event, "script") << "\n";
} }
else if (bg_event["type"] == "hidden_item") { else if (bg_event["type"] == "hidden_item") {
text << "\tbg_hidden_item_event " text << "\tbg_hidden_item_event "
<< bg_event["x"].int_value() << ", " << json_to_string(bg_event, "x") << ", "
<< bg_event["y"].int_value() << ", " << json_to_string(bg_event, "y") << ", "
<< bg_event["elevation"].int_value() << ", " << json_to_string(bg_event, "elevation") << ", "
<< bg_event["item"].string_value() << ", " << json_to_string(bg_event, "item") << ", "
<< bg_event["flag"].string_value() << "\n"; << json_to_string(bg_event, "flag") << "\n";
} }
else if (bg_event["type"] == "secret_base") { else if (bg_event["type"] == "secret_base") {
text << "\tbg_secret_base_event " text << "\tbg_secret_base_event "
<< bg_event["x"].int_value() << ", " << json_to_string(bg_event, "x") << ", "
<< bg_event["y"].int_value() << ", " << json_to_string(bg_event, "y") << ", "
<< bg_event["elevation"].int_value() << ", " << json_to_string(bg_event, "elevation") << ", "
<< bg_event["secret_base_id"].string_value() << "\n"; << json_to_string(bg_event, "secret_base_id") << "\n";
} }
} }
text << "\n"; text << "\n";
@ -258,7 +286,7 @@ string generate_map_events_text(Json map_data) {
bgs_label = "0x0"; bgs_label = "0x0";
} }
text << map_data["name"].string_value() << "_MapEvents::\n" text << mapName << "_MapEvents::\n"
<< "\tmap_events " << objects_label << ", " << warps_label << ", " << "\tmap_events " << objects_label << ", " << warps_label << ", "
<< coords_label << ", " << bgs_label << "\n\n"; << coords_label << ", " << bgs_label << "\n\n";
@ -301,17 +329,17 @@ string generate_groups_text(Json groups_data) {
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
for (auto &key : groups_data["group_order"].array_items()) { for (auto &key : groups_data["group_order"].array_items()) {
string group = key.string_value(); string group = json_to_string(key);
text << group << "::\n"; text << group << "::\n";
auto maps = groups_data[group].array_items(); auto maps = groups_data[group].array_items();
for (Json &map_name : maps) for (Json &map_name : maps)
text << "\t.4byte " << map_name.string_value() << "\n"; text << "\t.4byte " << json_to_string(map_name) << "\n";
text << "\n"; text << "\n";
} }
text << "\t.align 2\n" << "gMapGroups::\n"; text << "\t.align 2\n" << "gMapGroups::\n";
for (auto &group : groups_data["group_order"].array_items()) for (auto &group : groups_data["group_order"].array_items())
text << "\t.4byte " << group.string_value() << "\n"; text << "\t.4byte " << json_to_string(group) << "\n";
text << "\n"; text << "\n";
return text.str(); return text.str();
@ -321,7 +349,7 @@ string generate_connections_text(Json groups_data) {
vector<Json> map_names; vector<Json> map_names;
for (auto &group : groups_data["group_order"].array_items()) for (auto &group : groups_data["group_order"].array_items())
for (auto map_name : groups_data[group.string_value()].array_items()) for (auto map_name : groups_data[json_to_string(group)].array_items())
map_names.push_back(map_name); map_names.push_back(map_name);
vector<Json> connections_include_order = groups_data["connections_include_order"].array_items(); vector<Json> connections_include_order = groups_data["connections_include_order"].array_items();
@ -342,7 +370,7 @@ string generate_connections_text(Json groups_data) {
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
for (Json map_name : map_names) for (Json map_name : map_names)
text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n"; text << "\t.include \"data/maps/" << json_to_string(map_name) << "/connections.inc\"\n";
return text.str(); return text.str();
} }
@ -351,8 +379,8 @@ string generate_headers_text(Json groups_data) {
vector<string> map_names; vector<string> map_names;
for (auto &group : groups_data["group_order"].array_items()) for (auto &group : groups_data["group_order"].array_items())
for (auto map_name : groups_data[group.string_value()].array_items()) for (auto map_name : groups_data[json_to_string(group)].array_items())
map_names.push_back(map_name.string_value()); map_names.push_back(json_to_string(map_name));
ostringstream text; ostringstream text;
@ -368,8 +396,8 @@ string generate_events_text(Json groups_data) {
vector<string> map_names; vector<string> map_names;
for (auto &group : groups_data["group_order"].array_items()) for (auto &group : groups_data["group_order"].array_items())
for (auto map_name : groups_data[group.string_value()].array_items()) for (auto map_name : groups_data[json_to_string(group)].array_items())
map_names.push_back(map_name.string_value()); map_names.push_back(json_to_string(map_name));
ostringstream text; ostringstream text;
@ -397,25 +425,28 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
vector<int> map_count_vec; //DEBUG vector<int> map_count_vec; //DEBUG
for (auto &group : groups_data["group_order"].array_items()) { for (auto &group : groups_data["group_order"].array_items()) {
text << "// " << group.string_value() << "\n"; string groupName = json_to_string(group);
text << "// " << groupName << "\n";
vector<Json> map_ids; vector<Json> map_ids;
size_t max_length = 0; size_t max_length = 0;
int map_count = 0; //DEBUG int map_count = 0; //DEBUG
for (auto &map_name : groups_data[group.string_value()].array_items()) { for (auto &map_name : groups_data[groupName].array_items()) {
string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json"; string header_filepath = file_dir + json_to_string(map_name) + dir_separator + "map.json";
string err_str; string err_str;
Json map_data = Json::parse(read_text_file(header_filepath), err_str); Json map_data = Json::parse(read_text_file(header_filepath), err_str);
map_ids.push_back(map_data["id"]); map_ids.push_back(map_data["id"]);
if (map_data["id"].string_value().length() > max_length) string id = json_to_string(map_data, "id");
max_length = map_data["id"].string_value().length(); if (id.length() > max_length)
max_length = id.length();
map_count++; //DEBUG map_count++; //DEBUG
} }
int map_id_num = 0; int map_id_num = 0;
for (Json map_id : map_ids) { for (Json map_id : map_ids) {
text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ') string id = json_to_string(map_id);
text << "#define " << id << string((max_length - id.length() + 1), ' ')
<< "(" << map_id_num++ << " | (" << group_num << " << 8))\n"; << "(" << map_id_num++ << " | (" << group_num << " << 8))\n";
} }
text << "\n"; text << "\n";
@ -467,20 +498,21 @@ string generate_layout_headers_text(Json layouts_data) {
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n";
for (auto &layout : layouts_data["layouts"].array_items()) { for (auto &layout : layouts_data["layouts"].array_items()) {
string border_label = layout["name"].string_value() + "_Border"; string layoutName = json_to_string(layout, "name");
string blockdata_label = layout["name"].string_value() + "_Blockdata"; string border_label = layoutName + "_Border";
string blockdata_label = layoutName + "_Blockdata";
text << border_label << "::\n" text << border_label << "::\n"
<< "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n" << "\t.incbin \"" << json_to_string(layout, "border_filepath") << "\"\n\n"
<< blockdata_label << "::\n" << blockdata_label << "::\n"
<< "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n" << "\t.incbin \"" << json_to_string(layout, "blockdata_filepath") << "\"\n\n"
<< "\t.align 2\n" << "\t.align 2\n"
<< layout["name"].string_value() << "::\n" << layoutName << "::\n"
<< "\t.4byte " << layout["width"].int_value() << "\n" << "\t.4byte " << json_to_string(layout, "width") << "\n"
<< "\t.4byte " << layout["height"].int_value() << "\n" << "\t.4byte " << json_to_string(layout, "height") << "\n"
<< "\t.4byte " << border_label << "\n" << "\t.4byte " << border_label << "\n"
<< "\t.4byte " << blockdata_label << "\n" << "\t.4byte " << blockdata_label << "\n"
<< "\t.4byte " << layout["primary_tileset"].string_value() << "\n" << "\t.4byte " << json_to_string(layout, "primary_tileset") << "\n"
<< "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; << "\t.4byte " << json_to_string(layout, "secondary_tileset") << "\n\n";
} }
return text.str(); return text.str();
@ -492,10 +524,10 @@ string generate_layouts_table_text(Json layouts_data) {
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n"; text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n";
text << "\t.align 2\n" text << "\t.align 2\n"
<< layouts_data["layouts_table_label"].string_value() << "::\n"; << json_to_string(layouts_data, "layouts_table_label") << "::\n";
for (auto &layout : layouts_data["layouts"].array_items()) for (auto &layout : layouts_data["layouts"].array_items())
text << "\t.4byte " << layout["name"].string_value() << "\n"; text << "\t.4byte " << json_to_string(layout, "name") << "\n";
return text.str(); return text.str();
} }
@ -510,7 +542,7 @@ string generate_layouts_constants_text(Json layouts_data) {
int i = 0; int i = 0;
for (auto &layout : layouts_data["layouts"].array_items()) for (auto &layout : layouts_data["layouts"].array_items())
text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; text << "#define " << json_to_string(layout, "id") << " " << ++i << "\n";
text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n";