thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-10-22 14:57:58 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement Bug Catching Contest changes

Browse source 
I am really not sure about Tricules and Scizor being here, it's just so early...we can give it a whirl though. The day restriction alone seems to be enough of a balancing measure.

Added Heracross since we want that increased Johto frequency.
This commit is contained in:
Llinos Evans 2024-07-08 00:31:13 +01:00
parent 1e629ebc1a
commit 603073234a
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/events/bug_contest_winners.asm
View file

@ -22,13 +22,13 @@ BugContestantPointers:
BugContestant_BugCatcherDon: BugContestant_BugCatcherDon:
db BUG_CATCHER, DON db BUG_CATCHER, DON
dw KAKUNA, 300 dw KAKUNA, 300
dw METAPOD, 285 dw PUPAL, 285
dw CATERPIE, 226 dw CATERPIE, 226
BugContestant_BugCatcherEd: BugContestant_BugCatcherEd:
db BUG_CATCHER, ED db BUG_CATCHER, ED
dw BUTTERFREE, 286 dw BUTTERFREE, 286
dw BUTTERFREE, 251 dw CARAPTHOR, 251
dw CATERPIE, 237 dw CATERPIE, 237
BugContestant_CooltrainerMNick: BugContestant_CooltrainerMNick:
@ -57,7 +57,7 @@ BugContestant_CamperBarry:
BugContestant_PicnickerCindy: BugContestant_PicnickerCindy:
db PICNICKER, CINDY db PICNICKER, CINDY
dw BUTTERFREE, 341 dw HERACROSS, 341
dw METAPOD, 301 dw METAPOD, 301
dw CATERPIE, 264 dw CATERPIE, 264
@ -77,4 +77,4 @@ BugContestant_SchoolboyKipp:
db SCHOOLBOY, KIPP db SCHOOLBOY, KIPP
dw VENONAT, 267 dw VENONAT, 267
dw PARAS, 254 dw PARAS, 254
dw KAKUNA, 259 dw GENTLARVA, 259

25
data/wild/bug_contest_mons.asm
View file

@ -1,13 +1,18 @@
ContestMons: ContestMons:
; %, species, min, max ; %, species, min, max
dbwbb 20, CATERPIE, 7, 18 dbwbb 15, CATERPIE, 7, 18
dbwbb 20, WEEDLE, 7, 18 dbwbb 15, WEEDLE, 7, 18
dbwbb 10, METAPOD, 9, 18 dbwbb 15, GENTLARVA, 7, 18
dbwbb 10, KAKUNA, 9, 18 dbwbb 6, METAPOD, 9, 18
dbwbb 5, BUTTERFREE, 12, 15 dbwbb 6, KAKUNA, 9, 18
dbwbb 5, BEEDRILL, 12, 15 dbwbb 6, PUPAL, 9, 18
dbwbb 10, VENONAT, 10, 16 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 10, PARAS, 10, 17
dbwbb 5, SCYTHER, 13, 14 dbwbb 4, SCYTHER, 13, 14
dbwbb 5, PINSIR, 13, 14 dbwbb 4, PINSIR, 13, 14
dbwbb -1, VENOMOTH, 30, 40 dbwbb 1, TRICULES, 18, 20
dbwbb 1, HERACROSS, 18, 20
dbwbb 1, SCIZOR, 18, 20

4
engine/events/std_scripts.asm
View file

@ -425,10 +425,10 @@ BugContestResults_CleanUp:
BugContestResults_FirstPlace: BugContestResults_FirstPlace:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
getitemname STRING_BUFFER_4, SUN_STONE getitemname STRING_BUFFER_4, BLK_AUGURITE
farwritetext ContestResults_PlayerWonAPrizeText farwritetext ContestResults_PlayerWonAPrizeText
waitbutton waitbutton
verbosegiveitem SUN_STONE verbosegiveitem BLK_AUGURITE
iffalse BugContestResults_NoRoomForSunStone iffalse BugContestResults_NoRoomForSunStone
sjump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize