diff --git a/README.md b/README.md index c6e735e7..c351ecd4 100644 --- a/README.md +++ b/README.md @@ -324,8 +324,12 @@ Given many of these evolve via stones, we've given them their pre-evolution's le Credits ==== -* Plague von Karma - Creator of the Showdown Mod, Developer, Maps, and occasional spriter (assisting with Tsubomitto, Carapthor) -* Martha's Against Humanity - Developer, Pokémon implementation, tweaks of Albatross's sprites, a few maps (Citrine City, Cinnabar Volcano) +As the open source nature of this project implies, people are free to use what's here for their own ends, **so long as credit is given.** Specific credits are always encouraged as well. If you have any questions on this, contact @ plague_von_karma on Discord. + +If you use our implementations of anything at all, it is encouraged to submit Pull Requests for bug fixes if you find any issues! + +* Plague von Karma - Creator of the Showdown Mod, Developer, Scenarios, Balancing, Maps, Event scripting, and occasional spriter (assisting with Tsubomitto, Carapthor) +* Martha's Against Humanity - Developer, Pokémon implementation, Event scripting, tweaks of Albatross's sprites, a few maps (Citrine City, Cinnabar Volcano) * Ema Skye - Developer, Maps, Showdown Mod assistance * pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us! * ausma - Showdown Mod assistance diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 74699263..45204a22 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -1854,3 +1854,8 @@ _GameCornerArbok:: ; Putting here to be potentially farcalled somewhere else. _BirdBattleText:: ; This is defined in many places and can just be farcalled here instead. text "Gyaoo!@" text_end + +_GreedyBastardText:: + text "Better not get" + line "greedy..." + done diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index e7ab5045..f794828f 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -2,7 +2,7 @@ BrockData: db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1 - db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2 + db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2 db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3 db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, NIDOREIGN, 40, GYAOON, 0, ; 4 db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5 diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index c9a0214f..8fe927b9 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -3,9 +3,9 @@ Route2WildMons: db 4, RATTATA db 3, PIDGEY db 4, PIDGEY - db 4, WEEDLE + db 3, WEEDLE db 3, KONYA - db 4, CATERPIE + db 3, CATERPIE db 4, WEEDLE db 4, CATERPIE db 4, KONYA diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 08854235..69dd549b 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -2,9 +2,9 @@ Route22WildMons: def_grass_wildmons 25 ; encounter rate db 3, RATTATA db 4, NIDORAN_M - db 4, NIDORAN_F + db 3, NIDORAN_F db 4, RATTATA - db 4, MANKEY + db 3, MANKEY db 3, SPEAROW db 4, SPEAROW db 4, NIDORAN_F diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 3bf56da9..e158b9ae 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -4,11 +4,11 @@ ViridianForestWildMons: db 4, WEEDLE db 4, PIDGEY db 5, CATERPIE - db 5, KOKANA + db 4, KOKANA db 5, WEEDLE db 7, KAKUNA db 7, METAPOD - db 4, PIKACHU ; FIXME: Add considerations for STARTER4/Pikachu so it isn't rendered redundant. + db 5, KOKANA ; FIXME: Add considerations for STARTER4/Pikachu so it isn't rendered redundant. For now, it's a Kokana. db 9, PIDGEOTTO end_grass_wildmons diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 742be331..a32aeb05 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -310,5 +310,5 @@ WantHitmonchanText: text_end OtherHitmonText: - text_far _OtherHitmonText + text_far _GreedyBastardText text_end diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 76a788e8..302110a3 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -1071,7 +1071,7 @@ OaksLabScript_1d22d: jp TextScriptEnd OaksLabLastMonText: - text_far _OaksLabLastMonText + text_far _GreedyBastardText text_end OaksLabText32: diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index 3df069c1..fbebcda1 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -123,8 +123,3 @@ _WantHitmonchanText:: line "piston punching" cont "HITMONCHAN?" done - -_OtherHitmonText:: - text "Better not get" - line "greedy..." - done diff --git a/text/OaksLab.asm b/text/OaksLab.asm index 7f4ace0a..f384f56c 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -67,11 +67,6 @@ _OaksLabReceivedMonText:: text "!@" text_end -_OaksLabLastMonText:: ; figure out what to do with this - text "That's PROF.OAK's" - line "last #MON!" - done - _OaksLabText_1d2f0:: text "OAK: Now, ," line "which #MON do"