diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 4ced7d971..e174343f2 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -5,11 +5,6 @@ Debug_ShowFieldMessageStringVar4:: releaseall 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:: lockall setflag FLAG_SYS_POKEMON_GET @@ -27,8 +22,8 @@ Debug_CheatStart:: special SetUnlockedPokedexFlags setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 - @ setflag FLAG_SYS_NATIONAL_DEX - @ special EnableNationalPokedex + setflag FLAG_SYS_NATIONAL_DEX + special EnableNationalPokedex setflag FLAG_RECEIVED_RUNNING_SHOES setflag FLAG_SYS_B_DASH 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_RIVAL_STATE, 4 @ 4: Received Pokedex setflag FLAG_RECEIVED_BIKE - giveitem ITEM_ACRO_BIKE + additem ITEM_ACRO_BIKE setvar VAR_BRINEY_HOUSE_STATE, 1 setvar VAR_ROUTE116_STATE, 2 setflag FLAG_HIDE_ROUTE_116_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 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 release end diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 2e6c78194..eaf40a525 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -593,6 +593,4 @@ #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 diff --git a/include/main_menu.h b/include/main_menu.h index 790c9d10e..81e2d9794 100644 --- a/include/main_menu.h +++ b/include/main_menu.h @@ -2,7 +2,7 @@ #define GUARD_MAIN_MENU_H 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); #endif // GUARD_MAIN_MENU_H diff --git a/src/battle_main.c b/src/battle_main.c index 20ebc05c6..052b61163 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4001,7 +4001,7 @@ static void HandleTurnActionSelectionState(void) } break; case B_ACTION_USE_ITEM: - #if TX_DEBUG_SYSTEM == TRUE + #if TX_DEBUG_SYSTEM == TRUE if (FlagGet(TX_DEBUG_FLAG_NO_BAG_USE)) { RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -4011,7 +4011,7 @@ static void HandleTurnActionSelectionState(void) *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN; return; } - #endif + #endif if ((gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER_NO_PYRAMID diff --git a/src/event_object_movement.c b/src/event_object_movement.c index fbcb6ed79..9765febbf 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -4630,10 +4630,10 @@ u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir) { u8 direction = dir; - #if TX_DEBUG_SYSTEM == TRUE +#if TX_DEBUG_SYSTEM == TRUE if (FlagGet(TX_DEBUG_FLAG_NO_COLLISION)) return COLLISION_NONE; - #endif +#endif if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return COLLISION_OUTSIDE_RANGE; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e2bc06e98..2b86bf2cf 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -131,13 +131,13 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) else if (heldKeys & DPAD_RIGHT) 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) { input->input_field_1_2 = TRUE; input->pressedStartButton = FALSE; } - #endif +#endif } int ProcessPlayerFieldInput(struct FieldInput *input) @@ -197,14 +197,14 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == 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) { PlaySE(SE_WIN_OPEN); Debug_ShowMainMenu(); return TRUE; } - #endif +#endif return FALSE; } @@ -686,10 +686,10 @@ void RestartWildEncounterImmunitySteps(void) static bool8 CheckStandardWildEncounter(u16 metatileBehavior) { - #if TX_DEBUG_SYSTEM == TRUE +#if TX_DEBUG_SYSTEM == TRUE if (FlagGet(TX_DEBUG_FLAG_NO_ENCOUNTER)) return FALSE; - #endif +#endif if (sWildEncounterImmunitySteps < 4) { diff --git a/src/item_use.c b/src/item_use.c index 5cca3aee3..ea2bea0fe 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -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"); void ItemUseInBattle_PokeBall(u8 taskId) { - #if TX_DEBUG_SYSTEM == TRUE +#if TX_DEBUG_SYSTEM == TRUE if (FlagGet(TX_DEBUG_FLAG_NO_CATCHING)) { static const u8 sText_BallsCannotBeUsed[] = _("Poké Balls cannot be used\nright now!\p"); DisplayItemMessage(taskId, 1, sText_BallsCannotBeUsed, CloseItemMessage); return; } - #endif +#endif switch (GetBallThrowableState()) { diff --git a/src/start_menu.c b/src/start_menu.c index ce9b726a3..9f84df16a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -174,7 +174,7 @@ static const struct MenuAction sStartMenuItems[] = [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}}, [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, [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[] = @@ -284,17 +284,14 @@ static void BuildStartMenuActions(void) { BuildMultiPartnerRoomStartMenu(); } + else + { #if TX_DEBUG_SYSTEM == TRUE && TX_DEBUG_SYSTEM_IN_MENU == TRUE - else - { BuildDebugStartMenu(); - } #else - else - { BuildNormalStartMenu(); - } #endif + } } static void AddStartMenuAction(u8 action) @@ -328,26 +325,17 @@ static void BuildNormalStartMenu(void) static void BuildDebugStartMenu(void) { + AddStartMenuAction(MENU_ACTION_DEBUG); if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) - { AddStartMenuAction(MENU_ACTION_POKEDEX); - } if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) - { AddStartMenuAction(MENU_ACTION_POKEMON); - } - AddStartMenuAction(MENU_ACTION_BAG); - if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) - { AddStartMenuAction(MENU_ACTION_POKENAV); - } - AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); AddStartMenuAction(MENU_ACTION_OPTION); - AddStartMenuAction(MENU_ACTION_DEBUG); } static void BuildSafariZoneStartMenu(void) @@ -772,11 +760,11 @@ static bool8 StartMenuDebugCallback(void) RemoveExtraStartMenuWindows(); HideStartMenuDebug(); // Hide start menu without enabling movement - #if TX_DEBUG_SYSTEM == TRUE +#if TX_DEBUG_SYSTEM == TRUE Debug_ShowMainMenu(); #endif - return TRUE; +return TRUE; } static bool8 StartMenuSafariZoneRetireCallback(void) diff --git a/src/trainer_see.c b/src/trainer_see.c index 596b7456d..73b4395d4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -193,10 +193,10 @@ bool8 CheckForTrainersWantingBattle(void) { u8 i; - #if TX_DEBUG_SYSTEM == TRUE +#if TX_DEBUG_SYSTEM == TRUE if (FlagGet(TX_DEBUG_FLAG_NO_TRAINER_SEE)) return FALSE; - #endif +#endif gNoOfApproachingTrainers = 0; gApproachingTrainerId = 0;