Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up Debug Menu (#6070)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-01-22 11:27:08 -03:00 committed by GitHub
parent 3c5bd4d16c
commit af884b1be4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 369 additions and 883 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_message.h
View File

@ -273,7 +273,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst);
extern struct BattleMsgData *gBattleMsgDataPtr;
extern const u8 *const gBattleStringsTable[];
extern const u8 *const gStatNamesTable[];
extern const u8 *const gStatNamesTable[NUM_BATTLE_STATS];
extern const u8 *const gPokeblockWasTooXStringTable[];
extern const u8 *const gRefereeStringsTable[];
extern const u8 *const gRoundsStringTable[];

2
include/event_data.h
View File

@ -48,4 +48,6 @@ extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_Unused_0x8014;
extern const u16 gBadgeFlags[NUM_BADGES];
#endif // GUARD_EVENT_DATA_H

11
src/battle_message.c
View File

@ -137,9 +137,14 @@ static const u8 sText_Evasiveness[] = _("evasiveness");
const u8 *const gStatNamesTable[NUM_BATTLE_STATS] =
{
sText_HP, sText_Attack, sText_Defense,
sText_Speed, sText_SpAttack, sText_SpDefense,
sText_Accuracy, sText_Evasiveness
[STAT_HP] = sText_HP,
[STAT_ATK] = sText_Attack,
[STAT_DEF] = sText_Defense,
[STAT_SPEED] = sText_Speed,
[STAT_SPATK] = sText_SpAttack,
[STAT_SPDEF] = sText_SpDefense,
[STAT_ACC] = sText_Accuracy,
[STAT_EVASION] = sText_Evasiveness,
};
const u8 *const gPokeblockWasTooXStringTable[FLAVOR_COUNT] =
{

9
src/battle_script_commands.c
View File

@ -298,11 +298,6 @@ static const u16 sTrappingMoves[NUM_TRAPPING_MOVES] =
MOVE_THUNDER_CAGE
};
static const u16 sBadgeFlags[8] = {
FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET,
FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET,
};
static const u16 sWhiteOutBadgeMoney[9] = { 8, 16, 24, 36, 48, 64, 80, 100, 120 };
#define STAT_CHANGE_WORKED 0
@ -8325,9 +8320,9 @@ static void Cmd_getmoneyreward(void)
sPartyLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
}
}
for (count = 0, i = 0; i < ARRAY_COUNT(sBadgeFlags); i++)
for (count = 0, i = 0; i < ARRAY_COUNT(gBadgeFlags); i++)
{
if (FlagGet(sBadgeFlags[i]) == TRUE)
if (FlagGet(gBadgeFlags[i]) == TRUE)
++count;
}
money = sWhiteOutBadgeMoney[count] * sPartyLevel;

10
src/battle_setup.c
View File

@ -359,12 +359,6 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
[REMATCH_WALLACE] = REMATCH(TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, EVER_GRANDE_CITY),
};
static const u16 sBadgeFlags[NUM_BADGES] =
{
FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET,
FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET,
};
#define tState data[0]
#define tTransition data[1]
@ -1919,9 +1913,9 @@ static bool32 HasAtLeastFiveBadges(void)
{
s32 i, count;
for (count = 0, i = 0; i < ARRAY_COUNT(sBadgeFlags); i++)
for (count = 0, i = 0; i < ARRAY_COUNT(gBadgeFlags); i++)
{
if (FlagGet(sBadgeFlags[i]) == TRUE)
if (FlagGet(gBadgeFlags[i]) == TRUE)
{
if (++count >= 5)
return TRUE;

1192
src/debug.c
View File

File diff suppressed because it is too large Load Diff

12
src/event_data.c
View File

@ -29,6 +29,18 @@ EWRAM_DATA static u8 sSpecialFlags[SPECIAL_FLAGS_SIZE] = {0};
extern u16 *const gSpecialVars[];
const u16 gBadgeFlags[NUM_BADGES] =
{
FLAG_BADGE01_GET,
FLAG_BADGE02_GET,
FLAG_BADGE03_GET,
FLAG_BADGE04_GET,
FLAG_BADGE05_GET,
FLAG_BADGE06_GET,
FLAG_BADGE07_GET,
FLAG_BADGE08_GET,
};
void InitEventData(void)
{
memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags));

14
src/match_call.c
View File

@ -1839,25 +1839,13 @@ static void PopulateBattleFrontierStreak(int matchCallId, u8 *destStr)
ConvertIntToDecimalStringN(destStr, sBattleFrontierStreakInfo.streak, STR_CONV_MODE_LEFT_ALIGN, i);
}
static const u16 sBadgeFlags[NUM_BADGES] =
{
FLAG_BADGE01_GET,
FLAG_BADGE02_GET,
FLAG_BADGE03_GET,
FLAG_BADGE04_GET,
FLAG_BADGE05_GET,
FLAG_BADGE06_GET,
FLAG_BADGE07_GET,
FLAG_BADGE08_GET,
};
static int GetNumOwnedBadges(void)
{
u32 i;
for (i = 0; i < NUM_BADGES; i++)
{
if (!FlagGet(sBadgeFlags[i]))
if (!FlagGet(gBadgeFlags[i]))
break;
}