ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +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

20
src/start_menu.c
View File

@ -284,18 +284,15 @@ 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)