Voltorb in Fuchsia

simply makes sense tm

README.md

@@ -17,9 +17,9 @@ Johto baby Pokemon and regional pre-evolutions were omitted due to memory constr
 New Types:
 ====
 - Dark, Steel and Fairy types are added
-	- note that Dark and Steel use their type effectiveness from the SW97 demo
-	- note that Bite is still Normal-type
-	- note that the Clefairy, Mime Jr, and Jigglypuff lines are not Steel or Fairy-type, respectively
+	- Note that Dark and Steel use their type effectiveness from the SW97 demo
+	- Note that Bite is still Normal-type
+	- Note that the Clefairy, Mime Jr, and Jigglypuff lines are not Steel or Fairy-type, respectively
 		- This (and Bite) was done to ensure the original Kanto Pokemon were unaltered in any way
 		- While Magnemite, Magnetite, and Magneton are pure Electric, Magnezone is part-Steel.
 		- Scream Tail remains Psychic/Fairy.
@@ -170,7 +170,13 @@ Known Bugs
 
 Evolution Methods for new Pokemon
 ====
-Due to the odd way some new Pokemon evolve, methods are listed here. Beta Pokemon are included with their original methods, given their obscurity. Some Pokemon will have methods from the Spaceworld '97 demo to be closer to (or functional in the context of) RBY.
+Due to the odd way some new Pokemon evolve, methods are listed here. Beta Pokemon are included with their original methods, given their obscurity. Some Pokemon will have methods from the Spaceworld '97 demo to be closer to (or functional in the context of) RBY. To accomodate things and ensure everything makes sense, some Pokemon have also had their methods changed.
+
+Changed Methods:
+- Shellder -> Cloyster | Use Ice Stone (Accomodating Taaban)
+- Gloom -> Vileplume | Use Poison Stone (Accomodating Bellossom)
+- Nidorino -> Nidoking | L36 (Prototype method, accomodating Nidoreign)
+- Nidorina -> Nidoqueen | L36 (Prototype method, accomodating Nidoreign)
 
 New Pokemon:
 - Rhydon -> Rhyperior | Use Protector 
@@ -195,10 +201,8 @@ New Pokemon:
 - Porygon -> Porygon2 | Use Up-Grade
 - Porygon2 -> Porygon-Z | Use Dubious Disc
 - Gloom -> Bellossom | Use Leaf Stone
-- Gloom -> Vileplume | Use Poison Stone
 - Weepinbell -> Tsubomitto | Use Poison Stone
 - Shellder -> Taaban | Use Water Stone
-- Shellder -> Cloyster | Use Ice Stone
 
 Kanto Beta Pokemon:
 - Blottle -> Pendraken | L30
@@ -223,8 +227,6 @@ Kanto Beta Pokemon:
 - Kasanagi -> Carapthor | L10
 - Psyduck -> Weirduck | L22, Golduck level remains the same for Weirduck.
 - Nidorino OR Nidorina -> Nidoreign | Moon Stone
-- Nidorino -> Nidoking | L36
-- Nidorina -> Nidoqueen | L36
 
 Eeveelutions:
 - Espeon | Heart Stone 

data/maps/objects/FuchsiaCity.asm

@@ -34,7 +34,7 @@ FuchsiaCity_Object:
 	object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
 	object_event 24,  8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
 	object_event 31,  5, SPRITE_CHANSEY, STAY, ANY_DIR, 5 ; person
-	object_event 25,  6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event 25,  6, SPRITE_VOLTORB, STAY, NONE, 6 ; person
 	object_event 12,  6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
 	object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
 	object_event  8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person

data/maps/sprite_sets.asm

@@ -196,7 +196,7 @@ SpriteSets:
 	db SPRITE_SEEL
 	db SPRITE_SWIMMER
 	db SPRITE_YOUNGSTER
-	db SPRITE_POKE_BALL
+	db SPRITE_VOLTORB
 	db SPRITE_FOSSIL
 
 ; SPRITESET_CITRINE

engine/items/item_effects.asm

@@ -1311,8 +1311,20 @@ ItemUseMedicine:
 	ld a, 10
 	ld b, a
 	ld a, [hl] ; a = MSB of stat experience of the appropriate stat
+	
 	cp 100 ; is there already at least 25600 (256 * 100) stat experience?
 	jr nc, .vitaminNoEffect ; if so, vitamins can't add any more
+	
+	; Unfinished replacement for the limit, I want to raise it to the max.
+	; Thanks to Vimescarrot for the idea (I am silly)
+	;ld de, %11111111 ;65535
+	;ld a, b
+	;cp 255
+	;jr nz, .notCap
+	;ld a, c
+	;cp 255
+	;jr nz, .notCap
+	
 	add b ; add 2560 (256 * 10) stat experience
 	jr nc, .noCarry3 ; a carry should be impossible here, so this will always jump
 	ld a, 255