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

removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation

Browse Source
This commit is contained in:
TheXaman 2022-09-02 12:10:11 +02:00
parent c13561e5ba
commit ad57551db1
9 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/scripts/debug.inc
View File

@ -5,11 +5,6 @@ Debug_ShowFieldMessageStringVar4::
releaseall releaseall
end end
Debug_CheckWeekDay_Text:
.string "Aaaaah, yes!\l"
.string "{STR_VAR_1}s are made for dads!\l"
.string "And dad's car!$"
Debug_CheatStart:: Debug_CheatStart::
lockall lockall
setflag FLAG_SYS_POKEMON_GET setflag FLAG_SYS_POKEMON_GET
@ -27,8 +22,8 @@ Debug_CheatStart::
special SetUnlockedPokedexFlags special SetUnlockedPokedexFlags
setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
@ setflag FLAG_SYS_NATIONAL_DEX setflag FLAG_SYS_NATIONAL_DEX
@ special EnableNationalPokedex special EnableNationalPokedex
setflag FLAG_RECEIVED_RUNNING_SHOES setflag FLAG_RECEIVED_RUNNING_SHOES
setflag FLAG_SYS_B_DASH setflag FLAG_SYS_B_DASH
setvar VAR_LITTLEROOT_TOWN_STATE, 4 @ 4: Received Running Shoes setvar VAR_LITTLEROOT_TOWN_STATE, 4 @ 4: Received Running Shoes
@ -37,25 +32,12 @@ Debug_CheatStart::
setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2 @ 2: Met Rival's Mom (and is corresponding gender) setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2 @ 2: Met Rival's Mom (and is corresponding gender)
setvar VAR_LITTLEROOT_RIVAL_STATE, 4 @ 4: Received Pokedex setvar VAR_LITTLEROOT_RIVAL_STATE, 4 @ 4: Received Pokedex
setflag FLAG_RECEIVED_BIKE setflag FLAG_RECEIVED_BIKE
giveitem ITEM_ACRO_BIKE additem ITEM_ACRO_BIKE
setvar VAR_BRINEY_HOUSE_STATE, 1 setvar VAR_BRINEY_HOUSE_STATE, 1
setvar VAR_ROUTE116_STATE, 2 setvar VAR_ROUTE116_STATE, 2
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
@ additem ITEM_MAX_REPEL, 10
@ giveitem ITEM_EON_TICKET
@ setflag FLAG_SYS_HAS_EON_TICKET
@ setvar VAR_DISTRIBUTE_EON_TICKET, 0
@ giveitem ITEM_MYSTIC_TICKET
@ setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
@ setflag FLAG_RECEIVED_MYSTIC_TICKET
@ giveitem ITEM_AURORA_TICKET
@ setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
@ setflag FLAG_RECEIVED_AURORA_TICKET
@ setflag FLAG_BADGE06_GET @ Badge for flying filed move
@ setweather WEATHER_VOLCANIC_ASH
@ doweather
closemessage closemessage
release release
end end

2
include/constants/map_groups.h
View File

@ -593,6 +593,4 @@
#define MAP_GROUPS_COUNT 34 #define MAP_GROUPS_COUNT 34
// static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
#endif // GUARD_CONSTANTS_MAP_GROUPS_H #endif // GUARD_CONSTANTS_MAP_GROUPS_H

2
include/main_menu.h
View File

@ -2,7 +2,7 @@
#define GUARD_MAIN_MENU_H #define GUARD_MAIN_MENU_H
void CB2_InitMainMenu(void); void CB2_InitMainMenu(void);
void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f); void CreateYesNoMenuParameterized(u8 x, u8 y, u16 baseTileNum, u16 baseBlock, u8 yesNoPalNum, u8 winPalNum);
void NewGameBirchSpeech_SetDefaultPlayerName(u8); void NewGameBirchSpeech_SetDefaultPlayerName(u8);
#endif // GUARD_MAIN_MENU_H #endif // GUARD_MAIN_MENU_H

4
src/battle_main.c
View File

