Fix "Oak's Last Pokemon" line

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

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.
text "Gyaoo!@"
text_end
_GreedyBastardText::
text "Better not get"
line "greedy..."
done

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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