diff --git a/error.txt b/error.txt new file mode 100644 index 0000000000..0584e2a40e --- /dev/null +++ b/error.txt @@ -0,0 +1,11 @@ +src/new_game.c: In function 'NewGameInitData': +src/new_game.c:241:5: error: 'givemon' undeclared (first use in this function) + 241 | givemon 0, 0, SPECIES_EEVEE, 10 + | ^~~~~~~ +src/new_game.c:241:5: note: each undeclared identifier is reported only once for each function it appears in +src/new_game.c:241:12: error: expected ';' before numeric constant + 241 | givemon 0, 0, SPECIES_EEVEE, 10 + | ^~ + | ; +make: *** [Makefile:481: build/leafgreen/src/new_game.o] Error 1 +make: *** Deleting file 'build/leafgreen/src/new_game.o' diff --git a/src/new_game.c b/src/new_game.c index 43c4f0f459..51df18c54d 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -50,6 +50,7 @@ #include "constants/items.h" #include "difficulty.h" #include "follower_npc.h" +#include "script_pokemon_util.h" extern const u8 EventScript_ResetAllMapFlags[]; extern const u8 EventScript_ResetAllMapFlagsFrlg[]; @@ -232,12 +233,28 @@ void NewGameInitData(void) ResetItemFlags(); ResetDexNav(); ClearFollowerNPCData(); - AddBagItem(ITEM_RARE_CANDY,999); - AddBagItem(ITEM_WATER_STONE,999); - AddBagItem(ITEM_THUNDER_STONE,999); - AddBagItem(ITEM_FIRE_STONE,999); - AddBagItem(ITEM_LEAF_STONE,999); - AddBagItem(ITEM_MOON_STONE,999); + AddBagItem(ITEM_RARE_CANDY,990); + AddBagItem(ITEM_RARE_CANDY,990); + AddBagItem(ITEM_RARE_CANDY,990); + AddBagItem(ITEM_WATER_STONE,900); + AddBagItem(ITEM_THUNDER_STONE,900); + AddBagItem(ITEM_FIRE_STONE,900); + AddBagItem(ITEM_LEAF_STONE,900); + AddBagItem(ITEM_MOON_STONE,900); + AddBagItem(ITEM_ABILITY_CAPSULE,200); + AddBagItem(ITEM_ABILITY_PATCH,200); + AddBagItem(ITEM_POKEMON_BOX,1); + for (int i = ITEM_CHERI_BERRY; i <= ITEM_MARANGA_BERRY; i++){ + AddBagItem(i,900); + } + + /* + ScriptGiveMon(SPECIES_BEEBRUTE,10,ITEM_FIRE_STONE); + ScriptGiveMon(SPECIES_BEEBRUTE,10,ITEM_FIRE_STONE); + ScriptGiveMon(SPECIES_BEEBRUTE,10,ITEM_FIRE_STONE); + ScriptGiveMon(SPECIES_BEEBRUTE,10,ITEM_FIRE_STONE); + ScriptGiveMon(SPECIES_BEEBRUTE,10,ITEM_FIRE_STONE); + */ } static void ResetMiniGamesRecords(void)