Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

constants/pokedex_constants.asm

@@ -115,12 +115,12 @@
 	; const DEX_SIRFETCHD
 	const DEX_BLASTYKE  
 	const DEX_BLASTOISE 
-	; const DEX_HINAAZU
+	const DEX_HINAAZU
 	const DEX_DODUO      ; 84
 	const DEX_DODRIO     ; 85 
 	const DEX_SEEL       ; 86
 	const DEX_DEWGONG    ; 87
-	; const DEX_BETOBEBII 
+	const DEX_BETOBEBII 
 	const DEX_GRIMER     ; 88
 	const DEX_MUK        ; 89
 	const DEX_SHELLDER   ; 90

constants/pokemon_constants.asm

@@ -223,8 +223,8 @@
 	const ELECTIVIRE         ; $D6
 	const MAGMORTAR          ; $D7
 	const PARA               ; $D8
-	; const HINAAZU            ; $D9
+	const HINAAZU            ; $D9
-	; const BETOBEBII          ; $DA
+	const BETOBEBII          ; $DA
 	; const MAGNEZONE          ; $DB
 	; const PORYGONZ           ; $DC
 	; const PERRSERKER         ; $DD

data/pokemon/base_stats.asm

@@ -108,10 +108,12 @@ INCLUDE "data/pokemon/base_stats/farfetchd.asm"
 INCLUDE "data/pokemon/base_stats/madaamu.asm"
 INCLUDE "data/pokemon/base_stats/blastyke.asm"
 INCLUDE "data/pokemon/base_stats/blastoise.asm"
+INCLUDE "data/pokemon/base_stats/hinaazu.asm"
 INCLUDE "data/pokemon/base_stats/doduo.asm"
 INCLUDE "data/pokemon/base_stats/dodrio.asm"
 INCLUDE "data/pokemon/base_stats/seel.asm"
 INCLUDE "data/pokemon/base_stats/dewgong.asm"
+INCLUDE "data/pokemon/base_stats/betobebii.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
 INCLUDE "data/pokemon/base_stats/muk.asm"
 INCLUDE "data/pokemon/base_stats/shellder.asm"

data/pokemon/cries.asm

@@ -222,8 +222,8 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Electivire
 	mon_cry SFX_CRY_00, $00, $00 ; Magmortar
 	mon_cry SFX_CRY_1E, $79, $40 ; Para
-	; mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
+	mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
-	; mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
+	mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
 	; mon_cry SFX_CRY_00, $00, $00 ; Magnezone
 	; mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
 	; mon_cry SFX_CRY_00, $00, $00 ; Perrserker

data/pokemon/dex_entries.asm

@@ -216,6 +216,8 @@ PokedexEntryPointers:
 	dw ElectivireDexEntry
 	dw MagmortarDexEntry
 	dw ParaDexEntry
+	dw HinaazuDexEntry
+	dw BetobebiiDexEntry
 	assert_table_length NUM_POKEMON_INDEXES
 
 ; string: species name
@@ -1720,3 +1722,17 @@ ParaDexEntry:
 	dw 40
 	text_far _ParaDexEntry
 	text_end
+	
+BetobebiiDexEntry:
+	db "SLUDGE@"
+	db 1,0
+	dw 200
+	text_far _BetobebiiDexEntry
+	text_end
+	
+HinaazuDexEntry:
+	db "BIRD NEST@"
+	db 1,4
+	dw 200
+	text_far _HinaazuDexEntry
+	text_end

data/pokemon/dex_order.asm

@@ -216,4 +216,6 @@ PokedexOrder:
 	db DEX_ELECTIVIRE
 	db DEX_MAGMORTAR
 	db DEX_PARA
+	db DEX_HINAAZU
+	db DEX_BETOBEBII
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/evos_moves.asm

@@ -219,6 +219,8 @@ EvosMovesPointerTable:
 	dw ElectivireEvosMoves
 	dw MagmortarEvosMoves
 	dw ParaEvosMoves
+	dw HinaazuEvosMoves
+	dw BetobebiiEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
 RhydonEvosMoves:
@@ -2774,3 +2776,30 @@ ParaEvosMoves:
 	db 25, GROWTH
 	db 29, SLASH
 	db 0
