quick fix

fixed leftover stuff from development. more info in the changelog.md
wrulfy · Mar 22, 2023 · d9943f8 · d9943f8
1 parent 9b86685
commit d9943f8
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,7 @@ gfx/sprites.o \
 gfx/tilesets.o
 
 carminered_obj := $(rom_obj:.o=_red.o)
+#pokeblue_obj := $(rom_obj:.o=_blue.o)
 #pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
 
 ### Build tools

diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,8 @@
 Make the whole documentation for the actual full release
 
+fix the "end" character of the naming screen
+
+
 Check https://www.youtube.com/watch?v=mHkyO5T5wZU 0:52 because I should try to move that to the other side now that the map has changed 💀
 
 

diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,10 @@
+v0.9.1 Quickfix
+
+Fixed kakuna knowing tackle instead of poison sting
+Rebalanced viridian forest encounters to have more worm and less cocoon
+Increased spawn rates of the water grass and fire mon avaiable on the early routes to 15%
+Fixed abra not knowing just teleport at lv1
+Fialogue fixes
+______________________
+
+v0.9.0 Initial (pre)Release
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
@@ -10,7 +10,7 @@
  INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions
  dw AbraPicFront, AbraPicBack
 
- db DIZZY_PUNCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+ db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
  db GROWTH_STARTER ; growth rate
 
  ; tm/hm learnset

diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
@@ -10,7 +10,7 @@
  INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions
  dw KakunaPicFront, KakunaPicBack
 
- db DEFENSE_CURL, TACKLE, STRING_SHOT, HARDEN ; level 1 learnset
+ db DEFENSE_CURL, POISON_STING, STRING_SHOT, HARDEN ; level 1 learnset
  db GROWTH_FAST ; growth rate
 
  ; tm/hm learnset

diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm
@@ -3,13 +3,13 @@ Route2WildMons:
  db 3, PIDGEY
  db 3, RATTATA
  db 4, PIDGEY
- db 4, RATTATA
+ db 4, POLIWAG
  db 2, CATERPIE
  db 2, WEEDLE
  db 5, RATTATA
- db 3, POLIWAG
- db 4, POLIWAG
+ db 4, RATTATA
  db 5, POLIWAG
+ db 6, POLIWAG
  end_grass_wildmons
 
  def_water_wildmons 0 ; encounter rate

diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm
@@ -5,9 +5,9 @@ Route22WildMons:
  db 3, MANKEY
  db 4, SPEAROW
  db 4, RATTATA
- db 5, SPEAROW
- db 5, MANKEY
  db 3, VULPIX
+ db 5, MANKEY
+ db 5, SPEAROW
  db 4, VULPIX
  db 5, VULPIX
  end_grass_wildmons

diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm
@@ -2,12 +2,12 @@ ViridianForestWildMons:
  def_grass_wildmons 8 ; encounter rate
  db 4, CATERPIE
  db 4, WEEDLE
- db 5, KAKUNA
- db 5, METAPOD
- db 6, METAPOD
  db 5, ODDISH
+ db 4, VENONAT 
+ db 6, METAPOD
  db 6, KAKUNA
- db 4, VENONAT
+ db 5, CATERPIE
+ db 5, WEEDLE
  db 3, PIKACHU
  db 5, PIKACHU
  end_grass_wildmons

diff --git a/text/Route2.asm b/text/Route2.asm
@@ -11,7 +11,7 @@ _Route2EndBattleText1::
 _Route2AfterBattleText1::
  text "I just started my"
  line "own adventure"
- cont "yesterday"
+ cont "yesterday."
 
  para "#MON are"
  line "fantastic!"