diff --git a/src/debug.c b/src/debug.c index f889ed5d29..9e8a9b5b89 100644 --- a/src/debug.c +++ b/src/debug.c @@ -78,7 +78,6 @@ enum { // Util DEBUG_UTIL_MENU_ITEM_SAVEBLOCK, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK, - DEBUG_UTIL_MENU_ITEM_CHECKWEEKDAY, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS, DEBUG_UTIL_MENU_ITEM_TRAINER_NAME, DEBUG_UTIL_MENU_ITEM_TRAINER_GENDER, @@ -214,7 +213,6 @@ static void DebugAction_Util_PoisonMons(u8 taskId); static void DebugAction_Util_CheckSaveBlock(u8); static void DebugAction_Util_CheckWallClock(u8); static void DebugAction_Util_SetWallClock(u8); -static void DebugAction_Util_CheckWeekDay(u8); static void DebugAction_Util_WatchCredits(u8); static void DebugAction_Util_Trainer_Name(u8); static void DebugAction_Util_Trainer_Gender(u8); @@ -321,7 +319,6 @@ static const u8 gDebugText_Util_PoisonMons[] = _("Poison all mons" static const u8 gDebugText_Util_SaveBlockSpace[] = _("SaveBlock Space"); static const u8 gDebugText_Util_CheckWallClock[] = _("Check Wall Clock"); static const u8 gDebugText_Util_SetWallClock[] = _("Set Wall Clock"); -static const u8 gDebugText_Util_CheckWeekDay[] = _("Check Week Day"); static const u8 gDebugText_Util_WatchCredits[] = _("Watch Credits"); static const u8 gDebugText_Util_Trainer_Name[] = _("Trainer name"); static const u8 gDebugText_Util_Trainer_Gender[] = _("Toggle T. Gender"); @@ -1161,14 +1158,6 @@ static void DebugAction_Util_SetWallClock(u8 taskId) LockPlayerFieldControls(); ScriptContext_SetupScript(PlayersHouse_2F_EventScript_SetWallClock); } -static void DebugAction_Util_CheckWeekDay(u8 taskId) -{ - //StringCopy(gStringVar4, GetDayOfWeekString(gLocalTime.dayOfWeek)); - Debug_DestroyMenu(taskId); - //LockPlayerFieldControls(); - //ScriptContext_SetupScript(Debug_ShowFieldMessageStringVar4); - ScriptContext_Enable(); -} static void DebugAction_Util_WatchCredits(u8 taskId) { struct Task* task = &gTasks[taskId]; @@ -2212,7 +2201,7 @@ static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId) gTasks[taskId].data[3] = 0; } - while (GetAbilityBySpecies(sDebugMonData->mon_speciesId, gTasks[taskId].data[3] - i) == ABILITY_NONE) + while (GetAbilityBySpecies(sDebugMonData->mon_speciesId, gTasks[taskId].data[3] - i) == ABILITY_NONE && gTasks[taskId].data[3] - i < NUM_ABILITY_SLOTS) { i++; } @@ -3060,194 +3049,6 @@ static void DebugAction_Sound_MUS_SelectId(u8 taskId) X(MUS_RG_TRAINER_TOWER, "MUS-RG-TRAINER-TOWER") \ X(MUS_RG_SLOW_PALLET, "MUS-RG-SLOW-PALLET") \ X(MUS_RG_TEACHY_TV_MENU, "MUS-RG-TEACHY-TV-MENU") \ - X(DP_SEQ_TITLE00 , "DP-SEQ-TITLE00") \ - X(DP_SEQ_TITLE01 , "DP-SEQ-TITLE01") \ - X(DP_SEQ_OPENING , "DP-SEQ-OPENING") \ - X(DP_SEQ_TV_HOUSOU , "DP-SEQ-TV-HOUSOU") \ - X(DP_SEQ_TV_END , "DP-SEQ-TV-END") \ - X(DP_SEQ_TOWN01_D , "DP-SEQ-TOWN01-D") \ - X(DP_SEQ_TOWN01_N , "DP-SEQ-TOWN01-N") \ - X(DP_SEQ_THE_RIV , "DP-SEQ-THE-RIV") \ - X(DP_SEQ_ROAD_A_D , "DP-SEQ-ROAD-A-D") \ - X(DP_SEQ_ROAD_A_N , "DP-SEQ-ROAD-A-N") \ - X(DP_SEQ_D_LAKE , "DP-SEQ-D-LAKE") \ - X(DP_SEQ_THE_EVENT01, "DP-SEQ-THE-EVENT01") \ - X(DP_SEQ_BA_POKE , "DP-SEQ-BA-POKE") \ - X(DP_SEQ_WINPOKE , "DP-SEQ-WINPOKE") \ - X(DP_SEQ_THE_GIRL , "DP-SEQ-THE-GIRL") \ - X(DP_SEQ_THE_BOY , "DP-SEQ-THE-BOY") \ - X(DP_SEQ_FANFA4 , "DP-SEQ-FANFA4") \ - X(DP_SEQ_TOWN02_D , "DP-SEQ-TOWN02-D") \ - X(DP_SEQ_TOWN02_N , "DP-SEQ-TOWN02-N") \ - X(DP_SEQ_KENKYUJO , "DP-SEQ-KENKYUJO") \ - X(DP_SEQ_TSURETEKE , "DP-SEQ-TSURETEKE") \ - X(DP_SEQ_PC_01 , "DP-SEQ-PC-01") \ - X(DP_SEQ_PC_02 , "DP-SEQ-PC-02") \ - X(DP_SEQ_ASA , "DP-SEQ-ASA") \ - X(DP_SEQ_EYE_BOY , "DP-SEQ-EYE-BOY") \ - X(DP_SEQ_EYE_GIRL , "DP-SEQ-EYE-GIRL") \ - X(DP_SEQ_BA_TRAIN , "DP-SEQ-BA-TRAIN") \ - X(DP_SEQ_WINTRAIN , "DP-SEQ-WINTRAIN") \ - X(DP_SEQ_CITY01_D , "DP-SEQ-CITY01-D") \ - X(DP_SEQ_CITY01_N , "DP-SEQ-CITY01-N") \ - X(DP_SEQ_FANFA3 , "DP-SEQ-FANFA3") \ - X(DP_SEQ_FS , "DP-SEQ-FS") \ - X(DP_SEQ_ROAD_B_D , "DP-SEQ-ROAD-B-D") \ - X(DP_SEQ_ROAD_B_N , "DP-SEQ-ROAD-B-N") \ - X(DP_SEQ_BA_RIVAL , "DP-SEQ-BA-RIVAL") \ - X(DP_SEQ_D_05 , "DP-SEQ-D-05") \ - X(DP_SEQ_WAZA , "DP-SEQ-WAZA") \ - X(DP_SEQ_CITY03_D , "DP-SEQ-CITY03-D") \ - X(DP_SEQ_CITY03_N , "DP-SEQ-CITY03-N") \ - X(DP_SEQ_D_04 , "DP-SEQ-D-04") \ - X(DP_SEQ_GYM , "DP-SEQ-GYM") \ - X(DP_SEQ_BA_GYM , "DP-SEQ-BA-GYM") \ - X(DP_SEQ_WINTGYM , "DP-SEQ-WINTGYM") \ - X(DP_SEQ_BADGE , "DP-SEQ-BADGE") \ - X(DP_SEQ_EYE_KID , "DP-SEQ-EYE-KID") \ - X(DP_SEQ_FANFA1 , "DP-SEQ-FANFA1") \ - X(DP_SEQ_TOWN03_D , "DP-SEQ-TOWN03-D") \ - X(DP_SEQ_TOWN03_N , "DP-SEQ-TOWN03-N") \ - X(DP_SEQ_KINOMI , "DP-SEQ-KINOMI") \ - X(DP_SEQ_ROAD_C_D , "DP-SEQ-ROAD-C-D") \ - X(DP_SEQ_ROAD_C_N , "DP-SEQ-ROAD-C-N") \ - X(DP_SEQ_EYE_GINGA , "DP-SEQ-EYE-GINGA") \ - X(DP_SEQ_BA_GINGA , "DP-SEQ-BA-GINGA") \ - X(DP_SEQ_D_02 , "DP-SEQ-D-02") \ - X(DP_SEQ_GONIN , "DP-SEQ-GONIN") \ - X(DP_SEQ_CITY04_D , "DP-SEQ-CITY04-D") \ - X(DP_SEQ_CITY04_N , "DP-SEQ-CITY04-N") \ - X(DP_SEQ_D_GINLOBBY , "DP-SEQ-D-GINLOBBY") \ - X(DP_SEQ_BA_GINGA3 , "DP-SEQ-BA-GINGA3") \ - X(DP_SEQ_WINGINGA , "DP-SEQ-WINGINGA") \ - X(DP_SEQ_SHINKA , "DP-SEQ-SHINKA") \ - X(DP_SEQ_FANFA5 , "DP-SEQ-FANFA5") \ - X(DP_SEQ_BICYCLE , "DP-SEQ-BICYCLE") \ - X(DP_SEQ_EYE_SPORT , "DP-SEQ-EYE-SPORT") \ - X(DP_SEQ_ROAD_D_D , "DP-SEQ-ROAD-D-D") \ - X(DP_SEQ_ROAD_D_N , "DP-SEQ-ROAD-D-N") \ - X(DP_SEQ_CITY05_D , "DP-SEQ-CITY05-D") \ - X(DP_SEQ_CITY05_N , "DP-SEQ-CITY05-N") \ - X(DP_SEQ_ROAD_E_D , "DP-SEQ-ROAD-E-D") \ - X(DP_SEQ_ROAD_E_N , "DP-SEQ-ROAD-E-N") \ - X(DP_SEQ_EYE_MOUNT , "DP-SEQ-EYE-MOUNT") \ - X(DP_SEQ_TOWN04_D , "DP-SEQ-TOWN04-D") \ - X(DP_SEQ_TOWN04_N , "DP-SEQ-TOWN04-N") \ - X(DP_SEQ_POCKETCH , "DP-SEQ-POCKETCH") \ - X(DP_SEQ_ROAD_F_D , "DP-SEQ-ROAD-F-D") \ - X(DP_SEQ_ROAD_F_N , "DP-SEQ-ROAD-F-N") \ - X(DP_SEQ_CITY07_D , "DP-SEQ-CITY07-D") \ - X(DP_SEQ_CITY07_N , "DP-SEQ-CITY07-N") \ - X(DP_SEQ_TOWN07_D , "DP-SEQ-TOWN07-D") \ - X(DP_SEQ_TOWN07_N , "DP-SEQ-TOWN07-N") \ - X(DP_SEQ_CITY02_D , "DP-SEQ-CITY02-D") \ - X(DP_SEQ_CITY02_N , "DP-SEQ-CITY02-N") \ - X(DP_SEQ_ROAD_SNOW_D , "DP-SEQ-ROAD-SNOW-D") \ - X(DP_SEQ_ROAD_SNOW_N , "DP-SEQ-ROAD-SNOW-N") \ - X(DP_SEQ_CITY09_D , "DP-SEQ-CITY09-D") \ - X(DP_SEQ_CITY09_N , "DP-SEQ-CITY09-N") \ - X(DP_SEQ_D_AGITO , "DP-SEQ-D-AGITO") \ - X(DP_SEQ_BA_AGAKI , "DP-SEQ-BA-AGAKI") \ - X(DP_SEQ_THE_EVENT04 , "DP-SEQ-THE-EVENT04") \ - X(DP_SEQ_D_MOUNT1 , "DP-SEQ-D-MOUNT1") \ - X(DP_SEQ_D_MOUNT2 , "DP-SEQ-D-MOUNT2") \ - X(DP_SEQ_THE_EVENT02 , "DP-SEQ-THE-EVENT02") \ - X(DP_SEQ_THE_EVENT03 , "DP-SEQ-THE-EVENT03") \ - X(DP_SEQ_BA_DPOKE2 , "DP-SEQ-BA-DPOKE2") \ - X(DP_SEQ_CITY08_D , "DP-SEQ-CITY08-D") \ - X(DP_SEQ_CITY08_N , "DP-SEQ-CITY08-N") \ - X(DP_SEQ_D_01 , "DP-SEQ-D-01") \ - X(DP_SEQ_EYE_ELITE , "DP-SEQ-EYE-ELITE") \ - X(DP_SEQ_CITY10_D , "DP-SEQ-CITY10-D") \ - X(DP_SEQ_CITY10_N , "DP-SEQ-CITY10-N") \ - X(DP_SEQ_CITY11_D , "DP-SEQ-CITY11-D") \ - X(DP_SEQ_CITY11_N , "DP-SEQ-CITY11-N") \ - X(DP_SEQ_TOWN06_D , "DP-SEQ-TOWN06-D") \ - X(DP_SEQ_TOWN06_N , "DP-SEQ-TOWN06-N") \ - X(DP_SEQ_ROAD_BZA_D , "DP-SEQ-ROAD-BZA-D") \ - X(DP_SEQ_ROAD_BZA_N , "DP-SEQ-ROAD-BZA-N") \ - X(DP_SEQ_WIFILOBBY , "DP-SEQ-WIFILOBBY") \ - X(DP_SEQ_BLD_TV , "DP-SEQ-BLD-TV") \ - X(DP_SEQ_BLD_BLD_GTC , "DP-SEQ-BLD-BLD-GTC") \ - X(DP_SEQ_NAMINORI , "DP-SEQ-NAMINORI") \ - X(DP_SEQ_WASURE , "DP-SEQ-WASURE") \ - X(DP_SEQ_EYE_FIGHT , "DP-SEQ-EYE-FIGHT") \ - X(DP_SEQ_EYE_ENKA , "DP-SEQ-EYE-ENKA") \ - X(DP_SEQ_TANKOU , "DP-SEQ-TANKOU") \ - X(DP_SEQ_HATANIGE , "DP-SEQ-HATANIGE") \ - X(DP_SEQ_EYE_LADY , "DP-SEQ-EYE-LADY") \ - X(DP_SEQ_D_03 , "DP-SEQ-D-03") \ - X(DP_SEQ_D_SAFARI , "DP-SEQ-D-SAFARI") \ - X(DP_SEQ_EYE_MYS , "DP-SEQ-EYE-MYS") \ - X(DP_SEQ_BLD_GAME , "DP-SEQ-BLD-GAME") \ - X(DP_SEQ_SLOT_ATARI , "DP-SEQ-SLOT-ATARI") \ - X(DP_SEQ_SLOT_OOATARI , "DP-SEQ-SLOT-OOATARI") \ - X(DP_SEQ_EYE_RICH , "DP-SEQ-EYE-RICH") \ - X(DP_SEQ_D_RYAYHY , "DP-SEQ-D-RYAYHY") \ - X(DP_SEQ_BA_DPOKE1 , "DP-SEQ-BA-DPOKE1") \ - X(DP_SEQ_KUSAGASA , "DP-SEQ-KUSAGASA") \ - X(DP_SEQ_EYE_FUN , "DP-SEQ-EYE-FUN") \ - X(DP_SEQ_D_KOUEN , "DP-SEQ-D-KOUEN") \ - X(DP_SEQ_ACCE , "DP-SEQ-ACCE") \ - X(DP_SEQ_BLD_CON , "DP-SEQ-BLD-CON") \ - X(DP_SEQ_KINOMI1 , "DP-SEQ-KINOMI1") \ - X(DP_SEQ_CON_TEST , "DP-SEQ-CON-TEST") \ - X(DP_SEQ_CO_DRESS , "DP-SEQ-CO-DRESS") \ - X(DP_SEQ_CO_KASHI , "DP-SEQ-CO-KASHI") \ - X(DP_SEQ_CO_TAKUMA , "DP-SEQ-CO-TAKUMA") \ - X(DP_SEQ_CO_KEKKA , "DP-SEQ-CO-KEKKA") \ - X(DP_SEQ_CO_FANFA , "DP-SEQ-CO-FANFA") \ - X(DP_SEQ_BF_TOWWER , "DP-SEQ-BF-TOWWER") \ - X(DP_SEQ_D_06 , "DP-SEQ-D-06") \ - X(DP_SEQ_BA_SECRET2 , "DP-SEQ-BA-SECRET2") \ - X(DP_SEQ_PRESENT , "DP-SEQ-PRESENT") \ - X(DP_SEQ_D_LEAGUE , "DP-SEQ-D-LEAGUE") \ - X(DP_SEQ_EYE_TENNO , "DP-SEQ-EYE-TENNO") \ - X(DP_SEQ_BA_TENNO , "DP-SEQ-BA-TENNO") \ - X(DP_SEQ_WINTENNO , "DP-SEQ-WINTENNO") \ - X(DP_SEQ_EYE_CHAMP , "DP-SEQ-EYE-CHAMP") \ - X(DP_SEQ_BA_CHANP , "DP-SEQ-BA-CHANP") \ - X(DP_SEQ_WINCHAMP , "DP-SEQ-WINCHAMP") \ - X(DP_SEQ_BLD_DENDO , "DP-SEQ-BLD-DENDO") \ - X(DP_SEQ_BLD_EV_DENDO2 , "DP-SEQ-BLD-EV-DENDO2") \ - X(DP_SEQ_BLD_ENDING , "DP-SEQ-BLD-ENDING") \ - X(DP_SEQ_FUE , "DP-SEQ-FUE") \ - X(DP_SEQ_AUS , "DP-SEQ-AUS") \ - X(DP_SEQ_BA_SECRET1 , "DP-SEQ-BA-SECRET1") \ - X(PL_SEQ_TITLE00 , "PL-SEQ-TITLE00") \ - X(PL_SEQ_TITLE01 , "PL-SEQ-TITLE01") \ - X(PL_SEQ_TV_HOUSOU , "PL-SEQ-TV-HOUSOU") \ - X(PL_SEQ_TV_END , "PL-SEQ-TV-END") \ - X(PL_SEQ_PL_HANDSOME , "PL-SEQ-PL-HANDSOME") \ - X(PL_SEQ_PL_WIFITOWER , "PL-SEQ-PL-WIFITOWER") \ - X(PL_SEQ_PL_WIFIUNION , "PL-SEQ-PL-WIFIUNION") \ - X(PL_SEQ_PL_WIFIGAME , "PL-SEQ-PL-WIFIGAME") \ - X(PL_SEQ_PL_WINMINI2 , "PL-SEQ-PL-WINMINI2") \ - X(PL_SEQ_PL_WIFIPARADE , "PL-SEQ-PL-WIFIPARADE") \ - X(PL_SEQ_PL_EV_GIRA , "PL-SEQ-PL-EV-GIRA") \ - X(PL_SEQ_PL_EV_GIRA2 , "PL-SEQ-PL-EV-GIRA2") \ - X(PL_SEQ_PL_D_GIRATINA , "PL-SEQ-PL-D-GIRATINA") \ - X(PL_SEQ_PL_BA_GIRA , "PL-SEQ-PL-BA-GIRA") \ - X(PL_SEQ_PL_GURUGURU , "PL-SEQ-PL-GURUGURU") \ - X(PL_SEQ_PL_PTHAIFU , "PL-SEQ-PL-PTHAIFU") \ - X(PL_SEQ_PL_MTKAWA , "PL-SEQ-PL-MTKAWA") \ - X(PL_SEQ_PL_MTKAKKO , "PL-SEQ-PL-MTKAKKO") \ - X(PL_SEQ_PL_MTTAKMA , "PL-SEQ-PL-MTTAKMA") \ - X(PL_SEQ_PL_MTUTSUK , "PL-SEQ-PL-MTUTSUK") \ - X(PL_SEQ_PL_MTKASHI , "PL-SEQ-PL-MTKASHI") \ - X(PL_SEQ_PL_TOWN02 , "PL-SEQ-PL-TOWN02") \ - X(PL_SEQ_PL_AUDIO , "PL-SEQ-PL-AUDIO") \ - X(PL_SEQ_CITY11_D , "PL-SEQ-CITY11-D") \ - X(PL_SEQ_PL_BF_ROULETTE , "PL-SEQ-PL-BF-ROULETTE") \ - X(PL_SEQ_PL_DON2 , "PL-SEQ-PL-DON2") \ - X(PL_SEQ_PL_BF_STAGE , "PL-SEQ-PL-BF-STAGE") \ - X(PL_SEQ_PL_BF_FACTORY , "PL-SEQ-PL-BF-FACTORY") \ - X(PL_SEQ_PL_BF_CASTLE , "PL-SEQ-PL-BF-CASTLE") \ - X(PL_SEQ_PL_FRO , "PL-SEQ-PL-FRO") \ - X(PL_SEQ_PL_POINTGET3 , "PL-SEQ-PL-POINTGET3") \ - X(PL_SEQ_PL_BA_BRAIN , "PL-SEQ-PL-BA-BRAIN") \ - X(PL_SEQ_PL_WINBRAIN , "PL-SEQ-PL-WINBRAIN") \ - X(PL_SEQ_PL_BA_REGI , "PL-SEQ-PL-BA-REGI") \ X(PH_TRAP_BLEND, "PH-TRAP-BLEND") \ X(PH_TRAP_HELD, "PH-TRAP-HELD") \ X(PH_TRAP_SOLO, "PH-TRAP-SOLO") \ @@ -3595,4 +3396,4 @@ SOUND_LIST_SE }; #undef X -#endif \ No newline at end of file +#endif