@ -4001,7 +4001,7 @@ static void HandleTurnActionSelectionState(void)
} }
break; break;
case B_ACTION_USE_ITEM: case B_ACTION_USE_ITEM:
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
if (FlagGet(TX_DEBUG_FLAG_NO_BAG_USE)) if (FlagGet(TX_DEBUG_FLAG_NO_BAG_USE))
{ {
RecordedBattle_ClearBattlerAction(gActiveBattler, 1); RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
@ -4011,7 +4011,7 @@ static void HandleTurnActionSelectionState(void)
*(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN; *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN;
return; return;
} }
#endif #endif
if ((gBattleTypeFlags & (BATTLE_TYPE_LINK if ((gBattleTypeFlags & (BATTLE_TYPE_LINK
| BATTLE_TYPE_FRONTIER_NO_PYRAMID | BATTLE_TYPE_FRONTIER_NO_PYRAMID

4
src/event_object_movement.c
View File

@ -4630,10 +4630,10 @@ u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir)
{ {
u8 direction = dir; u8 direction = dir;
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
if (FlagGet(TX_DEBUG_FLAG_NO_COLLISION)) if (FlagGet(TX_DEBUG_FLAG_NO_COLLISION))
return COLLISION_NONE; return COLLISION_NONE;
#endif #endif
if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y))
return COLLISION_OUTSIDE_RANGE; return COLLISION_OUTSIDE_RANGE;

12
src/field_control_avatar.c
View File

@ -131,13 +131,13 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
else if (heldKeys & DPAD_RIGHT) else if (heldKeys & DPAD_RIGHT)
input->dpadDirection = DIR_EAST; input->dpadDirection = DIR_EAST;
#if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == FALSE #if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == FALSE
if ((heldKeys & R_BUTTON) && input->pressedStartButton) if ((heldKeys & R_BUTTON) && input->pressedStartButton)
{ {
input->input_field_1_2 = TRUE; input->input_field_1_2 = TRUE;
input->pressedStartButton = FALSE; input->pressedStartButton = FALSE;
} }
#endif #endif
} }
int ProcessPlayerFieldInput(struct FieldInput *input) int ProcessPlayerFieldInput(struct FieldInput *input)
@ -197,14 +197,14 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE) if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
return TRUE; return TRUE;
#if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == FALSE #if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == FALSE
if (input->input_field_1_2) if (input->input_field_1_2)
{ {
PlaySE(SE_WIN_OPEN); PlaySE(SE_WIN_OPEN);
Debug_ShowMainMenu(); Debug_ShowMainMenu();
return TRUE; return TRUE;
} }
#endif #endif
return FALSE; return FALSE;
} }
@ -686,10 +686,10 @@ void RestartWildEncounterImmunitySteps(void)
static bool8 CheckStandardWildEncounter(u16 metatileBehavior) static bool8 CheckStandardWildEncounter(u16 metatileBehavior)
{ {
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
if (FlagGet(TX_DEBUG_FLAG_NO_ENCOUNTER)) if (FlagGet(TX_DEBUG_FLAG_NO_ENCOUNTER))
return FALSE; return FALSE;
#endif #endif
if (sWildEncounterImmunitySteps < 4) if (sWildEncounterImmunitySteps < 4)
{ {

4
src/item_use.c
View File

@ -982,14 +982,14 @@ static const u8 sText_CantThrowPokeBall_TwoMons[] = _("Cannot throw a ball!\nThe
static const u8 sText_CantThrowPokeBall_SemiInvulnerable[] = _("Cannot throw a ball!\nThere's no Pokémon in sight!\p"); static const u8 sText_CantThrowPokeBall_SemiInvulnerable[] = _("Cannot throw a ball!\nThere's no Pokémon in sight!\p");
void ItemUseInBattle_PokeBall(u8 taskId) void ItemUseInBattle_PokeBall(u8 taskId)
{ {
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
if (FlagGet(TX_DEBUG_FLAG_NO_CATCHING)) if (FlagGet(TX_DEBUG_FLAG_NO_CATCHING))
{ {
static const u8 sText_BallsCannotBeUsed[] = _("Poké Balls cannot be used\nright now!\p"); static const u8 sText_BallsCannotBeUsed[] = _("Poké Balls cannot be used\nright now!\p");
DisplayItemMessage(taskId, 1, sText_BallsCannotBeUsed, CloseItemMessage); DisplayItemMessage(taskId, 1, sText_BallsCannotBeUsed, CloseItemMessage);
return; return;
} }
#endif #endif
switch (GetBallThrowableState()) switch (GetBallThrowableState())
{ {

26
src/start_menu.c
View File

@ -174,7 +174,7 @@ static const struct MenuAction sStartMenuItems[] =
[MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}}, [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
[MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
[MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}, [MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}},
[MENU_ACTION_DEBUG] = {gText_MenuDebug, {.u8_void = StartMenuDebugCallback}}, [MENU_ACTION_DEBUG] = {gText_MenuDebug, {.u8_void = StartMenuDebugCallback}},
}; };
static const struct BgTemplate sBgTemplates_LinkBattleSave[] = static const struct BgTemplate sBgTemplates_LinkBattleSave[] =
@ -284,17 +284,14 @@ static void BuildStartMenuActions(void)
{ {
BuildMultiPartnerRoomStartMenu(); BuildMultiPartnerRoomStartMenu();
} }
else
{
#if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == TRUE #if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == TRUE
else
{
BuildDebugStartMenu(); BuildDebugStartMenu();
}
#else #else
else
{
BuildNormalStartMenu(); BuildNormalStartMenu();
}
#endif #endif
}
} }
static void AddStartMenuAction(u8 action) static void AddStartMenuAction(u8 action)
@ -328,26 +325,17 @@ static void BuildNormalStartMenu(void)
static void BuildDebugStartMenu(void) static void BuildDebugStartMenu(void)
{ {
AddStartMenuAction(MENU_ACTION_DEBUG);
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{
AddStartMenuAction(MENU_ACTION_POKEDEX); AddStartMenuAction(MENU_ACTION_POKEDEX);
}
if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
{
AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_POKEMON);
}
AddStartMenuAction(MENU_ACTION_BAG); AddStartMenuAction(MENU_ACTION_BAG);
if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
{
AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_POKENAV);
}
AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_PLAYER);
AddStartMenuAction(MENU_ACTION_SAVE); AddStartMenuAction(MENU_ACTION_SAVE);
AddStartMenuAction(MENU_ACTION_OPTION); AddStartMenuAction(MENU_ACTION_OPTION);
AddStartMenuAction(MENU_ACTION_DEBUG);
} }
static void BuildSafariZoneStartMenu(void) static void BuildSafariZoneStartMenu(void)
@ -772,11 +760,11 @@ static bool8 StartMenuDebugCallback(void)
RemoveExtraStartMenuWindows(); RemoveExtraStartMenuWindows();
HideStartMenuDebug(); // Hide start menu without enabling movement HideStartMenuDebug(); // Hide start menu without enabling movement
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
Debug_ShowMainMenu(); Debug_ShowMainMenu();
#endif #endif
return TRUE; return TRUE;
} }
static bool8 StartMenuSafariZoneRetireCallback(void) static bool8 StartMenuSafariZoneRetireCallback(void)

4
src/trainer_see.c
View File

@ -193,10 +193,10 @@ bool8 CheckForTrainersWantingBattle(void)
{ {
u8 i; u8 i;
#if TX_DEBUG_SYSTEM == TRUE #if TX_DEBUG_SYSTEM == TRUE
if (FlagGet(TX_DEBUG_FLAG_NO_TRAINER_SEE)) if (FlagGet(TX_DEBUG_FLAG_NO_TRAINER_SEE))
return FALSE; return FALSE;
#endif #endif
gNoOfApproachingTrainers = 0; gNoOfApproachingTrainers = 0;
gApproachingTrainerId = 0; gApproachingTrainerId = 0;