thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 00:56:40 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "Oak's Last Pokemon" line

Browse source 
Done by refactoring the Fighting Dojo greed line.

Also shifted some wild levels for extra variance.
This commit is contained in:
Llinos Evans 2023-06-27 13:42:48 +01:00
parent 41e7439496
commit 27cc616c0d
10 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -324,8 +324,12 @@ Given many of these evolve via stones, we've given them their pre-evolution's le
Credits Credits
==== ====
* Plague von Karma - Creator of the Showdown Mod, Developer, Maps, and occasional spriter (assisting with Tsubomitto, Carapthor) 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.
* Martha's Against Humanity - Developer, Pokémon implementation, tweaks of Albatross's sprites, a few maps (Citrine City, Cinnabar Volcano)
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 * Ema Skye - Developer, Maps, Showdown Mod assistance
* pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us! * pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us!
* ausma - Showdown Mod assistance * ausma - Showdown Mod assistance

5
data/text/text_2.asm
View file

@ -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. _BirdBattleText:: ; This is defined in many places and can just be farcalled here instead.
text "Gyaoo!@" text "Gyaoo!@"
text_end text_end
_GreedyBastardText::
text "Better not get"
line "greedy..."
done

2
data/trainers/scaled_parties.asm
View file

@ -2,7 +2,7 @@
BrockData: BrockData:
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges 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, 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, 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, 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 db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5

4
data/wild/maps/Route2.asm
View file

@ -3,9 +3,9 @@ Route2WildMons:
db 4, RATTATA db 4, RATTATA
db 3, PIDGEY db 3, PIDGEY
db 4, PIDGEY db 4, PIDGEY
db 4, WEEDLE db 3, WEEDLE
db 3, KONYA db 3, KONYA
db 4, CATERPIE db 3, CATERPIE
db 4, WEEDLE db 4, WEEDLE
db 4, CATERPIE db 4, CATERPIE
db 4, KONYA db 4, KONYA

4
data/wild/maps/Route22.asm
View file

@ -2,9 +2,9 @@ Route22WildMons:
def_grass_wildmons 25 ; encounter rate def_grass_wildmons 25 ; encounter rate
db 3, RATTATA db 3, RATTATA
db 4, NIDORAN_M db 4, NIDORAN_M
db 4, NIDORAN_F db 3, NIDORAN_F
db 4, RATTATA db 4, RATTATA
db 4, MANKEY db 3, MANKEY
db 3, SPEAROW db 3, SPEAROW
db 4, SPEAROW db 4, SPEAROW
db 4, NIDORAN_F db 4, NIDORAN_F

4
data/wild/maps/ViridianForest.asm
View file

@ -4,11 +4,11 @@ ViridianForestWildMons:
db 4, WEEDLE db 4, WEEDLE
db 4, PIDGEY db 4, PIDGEY
db 5, CATERPIE db 5, CATERPIE
db 5, KOKANA db 4, KOKANA
db 5, WEEDLE db 5, WEEDLE
db 7, KAKUNA db 7, KAKUNA
db 7, METAPOD 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 db 9, PIDGEOTTO
end_grass_wildmons end_grass_wildmons

2
scripts/FightingDojo.asm
View file

@ -310,5 +310,5 @@ WantHitmonchanText:
text_end text_end
OtherHitmonText: OtherHitmonText:
text_far _OtherHitmonText text_far _GreedyBastardText
text_end text_end

2
scripts/OaksLab.asm
View file

@ -1071,7 +1071,7 @@ OaksLabScript_1d22d:
jp TextScriptEnd jp TextScriptEnd
OaksLabLastMonText: OaksLabLastMonText:
text_far _OaksLabLastMonText text_far _GreedyBastardText
text_end text_end
OaksLabText32: OaksLabText32:

5
text/FightingDojo.asm
View file

@ -123,8 +123,3 @@ _WantHitmonchanText::
line "piston punching" line "piston punching"
cont "HITMONCHAN?" cont "HITMONCHAN?"
done done
_OtherHitmonText::
text "Better not get"
line "greedy..."
done

5
text/OaksLab.asm
View file

@ -67,11 +67,6 @@ _OaksLabReceivedMonText::
text "!@" text "!@"
text_end text_end
_OaksLabLastMonText:: ; figure out what to do with this
text "That's PROF.OAK's"
line "last #MON!"
done
_OaksLabText_1d2f0:: _OaksLabText_1d2f0::
text "OAK: Now, <PLAYER>," text "OAK: Now, <PLAYER>,"
line "which #MON do" line "which #MON do"