(hopefully) fixes

constants/pokedex_constants.asm

@@ -68,7 +68,7 @@
 	const DEX_ARCANINE   ; 59	(061)
 	const DEX_MANKEY     ; 56	(062)
 	const DEX_PRIMEAPE   ; 57	(063)
-	; const DEX_ANNIHILAPE ;      (064)
+	const DEX_ANNIHILAPE ;      (064)
 	const DEX_ODDISH     ; 43	(065)
 	const DEX_GLOOM      ; 44	(066)
 	const DEX_VILEPLUME  ; 45	(067)
@@ -99,15 +99,15 @@
 	const DEX_DIGLETT    ; 50	(092)
 	const DEX_DUGTRIO    ; 51	(093)
 	; const DEX_WIGLETT    ; 	  (094)
-	; const DEX_WUGTRIO    ; 	  (095)
+	const DEX_WUGTRIO    ; 	  (095)
 	const DEX_CROCKY	 ;		(096)
 	const DEX_KOTORA	 ;		(097)
 	const DEX_GAOTORA	 ;		(098)
 	const DEX_GOROTORA 	 ;		(099)
 	const DEX_VOLTORB    ; 100	(100)
 	const DEX_ELECTRODE  ; 101	(101)
-	; const DEX_TENTACOOL  ; 72	  (102)
-	; const DEX_TENTACRUEL ; 73	  (103)
+	const DEX_TENTACOOL  ; 72	  (102)
+	const DEX_TENTACRUEL ; 73	  (103)
 	; const DEX_TOEDSCOOL  ;      (104)
 	; const DEX_TOEDSCRUEL ;      (105)
 	const DEX_DROWZEE    ; 96	(106)
@@ -219,8 +219,8 @@
 	const DEX_GYAOON     ;		(212)
 	const DEX_OMEGA      ;		(213)
 	const DEX_SNORLAX    ; 143	(214)
-	; const DEX_SCREAM_TAIL ;     (215)
-	; const DEX_SANDY_SHOCKS ;    (216)
+ 	const DEX_SCREAM_TAIL ;     (215)
+	const DEX_SANDY_SHOCKS ;    (216)
 	const DEX_DRATINI    ; 147	(217)
 	const DEX_DRAGONAIR  ; 148	(218)
 	const DEX_DRAGONITE  ; 149	(219)

data/pokemon/base_stats/sandyshocks.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/sandyshocks.pic", 0, 1 ; sprite dimensions
 	dw SandyShocksPicFront, SandyShocksPicBack
 
-	db TACKLE, SONIC_BOOM, THUNDERSHOCK, MAGNET_BOMB ; level 1 learnset
+	db TACKLE, SONICBOOM, THUNDERSHOCK, MAGNET_BOMB ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset

data/pokemon/base_stats/screamtail.asm

@@ -3,14 +3,14 @@
 	db 115,  65,  99, 111,  65
 	;   hp  atk  def  spd  spc
 
-	db FAIRY, PSYCHIC ; type
+	db FAIRY, PSYCHIC_TYPE ; type
 	db 50 ; catch rate
 	db 210 ; base exp
 
 	INCBIN "gfx/pokemon/front/screamtail.pic", 0, 1 ; sprite dimensions
 	dw ScreamTailPicFront, ScreamTailPicBack
 
-	db SING, POUND, DISABLE, NO_MOVE ; level 1 learnset
+	db SING, FAIRY_WIND, DISABLE, BITE ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset

data/pokemon/evos_moves.asm

@@ -223,6 +223,10 @@ EvosMovesPointerTable:
 	dw BetobebiiEvosMoves
 	dw MagnezoneEvosMoves
 	dw PorygonZEvosMoves
+	dw AnnihilapeEvosMoves
+	dw ScreamTailEvosMoves
+	dw SandyShocksEvosMoves
+	dw WugtrioEvosMoves
 	dw MissingNoEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
@@ -1620,6 +1624,7 @@ DodrioEvosMoves:
 
 PrimeapeEvosMoves:
 ; Evolutions
+	db EV_TRADE, 1, ANNIHILAPE
 	db 0
 ; Learnset
 	db 9, LOW_KICK
@@ -2825,6 +2830,50 @@ PorygonZEvosMoves:
 	db 50, AMNESIA	; will replace with nasty plot
 	db 0
 
+AnnihilapeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 9, LOW_KICK
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 28, RAGE
+	db 37, SEISMIC_TOSS
+	db 45, SCREECH
+	db 46, THRASH
+	db 50, NIGHT_SHADE
+	db 0
+
+ScreamTailEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 51, SCREECH
+	db 55, DAZZLE_GLEAM
+	db 55, DRAININGKISS
+	db 0
+
+SandyShocksEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 51, SUPERSONIC
+	db 55, SCREECH
+	db 55, METAL_SOUND
+	db 0
+
+WugtrioEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, SAND_ATTACK
+	db 19, WRAP
+	db 24, HEADBUTT
+	db 31, DIG
+	db 37, HYDRO_PUMP
+	db 0
+
 MissingNoEvosMoves:
 ; Evolutions
 	db 0

engine/events/hidden_objects/museum_fossils.asm

@@ -23,17 +23,17 @@ KabutopsFossilText::
 	text_end
 
 ScarletBook::
-	tx_pre ScarletBook1
+	text_far ScarletBook1
 	ld a, SCREAM_TAIL
 	ld [wcf91], a
 	call PlayCry
 	jp DisplayMonFrontSpriteInBox
-	tx_pre ScarletBook2
+	text_far ScarletBook2
 	ld a, SANDY_SHOCKS
 	ld [wcf91], a
 	call PlayCry
 	jp DisplayMonFrontSpriteInBox
-	tx_pre ScarletBook3
+	text_far ScarletBook3
 
 ScarletBook1::
 	text_far _ScarletBook1