diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index a36a57e..c75af98 100644 --- a/data/events/bug_contest_winners.asm +++ b/data/events/bug_contest_winners.asm @@ -22,13 +22,13 @@ BugContestantPointers: BugContestant_BugCatcherDon: db BUG_CATCHER, DON dw KAKUNA, 300 - dw METAPOD, 285 + dw PUPAL, 285 dw CATERPIE, 226 BugContestant_BugCatcherEd: db BUG_CATCHER, ED dw BUTTERFREE, 286 - dw BUTTERFREE, 251 + dw CARAPTHOR, 251 dw CATERPIE, 237 BugContestant_CooltrainerMNick: @@ -57,7 +57,7 @@ BugContestant_CamperBarry: BugContestant_PicnickerCindy: db PICNICKER, CINDY - dw BUTTERFREE, 341 + dw HERACROSS, 341 dw METAPOD, 301 dw CATERPIE, 264 @@ -77,4 +77,4 @@ BugContestant_SchoolboyKipp: db SCHOOLBOY, KIPP dw VENONAT, 267 dw PARAS, 254 - dw KAKUNA, 259 + dw GENTLARVA, 259 diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm index 67f92bf..fb3afd6 100644 --- a/data/wild/bug_contest_mons.asm +++ b/data/wild/bug_contest_mons.asm @@ -1,13 +1,18 @@ ContestMons: ; %, species, min, max - dbwbb 20, CATERPIE, 7, 18 - dbwbb 20, WEEDLE, 7, 18 - dbwbb 10, METAPOD, 9, 18 - dbwbb 10, KAKUNA, 9, 18 - dbwbb 5, BUTTERFREE, 12, 15 - dbwbb 5, BEEDRILL, 12, 15 - dbwbb 10, VENONAT, 10, 16 + dbwbb 15, CATERPIE, 7, 18 + dbwbb 15, WEEDLE, 7, 18 + dbwbb 15, GENTLARVA, 7, 18 + dbwbb 6, METAPOD, 9, 18 + dbwbb 6, KAKUNA, 9, 18 + dbwbb 6, PUPAL, 9, 18 + dbwbb 3, BUTTERFREE, 12, 15 + dbwbb 3, BEEDRILL, 12, 15 + dbwbb 4, CARAPTHOR, 12, 15 + dbwbb 9, VENONAT, 10, 16 dbwbb 10, PARAS, 10, 17 - dbwbb 5, SCYTHER, 13, 14 - dbwbb 5, PINSIR, 13, 14 - dbwbb -1, VENOMOTH, 30, 40 + dbwbb 4, SCYTHER, 13, 14 + dbwbb 4, PINSIR, 13, 14 + dbwbb 1, TRICULES, 18, 20 + dbwbb 1, HERACROSS, 18, 20 + dbwbb 1, SCIZOR, 18, 20 diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 1703429..c4908cc 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -425,10 +425,10 @@ BugContestResults_CleanUp: BugContestResults_FirstPlace: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - getitemname STRING_BUFFER_4, SUN_STONE + getitemname STRING_BUFFER_4, BLK_AUGURITE farwritetext ContestResults_PlayerWonAPrizeText waitbutton - verbosegiveitem SUN_STONE + verbosegiveitem BLK_AUGURITE iffalse BugContestResults_NoRoomForSunStone sjump BugContestResults_ReturnAfterWinnersPrize