diff --git a/data/layouts/Route113/map.bin b/data/layouts/Route113/map.bin index 609690de2..d21936771 100755 Binary files a/data/layouts/Route113/map.bin and b/data/layouts/Route113/map.bin differ diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index a1c1a81e9..ecaaa15a7 100755 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -721,7 +721,8 @@ DewfordTown_Text_GettingItchToFish: @ 81E9DD1 DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14 .string "I hear you, and I like what\n" .string "you're saying!\p" - .string "I'll give you one of my fishing Rods.$" + .string "I'll give you some of my special\n" + .string "Lure Balls to help you!$" DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65 .string "And, as an added bonus, I'll even throw\n" diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 2b4ef3bcf..f5916129f 100755 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -201,8 +201,6 @@ DewfordTown_Gym_EventScript_GiveHM:: DewfordTown_Gym_EventScript_GiveHM01:: giveitem ITEM_WAILMER_PAIL msgbox Gym_Text_ExplainWailmerPail, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM39 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -210,8 +208,6 @@ DewfordTown_Gym_EventScript_GiveHM01:: DewfordTown_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -219,8 +215,6 @@ DewfordTown_Gym_EventScript_GiveHM02:: DewfordTown_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -228,8 +222,6 @@ DewfordTown_Gym_EventScript_GiveHM03:: DewfordTown_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -237,8 +229,6 @@ DewfordTown_Gym_EventScript_GiveHM04:: DewfordTown_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -246,8 +236,6 @@ DewfordTown_Gym_EventScript_GiveHM05:: DewfordTown_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -255,8 +243,6 @@ DewfordTown_Gym_EventScript_GiveHM06:: DewfordTown_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -264,8 +250,6 @@ DewfordTown_Gym_EventScript_GiveHM07:: DewfordTown_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto DewfordTown_Gym_EventScript_GiveBulkUp end @@ -274,10 +258,7 @@ DewfordTown_Gym_EventScript_GiveHM08:: DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855 msgbox Gym_Text_Takethis2, MSGBOX_DEFAULT giveitem ITEM_TM08 - //compare VAR_RESULT, 0 - //goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT - //setflag FLAG_RECEIVED_TM08 return DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878 @@ -285,7 +266,6 @@ DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM08 release end diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index a4b5cb1f2..3c9f8a743 100755 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_TEALA", @@ -90,6 +90,10 @@ "dest_warp_id": 0 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 6076548d4..300d02637 100755 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -103,19 +103,6 @@ "script": "FortreeCity_EventScript_GameboyKid", "flag": "0" }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 18, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_Kecleon", - "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" - }, { "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 7, diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 4a9dc3131..aace7ea7a 100755 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -20,10 +20,6 @@ FortreeCity_Gym_EventScript_Winona:: @ 82165C8 faceplayer call_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_Winona_PostBattle trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC - //specialvar VAR_RESULT, ShouldTryRematchBattle - //compare VAR_RESULT, TRUE - //goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch - //goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2 msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT release end @@ -81,8 +77,6 @@ FortreeCity_Gym_EventScript_GiveHM01:: FortreeCity_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -90,8 +84,6 @@ FortreeCity_Gym_EventScript_GiveHM02:: FortreeCity_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -99,8 +91,6 @@ FortreeCity_Gym_EventScript_GiveHM03:: FortreeCity_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -108,8 +98,6 @@ FortreeCity_Gym_EventScript_GiveHM04:: FortreeCity_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -117,8 +105,6 @@ FortreeCity_Gym_EventScript_GiveHM05:: FortreeCity_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -126,8 +112,6 @@ FortreeCity_Gym_EventScript_GiveHM06:: FortreeCity_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -135,8 +119,6 @@ FortreeCity_Gym_EventScript_GiveHM07:: FortreeCity_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto FortreeCity_Gym_EventScript_GiveAerialAce end @@ -146,17 +128,13 @@ FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM40 release end FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A msgbox Gym_Text_Takethis2, MSGBOX_DEFAULT giveitem ITEM_TM40 - //compare VAR_RESULT, FALSE - //goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT - //setflag FLAG_RECEIVED_TM40 return FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index be2f5ae01..3089f0f5f 100755 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_GRANITE_CAVE_B1F", "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -79,6 +79,10 @@ "dest_warp_id": 4 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index bf58a40e3..6af0c4928 100755 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_GRANITE_CAVE_B2F", "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -169,7 +169,9 @@ "dest_warp_id": 6 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 160187108..05e2974da 100755 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -404,7 +404,7 @@ Text_Start_Pacifidlog_Town:: //Mauville City 07 Start_Text_Starter_Chose: - .string "Oh, Welcome to this hackrom.\p" + .string "Oh, Welcome to Pokemon ROWE 1.0.5.\p" .string "Before starting i would like to\n" .string "ask you some questions.\p" .string "What Pokemon would you like\n" diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index d7e7d5e2e..e0f316f73 100755 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_HIKER", diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 639f1024c..880f527fb 100755 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -109,8 +109,6 @@ LavaridgeTown_Gym_EventScript_GiveHM:: LavaridgeTown_Gym_EventScript_GiveHM01:: giveitem ITEM_WAILMER_PAIL msgbox Gym_Text_ExplainWailmerPail, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM39 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -118,8 +116,6 @@ LavaridgeTown_Gym_EventScript_GiveHM01:: LavaridgeTown_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -127,8 +123,6 @@ LavaridgeTown_Gym_EventScript_GiveHM02:: LavaridgeTown_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -136,8 +130,6 @@ LavaridgeTown_Gym_EventScript_GiveHM03:: LavaridgeTown_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -145,8 +137,6 @@ LavaridgeTown_Gym_EventScript_GiveHM04:: LavaridgeTown_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -154,8 +144,6 @@ LavaridgeTown_Gym_EventScript_GiveHM05:: LavaridgeTown_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -163,8 +151,6 @@ LavaridgeTown_Gym_EventScript_GiveHM06:: LavaridgeTown_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -172,8 +158,6 @@ LavaridgeTown_Gym_EventScript_GiveHM07:: LavaridgeTown_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end @@ -183,17 +167,13 @@ LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM50 release end LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841 msgbox Gym_Text_Takethis2, MSGBOX_DEFAULT giveitem ITEM_TM50 - //compare VAR_RESULT, FALSE - //goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT - //setflag FLAG_RECEIVED_TM50 return LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index eb1db1b81..d68c6bc2b 100755 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -586,13 +586,12 @@ PlayersHouse_1F_Text_IsThatABreakingStory: @ 81F824B .string "Mom: Is that a breaking news story?$" PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F - .string "We bring you this emergency\n" - .string "news flash!\p" + .string "We bring you this news flash!\n" .string "In various Hoenn locales, there have\n" - .string "been reports of a BZZT…colored\l" - .string "Pokémon in flight.\p" + .string "been reports of a Blue colored\l" + .string "Pokémon.\p" .string "The identity of this Pokémon is\n" - .string "currently unknown.\p" + .string "said to be the sea guardian.\p" .string "We now return you to the regular\n" .string "movie program.$" diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 39067c8aa..86c36b122 100755 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -246,8 +246,12 @@ MauvilleCity_BikeShop_Text_HappyYouLikeIt: @ 820F2C4 MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3 .string "Rydel: I'm happy that bikes\n" .string "are more widespread now!\p" - .string "May the wind always be at your back\n" - .string "on your adventure!$" + .string "Back in the day i used to give\n" + .string "trainers some of my bikes\p" + .string "but now the Gym Leaders have enough\n" + .string "money to be kind enough to give\p" + .string "trainers that beat them bikes and\n" + .string "other useful items, isn't that great?!$" MauvilleCity_BikeShop_Text_HandbooksAreInBack: @ 820F3C3 .string "I'm learning about Bikes while\n" diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 7984b8715..ad5c838b3 100755 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -137,8 +137,6 @@ MauvilleCity_Gym_EventScript_GiveHM:: MauvilleCity_Gym_EventScript_GiveHM01:: giveitem ITEM_WAILMER_PAIL msgbox Gym_Text_ExplainWailmerPail, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM39 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -146,8 +144,6 @@ MauvilleCity_Gym_EventScript_GiveHM01:: MauvilleCity_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -155,8 +151,6 @@ MauvilleCity_Gym_EventScript_GiveHM02:: MauvilleCity_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -164,8 +158,6 @@ MauvilleCity_Gym_EventScript_GiveHM03:: MauvilleCity_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -173,8 +165,6 @@ MauvilleCity_Gym_EventScript_GiveHM04:: MauvilleCity_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -182,8 +172,6 @@ MauvilleCity_Gym_EventScript_GiveHM05:: MauvilleCity_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -191,8 +179,6 @@ MauvilleCity_Gym_EventScript_GiveHM06:: MauvilleCity_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -200,8 +186,6 @@ MauvilleCity_Gym_EventScript_GiveHM07:: MauvilleCity_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto MauvilleCity_Gym_EventScript_GiveShockWave end @@ -211,17 +195,13 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM34 release end MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1 msgbox Gym_Text_Takethis2, MSGBOX_DEFAULT giveitem ITEM_TM34 - //compare VAR_RESULT, FALSE - //goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT - //setflag FLAG_RECEIVED_TM34 return MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4 diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 081e2757e..5c8a5c19d 100755 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -55,8 +55,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", - "x": 26, - "y": 32, + "x": 15, + "y": 30, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, @@ -65,6 +65,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_ItemPPUP", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" + }, + { + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "FortreeCity_EventScript_Kecleon", + "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } ], "warp_events": [ diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 57042ed44..d8c16ff35 100755 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -53,10 +53,6 @@ MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898 faceplayer call_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_TateAndLiza_PostBattle trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaIntro, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC - //specialvar VAR_RESULT, ShouldTryRematchBattle - //compare VAR_RESULT, TRUE - //goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch - //goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_GiveCalmMind2 msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT release end @@ -71,18 +67,6 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 setflag FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL setvar VAR_0x8008, 7 call Common_EventScript_SetGymTrainers - //setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - //learflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - //clearflag FLAG_UNKNOWN_0x393 - //setvar VAR_0x8008, 7 - //clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - //clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - //clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - //clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - //clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - //setvar VAR_MOSSDEEP_CITY_STATE, 1 - //setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - //setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 1 call MossdeepCity_Gym_EventScript_GiveHM closemessage delay 30 @@ -91,9 +75,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 waitfanfare closemessage delay 30 - call Common_EventScript_SetGymTrainers - //call MossdeepCity_Gym_EventScript_GiveHM release end @@ -117,8 +99,6 @@ MossdeepCity_Gym_EventScript_GiveHM:: MossdeepCity_Gym_EventScript_GiveHM01:: giveitem ITEM_WAILMER_PAIL msgbox Gym_Text_ExplainWailmerPail, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM39 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -126,8 +106,6 @@ MossdeepCity_Gym_EventScript_GiveHM01:: MossdeepCity_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -135,8 +113,6 @@ MossdeepCity_Gym_EventScript_GiveHM02:: MossdeepCity_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -144,8 +120,6 @@ MossdeepCity_Gym_EventScript_GiveHM03:: MossdeepCity_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -153,8 +127,6 @@ MossdeepCity_Gym_EventScript_GiveHM04:: MossdeepCity_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -162,8 +134,6 @@ MossdeepCity_Gym_EventScript_GiveHM05:: MossdeepCity_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -171,8 +141,6 @@ MossdeepCity_Gym_EventScript_GiveHM06:: MossdeepCity_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -180,8 +148,6 @@ MossdeepCity_Gym_EventScript_GiveHM07:: MossdeepCity_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto MossdeepCity_Gym_EventScript_GiveCalmMind end @@ -197,10 +163,7 @@ MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937 MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B giveitem ITEM_TM04 - //compare VAR_RESULT, FALSE - //goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT - //setflag FLAG_RECEIVED_TM04 return MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f4338078e..f0e79f90b 100755 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", @@ -57,6 +57,10 @@ "dest_warp_id": 0 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index e7990bad9..2b09530c3 100755 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_MAN_4", @@ -70,6 +70,10 @@ "dest_warp_id": 3 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index a0587ca0a..f2c95a76e 100755 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", @@ -44,6 +44,10 @@ "dest_warp_id": 5 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 6da2303f2..a35738f6e 100755 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -27,19 +27,19 @@ MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 822260C MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616 .string "Hey there, Trainer!\n" - .string "A Super Rod really is super!\p" + .string "A Lure Ball really is good!\p" .string "Say all you want, but this baby can\n" .string "catch Pokémon off the seafloor!\p" .string "What do you think?\n" - .string "You want it, don't you?$" + .string "You want some, don't you?$" MossdeepCity_House3_Text_SuperRodIsSuper: @ 82226B6 .string "You bet, you bet!\n" - .string "After all, a Super Rod is really super!$" + .string "After all, a Lure Ball is really the best!$" MossdeepCity_House3_Text_TryDroppingRodInWater: @ 82226F0 - .string "If there's any water, try dropping in\n" - .string "your Rod and see what bites!$" + .string "If there's any water Pokemon you\n" + .string "want, using a Lure Ball is the best!$" MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733 .string "Hunh?\n" @@ -47,5 +47,5 @@ MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733 MossdeepCity_House3_Text_GoAfterSeafloorPokemon: @ 8222751 .string "Go after the seafloor Pokémon with\n" - .string "your Super Rod.$" + .string "your Lure Balls.$" diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 0c7e0a112..ca6863641 100755 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", @@ -70,6 +70,10 @@ "dest_warp_id": 7 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index e9c05c136..9cf8af16a 100755 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -350,7 +350,6 @@ PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 8204D80 call PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry compare VAR_RESULT, TRUE goto_if_eq PetalburgCity_Gym_EventScript_GiveEnigmaBerry - //goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_GiveFacade2 goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough msgbox PetalburgCity_Gym_Text_DadGoingToKeepTraining, MSGBOX_DEFAULT release diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 9d2d34c05..80636ad5c 100755 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -15,17 +15,17 @@ "connections": 0, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 19, - "y": 10, + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 26, + "y": 6, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_11" + "script": "Route120_EventScript_Kecleon2", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", @@ -267,8 +267,8 @@ }, { "type": "hidden_item", - "x": 26, - "y": 6, + "x": 36, + "y": 9, "elevation": 3, "item": "ITEM_TINY_MUSHROOM", "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1" diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 082115501..b494b9153 100755 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -170,8 +170,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", - "x": 50, - "y": 5, + "x": 57, + "y": 6, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, @@ -182,17 +182,17 @@ "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" }, { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 57, + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 50, "y": 5, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_12" + "script": "Route120_EventScript_Kecleon4", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 2bc27922e..b6634ee70 100755 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -188,8 +188,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_LASS", - "x": 33, - "y": 15, + "x": 36, + "y": 47, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, @@ -201,8 +201,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_MANIAC", - "x": 34, - "y": 40, + "x": 19, + "y": 41, "elevation": 3, "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, @@ -358,7 +358,7 @@ { "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 10, - "y": 39, + "y": 41, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, @@ -370,8 +370,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_MAN_5", - "x": 36, - "y": 40, + "x": 32, + "y": 39, "elevation": 3, "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, @@ -383,8 +383,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", - "x": 6, - "y": 38, + "x": 5, + "y": 39, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, @@ -393,6 +393,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_ItemElixir", "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" + }, + { + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route120_EventScript_Kecleon3", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" } ], "warp_events": [ diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index a61b5e166..d0f3b02ed 100755 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -342,19 +342,6 @@ "script": "Route111_EventScript_ItemHPUp", "flag": "FLAG_ITEM_ROUTE_111_HP_UP" }, - { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 22, - "y": 21, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_13" - }, { "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, @@ -588,6 +575,19 @@ "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" + }, + { + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 34, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route120_EventScript_Kecleon1", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" } ], "warp_events": [ diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 8d9d74028..7280547aa 100755 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -237,6 +237,19 @@ "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_Coby", "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", + "x": 69, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route120_EventScript_Kecleon5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" } ], "warp_events": [ diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 1a06f4a0d..c40a60f36 100755 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -276,14 +276,14 @@ Route118_Text_StevenQuestions: @ 81F40BE Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B .string "Hmm!\n" - .string "A Good Rod is really good!\p" + .string "Fishing is really good!\p" .string "Wouldn't you agree?$" Route118_Text_IdenticalMindsTakeThis: @ 81F42AF .string "Hmm!\n" .string "We're of identical minds!\p" .string "Hmm!\n" - .string "Take this Good Rod!$" + .string "Take this Lure Balls!$" Route118_Text_TryYourLuckFishing: @ 81F42E7 .string "Wherever there's water, try your luck\n" diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index ab8e5ae15..27c408ff9 100755 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -417,8 +417,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 31, - "y": 6, + "x": 13, + "y": 87, "elevation": 3, "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 9a9e23882..2808e631d 100755 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", @@ -103,7 +103,9 @@ "dest_warp_id": 0 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b691d9e30..6309a9c38 100755 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -5,8 +5,6 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 .byte 0 Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C - compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos end Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: @ 826FA98 @@ -18,8 +16,6 @@ Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4 lock faceplayer special GetPlayerBigGuyGirlString - compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_if_eq Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere msgbox Route119_WeatherInstitute_1F_Text_WowYoureStrong, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index e2e5ebb8a..788d56c6c 100755 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", @@ -128,6 +128,10 @@ "dest_warp_id": 2 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 1b284b6dc..85ad03ec4 100755 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -10,8 +10,6 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E .byte 0 Route119_WeatherInstitute_2F_OnTransition: @ 826FF24 - compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 98b240cf7..3ec2a56a2 100755 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -285,19 +285,6 @@ "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, - { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 33, - "y": 24, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_11" - }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, @@ -404,8 +391,8 @@ }, { "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 25, - "y": 63, + "x": 37, + "y": 66, "elevation": 4, "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, @@ -415,32 +402,6 @@ "script": "Route120_EventScript_InvisibleBridgeKecleon", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE" }, - { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 21, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_14" - }, - { - "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", - "x": 19, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "EventScript_CutTree", - "flag": "FLAG_TEMP_12" - }, { "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 10, @@ -467,71 +428,6 @@ "script": "Route120_EventScript_Riley", "flag": "0" }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 37, - "y": 24, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_Kecleon1", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" - }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 27, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_Kecleon2", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" - }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 4, - "y": 77, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_Kecleon3", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" - }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 7, - "y": 51, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_Kecleon5", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" - }, - { - "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", - "x": 19, - "y": 48, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_INVISIBLE", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_Kecleon4", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" - }, { "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 19, diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 488ee97b5..64f21ada8 100755 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", @@ -57,6 +57,10 @@ "dest_warp_id": 0 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index b5dec4872..9e44cb544 100755 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -50,9 +50,6 @@ RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66 RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4 msgbox Gym_Text_Takethis2, MSGBOX_DEFAULT giveitem ITEM_TM39 - //compare VAR_RESULT, FALSE - //goto_if_eq Common_EventScript_ShowBagIsFull - //setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_ExplainRockTomb, MSGBOX_DEFAULT return diff --git a/data/maps/ScorchedSlab_B1F/map.json b/data/maps/ScorchedSlab_B1F/map.json index 9617b1a52..ea503cf92 100755 --- a/data/maps/ScorchedSlab_B1F/map.json +++ b/data/maps/ScorchedSlab_B1F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_SCORCHED_SLAB_B1F", "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, diff --git a/data/maps/ScorchedSlab_B2F/map.json b/data/maps/ScorchedSlab_B2F/map.json index dda92151c..79d6c9450 100755 --- a/data/maps/ScorchedSlab_B2F/map.json +++ b/data/maps/ScorchedSlab_B2F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_SCORCHED_SLAB_B2F", "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index b0d4e198b..ca37257fa 100755 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WALLACE", @@ -44,6 +44,10 @@ "dest_warp_id": 0 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 7b78802e3..4c6c02a73 100755 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -12,60 +12,8 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ - { - "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", - "x": 13, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_CaptStern", - "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" - }, - { - "graphics_id": "OBJ_EVENT_GFX_ARCHIE", - "x": 6, - "y": 1, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" - }, - { - "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", - "x": 6, - "y": 1, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" - }, - { - "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", - "x": 6, - "y": 1, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" - }, { "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 12, @@ -115,7 +63,9 @@ "dest_warp_id": 2 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 9783854f3..6c415f2d8 100755 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -143,8 +143,6 @@ SootopolisCity_Gym_EventScript_GiveHM:: SootopolisCity_Gym_EventScript_GiveHM01:: giveitem ITEM_WAILMER_PAIL msgbox Gym_Text_ExplainWailmerPail, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM39 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -152,8 +150,6 @@ SootopolisCity_Gym_EventScript_GiveHM01:: SootopolisCity_Gym_EventScript_GiveHM02:: giveitem ITEM_OLD_ROD msgbox Gym_Text_ExplainOldRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM08 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -161,8 +157,6 @@ SootopolisCity_Gym_EventScript_GiveHM02:: SootopolisCity_Gym_EventScript_GiveHM03:: giveitem ITEM_MACH_BIKE msgbox Gym_Text_ExplainMachBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM34 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -170,8 +164,6 @@ SootopolisCity_Gym_EventScript_GiveHM03:: SootopolisCity_Gym_EventScript_GiveHM04:: giveitem ITEM_ACRO_BIKE msgbox Gym_Text_ExplainAcroBike, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM50 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -179,8 +171,6 @@ SootopolisCity_Gym_EventScript_GiveHM04:: SootopolisCity_Gym_EventScript_GiveHM05:: giveitem ITEM_GOOD_ROD msgbox Gym_Text_ExplainGoodRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM42 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -188,8 +178,6 @@ SootopolisCity_Gym_EventScript_GiveHM05:: SootopolisCity_Gym_EventScript_GiveHM06:: giveitem ITEM_EXP_SHARE msgbox Gym_Text_ExplainExpShare, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM40 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -197,8 +185,6 @@ SootopolisCity_Gym_EventScript_GiveHM06:: SootopolisCity_Gym_EventScript_GiveHM07:: giveitem ITEM_SUPER_ROD msgbox Gym_Text_ExplainSuperRod, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM04 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -206,8 +192,6 @@ SootopolisCity_Gym_EventScript_GiveHM07:: SootopolisCity_Gym_EventScript_GiveHM08:: giveitem ITEM_OLD_SEA_MAP msgbox Gym_Text_ExplainOldSeaMap, MSGBOX_DEFAULT - //playfanfare MUS_OBTAIN_ITEM - //waitfanfare setflag FLAG_RECEIVED_TM03 goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse end @@ -217,7 +201,6 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM03 return SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7 @@ -225,7 +208,6 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM03 release end diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 26c47c432..5754d33c6 100755 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", @@ -57,6 +57,10 @@ "dest_warp_id": 4 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 3fe0baf48..c1e3743a1 100755 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", @@ -44,6 +44,10 @@ "dest_warp_id": 5 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 00d82637e..76b92257b 100755 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", @@ -57,6 +57,10 @@ "dest_warp_id": 6 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 6b25c5af6..b26c43449 100755 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_MANIAC", @@ -57,6 +57,10 @@ "dest_warp_id": 8 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 365503e8f..036c82d2c 100755 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", @@ -44,6 +44,10 @@ "dest_warp_id": 9 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 47d98c914..060eb2ac7 100755 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -12,7 +12,7 @@ "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", @@ -57,6 +57,10 @@ "dest_warp_id": 10 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/Underwater_Route124/map.json b/data/maps/Underwater_Route124/map.json index 46bc141a8..b74c13b1f 100755 --- a/data/maps/Underwater_Route124/map.json +++ b/data/maps/Underwater_Route124/map.json @@ -24,9 +24,15 @@ "map": "MAP_ROUTE124" } ], - "object_events": [], - "warp_events": [], - "coord_events": [], + "object_events": [ + + ], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Underwater_Route126/map.json b/data/maps/Underwater_Route126/map.json index 993bb7907..26a2a6725 100755 --- a/data/maps/Underwater_Route126/map.json +++ b/data/maps/Underwater_Route126/map.json @@ -29,7 +29,9 @@ "map": "MAP_ROUTE126" } ], - "object_events": [], + "object_events": [ + + ], "warp_events": [ { "x": 45, @@ -39,7 +41,9 @@ "dest_warp_id": 0 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Underwater_Route127/map.json b/data/maps/Underwater_Route127/map.json index b96f79c5d..1ce56cfad 100755 --- a/data/maps/Underwater_Route127/map.json +++ b/data/maps/Underwater_Route127/map.json @@ -29,7 +29,9 @@ "map": "MAP_UNDERWATER_ROUTE128" } ], - "object_events": [], + "object_events": [ + + ], "warp_events": [ { "x": 57, @@ -46,7 +48,9 @@ "dest_warp_id": 0 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Underwater_Route128/map.json b/data/maps/Underwater_Route128/map.json index f80cf41a6..a91c19180 100755 --- a/data/maps/Underwater_Route128/map.json +++ b/data/maps/Underwater_Route128/map.json @@ -24,7 +24,9 @@ "map": "MAP_ROUTE128" } ], - "object_events": [], + "object_events": [ + + ], "warp_events": [ { "x": 38, @@ -34,7 +36,9 @@ "dest_warp_id": 0 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "hidden_item", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 0d1363ff6..5b8ed4493 100755 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 9, @@ -30,6 +32,10 @@ "dest_warp_id": 0 } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 5f3271c89..6f014c3cf 100755 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -12,7 +12,7 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { "graphics_id": "OBJ_EVENT_GFX_MAN_3", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 6e8f47c16..aac572aa8 100755 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_VICTORY_ROAD_B1F", "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 416314769..ccb783f05 100755 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -4,7 +4,7 @@ "layout": "LAYOUT_VICTORY_ROAD_B2F", "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", - "requires_flash": true, + "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index f2b21c48a..f7efcb4f0 100755 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -48,8 +48,8 @@ Route119_EventScript_Kecleon2:: @ 8272329 end EventScript_Kecleon:: @ 8272336 - goto EventScript_BattleKecleon - msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT + goto EventScript_AskUseDevonScope + //msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT release end @@ -71,7 +71,7 @@ EventScript_BattleKecleon:: @ 8272365 playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setwildbattle SPECIES_KECLEON, 15, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/include/event_data.h b/include/event_data.h index e4792c7f6..114a0f287 100755 --- a/include/event_data.h +++ b/include/event_data.h @@ -1,5 +1,6 @@ #ifndef GUARD_EVENT_DATA_H #define GUARD_EVENT_DATA_H +#define NUM_SOFT_CAPS 10 void InitEventData(void); void ClearTempFieldEventData(void); @@ -48,4 +49,7 @@ extern u16 gSpecialVar_MonBoxId; extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_Unused_0x8014; +extern const u16 sLevelCapFlags[NUM_SOFT_CAPS]; +extern const u16 sLevelCaps[NUM_SOFT_CAPS]; + #endif // GUARD_EVENT_DATA_H diff --git a/src/battle_main.c b/src/battle_main.c index 8a55fa9cb..5c8d88c60 100755 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2070,8 +2070,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir CreateMon(&party[i], HasEvolution(partyData[i].species,TrainerLevel[i]), TrainerLevel[i], fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0, partyData[i].formId); } else //Complete static trainers(planned to use for post game) + if(gSaveBlock2Ptr->optionsBattleStyle == OPTIONS_BATTLE_STYLE_SHIFT) CreateMon(&party[i], HasEvolution(partyData[i].species, TrainerLevel[i]), TrainerLevel[i], fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0, partyData[i].formId); - + else + CreateMon(&party[i], HasEvolution(partyData[i].species, TrainerLevel[i]+numMonsBadge), TrainerLevel[i]+numMonsBadge, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0, partyData[i].formId); + SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); for (j = 0; j < MAX_MON_MOVES; j++) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e75f9464c..cc018fd45 100755 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -562,6 +562,32 @@ static const u16 sBadgeFlags[8] = FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET, FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET, }; + +const u16 sLevelCapFlags[NUM_SOFT_CAPS] = +{ + FLAG_RECEIVED_TM39, + FLAG_RECEIVED_TM08, + FLAG_RECEIVED_TM34, + FLAG_RECEIVED_TM50, + FLAG_RECEIVED_TM42, + FLAG_RECEIVED_TM40, + FLAG_RECEIVED_TM04, + FLAG_RECEIVED_TM03, + FLAG_DEFEATED_WALLY_VICTORY_ROAD, +}; + +const u16 sLevelCaps[NUM_SOFT_CAPS] = {16, 23, 29, 36, 42, 49, 55, 66, 76}; +const double sLevelCapReduction[7] = { .5, .33, .25, .20, .15, .10, .05 }; +const double sRelativePartyScaling[27] = +{ + 3.00, 2.75, 2.50, 2.33, 2.25, + 2.00, 1.80, 1.70, 1.60, 1.50, + 1.40, 1.30, 1.20, 1.10, 1.00, + 0.90, 0.80, 0.75, 0.66, 0.50, + 0.40, 0.33, 0.25, 0.20, 0.15, + 0.10, 0.05, +}; + static const u16 sWhiteOutBadgeMoney[9] = { 8, 16, 24, 36, 48, 60, 80, 100, 120, }; void (* const gBattleScriptingCommandsTable[])(void) = @@ -3608,6 +3634,72 @@ static void Cmd_jumpbasedontype(void) } } +u8 GetTeamLevel(void) +{ + u8 i; + u16 partyLevel = 0; + u16 threshold = 0; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE) + partyLevel += gPlayerParty[i].level; + else + break; + } + partyLevel /= i; + + threshold = partyLevel * .8; + partyLevel = 0; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE) + { + if (gPlayerParty[i].level >= threshold) + partyLevel += gPlayerParty[i].level; + } + else + break; + } + partyLevel /= i; + + return partyLevel; +} + +double GetPkmnExpMultiplier(u8 level) +{ + u8 i; + double lvlCapMultiplier = 1.0; + u8 levelDiff; + s8 avgDiff; + + // multiply the usual exp yield by the soft cap multiplier + for (i = 0; i < NUM_SOFT_CAPS; i++) + { + if (!FlagGet(sLevelCapFlags[i]) && level >= sLevelCaps[i]) + { + levelDiff = level - sLevelCaps[i]; + if (levelDiff > 6) + levelDiff = 6; + lvlCapMultiplier = sLevelCapReduction[levelDiff]; + break; + } + } + + // multiply the usual exp yield by the party level multiplier + avgDiff = level - GetTeamLevel(); + + if (avgDiff >= 12) + avgDiff = 12; + else if (avgDiff <= -14) + avgDiff = -14; + + avgDiff += 14; + + return lvlCapMultiplier * sRelativePartyScaling[avgDiff]; +} + static void Cmd_getexp(void) { u16 item; @@ -3692,9 +3784,15 @@ static void Cmd_getexp(void) } #else *exp = calculatedExp; + if(gSaveBlock2Ptr->optionsBattleStyle == OPTIONS_BATTLE_STYLE_SHIFT){ gExpShareExp = calculatedExp / 2; if (gExpShareExp == 0) gExpShareExp = 1; + }else{ + gExpShareExp = calculatedExp / 4; + if (gExpShareExp == 0) + gExpShareExp = 1; + } #endif gBattleScripting.getexpState++; @@ -3741,11 +3839,10 @@ static void Cmd_getexp(void) if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) { - if (gBattleStruct->sentInPokes & 1) + double expMultiplier = GetPkmnExpMultiplier(gPlayerParty[gBattleStruct->expGetterMonId].level); + if(gSaveBlock2Ptr->optionsBattleStyle == OPTIONS_BATTLE_STYLE_SHIFT){ + if (gBattleStruct->sentInPokes & 1) gBattleMoveDamage = *exp; - else - gBattleMoveDamage = 0; - // only give exp share bonus in later gens if the mon wasn't sent out if (gSaveBlock2Ptr->expShare || ((holdEffect == HOLD_EFFECT_EXP_SHARE) && ((gBattleMoveDamage == 0) || (B_SPLIT_EXP < GEN_6)))) gBattleMoveDamage += gExpShareExp; @@ -3758,7 +3855,27 @@ static void Cmd_getexp(void) gBattleMoveDamage /= sExperienceScalingFactors[gBattleMons[gBattlerFainted].level + GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) + 10]; gBattleMoveDamage++; #endif - + } + else{ + if (gBattleStruct->sentInPokes & 1) + gBattleMoveDamage = *exp * expMultiplier; + else + gBattleMoveDamage = 0; + + // only give exp share bonus in later gens if the mon wasn't sent out + if (gSaveBlock2Ptr->expShare || ((holdEffect == HOLD_EFFECT_EXP_SHARE) && ((gBattleMoveDamage == 0) || (B_SPLIT_EXP < GEN_6)))) + gBattleMoveDamage += gExpShareExp; + if (holdEffect == HOLD_EFFECT_LUCKY_EGG) + gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && B_TRAINER_EXP_MULTIPLIER <= GEN_7) + gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; + #if (B_SCALED_EXP >= GEN_5) && (B_SCALED_EXP != GEN_6) + gBattleMoveDamage *= sExperienceScalingFactors[(gBattleMons[gBattlerFainted].level * 2) + 10]; + gBattleMoveDamage /= sExperienceScalingFactors[gBattleMons[gBattlerFainted].level + GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) + 10]; + gBattleMoveDamage++; + #endif + } + if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterMonId])) { // check if the pokemon doesn't belong to the player diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 0e05705f9..9270b3dcf 100755 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -3770,8 +3770,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 35, .expYield = 101, .evYield_HP = 1, - .item1 = ITEM_QUICK_POWDER, - .item2 = ITEM_METAL_POWDER, + .item1 = ITEM_EVERSTONE, + .item2 = ITEM_DESTINY_KNOT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -7909,7 +7909,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 154, .evYield_Defense = 2, - .item1 = ITEM_PRETTY_WING, + .item1 = ITEM_DAMP_ROCK, .item2 = ITEM_LUCKY_EGG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -9211,7 +9211,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 165, .evYield_Defense = 2, - .item2 = ITEM_CHARCOAL, + .item1 = ITEM_HEAT_ROCK, + .item2 = ITEM_ASSAULT_VEST, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10513,6 +10514,7 @@ const struct BaseStats gBaseStats[] = .expYield = 116, .evYield_Speed = 1, .item1 = ITEM_HEART_SCALE, + .item2 = ITEM_HEART_SCALE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 028fe8009..676cae5b4 100755 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -249,7 +249,6 @@ static const struct LevelUpMove sMetapodLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 7, MOVE_HARDEN), LEVEL_UP_END }; @@ -291,7 +290,6 @@ static const struct LevelUpMove sKakunaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 7, MOVE_HARDEN), LEVEL_UP_END }; @@ -2661,7 +2659,8 @@ static const struct LevelUpMove sVoltorbLevelUpLearnset[] = { }; static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 0, MOVE_SELF_DESTRUCT), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LIGHT_SCREEN), LEVEL_UP_MOVE( 1, MOVE_SONIC_BOOM), LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), @@ -2671,6 +2670,8 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SPARK), LEVEL_UP_MOVE( 1, MOVE_SCREECH), LEVEL_UP_MOVE( 1, MOVE_SELF_DESTRUCT), + LEVEL_UP_MOVE( 1, MOVE_FOUL_PLAY), + LEVEL_UP_MOVE( 1, MOVE_VOLT_SWITCH), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_EERIE_IMPULSE), LEVEL_UP_MOVE( 8, MOVE_SONIC_BOOM), @@ -2683,12 +2684,18 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_ELECTRO_BALL), LEVEL_UP_MOVE(27, MOVE_SELF_DESTRUCT), LEVEL_UP_MOVE(32, MOVE_SWIFT), + LEVEL_UP_MOVE(32, MOVE_SIGNAL_BEAM), LEVEL_UP_MOVE(36, MOVE_THUNDERBOLT), LEVEL_UP_MOVE(41, MOVE_MAGNET_RISE), LEVEL_UP_MOVE(41, MOVE_DISCHARGE), + LEVEL_UP_MOVE(43, MOVE_FLASH_CANNON), + LEVEL_UP_MOVE(45, MOVE_SUCKER_PUNCH), LEVEL_UP_MOVE(50, MOVE_GYRO_BALL), LEVEL_UP_MOVE(52, MOVE_EXPLOSION), + LEVEL_UP_MOVE(55, MOVE_DARK_PULSE), LEVEL_UP_MOVE(57, MOVE_MIRROR_COAT), + LEVEL_UP_MOVE(60, MOVE_THUNDER), + LEVEL_UP_MOVE(65, MOVE_ZAP_CANNON), LEVEL_UP_END }; @@ -4183,8 +4190,10 @@ static const struct LevelUpMove sBayleefLevelUpLearnset[] = { static const struct LevelUpMove sMeganiumLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PETAL_DANCE), + LEVEL_UP_MOVE( 1, MOVE_EARTH_POWER), LEVEL_UP_MOVE( 1, MOVE_PETAL_DANCE), LEVEL_UP_MOVE( 1, MOVE_PETAL_BLIZZARD), + LEVEL_UP_MOVE( 1, MOVE_SLUDGE_BOMB), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_RAZOR_LEAF), @@ -4198,9 +4207,12 @@ static const struct LevelUpMove sMeganiumLevelUpLearnset[] = { LEVEL_UP_MOVE(26, MOVE_NATURAL_GIFT), LEVEL_UP_MOVE(32, MOVE_PETAL_DANCE), LEVEL_UP_MOVE(34, MOVE_SWEET_SCENT), + LEVEL_UP_MOVE(38, MOVE_ANCIENT_POWER), LEVEL_UP_MOVE(40, MOVE_LIGHT_SCREEN), LEVEL_UP_MOVE(43, MOVE_BODY_SLAM), + LEVEL_UP_MOVE(50, MOVE_NATURE_POWER), LEVEL_UP_MOVE(53, MOVE_SAFEGUARD), + LEVEL_UP_MOVE(55, MOVE_DRAGON_PULSE), LEVEL_UP_MOVE(60, MOVE_AROMATHERAPY), LEVEL_UP_MOVE(65, MOVE_SOLAR_BEAM), LEVEL_UP_MOVE(70, MOVE_PETAL_BLIZZARD), @@ -4250,6 +4262,8 @@ static const struct LevelUpMove sQuilavaLevelUpLearnset[] = { static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ERUPTION), + LEVEL_UP_MOVE( 1, MOVE_EARTH_POWER), + LEVEL_UP_MOVE( 1, MOVE_EXTRASENSORY), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_EDGE), LEVEL_UP_MOVE( 1, MOVE_GYRO_BALL), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -4264,9 +4278,12 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { LEVEL_UP_MOVE(33, MOVE_SWIFT), LEVEL_UP_MOVE(35, MOVE_FLAME_CHARGE), LEVEL_UP_MOVE(40, MOVE_LAVA_PLUME), + LEVEL_UP_MOVE(40, MOVE_NATURE_POWER), + LEVEL_UP_MOVE(45, MOVE_SHOCK_WAVE), LEVEL_UP_MOVE(48, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(56, MOVE_INFERNO), LEVEL_UP_MOVE(56, MOVE_ROLLOUT), + LEVEL_UP_MOVE(56, MOVE_FOCUS_BLAST), LEVEL_UP_MOVE(64, MOVE_DOUBLE_EDGE), LEVEL_UP_MOVE(70, MOVE_ERUPTION), LEVEL_UP_MOVE(74, MOVE_BURN_UP), @@ -6949,7 +6966,7 @@ static const struct LevelUpMove sSilcoonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 7, MOVE_HARDEN), + LEVEL_UP_MOVE( 5, MOVE_POISON_STING), LEVEL_UP_END }; @@ -6976,8 +6993,8 @@ static const struct LevelUpMove sBeautiflyLevelUpLearnset[] = { static const struct LevelUpMove sCascoonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 7, MOVE_HARDEN), + LEVEL_UP_MOVE( 1, MOVE_HARDEN), + LEVEL_UP_MOVE( 5, MOVE_POISON_STING), LEVEL_UP_END }; @@ -7067,9 +7084,25 @@ static const struct LevelUpMove sLudicoloLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ENERGY_BALL), LEVEL_UP_MOVE( 1, MOVE_HYDRO_PUMP), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), + LEVEL_UP_MOVE( 3, MOVE_GROWL), + LEVEL_UP_MOVE( 5, MOVE_ABSORB), + LEVEL_UP_MOVE( 9, MOVE_MIST), + LEVEL_UP_MOVE( 9, MOVE_BUBBLE), + LEVEL_UP_MOVE(12, MOVE_MEGA_DRAIN), + LEVEL_UP_MOVE(13, MOVE_FAKE_OUT), + LEVEL_UP_MOVE(16, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(19, MOVE_NATURE_POWER), + LEVEL_UP_MOVE(20, MOVE_WATER_SPORT), + LEVEL_UP_MOVE(24, MOVE_BUBBLE_BEAM), + LEVEL_UP_MOVE(36, MOVE_GIGA_DRAIN), + LEVEL_UP_MOVE(36, MOVE_UPROAR), + LEVEL_UP_MOVE(36, MOVE_KNOCK_OFF), + LEVEL_UP_MOVE(37, MOVE_THIEF), + LEVEL_UP_MOVE(39, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(43, MOVE_RAIN_DANCE), + LEVEL_UP_MOVE(51, MOVE_HYDRO_PUMP), + LEVEL_UP_MOVE(57, MOVE_ENERGY_BALL), LEVEL_UP_END }; @@ -7153,9 +7186,25 @@ static const struct LevelUpMove sShiftryLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAINT_ATTACK), LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE(19, MOVE_LEAF_TORNADO), - LEVEL_UP_MOVE(32, MOVE_HURRICANE), - LEVEL_UP_MOVE(47, MOVE_LEAF_STORM), + LEVEL_UP_MOVE( 3, MOVE_HARDEN), + LEVEL_UP_MOVE( 7, MOVE_GROWTH), + LEVEL_UP_MOVE(12, MOVE_ROLLOUT), + LEVEL_UP_MOVE(14, MOVE_RAZOR_LEAF), + LEVEL_UP_MOVE(17, MOVE_FAKE_OUT), + LEVEL_UP_MOVE(18, MOVE_MEGA_DRAIN), + LEVEL_UP_MOVE(18, MOVE_NATURE_POWER), + LEVEL_UP_MOVE(19, MOVE_LEAF_TORNADO), + LEVEL_UP_MOVE(21, MOVE_TORMENT), + LEVEL_UP_MOVE(24, MOVE_PAYBACK), + LEVEL_UP_MOVE(29, MOVE_FAINT_ATTACK), + LEVEL_UP_MOVE(32, MOVE_RAZOR_WIND), + LEVEL_UP_MOVE(32, MOVE_HURRICANE), + LEVEL_UP_MOVE(36, MOVE_SUNNY_DAY), + LEVEL_UP_MOVE(39, MOVE_SWAGGER), + LEVEL_UP_MOVE(44, MOVE_EXTRASENSORY), + LEVEL_UP_MOVE(46, MOVE_LEAF_BLADE), + LEVEL_UP_MOVE(47, MOVE_LEAF_STORM), + LEVEL_UP_MOVE(50, MOVE_SUCKER_PUNCH), LEVEL_UP_END }; @@ -7414,6 +7463,7 @@ static const struct LevelUpMove sBreloomLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_MIND_READER), LEVEL_UP_MOVE(41, MOVE_SEED_BOMB), LEVEL_UP_MOVE(47, MOVE_DYNAMIC_PUNCH), + LEVEL_UP_MOVE(55, MOVE_SPORE), LEVEL_UP_END }; @@ -10198,8 +10248,10 @@ static const struct LevelUpMove sKricketuneLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_BUG_BUZZ), LEVEL_UP_MOVE(46, MOVE_KNOCK_OFF), LEVEL_UP_MOVE(48, MOVE_PERISH_SONG), + LEVEL_UP_MOVE(50, MOVE_LEAF_BLADE), LEVEL_UP_MOVE(55, MOVE_BOOMBURST), LEVEL_UP_MOVE(60, MOVE_CHATTER), + LEVEL_UP_MOVE(65, MOVE_SOLAR_BLADE), LEVEL_UP_END }; @@ -10302,6 +10354,21 @@ static const struct LevelUpMove sRoseradeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE), LEVEL_UP_MOVE( 1, MOVE_WORRY_SEED), LEVEL_UP_MOVE( 1, MOVE_WEATHER_BALL), + LEVEL_UP_MOVE(10, MOVE_MEGA_DRAIN), + LEVEL_UP_MOVE(10, MOVE_STUN_SPORE), + LEVEL_UP_MOVE(14, MOVE_LEECH_SEED), + LEVEL_UP_MOVE(18, MOVE_MAGICAL_LEAF), + LEVEL_UP_MOVE(26, MOVE_GRASS_WHISTLE), + LEVEL_UP_MOVE(28, MOVE_TOXIC_SPIKES), + LEVEL_UP_MOVE(30, MOVE_PETAL_BLIZZARD), + LEVEL_UP_MOVE(35, MOVE_SWEET_SCENT), + LEVEL_UP_MOVE(38, MOVE_TOXIC), + LEVEL_UP_MOVE(40, MOVE_INGRAIN), + LEVEL_UP_MOVE(41, MOVE_EXTRASENSORY), + LEVEL_UP_MOVE(43, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(45, MOVE_GIGA_DRAIN), + LEVEL_UP_MOVE(48, MOVE_SLUDGE_BOMB), + LEVEL_UP_MOVE(50, MOVE_DAZZLING_GLEAM), LEVEL_UP_END }; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index bd7e6e67d..83c435f15 100755 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,7 +1,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = { { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_GEODUDE, .formId = 1, } @@ -10,7 +10,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = { { .iv = 0, - .lvl = 57, + .lvl = 1, .species = SPECIES_SURSKIT, } }; @@ -18,12 +18,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = { { .iv = 0, - .lvl = 55, + .lvl = 1, .species = SPECIES_GIBLE, }, { .iv = 0, - .lvl = 55, + .lvl = 1, .species = SPECIES_MAGIKARP, } }; @@ -31,7 +31,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = { { .iv = 0, - .lvl = 57, + .lvl = 1, .species = SPECIES_AIPOM, } }; @@ -39,7 +39,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = { { .iv = 0, - .lvl = 57, + .lvl = 1, .species = SPECIES_KLINK, } }; @@ -47,7 +47,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = { { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_TYMPOLE, } }; @@ -55,7 +55,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = { { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_SIGILYPH, } }; @@ -63,7 +63,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = { { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_PINECO, } }; @@ -71,32 +71,32 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_BULBASAUR, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_CHIKORITA, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_TREECKO, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_TURTWIG, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_SNIVY, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_CHESPIN, } }; @@ -104,12 +104,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = { { .iv = 0, - .lvl = 12, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 0, - .lvl = 12, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -117,12 +117,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = { { .iv = 100, - .lvl = 48, + .lvl = 1, .species = SPECIES_EMOLGA, }, { .iv = 100, - .lvl = 48, + .lvl = 1, .species = SPECIES_VANILLITE, } }; @@ -130,12 +130,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_RUFFLET, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_VULLABY, } }; @@ -143,12 +143,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_HONEDGE, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_BRONZOR, } }; @@ -156,7 +156,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = { { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -164,7 +164,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = { { .iv = 0, - .lvl = 56, + .lvl = 1, .species = SPECIES_FINNEON, } }; @@ -172,12 +172,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = { { .iv = 0, - .lvl = 16, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 0, - .lvl = 16, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -185,12 +185,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = { { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_HAWLUCHA, }, { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_ARON, } }; @@ -198,12 +198,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = { { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_SANDILE, }, { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_REMORAID, } }; @@ -211,17 +211,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = { { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_FURFROU, }, { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_ZUBAT, }, { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_CORSOLA, } }; @@ -229,17 +229,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = { { .iv = 0, - .lvl = 19, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 19, + .lvl = 1, .species = SPECIES_ODDISH, }, { .iv = 0, - .lvl = 19, + .lvl = 1, .species = SPECIES_GRIMER, .formId = 1, } @@ -248,12 +248,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = { { .iv = 0, - .lvl = 21, + .lvl = 1, .species = SPECIES_ZUBAT, }, { .iv = 0, - .lvl = 21, + .lvl = 1, .species = SPECIES_TOTODILE, } }; @@ -261,7 +261,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = { { .iv = 0, - .lvl = 64, + .lvl = 1, .species = SPECIES_CHIMCHAR, } }; @@ -269,7 +269,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = { { .iv = 0, - .lvl = 50, + .lvl = 1, .species = SPECIES_TOTODILE, } }; @@ -277,7 +277,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = { { .iv = 0, - .lvl = 50, + .lvl = 1, .species = SPECIES_PIPLUP, } }; @@ -285,12 +285,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_MAWILE, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_SABLEYE, } }; @@ -298,7 +298,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = { { .iv = 0, - .lvl = 42, + .lvl = 1, .species = SPECIES_PANPOUR, } }; @@ -306,7 +306,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = { { .iv = 0, - .lvl = 57, + .lvl = 1, .species = SPECIES_SQUIRTLE, } }; @@ -314,7 +314,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = { { .iv = 0, - .lvl = 57, + .lvl = 1, .species = SPECIES_FROAKIE, } }; @@ -322,12 +322,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = { { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_HAPPINY, }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_LITWICK, } }; @@ -335,32 +335,32 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = { { .iv = 50, - .lvl = 58, + .lvl = 1, .species = SPECIES_PSYDUCK, }, { .iv = 50, - .lvl = 58, + .lvl = 1, .species = SPECIES_BINACLE, }, { .iv = 50, - .lvl = 58, + .lvl = 1, .species = SPECIES_FERROSEED, }, { .iv = 50, - .lvl = 58, + .lvl = 1, .species = SPECIES_CARVANHA, }, { .iv = 50, - .lvl = 58, + .lvl = 1, .species = SPECIES_NIDORAN_F, }, { .iv = 50, - .lvl = 60, + .lvl = 1, .species = SPECIES_SQUIRTLE, } }; @@ -368,7 +368,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = { { .iv = 0, - .lvl = 52, + .lvl = 1, .species = SPECIES_TIMBURR, } }; @@ -376,33 +376,33 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = { static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = { { .iv = 50, - .lvl = 45, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 50, - .lvl = 45, + .lvl = 1, .species = SPECIES_GRIMER, .formId = 1, }, { .iv = 50, - .lvl = 45, + .lvl = 1, .species = SPECIES_LAPRAS, }, { .iv = 50, - .lvl = 45, + .lvl = 1, .species = SPECIES_BUDEW, }, { .iv = 50, - .lvl = 45, + .lvl = 1, .species = SPECIES_CARVANHA, }, { .iv = 50, - .lvl = 47, + .lvl = 1, .species = SPECIES_FRILLISH, } }; @@ -410,33 +410,33 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = { { .iv = 100, - .lvl = 64, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 100, - .lvl = 64, + .lvl = 1, .species = SPECIES_GRIMER, .formId = 1, }, { .iv = 100, - .lvl = 64, + .lvl = 1, .species = SPECIES_LAPRAS, }, { .iv = 100, - .lvl = 64, + .lvl = 1, .species = SPECIES_BUDEW, }, { .iv = 100, - .lvl = 64, + .lvl = 1, .species = SPECIES_CARVANHA, }, { .iv = 100, - .lvl = 66, + .lvl = 1, .species = SPECIES_FRILLISH, } }; @@ -444,37 +444,37 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = static const struct TrainerMonItemDefaultMoves sParty_Archie[] = { { .iv = 150, - .lvl = 66, + .lvl = 1, .species = SPECIES_ZUBAT, .heldItem = ITEM_NONE }, { .iv = 150, - .lvl = 66, + .lvl = 1, .species = SPECIES_TENTACOOL, .heldItem = ITEM_NONE }, { .iv = 150, - .lvl = 66, + .lvl = 1, .species = SPECIES_SPHEAL, .heldItem = ITEM_NONE }, { .iv = 150, - .lvl = 66, + .lvl = 1, .species = SPECIES_DRATINI, .heldItem = ITEM_NONE }, { .iv = 150, - .lvl = 66, + .lvl = 1, .species = SPECIES_TYMPOLE, .heldItem = ITEM_NONE }, { .iv = 150, - .lvl = 68, + .lvl = 1, .species = SPECIES_CARVANHA, .heldItem = ITEM_SHARPEDONITE } @@ -483,7 +483,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Archie[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = { { .iv = 0, - .lvl = 52, + .lvl = 1, .species = SPECIES_ABRA, } }; @@ -491,17 +491,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = { { .iv = 0, - .lvl = 20, + .lvl = 1, .species = SPECIES_ODDISH, }, { .iv = 0, - .lvl = 20, + .lvl = 1, .species = SPECIES_BELLSPROUT, }, { .iv = 0, - .lvl = 20, + .lvl = 1, .species = SPECIES_BUDEW, } }; @@ -509,17 +509,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = { { .iv = 0, - .lvl = 22, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 0, - .lvl = 22, + .lvl = 1, .species = SPECIES_SUNKERN, }, { .iv = 0, - .lvl = 22, + .lvl = 1, .species = SPECIES_CHERUBI, } }; @@ -527,13 +527,13 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = { static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = { { .iv = 0, - .lvl = 68, + .lvl = 1, .species = SPECIES_HONEDGE, .moves = {MOVE_SHADOW_SNEAK, MOVE_SWORDS_DANCE, MOVE_IRON_HEAD, MOVE_NONE} }, { .iv = 0, - .lvl = 68, + .lvl = 1, .species = SPECIES_KLINK, .moves = {MOVE_SCREECH, MOVE_ZAP_CANNON, MOVE_GEAR_GRIND, MOVE_SHIFT_GEAR} } @@ -542,17 +542,17 @@ static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = { { .iv = 0, - .lvl = 39, + .lvl = 1, .species = SPECIES_CHIKORITA, }, { .iv = 0, - .lvl = 39, + .lvl = 1, .species = SPECIES_PANSAGE, }, { .iv = 0, - .lvl = 39, + .lvl = 1, .species = SPECIES_EXEGGCUTE, .formId = 1 } @@ -561,17 +561,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = { { .iv = 10, - .lvl = 36, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 10, - .lvl = 36, + .lvl = 1, .species = SPECIES_SUNKERN, }, { .iv = 10, - .lvl = 36, + .lvl = 1, .species = SPECIES_CHERRIM, } }; @@ -579,22 +579,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = { { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_SUNKERN, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_ODDISH, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_CHERUBI, } }; @@ -602,22 +602,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = { { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_SUNKERN, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_ODDISH, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_CHERUBI, } }; @@ -625,22 +625,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = { { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_SUNKERN, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_ODDISH, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_CHERUBI, } }; @@ -648,17 +648,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dusty1[] = { { .iv = 50, - .lvl = 36, + .lvl = 1, .species = SPECIES_SIGILYPH, }, { .iv = 50, - .lvl = 36, + .lvl = 1, .species = SPECIES_AERODACTYL, }, { .iv = 50, - .lvl = 36, + .lvl = 1, .species = SPECIES_BALTOY, } }; @@ -666,22 +666,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dusty1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Chip[] = { { .iv = 50, - .lvl = 46, + .lvl = 1, .species = SPECIES_LILEEP, }, { .iv = 50, - .lvl = 46, + .lvl = 1, .species = SPECIES_TIRTOUGA, }, { .iv = 50, - .lvl = 46, + .lvl = 1, .species = SPECIES_SHIELDON, }, { .iv = 50, - .lvl = 46, + .lvl = 1, .species = SPECIES_TYRUNT, } }; @@ -689,7 +689,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chip[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Foster[] = { { .iv = 100, - .lvl = 39, + .lvl = 1, .species = SPECIES_CRANIDOS, } }; @@ -697,27 +697,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Foster[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dusty2[] = { { .iv = 60, - .lvl = 36, + .lvl = 1, .species = SPECIES_OMANYTE, }, { .iv = 60, - .lvl = 36, + .lvl = 1, .species = SPECIES_KABUTO, }, { .iv = 60, - .lvl = 36, + .lvl = 1, .species = SPECIES_SIGILYPH, }, { .iv = 60, - .lvl = 36, + .lvl = 1, .species = SPECIES_AERODACTYL, }, { .iv = 60, - .lvl = 36, + .lvl = 1, .species = SPECIES_BALTOY, } }; @@ -725,27 +725,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dusty2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dusty3[] = { { .iv = 70, - .lvl = 45, + .lvl = 1, .species = SPECIES_OMANYTE, }, { .iv = 70, - .lvl = 45, + .lvl = 1, .species = SPECIES_KABUTO, }, { .iv = 70, - .lvl = 45, + .lvl = 1, .species = SPECIES_SIGILYPH, }, { .iv = 70, - .lvl = 45, + .lvl = 1, .species = SPECIES_AERODACTYL, }, { .iv = 70, - .lvl = 45, + .lvl = 1, .species = SPECIES_BALTOY, } }; @@ -753,27 +753,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dusty3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dusty4[] = { { .iv = 80, - .lvl = 60, + .lvl = 1, .species = SPECIES_OMANYTE, }, { .iv = 80, - .lvl = 60, + .lvl = 1, .species = SPECIES_KABUTO, }, { .iv = 80, - .lvl = 60, + .lvl = 1, .species = SPECIES_SIGILYPH, }, { .iv = 80, - .lvl = 60, + .lvl = 1, .species = SPECIES_AERODACTYL, }, { .iv = 80, - .lvl = 60, + .lvl = 1, .species = SPECIES_BALTOY, } }; @@ -781,31 +781,31 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dusty4[] = { static const struct TrainerMonItemDefaultMoves sParty_Dusty5[] = { { .iv = 90, - .lvl = 75, + .lvl = 1, .species = SPECIES_OMANYTE, .heldItem = ITEM_NONE, }, { .iv = 90, - .lvl = 75, + .lvl = 1, .species = SPECIES_KABUTO, .heldItem = ITEM_NONE, }, { .iv = 90, - .lvl = 75, + .lvl = 1, .species = SPECIES_SIGILYPH, .heldItem = ITEM_NONE, }, { .iv = 90, - .lvl = 75, + .lvl = 1, .species = SPECIES_AERODACTYL, .heldItem = ITEM_AERODACTYLITE, }, { .iv = 90, - .lvl = 75, + .lvl = 1, .species = SPECIES_BALTOY, .heldItem = ITEM_NONE, } @@ -814,22 +814,22 @@ static const struct TrainerMonItemDefaultMoves sParty_Dusty5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = { { .iv = 50, - .lvl = 26, + .lvl = 1, .species = SPECIES_MAGNEMITE, }, { .iv = 50, - .lvl = 26, + .lvl = 1, .species = SPECIES_WHISMUR, }, { .iv = 50, - .lvl = 26, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 50, - .lvl = 26, + .lvl = 1, .species = SPECIES_MAREEP, } }; @@ -837,22 +837,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = { { .iv = 100, - .lvl = 36, + .lvl = 1, .species = SPECIES_MAGNETON, }, { .iv = 100, - .lvl = 36, + .lvl = 1, .species = SPECIES_WHISMUR, }, { .iv = 100, - .lvl = 36, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 100, - .lvl = 36, + .lvl = 1, .species = SPECIES_MAREEP, } }; @@ -860,22 +860,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = { { .iv = 150, - .lvl = 46, + .lvl = 1, .species = SPECIES_MAGNEMITE, }, { .iv = 150, - .lvl = 46, + .lvl = 1, .species = SPECIES_WHISMUR, }, { .iv = 150, - .lvl = 46, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 150, - .lvl = 46, + .lvl = 1, .species = SPECIES_MAREEP, } }; @@ -883,22 +883,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = { { .iv = 200, - .lvl = 60, + .lvl = 1, .species = SPECIES_MAGNEMITE, }, { .iv = 200, - .lvl = 60, + .lvl = 1, .species = SPECIES_WHISMUR, }, { .iv = 200, - .lvl = 60, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 200, - .lvl = 60, + .lvl = 1, .species = SPECIES_MAREEP, } }; @@ -906,22 +906,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = { { .iv = 250, - .lvl = 65, + .lvl = 1, .species = SPECIES_MAGNEMITE, }, { .iv = 250, - .lvl = 65, + .lvl = 1, .species = SPECIES_WHISMUR, }, { .iv = 250, - .lvl = 65, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 250, - .lvl = 65, + .lvl = 1, .species = SPECIES_MAREEP, } }; @@ -929,25 +929,25 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = { static const struct TrainerMonItemDefaultMoves sParty_GabbyAndTy6[] = { { .iv = 250, - .lvl = 75, + .lvl = 1, .species = SPECIES_MAGNEMITE, .heldItem = ITEM_NONE, }, { .iv = 250, - .lvl = 75, + .lvl = 1, .species = SPECIES_WHISMUR, .heldItem = ITEM_NONE, }, { .iv = 250, - .lvl = 75, + .lvl = 1, .species = SPECIES_PORYGON, .heldItem = ITEM_NONE, }, { .iv = 250, - .lvl = 75, + .lvl = 1, .species = SPECIES_MAREEP, .heldItem = ITEM_AMPHAROSITE, } @@ -956,12 +956,12 @@ static const struct TrainerMonItemDefaultMoves sParty_GabbyAndTy6[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = { { .iv = 10, - .lvl = 18, + .lvl = 1, .species = SPECIES_AZURILL, }, { .iv = 10, - .lvl = 18, + .lvl = 1, .species = SPECIES_BIDOOF, } }; @@ -969,7 +969,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = { { .iv = 0, - .lvl = 39, + .lvl = 1, .species = SPECIES_LUVDISC, } }; @@ -977,7 +977,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = { { .iv = 0, - .lvl = 38, + .lvl = 1, .species = SPECIES_AZURILL, } }; @@ -985,12 +985,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = { { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_AZURILL, }, { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_BIDOOF, } }; @@ -998,17 +998,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = { { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_STARYU, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_AZURILL, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_BIDOOF, } }; @@ -1016,17 +1016,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = { { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_STARYU, }, { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_AZURILL, }, { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_BIDOOF, } }; @@ -1034,22 +1034,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = { { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_POLIWAG, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_STARYU, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_AZURILL, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_BIDOOF, } }; @@ -1057,12 +1057,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ricky1[] = { { .iv = 10, - .lvl = 18, + .lvl = 1, .species = SPECIES_ZIGZAGOON, }, { .iv = 10, - .lvl = 18, + .lvl = 1, .species = SPECIES_MANTYKE, } }; @@ -1070,7 +1070,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ricky1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = { { .iv = 0, - .lvl = 19, + .lvl = 1, .species = SPECIES_MUDKIP, } }; @@ -1078,7 +1078,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = { { .iv = 0, - .lvl = 38, + .lvl = 1, .species = SPECIES_WOOPER, } }; @@ -1086,12 +1086,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ricky2[] = { { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_MANTYKE, }, { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_ZIGZAGOON, } }; @@ -1099,17 +1099,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ricky2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ricky3[] = { { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_REMORAID, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_MANTYKE, }, { .iv = 20, - .lvl = 46, + .lvl = 1, .species = SPECIES_ZIGZAGOON, } }; @@ -1117,17 +1117,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ricky3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ricky4[] = { { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_REMORAID, }, { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_MANTYKE, }, { .iv = 30, - .lvl = 60, + .lvl = 1, .species = SPECIES_ZIGZAGOON, } }; @@ -1135,22 +1135,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ricky4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Ricky5[] = { { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_POLIWAG, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_REMORAID, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_MANTYKE, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_ZIGZAGOON, } }; @@ -1158,17 +1158,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ricky5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Randall[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_GLAMEOW, }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_AIPOM, }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_MINCCINO, } }; @@ -1176,21 +1176,21 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Randall[] = { static const struct TrainerMonItemCustomMoves sParty_Parker[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_GLAMEOW, .heldItem = ITEM_NONE, .moves = {MOVE_ASSIST, MOVE_CAPTIVATE, MOVE_HYPNOSIS, MOVE_ATTRACT} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_AIPOM, .heldItem = ITEM_NONE, .moves = {MOVE_NASTY_PLOT, MOVE_BATON_PASS, MOVE_AGILITY, MOVE_SWIFT} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_PATRAT, .heldItem = ITEM_NONE, .moves = {MOVE_CONFUSE_RAY, MOVE_THUNDERBOLT, MOVE_WATER_PULSE, MOVE_ICE_BEAM} @@ -1200,21 +1200,21 @@ static const struct TrainerMonItemCustomMoves sParty_Parker[] = { static const struct TrainerMonItemCustomMoves sParty_George[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_HAPPINY, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_REFRESH, MOVE_SOFT_BOILED, MOVE_MINIMIZE, MOVE_DISARMING_VOICE} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_MUNCHLAX, .heldItem = ITEM_LEFTOVERS, .moves = {MOVE_BELLY_DRUM, MOVE_BODY_SLAM, MOVE_AMNESIA, MOVE_METRONOME} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_HOOTHOOT, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_AIR_SLASH, MOVE_EXTRASENSORY, MOVE_HYPNOSIS, MOVE_TAKE_DOWN} @@ -1224,21 +1224,21 @@ static const struct TrainerMonItemCustomMoves sParty_George[] = { static const struct TrainerMonItemCustomMoves sParty_Berke[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_SMEARGLE, .heldItem = ITEM_FOCUS_SASH, .moves = {MOVE_SPORE, MOVE_STEALTH_ROCK, MOVE_SPIKES, MOVE_DESTINY_BOND} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_SMEARGLE, .heldItem = ITEM_FOCUS_SASH, .moves = {MOVE_STICKY_WEB, MOVE_NUZZLE, MOVE_TAUNT, MOVE_WHIRLWIND} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_SMEARGLE, .heldItem = ITEM_FOCUS_SASH, .moves = {MOVE_DRAGON_RAGE, MOVE_ENDEAVOR, MOVE_PROTECT, MOVE_EXPLOSION} @@ -1248,31 +1248,31 @@ static const struct TrainerMonItemCustomMoves sParty_Berke[] = { static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = { { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_DURANT, .moves = {MOVE_X_SCISSOR, MOVE_IRON_HEAD, MOVE_IRON_DEFENSE, MOVE_CRUNCH} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_UNOWN, .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_HEATMOR, .moves = {MOVE_FLAMETHROWER, MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_SWALLOW} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_TANGELA, .moves = {MOVE_WRING_OUT, MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SLAM} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_CHATOT, .moves = {MOVE_FEATHER_DANCE, MOVE_ROOST, MOVE_MIMIC, MOVE_CHATTER} } @@ -1281,17 +1281,17 @@ static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_KLEFKI, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_MEDITITE, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_CARNIVINE, } }; @@ -1299,12 +1299,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = { { .iv = 100, - .lvl = 70, + .lvl = 1, .species = SPECIES_AXEW, }, { .iv = 100, - .lvl = 70, + .lvl = 1, .species = SPECIES_STARYU, } }; @@ -1312,17 +1312,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = { { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_IGGLYBUFF, } }; @@ -1330,27 +1330,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_SKIDDO, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_CUBCHOO, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_PORYGON, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_NINCADA, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_PINSIR, } }; @@ -1358,28 +1358,28 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_GEODUDE, .formId = 1 }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_SNIVY, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_SNORUNT, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_BLITZLE, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_PIDGEY, } }; @@ -1387,17 +1387,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_TAILLOW, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_ALOMOMOLA, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_HAWLUCHA, } }; @@ -1405,27 +1405,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_VOLTORB, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_TAILLOW, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_SEEDOT, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_DARUMAKA, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_ABRA, } }; @@ -1433,17 +1433,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_KECLEON, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_GOOMY, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_FLABEBE_ORANGE_FLOWER, } }; @@ -1451,17 +1451,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = { { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_IGGLYBUFF, } }; @@ -1469,22 +1469,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = { { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_IGGLYBUFF, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_KOFFING, } }; @@ -1492,27 +1492,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = { { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_IGGLYBUFF, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_KOFFING, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_SNEASEL, } }; @@ -1520,32 +1520,32 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = { { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_IGGLYBUFF, }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_KOFFING, }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_SNEASEL, }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_SPHEAL, } }; @@ -1553,32 +1553,32 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = { { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_ZORUA, }, { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_EEVEE, }, { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_ARCHEN, }, { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_SWIRLIX, }, { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_PINECO, }, { .iv = 100, - .lvl = 63, + .lvl = 1, .species = SPECIES_MAREANIE, } }; @@ -1586,21 +1586,21 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = { static const struct TrainerMonItemCustomMoves sParty_Mary[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_IGGLYBUFF, .heldItem = ITEM_NONE, .moves = {MOVE_PLAY_ROUGH, MOVE_HYPER_VOICE, MOVE_SING, MOVE_MINIMIZE} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_PORYGON, .heldItem = ITEM_NONE, .moves = {MOVE_CONVERSION_2, MOVE_SIGNAL_BEAM, MOVE_CONVERSION_2, MOVE_RECOVER} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_HELIOPTILE, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER_WAVE, MOVE_EERIE_IMPULSE, MOVE_PARABOLIC_CHARGE, MOVE_BULLDOZE} @@ -1610,7 +1610,7 @@ static const struct TrainerMonItemCustomMoves sParty_Mary[] = { static const struct TrainerMonItemCustomMoves sParty_Alexia[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_PATRAT, .heldItem = ITEM_NONE, .moves = {MOVE_CONFUSE_RAY, MOVE_HYPER_FANG, MOVE_MEAN_LOOK, MOVE_SUPER_FANG} @@ -1620,21 +1620,21 @@ static const struct TrainerMonItemCustomMoves sParty_Alexia[] = { static const struct TrainerMonItemCustomMoves sParty_Jody[] = { { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_ZANGOOSE, .heldItem = ITEM_NONE, .moves = {MOVE_SWORDS_DANCE, MOVE_CRUSH_CLAW, MOVE_PURSUIT, MOVE_REVENGE} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_TEDDIURSA, .heldItem = ITEM_NONE, .moves = {MOVE_FAKE_TEARS, MOVE_PLAY_NICE, MOVE_HAMMER_ARM, MOVE_ROCK_TOMB} }, { .iv = 255, - .lvl = 37, + .lvl = 1, .species = SPECIES_LILLIPUP, .heldItem = ITEM_NONE, .moves = {MOVE_CRUNCH, MOVE_ICE_FANG, MOVE_FIRE_FANG, MOVE_THUNDER_FANG} @@ -1644,31 +1644,31 @@ static const struct TrainerMonItemCustomMoves sParty_Jody[] = { static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = { { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_GOTHITA, .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_FAKE_TEARS, MOVE_HEAL_BLOCK} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_OSHAWOTT, .moves = {MOVE_RETALIATE, MOVE_AQUA_TAIL, MOVE_SLASH, MOVE_MEGAHORN} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_AMAURA, .moves = {MOVE_THUNDER_WAVE, MOVE_FREEZE_DRY, MOVE_NATURE_POWER, MOVE_ANCIENT_POWER} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_LARVESTA, .moves = {MOVE_SILVER_WIND, MOVE_FLAME_WHEEL, MOVE_LEECH_LIFE, MOVE_FIRE_SPIN} }, { .iv = 100, - .lvl = 50, + .lvl = 1, .species = SPECIES_BUDEW, .moves = {MOVE_PETAL_BLIZZARD, MOVE_TOXIC, MOVE_INGRAIN, MOVE_TOXIC_SPIKES} } @@ -1677,12 +1677,12 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = { { .iv = 100, - .lvl = 69, + .lvl = 1, .species = SPECIES_SPRITZEE, }, { .iv = 100, - .lvl = 69, + .lvl = 1, .species = SPECIES_SWIRLIX, } }; @@ -1690,17 +1690,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = { { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_BRONZOR, }, { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_CATERPIE, }, { .iv = 100, - .lvl = 30, + .lvl = 1, .species = SPECIES_BOUFFALANT, } }; @@ -1708,22 +1708,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = { { .iv = 200, - .lvl = 48, + .lvl = 1, .species = SPECIES_CHIKORITA, }, { .iv = 200, - .lvl = 48, + .lvl = 1, .species = SPECIES_FEEBAS, }, { .iv = 200, - .lvl = 48, + .lvl = 1, .species = SPECIES_MISDREAVUS, }, { .iv = 200, - .lvl = 48, + .lvl = 1, .species = SPECIES_PICHU, .formId = 1 } @@ -1732,27 +1732,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_EEVEE, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_PHANPY, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_TOGEPI, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_AUDINO, } }; @@ -1760,7 +1760,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_BONSLY, } }; @@ -1768,17 +1768,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_STUNKY, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_GLAMEOW, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_BURMY, } }; @@ -1786,12 +1786,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_SKARMORY, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_RIOLU, } }; @@ -1799,27 +1799,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = { { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_CYNDAQUIL, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_LAPRAS, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_PETILIL, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_STANTLER, }, { .iv = 100, - .lvl = 68, + .lvl = 1, .species = SPECIES_KLINK, } }; @@ -1827,17 +1827,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = { { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_BRONZOR, }, { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_CATERPIE, }, { .iv = 110, - .lvl = 37, + .lvl = 1, .species = SPECIES_BOUFFALANT, } }; @@ -1845,22 +1845,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = { { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_BRONZOR, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_CATERPIE, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_BOUFFALANT, }, { .iv = 120, - .lvl = 48, + .lvl = 1, .species = SPECIES_SQUIRTLE, } }; @@ -1868,27 +1868,27 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = { { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_BRONZOR, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_CATERPIE, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_BOUFFALANT, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_SQUIRTLE, }, { .iv = 130, - .lvl = 65, + .lvl = 1, .species = SPECIES_HAPPINY, } }; @@ -1896,37 +1896,37 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = { static const struct TrainerMonItemDefaultMoves sParty_Brooke5[] = { { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_BRONZOR, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_CATERPIE, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_BOUFFALANT, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_SQUIRTLE, .heldItem = ITEM_BLASTOISINITE }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_HAPPINY, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 75, + .lvl = 1, .species = SPECIES_ODDISH, .heldItem = ITEM_NONE } @@ -1935,12 +1935,12 @@ static const struct TrainerMonItemDefaultMoves sParty_Brooke5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = { { .iv = 0, - .lvl = 66, + .lvl = 1, .species = SPECIES_MIMEJR, }, { .iv = 0, - .lvl = 66, + .lvl = 1, .species = SPECIES_FENNEKIN, } }; @@ -1948,17 +1948,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_WYNAUT, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_GOTHITA, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_CHINGLING, } }; @@ -1966,17 +1966,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_GASTLY, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_SHUPPET, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_MISDREAVUS, } }; @@ -1984,17 +1984,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_YAMASK, }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_LITWICK, } }; @@ -2002,7 +2002,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = { { .iv = 50, - .lvl = 50, + .lvl = 1, .species = SPECIES_LITWICK, } }; @@ -2010,17 +2010,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = { { .iv = 10, - .lvl = 54, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 10, - .lvl = 54, + .lvl = 1, .species = SPECIES_YAMASK, }, { .iv = 10, - .lvl = 54, + .lvl = 1, .species = SPECIES_LITWICK, } }; @@ -2028,22 +2028,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = { { .iv = 20, - .lvl = 60, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 20, - .lvl = 60, + .lvl = 1, .species = SPECIES_YAMASK, }, { .iv = 20, - .lvl = 60, + .lvl = 1, .species = SPECIES_LITWICK, }, { .iv = 20, - .lvl = 60, + .lvl = 1, .species = SPECIES_PUMPKABOO, } }; @@ -2051,22 +2051,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = { { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_YAMASK, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_LITWICK, }, { .iv = 30, - .lvl = 65, + .lvl = 1, .species = SPECIES_PUMPKABOO, } }; @@ -2074,22 +2074,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = { { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_DUSKULL, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_YAMASK, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_LITWICK, }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_PUMPKABOO, } }; @@ -2097,13 +2097,13 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = { static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = { { .iv = 0, - .lvl = 10, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET }, { .iv = 0, - .lvl = 10, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET } @@ -2112,14 +2112,14 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = { static const struct TrainerMonItemCustomMoves sParty_Daphne[] = { { .iv = 100, - .lvl = 65, + .lvl = 1, .species = SPECIES_BASCULIN, .heldItem = ITEM_NUGGET, .moves = {MOVE_THRASH, MOVE_FINAL_GAMBIT, MOVE_FLAIL, MOVE_SCARY_FACE} }, { .iv = 100, - .lvl = 39, + .lvl = 1, .species = SPECIES_BASCULIN_BLUE_STRIPED, .heldItem = ITEM_NUGGET, .moves = {MOVE_AQUA_TAIL, MOVE_HEAD_SMASH, MOVE_TAKE_DOWN, MOVE_CRUNCH} @@ -2129,17 +2129,17 @@ static const struct TrainerMonItemCustomMoves sParty_Daphne[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = { { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_PATRAT, }, { .iv = 0, - .lvl = 63, + .lvl = 1, .species = SPECIES_FLAREON, } }; @@ -2147,14 +2147,14 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = { static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = { { .iv = 0, - .lvl = 11, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET, .moves = {MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE} }, { .iv = 0, - .lvl = 11, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET, .moves = {MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE} @@ -2164,19 +2164,19 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = { static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = { { .iv = 150, - .lvl = 65, + .lvl = 1, .species = SPECIES_TYMPOLE, .heldItem = ITEM_NUGGET }, { .iv = 150, - .lvl = 65, + .lvl = 1, .species = SPECIES_FINNEON, .heldItem = ITEM_NUGGET }, { .iv = 150, - .lvl = 65, + .lvl = 1, .species = SPECIES_PELIPPER, .heldItem = ITEM_NUGGET } @@ -2185,7 +2185,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = { static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = { { .iv = 100, - .lvl = 78, + .lvl = 1, .species = SPECIES_BUDEW, .heldItem = ITEM_NUGGET } @@ -2194,19 +2194,19 @@ static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = { static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = { { .iv = 10, - .lvl = 15, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET }, { .iv = 10, - .lvl = 15, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET }, { .iv = 10, - .lvl = 15, + .lvl = 1, .species = SPECIES_VULPIX, .formId = 1, .heldItem = ITEM_NUGGET @@ -2216,19 +2216,19 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = { static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = { { .iv = 20, - .lvl = 27, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET }, { .iv = 20, - .lvl = 27, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET }, { .iv = 20, - .lvl = 27, + .lvl = 1, .species = SPECIES_VULPIX, .formId = 1, .heldItem = ITEM_NUGGET @@ -2238,25 +2238,25 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = { static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = { { .iv = 30, - .lvl = 36, + .lvl = 1, .species = SPECIES_GLAMEOW, .heldItem = ITEM_NUGGET }, { .iv = 30, - .lvl = 36, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET }, { .iv = 30, - .lvl = 36, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET }, { .iv = 30, - .lvl = 36, + .lvl = 1, .species = SPECIES_VULPIX, .formId = 1, .heldItem = ITEM_NUGGET @@ -2266,28 +2266,28 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = { static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = { { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_GLAMEOW, .heldItem = ITEM_NUGGET, .moves = {MOVE_ATTRACT, MOVE_BODY_SLAM, MOVE_ASSIST, MOVE_CHARM} }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_EEVEE, .heldItem = ITEM_NUGGET, .moves = {MOVE_MOONBLAST, MOVE_MISTY_TERRAIN, MOVE_LIGHT_SCREEN, MOVE_BABY_DOLL_EYES} }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_BUNEARY, .heldItem = ITEM_NUGGET, .moves = {MOVE_HI_JUMP_KICK, MOVE_BOUNCE, MOVE_HEADBUTT, MOVE_ENTRAINMENT} }, { .iv = 40, - .lvl = 75, + .lvl = 1, .species = SPECIES_VULPIX, .formId = 1, .heldItem = ITEM_NUGGET, @@ -2298,17 +2298,17 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = { { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_GLAMEOW, }, { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_FINNEON, }, { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_FRILLISH, } }; @@ -2316,7 +2316,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = { { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_TIMBURR, } }; @@ -2324,7 +2324,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = { { .iv = 0, - .lvl = 35, + .lvl = 1, .species = SPECIES_HOPPIP, } }; @@ -2332,19 +2332,19 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = { static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = { { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_JAB, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_CRUNCH} }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_SANDILE, .moves = {MOVE_EARTHQUAKE, MOVE_FOUL_PLAY, MOVE_SWAGGER, MOVE_TORMENT} }, { .iv = 0, - .lvl = 48, + .lvl = 1, .species = SPECIES_ABSOL, .moves = {MOVE_SWORDS_DANCE, MOVE_SUCKER_PUNCH, MOVE_SLASH, MOVE_RAZOR_WIND} } @@ -2353,17 +2353,17 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = { { .iv = 100, - .lvl = 65, + .lvl = 1, .species = SPECIES_CORSOLA, }, { .iv = 100, - .lvl = 65, + .lvl = 1, .species = SPECIES_REMORAID, }, { .iv = 100, - .lvl = 65, + .lvl = 1, .species = SPECIES_BARBOACH, } }; @@ -2371,7 +2371,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = { { .iv = 150, - .lvl = 40, + .lvl = 1, .species = SPECIES_AZURILL, } }; @@ -2379,19 +2379,19 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = { static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = { { .iv = 100, - .lvl = 35, + .lvl = 1, .species = SPECIES_CLAMPERL, .moves = {MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE} }, { .iv = 100, - .lvl = 37, + .lvl = 1, .species = SPECIES_CORPHISH, .moves = {MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE} }, { .iv = 100, - .lvl = 39, + .lvl = 1, .species = SPECIES_LOTAD, .moves = {MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE} } @@ -2400,12 +2400,12 @@ static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = { { .iv = 100, - .lvl = 39, + .lvl = 1, .species = SPECIES_CARVANHA, }, { .iv = 100, - .lvl = 39, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2413,13 +2413,13 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = { static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = { { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK} }, { .iv = 10, - .lvl = 35, + .lvl = 1, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } @@ -2428,13 +2428,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = { static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = { { .iv = 20, - .lvl = 38, + .lvl = 1, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK} }, { .iv = 20, - .lvl = 38, + .lvl = 1, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } @@ -2443,13 +2443,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = { static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = { { .iv = 30, - .lvl = 41, + .lvl = 1, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK} }, { .iv = 30, - .lvl = 41, + .lvl = 1, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } @@ -2458,13 +2458,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = { static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = { { .iv = 40, - .lvl = 44, + .lvl = 1, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK} }, { .iv = 40, - .lvl = 44, + .lvl = 1, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } @@ -2473,7 +2473,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = { static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = { { .iv = 0, - .lvl = 7, + .lvl = 1, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } @@ -2482,12 +2482,12 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_BARBOACH, }, { .iv = 200, - .lvl = 33, + .lvl = 1, .species = SPECIES_MEDITITE, } }; @@ -2495,7 +2495,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = { static const struct TrainerMonItemDefaultMoves sParty_Garret[] = { { .iv = 0, - .lvl = 45, + .lvl = 1, .species = SPECIES_AZURILL, .heldItem = ITEM_NUGGET } @@ -2504,7 +2504,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Garret[] = { static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = { { .iv = 0, - .lvl = 27, + .lvl = 1, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } @@ -2513,7 +2513,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = { static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = { { .iv = 0, - .lvl = 30, + .lvl = 1, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } @@ -2522,7 +2522,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = { static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } @@ -2531,7 +2531,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = { static const struct TrainerMonItemCustomMoves sParty_Winston5[] = { { .iv = 0, - .lvl = 36, + .lvl = 1, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET, .moves = {MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK} @@ -2541,7 +2541,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winston5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = { { .iv = 0, - .lvl = 19, + .lvl = 1, .species = SPECIES_ARON, } }; @@ -2549,12 +2549,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = { { .iv = 0, - .lvl = 25, + .lvl = 1, .species = SPECIES_WAILMER, }, { .iv = 0, - .lvl = 25, + .lvl = 1, .species = SPECIES_HORSEA, } }; @@ -2562,7 +2562,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = { { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_RHYHORN, } }; @@ -2570,7 +2570,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = { { .iv = 0, - .lvl = 20, + .lvl = 1, .species = SPECIES_NUMEL, } }; @@ -2578,7 +2578,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = { { .iv = 10, - .lvl = 27, + .lvl = 1, .species = SPECIES_ARON, } }; @@ -2586,12 +2586,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = { { .iv = 20, - .lvl = 29, + .lvl = 1, .species = SPECIES_ARON, }, { .iv = 20, - .lvl = 29, + .lvl = 1, .species = SPECIES_RHYHORN, } }; @@ -2599,12 +2599,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = { { .iv = 30, - .lvl = 32, + .lvl = 1, .species = SPECIES_ARON, }, { .iv = 30, - .lvl = 32, + .lvl = 1, .species = SPECIES_RHYHORN, } }; @@ -2612,12 +2612,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = { { .iv = 40, - .lvl = 35, + .lvl = 1, .species = SPECIES_ARON, }, { .iv = 40, - .lvl = 35, + .lvl = 1, .species = SPECIES_RHYDON, } }; @@ -2625,7 +2625,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = { { .iv = 0, - .lvl = 26, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2633,7 +2633,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = { { .iv = 0, - .lvl = 26, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2641,12 +2641,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = { { .iv = 10, - .lvl = 24, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 10, - .lvl = 24, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2654,17 +2654,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = { { .iv = 10, - .lvl = 24, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 10, - .lvl = 24, + .lvl = 1, .species = SPECIES_WINGULL, }, { .iv = 10, - .lvl = 24, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2672,7 +2672,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = { { .iv = 0, - .lvl = 26, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2680,7 +2680,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = { { .iv = 0, - .lvl = 26, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2688,7 +2688,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = { { .iv = 0, - .lvl = 26, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2696,12 +2696,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = { static const struct TrainerMonNoItemDefaultMoves sParty_David[] = { { .iv = 0, - .lvl = 25, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 25, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2709,12 +2709,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_David[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_WINGULL, } }; @@ -2722,7 +2722,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2730,7 +2730,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2738,7 +2738,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_HORSEA, } }; @@ -2746,7 +2746,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_MAGIKARP, } }; @@ -2754,17 +2754,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = { { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_CARVANHA, }, { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_WINGULL, }, { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2772,7 +2772,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_MAGIKARP, } }; @@ -2780,7 +2780,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_WINGULL, } }; @@ -2788,12 +2788,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_WINGULL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2801,12 +2801,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_WAILMER, } }; @@ -2814,7 +2814,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2822,7 +2822,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_SPHEAL, } }; @@ -2830,7 +2830,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_SPHEAL, } }; @@ -2838,7 +2838,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = { { .iv = 0, - .lvl = 34, + .lvl = 1, .species = SPECIES_MAGIKARP, } }; @@ -2846,17 +2846,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_WINGULL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, } }; @@ -2864,12 +2864,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = { { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_TENTACOOL, }, { .iv = 0, - .lvl = 33, + .lvl = 1, .species = SPECIES_WAILMER, } }; @@ -2877,7 +2877,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = { { .iv = 10, - .lvl = 30, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2885,7 +2885,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = { { .iv = 20, - .lvl = 33, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2893,12 +2893,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = { { .iv = 30, - .lvl = 34, + .lvl = 1, .species = SPECIES_STARYU, }, { .iv = 30, - .lvl = 36, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2906,12 +2906,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = { { .iv = 40, - .lvl = 37, + .lvl = 1, .species = SPECIES_STARYU, }, { .iv = 40, - .lvl = 39, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -2919,7 +2919,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = { { .iv = 127, - .lvl = 13, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2927,12 +2927,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = { { .iv = 50, - .lvl = 32, + .lvl = 1, .species = SPECIES_MACHOP, }, { .iv = 200, - .lvl = 32, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2940,7 +2940,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = { { .iv = 100, - .lvl = 34, + .lvl = 1, .species = SPECIES_MAKUHITA, } }; @@ -2948,12 +2948,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = { { .iv = 100, - .lvl = 24, + .lvl = 1, .species = SPECIES_MACHOP, }, { .iv = 150, - .lvl = 28, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2961,7 +2961,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = { { .iv = 100, - .lvl = 19, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2969,7 +2969,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = { { .iv = 110, - .lvl = 27, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2977,12 +2977,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = { { .iv = 120, - .lvl = 29, + .lvl = 1, .species = SPECIES_MACHOP, }, { .iv = 120, - .lvl = 29, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -2990,17 +2990,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = { { .iv = 130, - .lvl = 31, + .lvl = 1, .species = SPECIES_MACHOP, }, { .iv = 130, - .lvl = 31, + .lvl = 1, .species = SPECIES_MACHOP, }, { .iv = 130, - .lvl = 31, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -3008,25 +3008,25 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = { static const struct TrainerMonItemDefaultMoves sParty_Nob5[] = { { .iv = 140, - .lvl = 33, + .lvl = 1, .species = SPECIES_MACHOP, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 33, + .lvl = 1, .species = SPECIES_MACHOP, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 33, + .lvl = 1, .species = SPECIES_MACHOP, .heldItem = ITEM_NONE }, { .iv = 140, - .lvl = 33, + .lvl = 1, .species = SPECIES_MACHOP, .heldItem = ITEM_BLACK_BELT } @@ -3035,12 +3035,12 @@ static const struct TrainerMonItemDefaultMoves sParty_Nob5[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = { { .iv = 100, - .lvl = 26, + .lvl = 1, .species = SPECIES_MAKUHITA, }, { .iv = 100, - .lvl = 26, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -3048,7 +3048,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = { { .iv = 100, - .lvl = 19, + .lvl = 1, .species = SPECIES_MACHOP, } }; @@ -3056,7 +3056,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = { { .iv = 100, - .lvl = 32, + .lvl = 1, .species = SPECIES_MAKUHITA, } }; @@ -3064,13 +3064,13 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = { static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = { { .iv = 100, - .lvl = 17, + .lvl = 1, .species = SPECIES_ELECTRIKE, .moves = {MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER} }, { .iv = 100, - .lvl = 17, + .lvl = 1, .species = SPECIES_VOLTORB, .moves = {MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE} } @@ -3079,12 +3079,12 @@ static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = { { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_POOCHYENA, }, { .iv = 0, - .lvl = 31, + .lvl = 1, .species = SPECIES_ZUBAT, } }; @@ -3092,7 +3092,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = { static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = { { .iv = 0, - .lvl = 32, + .lvl = 1, .species = SPECIES_CARVANHA, } }; @@ -3100,12 +3100,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = { { .iv = 100, - .lvl = 17, + .lvl = 1, .species = SPECIES_VOLTORB, }, { .iv = 100, - .lvl = 17, + .lvl = 1, .species = SPECIES_MAGNEMITE, } }; @@ -3113,12 +3113,12 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Fernando1[] = { { .iv = 0, - .lvl = 30, + .lvl = 1, .species = SPECIES_ELECTRIKE, }, { .iv = 0, - .lvl = 30, + .lvl = 1, .species = SPECIES_WHISMUR, } }; @@ -9848,100 +9848,118 @@ static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = { //WALLY static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = { { - .iv = 150, - .lvl = 1, - .species = SPECIES_SWABLU, - .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} + .iv = 200, + .lvl = 55, + .species = SPECIES_ROSERADE, + .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_SHADOW_BALL, MOVE_TOXIC_SPIKES} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_SKITTY, - .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK} + .iv = 200, + .lvl = 56, + .species = SPECIES_TALONFLAME, + .moves = {MOVE_BRAVE_BIRD, MOVE_FLARE_BLITZ, MOVE_STEEL_WING, MOVE_ROOST} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_BUDEW, - .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} + .iv = 200, + .lvl = 57, + .species = SPECIES_AZUMARILL, + .moves = {MOVE_AQUA_JET, MOVE_LIQUIDATION, MOVE_PLAY_ROUGH, MOVE_BOUNCE} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_MAGNEMITE, - .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} + .iv = 200, + .lvl = 58, + .species = SPECIES_MAGNEZONE, + .moves = {MOVE_THUNDERBOLT, MOVE_FLASH_CANNON, MOVE_TRI_ATTACK, MOVE_SIGNAL_BEAM} }, - { + { .iv = 250, - .lvl = 1, - .species = SPECIES_RALTS, - .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} + .lvl = 59, + .species = SPECIES_GARCHOMP, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_STONE_EDGE, MOVE_FIRE_FANG} + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_GALLADE, + .moves = {MOVE_ZEN_HEADBUTT, MOVE_CLOSE_COMBAT, MOVE_LEAF_BLADE, MOVE_POISON_JAB} } }; static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = { { - .iv = 150, - .lvl = 1, - .species = SPECIES_SWABLU, - .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} + .iv = 200, + .lvl = 55, + .species = SPECIES_ROSERADE, + .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_SHADOW_BALL, MOVE_TOXIC_SPIKES} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_SKITTY, - .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK} + .iv = 200, + .lvl = 56, + .species = SPECIES_TALONFLAME, + .moves = {MOVE_BRAVE_BIRD, MOVE_FLARE_BLITZ, MOVE_STEEL_WING, MOVE_ROOST} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_BUDEW, - .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} + .iv = 200, + .lvl = 57, + .species = SPECIES_AZUMARILL, + .moves = {MOVE_AQUA_JET, MOVE_LIQUIDATION, MOVE_PLAY_ROUGH, MOVE_BOUNCE} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_MAGNEMITE, - .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} + .iv = 200, + .lvl = 58, + .species = SPECIES_MAGNEZONE, + .moves = {MOVE_THUNDERBOLT, MOVE_FLASH_CANNON, MOVE_TRI_ATTACK, MOVE_SIGNAL_BEAM} }, - { + { .iv = 250, - .lvl = 1, - .species = SPECIES_RALTS, - .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} + .lvl = 59, + .species = SPECIES_GARCHOMP, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_STONE_EDGE, MOVE_FIRE_FANG} + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_GALLADE, + .moves = {MOVE_ZEN_HEADBUTT, MOVE_CLOSE_COMBAT, MOVE_LEAF_BLADE, MOVE_POISON_JAB} } }; static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = { { - .iv = 150, - .lvl = 1, - .species = SPECIES_SWABLU, - .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} + .iv = 200, + .lvl = 55, + .species = SPECIES_ROSERADE, + .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_SHADOW_BALL, MOVE_TOXIC_SPIKES} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_SKITTY, - .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK} + .iv = 200, + .lvl = 56, + .species = SPECIES_TALONFLAME, + .moves = {MOVE_BRAVE_BIRD, MOVE_FLARE_BLITZ, MOVE_STEEL_WING, MOVE_ROOST} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_BUDEW, - .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} + .iv = 200, + .lvl = 57, + .species = SPECIES_AZUMARILL, + .moves = {MOVE_AQUA_JET, MOVE_LIQUIDATION, MOVE_PLAY_ROUGH, MOVE_BOUNCE} }, { - .iv = 150, - .lvl = 1, - .species = SPECIES_MAGNEMITE, - .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} + .iv = 200, + .lvl = 58, + .species = SPECIES_MAGNEZONE, + .moves = {MOVE_THUNDERBOLT, MOVE_FLASH_CANNON, MOVE_TRI_ATTACK, MOVE_SIGNAL_BEAM} }, - { + { .iv = 250, - .lvl = 1, - .species = SPECIES_RALTS, - .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} + .lvl = 59, + .species = SPECIES_GARCHOMP, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_STONE_EDGE, MOVE_FIRE_FANG} + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_GALLADE, + .moves = {MOVE_ZEN_HEADBUTT, MOVE_CLOSE_COMBAT, MOVE_LEAF_BLADE, MOVE_POISON_JAB} } }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 161a4b5ce..a132c5863 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -130,7 +130,7 @@ { "min_level": 2, "max_level": 2, - "species": "SPECIES_WOOLOO" + "species": "SPECIES_ZIGZAGOON" }, { "min_level": 2, @@ -235,22 +235,22 @@ { "min_level": 2, "max_level": 2, - "species": "SPECIES_PIDGEY" + "species": "SPECIES_ZORUA" }, { "min_level": 2, "max_level": 2, - "species": "SPECIES_CATERPIE" + "species": "SPECIES_ZORUA" }, { "min_level": 3, "max_level": 3, - "species": "SPECIES_PIDGEY" + "species": "SPECIES_ZORUA" }, { "min_level": 3, "max_level": 3, - "species": "SPECIES_CATERPIE" + "species": "SPECIES_ZORUA" } ] } @@ -2253,7 +2253,7 @@ { "min_level": 26, "max_level": 26, - "species": "SPECIES_MANECTRIC" + "species": "SPECIES_ELECTRIKE" }, { "min_level": 25, @@ -2476,6 +2476,30 @@ ] } }, + { + "map": "MAP_PETALBURG_WOODS", + "base_label": "gPetalburgWoods1", + "hidden_mons": { + "encounter_rate": 0, + "mons": [ + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_TREECKO" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_TREECKO" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_CHIKORITA" + } + ] + } + }, { "map": "MAP_RUSTURF_TUNNEL", "base_label": "gRusturfTunnel", @@ -2835,7 +2859,7 @@ { "min_level": 27, "max_level": 27, - "species": "SPECIES_ODDISH" + "species": "SPECIES_PICHU" }, { "min_level": 25, @@ -2853,14 +2877,14 @@ "species": "SPECIES_NATU" }, { - "min_level": 25, + "min_level": 24, "max_level": 25, "species": "SPECIES_DODUO" }, { "min_level": 25, "max_level": 25, - "species": "SPECIES_GLOOM" + "species": "SPECIES_ODDISH" }, { "min_level": 27, @@ -2870,7 +2894,7 @@ { "min_level": 25, "max_level": 25, - "species": "SPECIES_PICHU" + "species": "SPECIES_TYPE_NULL" }, { "min_level": 27, @@ -2880,7 +2904,7 @@ { "min_level": 27, "max_level": 27, - "species": "SPECIES_PICHU" + "species": "SPECIES_TYPE_NULL" }, { "min_level": 29, @@ -2909,7 +2933,7 @@ { "min_level": 30, "max_level": 35, - "species": "SPECIES_CLAMPERL" + "species": "SPECIES_PANPOUR" }, { "min_level": 30, @@ -3225,17 +3249,17 @@ { "min_level": 30, "max_level": 35, - "species": "SPECIES_WHISCASH" + "species": "SPECIES_BARBOACH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_WHISCASH" + "species": "SPECIES_BARBOACH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_WHISCASH" + "species": "SPECIES_BARBOACH" } ] }, @@ -3404,6 +3428,30 @@ ] } }, + { + "map": "MAP_JAGGED_PASS", + "base_label": "gJaggedPass1", + "hidden_mons": { + "encounter_rate": 0, + "mons": [ + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_TORCHIC" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_TORCHIC" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_CYNDAQUIL" + } + ] + } + }, { "map": "MAP_ROUTE106", "base_label": "gRoute106", @@ -3849,7 +3897,7 @@ { "min_level": 25, "max_level": 25, - "species": "SPECIES_SWELLOW" + "species": "SPECIES_TAILLOW" }, { "min_level": 24, @@ -7558,12 +7606,12 @@ { "min_level": 35, "max_level": 40, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_DRATINI" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_DRATINI" } ] }, @@ -7583,7 +7631,7 @@ { "min_level": 25, "max_level": 25, - "species": "SPECIES_GIRAFARIG" + "species": "SPECIES_PICHU" }, { "min_level": 27, @@ -7613,7 +7661,7 @@ { "min_level": 25, "max_level": 25, - "species": "SPECIES_PICHU" + "species": "SPECIES_RIOLU" }, { "min_level": 27, @@ -7623,7 +7671,7 @@ { "min_level": 27, "max_level": 27, - "species": "SPECIES_PICHU" + "species": "SPECIES_RIOLU" }, { "min_level": 29, @@ -7643,22 +7691,22 @@ { "min_level": 20, "max_level": 30, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_SLOWPOKE" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_SLOWPOKE_GALARIAN" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_DRATINI" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_DRATINI" } ] } @@ -7712,7 +7760,7 @@ { "min_level": 29, "max_level": 29, - "species": "SPECIES_XATU" + "species": "SPECIES_EEVEE" }, { "min_level": 27, @@ -7722,7 +7770,7 @@ { "min_level": 31, "max_level": 31, - "species": "SPECIES_XATU" + "species": "SPECIES_EEVEE" }, { "min_level": 29, @@ -7747,17 +7795,17 @@ { "min_level": 15, "max_level": 20, - "species": "SPECIES_GEODUDE" + "species": "SPECIES_OMANYTE" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_GEODUDE" + "species": "SPECIES_KABUTO" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_GEODUDE" + "species": "SPECIES_KABUTO" } ] } @@ -7779,7 +7827,7 @@ "species": "SPECIES_GOLDEEN" }, { - "min_level": 10, + "min_level": 11, "max_level": 30, "species": "SPECIES_MAGIKARP" }, @@ -7811,12 +7859,12 @@ { "min_level": 35, "max_level": 40, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_DRATINI" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_DRATINI" } ] }, @@ -7861,12 +7909,12 @@ { "min_level": 29, "max_level": 29, - "species": "SPECIES_DODUO" + "species": "SPECIES_HAPPINY" }, { "min_level": 29, "max_level": 29, - "species": "SPECIES_DODRIO" + "species": "SPECIES_MUNCHLAX" }, { "min_level": 27, @@ -7876,7 +7924,7 @@ { "min_level": 31, "max_level": 31, - "species": "SPECIES_DODRIO" + "species": "SPECIES_MUNCHLAX" }, { "min_level": 29, @@ -7896,22 +7944,22 @@ { "min_level": 20, "max_level": 30, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_SLOWPOKE" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_PSYDUCK" + "species": "SPECIES_SLOWBRO_GALARIAN" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_GOLDUCK" + "species": "SPECIES_DRATINI" }, { "min_level": 25, "max_level": 40, - "species": "SPECIES_GOLDUCK" + "species": "SPECIES_DRATINI" } ] } @@ -7990,7 +8038,7 @@ { "min_level": 30, "max_level": 40, - "species": "SPECIES_GRAVELER" + "species": "SPECIES_GEODUDE" }, { "min_level": 30, @@ -9077,6 +9125,30 @@ ] } }, + { + "map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "base_label": "gShoalCave_LowTideEntranceRoom1", + "hidden_mons": { + "encounter_rate": 0, + "mons": [ + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_MUDKIP" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_MUDKIP" + }, + { + "min_level": 5, + "max_level": 5, + "species": "SPECIES_TOTODILE" + } + ] + } + }, { "map": "MAP_LILYCOVE_CITY", "base_label": "gLilycoveCity", @@ -11694,12 +11766,12 @@ { "min_level": 22, "max_level": 22, - "species": "SPECIES_ZUBAT" + "species": "SPECIES_GROWLITHE" }, { "min_level": 23, "max_level": 23, - "species": "SPECIES_MAGCARGO" + "species": "SPECIES_SLUGMA" }, { "min_level": 23, @@ -11734,7 +11806,7 @@ { "min_level": 23, "max_level": 23, - "species": "SPECIES_MAGBY" + "species": "SPECIES_PANSEAR" }, { "min_level": 23, @@ -11744,7 +11816,7 @@ { "min_level": 22, "max_level": 22, - "species": "SPECIES_MAGBY" + "species": "SPECIES_PANSEAR" }, { "min_level": 24, @@ -12638,12 +12710,12 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12691,17 +12763,17 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12711,7 +12783,7 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12749,12 +12821,12 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12797,22 +12869,22 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12880,7 +12952,7 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, @@ -12973,22 +13045,22 @@ { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" }, { "max_level": 5, "min_level": 5, - "species": "SPECIES_CHARMELEON" + "species": "SPECIES_CHARMANDER" } ] } diff --git a/src/daycare.c b/src/daycare.c index c2e0dfa88..e902afbeb 100755 --- a/src/daycare.c +++ b/src/daycare.c @@ -293,7 +293,7 @@ static u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps) { struct BoxPokemon tempMon = *mon; - u32 experience = GetBoxMonData(mon, MON_DATA_EXP) + steps; + u32 experience = GetBoxMonData(mon, MON_DATA_EXP); SetBoxMonData(&tempMon, MON_DATA_EXP, &experience); return GetLevelFromBoxMonExp(&tempMon); } @@ -322,7 +322,7 @@ static u32 GetDaycareCostForSelectedMon(struct DaycareMon *daycareMon) u8 numLevelsGained = GetNumLevelsGainedFromSteps(daycareMon); GetBoxMonNickname(&daycareMon->mon, gStringVar1); - cost = 100 + 100 * numLevelsGained; + cost = 500; ConvertIntToDecimalStringN(gStringVar2, cost, STR_CONV_MODE_LEFT_ALIGN, 5); return cost; } diff --git a/src/strings.c b/src/strings.c index 1597609b1..abe1c415d 100755 --- a/src/strings.c +++ b/src/strings.c @@ -3435,7 +3435,8 @@ const u8 gText_ABtnTitleScreen[] = _("A Button: Title Screen"); const u8 gText_Option[] = _("Option"); const u8 gText_TextSpeed[] = _("Text speed"); const u8 gText_BattleScene[] = _("Battle scene"); -const u8 gText_BattleStyle[] = _("Battle style"); +//const u8 gText_BattleStyle[] = _("Battle style"); +const u8 gText_BattleStyle[] = _("Game Mode"); const u8 gText_Sound[] = _("Sound"); const u8 gText_Frame[] = _("Frame"); const u8 gText_OptionMenuCancel[] = _("Save"); @@ -3445,8 +3446,8 @@ const u8 gText_TextSpeedMid[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Mid"); const u8 gText_TextSpeedFast[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Fast"); const u8 gText_BattleSceneOn[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}On"); const u8 gText_BattleSceneOff[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Off"); -const u8 gText_BattleStyleShift[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Shift"); -const u8 gText_BattleStyleSet[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Set"); +const u8 gText_BattleStyleShift[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Normal"); +const u8 gText_BattleStyleSet[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Hard"); const u8 gText_TransitionStyleNormal[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Normal"); const u8 gText_TransitionStyleInstant[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Instant"); const u8 gText_UnitSystemMetric[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}Metric"); diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 8a61caf01..57f7b1d42 100755 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -248,7 +248,10 @@ u16 HasLevelEvolutionwild(u16 species, u8 level, u16 item) break; case EVO_LEVEL: + case EVO_LEVEL_CASCOON: + case EVO_LEVEL_ATK_GT_DEF: case EVO_LEVEL_NINJASK: + case EVO_LEVEL_DUSK: if(gEvolutionTable[species][0].param && gEvolutionTable[species][0].param <= level) return HasItemEvolutionWild(gEvolutionTable[species][0].targetSpecies, level, item); break; @@ -271,23 +274,23 @@ u16 HasLevelEvolutionwild(u16 species, u8 level, u16 item) u16 HasItemEvolutionWild(u16 species, u8 level, u16 item) { - u16 EvolutionItem = gEvolutionTable[species][0].param; - if(gEvolutionTable[species][0].targetSpecies != SPECIES_NONE){ - if(gEvolutionTable[species][0].method == EVO_ITEM){ - switch(EvolutionItem) - { - case ITEM_FIRE_STONE: - case ITEM_THUNDER_STONE: - case ITEM_WATER_STONE: - case ITEM_LEAF_STONE: - case ITEM_SUN_STONE: - case ITEM_MOON_STONE: - if (FlagGet(FLAG_RECEIVED_TM40) == TRUE && level > (GetMinLevelWild()+5)) + if( gEvolutionTable[species][0].method == EVO_ITEM || + gEvolutionTable[species][0].method == EVO_TRADE || + gEvolutionTable[species][0].method == EVO_ITEM_FEMALE || + gEvolutionTable[species][0].method == EVO_ITEM_MALE || + gEvolutionTable[species][0].method == EVO_LEVEL_DARK_TYPE_MON_IN_PARTY || + gEvolutionTable[species][0].method == EVO_SPECIFIC_MON_IN_PARTY || + gEvolutionTable[species][0].method == EVO_TRADE_ITEM){ + if (FlagGet(FLAG_RECEIVED_TM40) == TRUE && level > (GetMinLevelWild()+5)) return HasItemEvolutionWild(gEvolutionTable[species][0].targetSpecies, level, item); - default: - return species; - }}} + } + + if(gEvolutionTable[species][0].method == EVO_BEAUTY){ + if (FlagGet(FLAG_RECEIVED_TM03) == TRUE && level > (GetMinLevelWild()+5)) + return HasItemEvolutionWild(gEvolutionTable[species][0].targetSpecies, level, item); + } + } return species; }