+	
+HinaazuEvosMoves:
+; Evolutions
+	db EV_LEVEL, 18, DODUO
+	db 0
+; Learnset
+	db 5, QUICK_ATTACK
+	db 11, FURY_ATTACK
+	db 20, DRILL_PECK
+	db 23, RAGE
+	db 27, TRI_ATTACK
+	db 32, AGILITY
+	db 0
+
+BetobebiiEvosMoves:
+; Evolutions
+	db EV_LEVEL, 20, GRIMER
+	db 0
+; Learnset
+	db 13, POISON_GAS
+	db 16, ACID
+	db 19, MINIMIZE
+	db 22, SLUDGE
+	db 28, HARDEN
+	db 33, SCREECH
+	db 37, ACID_ARMOR
+	db 0

data/pokemon/menu_icons.asm

@@ -108,10 +108,12 @@ MonPartyData:
 	nybble ICON_BIRD	  ; Madaamu
 	nybble ICON_WATER     ; Blastyke
 	nybble ICON_WATER     ; Blastoise
+	nybble ICON_BIRD      ; Hinaazu
 	nybble ICON_BIRD      ; Doduo
 	nybble ICON_BIRD      ; Dodrio
 	nybble ICON_WATER     ; Seel
 	nybble ICON_WATER     ; Dewgong
+	nybble ICON_MON       ; Betobebii
 	nybble ICON_MON       ; Grimer
 	nybble ICON_MON       ; Muk
 	nybble ICON_HELIX     ; Shellder

data/pokemon/names.asm

@@ -216,5 +216,7 @@ MonsterNames::
 	db "ELECTIVIRE"
 	db "MAGMORTAR@"
 	db "PARA@@@@@@"
+	db "HINAAZU@@@"
+	db "BETOBEBII@"
 	
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/new_dex_text.asm

@@ -399,13 +399,13 @@ _ParaDexEntry::
 	dex
 
 _HinaazuDexEntry::
-	text "This is a newly"
+	text "One of the three"
-	next "discovered"
+	next "heads is withdrawn"
-	next "#MON. It is"
+	next "upon evolution."
 
-	page "currently under"
+	page "It grows back in"
-	next "investigation. No"
+	next "as the angriest"
-	next "info is available"
+	next "head of DODRIO"
 	dex
 
 _PudiDexEntry::
@@ -419,13 +419,13 @@ _PudiDexEntry::
 	dex
 
 _BetobebiiDexEntry::
-	text "This is a newly"
+	text "Though it has a"
-	next "discovered"
+	next "cute appearance,"
-	next "#MON. It is"
+	next "it constantly"
 
-	page "currently under"
+	page "emits an foul"
-	next "investigation. No"
+	next "odor that deters"
-	next "info is available"
+	next "anyone around it"
 	dex
 
 _ScizorDexEntry::

data/pokemon/palettes.asm

@@ -109,10 +109,12 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; MADAAMU
 	db PAL_CYANMON   ; BLASTYKE
 	db PAL_CYANMON   ; BLASTOISE
+	db PAL_BROWNMON  ; HINAAZU
 	db PAL_BROWNMON  ; DODUO
 	db PAL_BROWNMON  ; DODRIO
 	db PAL_BLUEMON   ; SEEL
 	db PAL_BLUEMON   ; DEWGONG
+	db PAL_PURPLEMON ; HINAAZU
 	db PAL_PURPLEMON ; GRIMER
 	db PAL_PURPLEMON ; MUK
 	db PAL_PURPLEMON ; SHELLDER

gfx/pics.asm

@@ -506,5 +506,9 @@ ElectivirePicFront::   INCBIN "gfx/pokemon/front/electivire.pic"
 ElectivirePicBack::    INCBIN "gfx/pokemon/back/electivireb.pic"
 MagmortarPicFront::    INCBIN "gfx/pokemon/front/magmortar.pic"
 MagmortarPicBack::     INCBIN "gfx/pokemon/back/magmortarb.pic"
-ParaPicFront::    INCBIN "gfx/pokemon/front/para.pic"
+ParaPicFront::    	   INCBIN "gfx/pokemon/front/para.pic"
-ParaPicBack::     INCBIN "gfx/pokemon/back/parab.pic"
+ParaPicBack::     	   INCBIN "gfx/pokemon/back/parab.pic"
+HinaazuPicFront::      INCBIN "gfx/pokemon/front/hinaazu.pic"
+HinaazuPicBack::       INCBIN "gfx/pokemon/back/hinaazub.pic"
+BetobebiiPicFront::    INCBIN "gfx/pokemon/front/betobebii.pic"
+BetobebiiPicBack::     INCBIN "gfx/pokemon/back/betobebiib.pic"