Finally adding Meltan and Melmetal!

Also had to remove Mr. Mime-G since I forgot to add Alolan Persian and Raichu. Oops.

constants/pokedex_constants.asm

@@ -42,185 +42,185 @@
 	const DEX_KONYA 	 ;		(035)
 	const DEX_MEOWTH     ; 52	(036)
 	const DEX_PERSIAN    ; 53	(037)
-	const DEX_PERRSERKER ;      (038)
-	const DEX_SPEAROW    ; 21	(039)
-	const DEX_FEAROW     ; 22	(040)
-	const DEX_EKANS      ; 23	(041)
-	const DEX_ARBOK      ; 24	(042)
-	const DEX_SANDSHREW  ; 27	(043)
-	const DEX_SANDSLASH  ; 28	(044)
-	; const DEX_SANDSLASH_A  ;	(045)
-	const DEX_NIDORAN_F  ; 29	(046)
-	const DEX_NIDORINA   ; 30	(047)
-	const DEX_NIDOQUEEN  ; 31	(048)
-	const DEX_NIDORAN_M  ; 32	(049)
-	const DEX_NIDORINO   ; 33	(050)
-	const DEX_NIDOKING   ; 34	(051)
-	const DEX_NIDOREIGN	 ;		(052)
-	const DEX_BITTYBAT	 ;		(053)
-	const DEX_ZUBAT      ; 41	(054)
-	const DEX_GOLBAT     ; 42	(055)
-	const DEX_CROBAT	 ;		(056)
-	const DEX_GEODUDE    ; 74	(057)
-	const DEX_GRAVELER   ; 75	(058)
-	const DEX_GOLEM      ; 76	(059)
-	; const DEX_GOLEM_A    ; 	(060)
-	const DEX_PARA		 ;		(061)
-	const DEX_PARAS      ; 46	(062)
-	const DEX_PARASECT   ; 47	(063)
-	const DEX_CLEFAIRY   ; 35	(064)
-	const DEX_CLEFABLE   ; 36	(065)
-	const DEX_JIGGLYPUFF ; 39	(066)
-	const DEX_WIGGLYTUFF ; 40	(067)
-	const DEX_MIKON      ;		(068)
-	const DEX_VULPIX     ; 37	(069)
-	const DEX_NINETALES  ; 38	(070)
-	; const DEX_NINETALES_A ;	(071)
-	const DEX_PUDI		 ;		(072)
-	const DEX_GROWLITHE  ; 58	(073)
-	const DEX_ARCANINE   ; 59	(074)
-	; const DEX_ARCANINE_A  ; 	(075)	
-	const DEX_MANKEY     ; 56	(076)
-	const DEX_PRIMEAPE   ; 57	(077)
-	const DEX_ANNIHILAPE ;      (078)
-	const DEX_ODDISH     ; 43	(079)
-	const DEX_GLOOM      ; 44	(080)
-	const DEX_VILEPLUME  ; 45	(081)
-	const DEX_BELLOSSOM	 ;		(082)
-	const DEX_BELLSPROUT ; 69	(083)
-	const DEX_WEEPINBELL ; 70	(084)
-	const DEX_VICTREEBEL ; 71	(085)
-	const DEX_TSUBOMITTO ;		(086)
-	const DEX_MAGIKARP   ; 129	(087)
-	const DEX_GYARADOS   ; 130	(088)
-	const DEX_GYOPIN	 ;		(089)
-	const DEX_GOLDEEN    ; 118	(090)
-	const DEX_SEAKING    ; 119	(091)
-	const DEX_VENONAT    ; 48	(092)
-	const DEX_VENOMOTH   ; 49	(093)
-	const DEX_CHEEP    	 ;		(094)
-	const DEX_JABETTA    ;		(095)
-	const DEX_PSYDUCK    ; 54	(096)
-	const DEX_WEIRDUCK   ;		(097)
-	const DEX_GOLDUCK    ; 55	(098)
-	const DEX_ABRA       ; 63	(099)
-	const DEX_KADABRA    ; 64	(100)
-	const DEX_ALAKAZAM   ; 65	(101)
-	const DEX_POLIWAG    ; 60	(102)
-	const DEX_POLIWHIRL  ; 61	(103)
-	const DEX_POLIWRATH  ; 62	(104)
-	const DEX_POLITOED	 ;		(105)
-	const DEX_RIBBITO    ;		(106)
-	const DEX_CROAKOZUNA ;		(107)
+	; const DEX_PERSIAN_A  ;	    (038)
+	const DEX_PERRSERKER ;      (039)
+	const DEX_SPEAROW    ; 21	(040)
+	const DEX_FEAROW     ; 22	(041)
+	const DEX_EKANS      ; 23	(042)
+	const DEX_ARBOK      ; 24	(043)
+	const DEX_SANDSHREW  ; 27	(044)
+	const DEX_SANDSLASH  ; 28	(045)
+	; const DEX_SANDSLASH_A  ;	(046)
+	const DEX_NIDORAN_F  ; 29	(047)
+	const DEX_NIDORINA   ; 30	(048)
+	const DEX_NIDOQUEEN  ; 31	(049)
+	const DEX_NIDORAN_M  ; 32	(050)
+	const DEX_NIDORINO   ; 33	(051)
+	const DEX_NIDOKING   ; 34	(052)
+	const DEX_NIDOREIGN	 ;		(053)
+	const DEX_BITTYBAT	 ;		(054)
+	const DEX_ZUBAT      ; 41	(055)
+	const DEX_GOLBAT     ; 42	(056)
+	const DEX_CROBAT	 ;		(057)
+	const DEX_GEODUDE    ; 74	(058)
+	const DEX_GRAVELER   ; 75	(059)
+	const DEX_GOLEM      ; 76	(060)
+	; const DEX_GOLEM_A    ; 	(061)
+	const DEX_PARA		 ;		(062)
+	const DEX_PARAS      ; 46	(063)
+	const DEX_PARASECT   ; 47	(064)
+	const DEX_CLEFAIRY   ; 35	(065)
+	const DEX_CLEFABLE   ; 36	(066)
+	const DEX_JIGGLYPUFF ; 39	(067)
+	const DEX_WIGGLYTUFF ; 40	(068)
+	const DEX_MIKON      ;		(069)
+	const DEX_VULPIX     ; 37	(070)
+	const DEX_NINETALES  ; 38	(071)
+	; const DEX_NINETALES_A ;	(072)
+	const DEX_PUDI		 ;		(073)
+	const DEX_GROWLITHE  ; 58	(074)
+	const DEX_ARCANINE   ; 59	(075)
+	; const DEX_ARCANINE_H  ; 	(076)	
+	const DEX_MANKEY     ; 56	(077)
+	const DEX_PRIMEAPE   ; 57	(078)
+	const DEX_ANNIHILAPE ;      (079)
+	const DEX_ODDISH     ; 43	(080)
+	const DEX_GLOOM      ; 44	(081)
+	const DEX_VILEPLUME  ; 45	(082)
+	const DEX_BELLOSSOM	 ;		(083)
+	const DEX_BELLSPROUT ; 69	(084)
+	const DEX_WEEPINBELL ; 70	(085)
+	const DEX_VICTREEBEL ; 71	(086)
+	const DEX_TSUBOMITTO ;		(087)
+	const DEX_MAGIKARP   ; 129	(088)
+	const DEX_GYARADOS   ; 130	(089)
+	const DEX_GYOPIN	 ;		(090)
+	const DEX_GOLDEEN    ; 118	(091)
+	const DEX_SEAKING    ; 119	(092)
+	const DEX_VENONAT    ; 48	(093)
+	const DEX_VENOMOTH   ; 49	(094)
+	const DEX_CHEEP    	 ;		(095)
+	const DEX_JABETTA    ;		(096)
+	const DEX_PSYDUCK    ; 54	(097)
+	const DEX_WEIRDUCK   ;		(098)
+	const DEX_GOLDUCK    ; 55	(099)
+	const DEX_POLIWAG    ; 60	(100)
+	const DEX_POLIWHIRL  ; 61	(101)
+	const DEX_POLIWRATH  ; 62	(102)
+	const DEX_POLITOED	 ;		(103)
+	const DEX_RIBBITO    ;		(104)
+	const DEX_CROAKOZUNA ;		(105)
+	const DEX_DROWZEE    ; 96	(106)
+	const DEX_HYPNO      ; 97	(107)
 	const DEX_LICKITUNG  ; 108	(108)		; There's a reason we're keeping Lickitung's number.
 	const DEX_LICKILICKY ;		(109)
-	const DEX_ONIX       ; 95	(110)
-	const DEX_STEELIX	 ;		(111)
-	const DEX_DIGLETT    ; 50	(112)
-	const DEX_DUGTRIO    ; 51	(113)
-	; const DEX_DUGTRIO_A    ;  (114)
-	const DEX_WIGLETT    ; 	    (115)
-	const DEX_WUGTRIO    ; 	    (116)
-	const DEX_DROWZEE    ; 96	(117)
-	const DEX_HYPNO      ; 97	(118)
-	const DEX_KOTORA	 ;		(119)
-	const DEX_GAOTORA	 ;		(120)
-	const DEX_GOROTORA 	 ;		(121)
-	const DEX_VOLTORB    ; 100	(122)
-	const DEX_ELECTRODE  ; 101	(123)
-	; const DEX_ELECTRODE_H  ; 	(124)
-	const DEX_TENTACOOL  ; 72	(125)
-	const DEX_TENTACRUEL ; 73	(126)
-	const DEX_TOEDSCOOL  ;      (127)
-	const DEX_TOEDSCRUEL ;      (128)
-	const DEX_MAGNEMITE  ; 81	(129)
-	const DEX_MAGNETITE	 ;		(130)
-	const DEX_MAGNETON   ; 82	(131)
-	const DEX_MAGNEZONE  ;		(132)
-	const DEX_MACHOP     ; 66	(133)
-	const DEX_MACHOKE    ; 67	(134)
-	const DEX_MACHAMP    ; 68	(135)
-	const DEX_CROCKY	 ;		(136)
-	const DEX_FARFETCHD  ; 83 	(137)
-	const DEX_MADAAMU    ;		(138)
-	const DEX_SIRFETCHD	 ;	    (139)
-	const DEX_KRABBY     ; 98	(140)
-	const DEX_KINGLER    ; 99	(141)
-	const DEX_SLOWPOKE   ; 79	(142)
-	const DEX_SLOWBRO    ; 80	(143)
-	; const DEX_SLOWBRO_G  ;  	(144)
-	const DEX_SLOWKING   ;		(145)
-	; const DEX_SLOWKING_G   ;	(146)
-	const DEX_PUCHIKOON  ;		(147)
-	const DEX_PONYTA     ; 77	(148)
-	const DEX_RAPIDASH   ; 78	(149)
-	; const DEX_RAPIDASH_G ;  	(150)
-	const DEX_MONJA		 ;		(151)
-	const DEX_TANGELA    ; 114 	(152)
-	const DEX_TANGROWTH	 ;		(153)
-	const DEX_HINAAZU	 ;		(154)
-	const DEX_DODUO      ; 84	(155)
-	const DEX_DODRIO     ; 85 	(156)
-	const DEX_BARUNDA    ;		(157)
-	const DEX_GASTLY     ; 92	(158)
-	const DEX_HAUNTER    ; 93	(159)
-	const DEX_GENGAR     ; 94	(160)
-	const DEX_CUBONE     ; 104	(161)
-	const DEX_MAROWAK    ; 105	(162)
-	; const DEX_MAROWAK_A  ;	(163)
-	const DEX_GUARDIA 	 ;		(164)
-	const DEX_BETOBEBII  ;		(165)
-	const DEX_GRIMER     ; 88	(166)
-	const DEX_MUK        ; 89	(167)
-	; const DEX_MUK_A      ; 	(168)
-	const DEX_KOFFING    ; 109	(169)
-	const DEX_WEEZING    ; 110	(170)
-	; const DEX_WEEZING_G  ; 	(171)
-	const DEX_BLASTYKE   ;		(172)  
-	const DEX_BLASTOISE  ; 9	(173)
-	const DEX_DITTO      ; 132	(174)
-	const DEX_ANIMON	 ;		(175)
-	const DEX_DEER		 ;		(176)
-	const DEX_HITMONLEE  ; 106	(177)
-	const DEX_HITMONCHAN ; 107	(178)
-	const DEX_HITMONTOP	 ;		(179)
-	const DEX_CACTUS	 ;		(180)
-	const DEX_SHELLDER   ; 90	(181)
-	const DEX_CLOYSTER   ; 91	(182)
-	const DEX_BLOTTLE    ;		(183)
-	const DEX_PENDRAKEN  ;		(184)
-	const DEX_STARYU     ; 120	(185)
-	const DEX_STARMIE    ; 121	(186)
-	const DEX_SEEL       ; 86	(187)
-	const DEX_DEWGONG    ; 87	(188)
-	const DEX_HORSEA     ; 116	(189)
-	const DEX_SEADRA     ; 117	(190)
-	const DEX_KINGDRA	 ;		(191)
-	const DEX_JAGG		 ;		(192)
-	const DEX_EXEGGCUTE  ; 102	(193)
-	const DEX_EXEGGUTOR  ; 103	(194)
-	; const DEX_EXEGGUTOR_A ; 	(195)
-	const DEX_RHYHORN    ; 111	(196)
-	const DEX_RHYDON     ; 112	(197)
-	const DEX_RHYPERIOR	 ;		(198)
-	const DEX_SCYTHER    ; 123	(199)
-	const DEX_SCIZOR	 ;		(200)
-	const DEX_KLEAVOR	 ;		(201)
-	const DEX_PINSIR     ; 127	(202)
-	const DEX_PURAKKUSU	 ;		(203)
-	const DEX_KANGASKHAN ; 115	(204)
-	const DEX_TRAMPEL    ; 		(205)
-	const DEX_TAUROS     ; 128	(206)
-	; const DEX_TAUROS_P   ; 	(207)
-	; const DEX_TAUROS_PA  ; 	(208)
-	; const DEX_TAUROS_PB  ; 	(209)
-	const DEX_CHANSEY    ; 113	(210)
-	const DEX_BLISSEY	 ;		(211)
-	const DEX_SKIMPER    ;		(212)
-	const DEX_BAWLIGUA   ;		(213)
-	const DEX_CRYITHAN   ;		(214)
-	const DEX_MR_MIME    ; 122	(215)
-	; const DEX_MR_MIME_G  ; 	(216)
+	const DEX_ABRA       ; 63	(110)
+	const DEX_KADABRA    ; 64	(111)
+	const DEX_ALAKAZAM   ; 65	(112)
+	const DEX_DIGLETT    ; 50	(113)
+	const DEX_DUGTRIO    ; 51	(114)
+	; const DEX_DUGTRIO_A    ;  (115)
+	const DEX_WIGLETT    ; 	    (116)
+	const DEX_WUGTRIO    ; 	    (117)
+	const DEX_ONIX       ; 95	(118)
+	const DEX_STEELIX	 ;		(119)
+	const DEX_KOTORA	 ;		(120)
+	const DEX_GAOTORA	 ;		(121)
+	const DEX_GOROTORA 	 ;		(122)
+	const DEX_VOLTORB    ; 100	(123)
+	const DEX_ELECTRODE  ; 101	(124)
+	; const DEX_ELECTRODE_H  ; 	(125)
+	const DEX_TENTACOOL  ; 72	(126)
+	const DEX_TENTACRUEL ; 73	(127)
+	const DEX_TOEDSCOOL  ;      (128)
+	const DEX_TOEDSCRUEL ;      (129)
+	const DEX_MAGNEMITE  ; 81	(130)
+	const DEX_MAGNETITE	 ;		(131)
+	const DEX_MAGNETON   ; 82	(132)
+	const DEX_MAGNEZONE  ;		(133)
+	const DEX_MACHOP     ; 66	(134)
+	const DEX_MACHOKE    ; 67	(135)
+	const DEX_MACHAMP    ; 68	(136)
+	const DEX_CROCKY	 ;		(137)
+	const DEX_FARFETCHD  ; 83 	(138)
+	const DEX_MADAAMU    ;		(139)
+	const DEX_SIRFETCHD	 ;	    (140)
+	const DEX_KRABBY     ; 98	(141)
+	const DEX_KINGLER    ; 99	(142)
+	const DEX_SLOWPOKE   ; 79	(143)
+	const DEX_SLOWBRO    ; 80	(144)
+	; const DEX_SLOWBRO_G  ;  	(145)
+	const DEX_SLOWKING   ;		(146)
+	; const DEX_SLOWKING_G   ;	(147)
+	const DEX_PUCHIKOON  ;		(148)
+	const DEX_PONYTA     ; 77	(149)
+	const DEX_RAPIDASH   ; 78	(150)
+	; const DEX_RAPIDASH_G ;  	(151)
+	const DEX_MONJA		 ;		(152)
+	const DEX_TANGELA    ; 114 	(153)
+	const DEX_TANGROWTH	 ;		(154)
+	const DEX_HINAAZU	 ;		(155)
+	const DEX_DODUO      ; 84	(156)
+	const DEX_DODRIO     ; 85 	(157)
+	const DEX_BARUNDA    ;		(158)
+	const DEX_GASTLY     ; 92	(159)
+	const DEX_HAUNTER    ; 93	(160)
+	const DEX_GENGAR     ; 94	(161)
+	const DEX_CUBONE     ; 104	(162)
+	const DEX_MAROWAK    ; 105	(163)
+	; const DEX_MAROWAK_A  ;	(164)
+	const DEX_GUARDIA 	 ;		(165)
+	const DEX_BETOBEBII  ;		(166)
+	const DEX_GRIMER     ; 88	(167)
+	const DEX_MUK        ; 89	(168)
+	; const DEX_MUK_A      ; 	(169)
+	const DEX_KOFFING    ; 109	(170)
+	const DEX_WEEZING    ; 110	(171)
+	; const DEX_WEEZING_G  ; 	(172)
+	const DEX_BLASTYKE   ;		(173)  
+	const DEX_BLASTOISE  ; 9	(174)
+	const DEX_DITTO      ; 132	(175)
+	const DEX_ANIMON	 ;		(176)
+	const DEX_DEER		 ;		(177)
+	const DEX_HITMONLEE  ; 106	(178)
+	const DEX_HITMONCHAN ; 107	(179)
+	const DEX_HITMONTOP	 ;		(180)
+	const DEX_CACTUS	 ;		(181)
+	const DEX_SHELLDER   ; 90	(182)
+	const DEX_CLOYSTER   ; 91	(183)
+	const DEX_BLOTTLE    ;		(184)
+	const DEX_PENDRAKEN  ;		(185)
+	const DEX_STARYU     ; 120	(186)
+	const DEX_STARMIE    ; 121	(187)
+	const DEX_SEEL       ; 86	(188)
+	const DEX_DEWGONG    ; 87	(189)
+	const DEX_HORSEA     ; 116	(190)
+	const DEX_SEADRA     ; 117	(191)
+	const DEX_KINGDRA	 ;		(192)
+	const DEX_JAGG		 ;		(193)
+	const DEX_EXEGGCUTE  ; 102	(194)
+	const DEX_EXEGGUTOR  ; 103	(195)
+	; const DEX_EXEGGUTOR_A ; 	(196)
+	const DEX_RHYHORN    ; 111	(197)
+	const DEX_RHYDON     ; 112	(198)
+	const DEX_RHYPERIOR	 ;		(199)
+	const DEX_SCYTHER    ; 123	(200)
+	const DEX_SCIZOR	 ;		(201)
+	const DEX_KLEAVOR	 ;		(202)
+	const DEX_PINSIR     ; 127	(203)
+	const DEX_PURAKKUSU	 ;		(204)
+	const DEX_KANGASKHAN ; 115	(205)
+	const DEX_TRAMPEL    ; 		(206)
+	const DEX_TAUROS     ; 128	(207)
+	; const DEX_TAUROS_P   ; 	(208)
+	; const DEX_TAUROS_PA  ; 	(209)
+	; const DEX_TAUROS_PB  ; 	(210)
+	const DEX_CHANSEY    ; 113	(211)
+	const DEX_BLISSEY	 ;		(212)
+	const DEX_SKIMPER    ;		(213)
+	const DEX_BAWLIGUA   ;		(214)
+	const DEX_CRYITHAN   ;		(215)
+	const DEX_MR_MIME    ; 122	(216)
 	const DEX_MR_RIME	 ;      (217)
 	const DEX_JYNX       ; 124	(218)
 	const DEX_BUU		 ;		(219)
@@ -254,7 +254,7 @@
 	const DEX_MOLTRES_G  ; 	    (247)
 	const DEX_MEWTWO     ; 150	(248)
 	const DEX_MEW        ; 151	(249)
-	; const DEX_MELTAN	   ; 	  (250)
-	; const DEX_MELMETAL   ; 	  (251)
+	const DEX_MELTAN	 ; 	    (250)
+	const DEX_MELMETAL   ; 	   	(251)
 
 DEF NUM_POKEMON EQU const_value

constants/pokemon_constants.asm

@@ -237,24 +237,24 @@
 	const PERRSERKER         ; $E4
 	const SIRFETCHD          ; $E5
 	const MR_RIME            ; $E6
-	; const MELTAN			   ; $E7
-	; const MELMETAL		   ; $E8
+	const MELTAN			 ; $E7
+	const MELMETAL		   	 ; $E8
 	; const ARCANINE_H		   ; $E9
 	; const ELECTRODE_H		   ; $EA
 	; const RATICATE_A		   ; $EB
-	; const SANDSLASH_A		   ; $EC
-	; const NINETALES_A		   ; $ED
-	; const DUGTRIO_A		   ; $EE
-	; const PERSIAN_A		   ; $EF
-	; const GOLEM_A		 	   ; $F0
-	; const RAPIDASH_G		   ; $F1
-	; const SLOWBRO_G		   ; $F2
-	; const SLOWKING_G		   ; $F3
-	; const MUK_A		       ; $F4
-	; const EXEGGUTOR_A		   ; $F5
-	; const MAROWAK_A		   ; $F6
-	; const WEEZING_G		   ; $F7
-	; const MR_MIME_G		   ; $F8
+	; const RAICHU_A           ; $EC
+	; const SANDSLASH_A		   ; $ED
+	; const NINETALES_A		   ; $EE
+	; const DUGTRIO_A		   ; $EF
+	; const PERSIAN_A		   ; $F0
+	; const GOLEM_A		 	   ; $F1
+	; const RAPIDASH_G		   ; $F2
+	; const SLOWBRO_G		   ; $F3
+	; const SLOWKING_G		   ; $F4
+	; const MUK_A		       ; $F5
+	; const EXEGGUTOR_A		   ; $F6
+	; const MAROWAK_A		   ; $F7
+	; const WEEZING_G		   ; $F8
 	; const TAUROS_P		   ; $F9
 	; const TAUROS_PA		   ; $FA
 	; const TAUROS_PB		   ; $FB

data/pokemon/base_stats.asm

@@ -37,6 +37,7 @@ INCLUDE "data/pokemon/base_stats/beedrill.asm"
 INCLUDE "data/pokemon/base_stats/konya.asm"
 INCLUDE "data/pokemon/base_stats/meowth.asm"
 INCLUDE "data/pokemon/base_stats/persian.asm"
+; INCLUDE "data/pokemon/base_stats/persiana.asm"
 INCLUDE "data/pokemon/base_stats/perrserker.asm"
 INCLUDE "data/pokemon/base_stats/spearow.asm"
 INCLUDE "data/pokemon/base_stats/fearow.asm"
@@ -98,26 +99,26 @@ INCLUDE "data/pokemon/base_stats/jabetta.asm"
 INCLUDE "data/pokemon/base_stats/psyduck.asm"
 INCLUDE "data/pokemon/base_stats/weirduck.asm"
 INCLUDE "data/pokemon/base_stats/golduck.asm"
-INCLUDE "data/pokemon/base_stats/abra.asm"
-INCLUDE "data/pokemon/base_stats/kadabra.asm"
-INCLUDE "data/pokemon/base_stats/alakazam.asm"
 INCLUDE "data/pokemon/base_stats/poliwag.asm"
 INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
 INCLUDE "data/pokemon/base_stats/poliwrath.asm"
 INCLUDE "data/pokemon/base_stats/politoed.asm"
 INCLUDE "data/pokemon/base_stats/ribbito.asm"
 INCLUDE "data/pokemon/base_stats/croakozuna.asm"
+INCLUDE "data/pokemon/base_stats/drowzee.asm"
+INCLUDE "data/pokemon/base_stats/hypno.asm"
 INCLUDE "data/pokemon/base_stats/lickitung.asm"
 INCLUDE "data/pokemon/base_stats/lickilicky.asm"
-INCLUDE "data/pokemon/base_stats/onix.asm"
-INCLUDE "data/pokemon/base_stats/steelix.asm"
+INCLUDE "data/pokemon/base_stats/abra.asm"
+INCLUDE "data/pokemon/base_stats/kadabra.asm"
+INCLUDE "data/pokemon/base_stats/alakazam.asm"
 INCLUDE "data/pokemon/base_stats/diglett.asm"
 INCLUDE "data/pokemon/base_stats/dugtrio.asm"
 ; INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
 INCLUDE "data/pokemon/base_stats/wiglett.asm"
 INCLUDE "data/pokemon/base_stats/wugtrio.asm"
-INCLUDE "data/pokemon/base_stats/drowzee.asm"
-INCLUDE "data/pokemon/base_stats/hypno.asm"
+INCLUDE "data/pokemon/base_stats/onix.asm"
+INCLUDE "data/pokemon/base_stats/steelix.asm"
 INCLUDE "data/pokemon/base_stats/kotora.asm"
 INCLUDE "data/pokemon/base_stats/gaotora.asm"
 INCLUDE "data/pokemon/base_stats/gorotora.asm"
@@ -215,7 +216,6 @@ INCLUDE "data/pokemon/base_stats/skimper.asm"
 INCLUDE "data/pokemon/base_stats/bawligua.asm"
 INCLUDE "data/pokemon/base_stats/cryithan.asm"
 INCLUDE "data/pokemon/base_stats/mrmime.asm"
-; INCLUDE "data/pokemon/base_stats/mrmimeg.asm"
 INCLUDE "data/pokemon/base_stats/mrrime.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
@@ -249,8 +249,8 @@ INCLUDE "data/pokemon/base_stats/moltres.asm"
 INCLUDE "data/pokemon/base_stats/moltresg.asm"
 INCLUDE "data/pokemon/base_stats/mewtwo.asm"
 INCLUDE "data/pokemon/base_stats/mew.asm"
-; INCLUDE "data/pokemon/base_stats/meltan.asm"
-; INCLUDE "data/pokemon/base_stats/melmetal.asm"
+INCLUDE "data/pokemon/base_stats/meltan.asm"
+INCLUDE "data/pokemon/base_stats/melmetal.asm"
 	assert_table_length NUM_POKEMON - 1 ; discount MissingNo
 
 MissingnoBaseStats::

data/pokemon/cries.asm

@@ -14,10 +14,8 @@ CryData::
 	mon_cry SFX_CRY_06, $ED, $80 ; Voltorb
 	mon_cry SFX_CRY_09, $00, $80 ; Nidoking
 	mon_cry SFX_CRY_1F, $00, $80 ; Slowbro
-	; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
 	mon_cry SFX_CRY_0F, $20, $80 ; Ivysaur
 	mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor
-	; mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
 	mon_cry SFX_CRY_0C, $00, $80 ; Lickitung
 	mon_cry SFX_CRY_0B, $00, $80 ; Exeggcute
 	mon_cry SFX_CRY_05, $00, $80 ; Grimer
@@ -28,7 +26,6 @@ CryData::
 	mon_cry SFX_CRY_04, $00, $80 ; Rhyhorn
 	mon_cry SFX_CRY_1B, $00, $80 ; Lapras
 	mon_cry SFX_CRY_15, $00, $80 ; Arcanine
-	; mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H
 	mon_cry SFX_CRY_1E, $EE, $FF ; Mew
 	mon_cry SFX_CRY_17, $00, $80 ; Gyarados
 	mon_cry SFX_CRY_18, $00, $80 ; Shellder
@@ -51,7 +48,6 @@ CryData::
 	mon_cry SFX_CRY_14, $0A, $C0 ; Chansey
 	mon_cry SFX_CRY_1F, $48, $60 ; Machoke
 	mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime
-	; mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime-G
 	mon_cry SFX_CRY_12, $80, $C0 ; Hitmonlee
 	mon_cry SFX_CRY_0C, $EE, $C0 ; Hitmonchan
 	mon_cry SFX_CRY_17, $E0, $10 ; Arbok
@@ -59,7 +55,6 @@ CryData::
 	mon_cry SFX_CRY_21, $20, $60 ; Psyduck
 	mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
 	mon_cry SFX_CRY_12, $E0, $40 ; Golem
-	; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
 	mon_cry SFX_CRY_0E, $00, $80 ; Barunda
 	mon_cry SFX_CRY_04, $FF, $30 ; Magmar
 	mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
@@ -71,9 +66,6 @@ CryData::
 	mon_cry SFX_CRY_0C, $88, $C0 ; Seel
 	mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
 	mon_cry SFX_CRY_1D, $11, $40 ; Tauros
-	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
-	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
-	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
 	mon_cry SFX_CRY_03, $90, $B0 ; Trampel
 	mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
 	mon_cry SFX_CRY_13, $93, $00 ; Blottle
@@ -97,10 +89,8 @@ CryData::
 	mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
 	mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
 	mon_cry SFX_CRY_24, $88, $60 ; Ninetales
-	; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
 	mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
 	mon_cry SFX_CRY_09, $EE, $08 ; Raichu
-	; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
 	mon_cry SFX_CRY_12, $93, $60 ; Ribbito
 	mon_cry SFX_CRY_12, $25, $FF ; Croakozuna
 	mon_cry SFX_CRY_0F, $60, $40 ; Dratini
@@ -113,7 +103,6 @@ CryData::
 	mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
 	mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
 	mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
-	; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
 	mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
 	mon_cry SFX_CRY_1F, $FF, $40 ; Omastar
 	mon_cry SFX_CRY_0E, $FF, $35 ; Jigglypuff
@@ -135,7 +124,6 @@ CryData::
 	mon_cry SFX_CRY_0B, $99, $20 ; Dodrio
 	mon_cry SFX_CRY_0A, $AF, $40 ; Primeape
 	mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
-	; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
 	mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
 	mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
 	mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
@@ -154,20 +142,15 @@ CryData::
 	mon_cry SFX_CRY_19, $C1, $1C ; Konya
 	mon_cry SFX_CRY_13, $00, $00 ; Omega
 	mon_cry SFX_CRY_07, $EF, $FF ; Muk
-	; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
 	mon_cry SFX_CRY_0F, $40, $80 ; Decilla
 	mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
 	mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster
 	mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite
 	mon_cry SFX_CRY_06, $A8, $90 ; Electrode
-	; mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H
 	mon_cry SFX_CRY_19, $AA, $20 ; Clefable
 	mon_cry SFX_CRY_12, $FF, $FF ; Weezing
-	; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
 	mon_cry SFX_CRY_19, $99, $FF ; Persian
-	; mon_cry SFX_CRY_19, $99, $FF ; Persian-A
 	mon_cry SFX_CRY_08, $4F, $60 ; Marowak
-	; mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
 	mon_cry SFX_CRY_08, $00, $FF ; Guardia
 	mon_cry SFX_CRY_1C, $30, $40 ; Haunter
 	mon_cry SFX_CRY_1C, $C0, $01 ; Abra
@@ -187,10 +170,8 @@ CryData::
 	mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
 	mon_cry SFX_CRY_25, $00, $80 ; Ponyta
 	mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
-	; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
 	mon_cry SFX_CRY_22, $00, $80 ; Rattata
 	mon_cry SFX_CRY_22, $20, $FF ; Raticate
-	; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
 	mon_cry SFX_CRY_00, $2C, $C0 ; Nidorino
 	mon_cry SFX_CRY_01, $2C, $E0 ; Nidorina
 	mon_cry SFX_CRY_24, $F0, $10 ; Geodude
@@ -206,9 +187,9 @@ CryData::
 	mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
 	mon_cry SFX_CRY_04, $00, $80 ; Charizard
 	mon_cry SFX_CRY_1D, $00, $80 ; Totartle
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Ghost)
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Aerodactyl Fossil)
 	mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Kabutops Fossil)
+	mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Aerodactyl Fossil)
+	mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Ghost)
 	mon_cry SFX_CRY_08, $DD, $01 ; Oddish
 	mon_cry SFX_CRY_08, $AA, $40 ; Gloom
 	mon_cry SFX_CRY_23, $22, $FF ; Vileplume
@@ -238,7 +219,6 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Kingdra
 	mon_cry SFX_CRY_00, $00, $00 ; Politoed
 	mon_cry SFX_CRY_00, $00, $00 ; Slowking
-	; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
 	mon_cry SFX_CRY_00, $00, $00 ; Electivire
 	mon_cry SFX_CRY_00, $00, $00 ; Magmortar
 	mon_cry SFX_CRY_1E, $79, $40 ; Para
@@ -256,8 +236,27 @@ CryData::
 	mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
 	mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd
 	mon_cry SFX_CRY_20, $00, $90 ; Mr. Rime
-	; mon_cry SFX_CRY_00, $00, $00 ; Meltan
-	; mon_cry SFX_CRY_00, $00, $00 ; Melmetal
+	mon_cry SFX_CRY_0E, $FF, $1C ; Meltan
+	mon_cry SFX_CRY_11, $F0, $60 ; Melmetal
+	; mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H
+	; mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H
+	; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
+	; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
+	; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
+	; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
+	; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
+	; mon_cry SFX_CRY_19, $99, $FF ; Persian-A
+	; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
+	; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
+	; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
+	; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
+	; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
+	; mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
+	; mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
+	; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
+	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
+	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
+	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
 	mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
 	mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
 	mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G

data/pokemon/dex_entries.asm

@@ -230,6 +230,8 @@ PokedexEntryPointers:
 	dw PerrserkerDexEntry
 	dw SirfetchdDexEntry
 	dw MrRimeDexEntry
+	dw MeltanDexEntry
+	dw MelmetalDexEntry
 	dw ArticunoGDexEntry
 	dw ZapdosGDexEntry
 	dw MoltresGDexEntry
@@ -1837,6 +1839,20 @@ MrRimeDexEntry:
 	text_far _MrRimeDexEntry
 	text_end
 	
+MeltanDexEntry:
+    db "HEX NUT@"
+	db 0,8
+	dw 180
+	text_far _MeltanDexEntry
+	text_end
+	
+MelmetalDexEntry:
+	db "HEX NUT@"
+	db 8,2
+	dw 17640
+	text_far _MelmetalDexEntry
+	text_end
+	
 ArticunoGDexEntry:
 	db "CRUEL@"
 	db 5,7

data/pokemon/dex_order.asm

@@ -230,8 +230,8 @@ PokedexOrder:
 	db DEX_PERRSERKER
 	db DEX_SIRFETCHD
 	db DEX_MR_RIME
-	; db DEX_MELTAN
-	; db DEX_MELMETAL
+	db DEX_MELTAN
+	db DEX_MELMETAL
 	db DEX_ARTICUNO_G
 	db DEX_ZAPDOS_G
 	db DEX_MOLTRES_G

data/pokemon/evos_moves.asm

@@ -262,11 +262,11 @@ EvosMovesPointerTable:
 	dw PerrserkerEvosMoves
 	dw SirfetchdEvosMoves
 	dw MrRimeEvosMoves
+	dw MeltanEvosMoves
+	dw MelmetalEvosMoves
 	dw ArticunoGEvosMoves	
 	dw ZapdosGEvosMoves
 	dw MoltresGEvosMoves
-	; dw MeltanEvosMoves
-	; dw MelmetalEvosMoves
 	dw MissingNoEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
@@ -3240,6 +3240,36 @@ MrRimeEvosMoves:
 	db 44, PSYCHIC_M
 	db 50, FEINT_ATTACK
 	db 0
+	
+MeltanEvosMoves:
+; Evolutions
+	db EV_ITEM, CANDY_JAR, 1, MELMETAL
+	db 0
+; Learnset
+	db 8, TAIL_WHIP
+	db 16, HEADBUTT
+	db 24, THUNDER_WAVE
+	db 32, ACID_ARMOR
+	db 40, IRON_HEAD
+	db 0
+
+MelmetalEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 9, TAIL_WHIP
+	db 16, HEADBUTT
+	db 18, THUNDER_WAVE
+	db 20, THUNDERSHOCK
+	db 27, THUNDERPUNCH
+	db 36, ACID_ARMOR
+	db 45, MAGNET_BOMB
+	db 51, MEGA_PUNCH
+;	db 63, SMART_STRIKE
+	db 72, IRON_HEAD
+	db 81, SUBMISSION
+	db 90, HYPER_BEAM
+	db 0
 
 ArticunoGEvosMoves:
 ; Evolutions
@@ -3282,36 +3312,6 @@ MoltresGEvosMoves:
 	db 70, SKY_ATTACK
 	db 0
 
-;MeltanEvosMoves:
-; Evolutions
-;	db EV_ITEM, CANDY_JAR, 1, MELMETAL
-;	db 0
-; Learnset
-;	db 8, TAIL_WHIP
-;	db 16, HEADBUTT
-;	db 24, THUNDER_WAVE
-;	db 32, ACID_ARMOR
-;	db 40, IRON_HEAD
-;	db 0
-
-;MelmetalEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 9, TAIL_WHIP
-;	db 16, HEADBUTT
-;	db 18, THUNDER_WAVE
-;	db 20, THUNDERPUNCH
-;	db 27, THUNDERSHOCK
-;	db 36, ACID_ARMOR
-;	db 45, MAGNET_BOMB
-;	db 51, MEGA_PUNCH
-;	db 63, SMART_STRIKE
-;	db 72, IRON_HEAD
-;	db 81, SUBMISSION
-;	db 90, HYPER_BEAM
-;	db 0
-
 MissingNoEvosMoves:
 ; Evolutions
 	db 0

data/pokemon/menu_icons.asm

@@ -37,6 +37,7 @@ MonPartyData:
 	nybble ICON_MON       ; Konya
 	nybble ICON_MON       ; Meowth
 	nybble ICON_MON       ; Persian
+	;	nybble ICON_MON       ; Persian-A
 	nybble ICON_MON       ; Perrserker
 	nybble ICON_BIRD      ; Spearow
 	nybble ICON_BIRD      ; Fearow
@@ -98,26 +99,26 @@ MonPartyData:
 	nybble ICON_MON       ; Psyduck
 	nybble ICON_MON       ; Weirduck
 	nybble ICON_MON       ; Golduck
-	nybble ICON_MON       ; Abra
-	nybble ICON_MON       ; Kadabra
-	nybble ICON_MON       ; Alakazam
 	nybble ICON_MON       ; Poliwag
 	nybble ICON_MON       ; Poliwhirl
 	nybble ICON_MON       ; Poliwrath
 	nybble ICON_MON       ; Politoed
 	nybble ICON_MON       ; Ribbito
 	nybble ICON_MON       ; Croakozuna
+	nybble ICON_MON       ; Drowzee
+	nybble ICON_MON       ; Hypno
 	nybble ICON_MON       ; Lickitung
 	nybble ICON_MON       ; Lickilicky
-	nybble ICON_SNAKE     ; Onix
-	nybble ICON_SNAKE     ; Steelix
+	nybble ICON_MON       ; Abra
+	nybble ICON_MON       ; Kadabra
+	nybble ICON_MON       ; Alakazam
 	nybble ICON_MON       ; Diglett
 	nybble ICON_MON       ; Dugtrio
 	; 	nybble ICON_MON       ; Dugtrio-A
 	nybble ICON_WATER     ; Wiglett
 	nybble ICON_WATER     ; Wugtrio
-	nybble ICON_MON       ; Drowzee
-	nybble ICON_MON       ; Hypno
+	nybble ICON_SNAKE     ; Onix
+	nybble ICON_SNAKE     ; Steelix
 	nybble ICON_QUADRUPED ; Kotora
 	nybble ICON_QUADRUPED ; Gaotora
 	nybble ICON_QUADRUPED ; Gorotora
@@ -249,6 +250,6 @@ MonPartyData:
 	nybble ICON_BIRD      ; Moltres-G
 	nybble ICON_MON       ; Mewtwo
 	nybble ICON_MON       ; Mew
-	; nybble ICON_BALL      ; Meltan
-	; nybble ICON_BALL      ; Melmetal
+	nybble ICON_BALL      ; Meltan
+	nybble ICON_BALL      ; Melmetal
 	end_nybble_array NUM_POKEMON - 1

data/pokemon/names.asm

@@ -250,11 +250,11 @@ MonsterNames::
 	db "PERRSERKER"
 	db "SIRFETCH'D"
 	db "MR.RIME@@@"
+	db "MELTAN@@@@"
+	db "MELMETAL@@"
 	db "ARTICUNO-G"
 	db "ZAPDOS-G@@"
 	db "MOLTRES-G@"
-	; db "MELTAN@@@@"
-	; db "MELMETAL@@"
 	db "MISSINGNO."
 	
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/palettes.asm

@@ -38,6 +38,7 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; KONYA
 	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
+	;	db PAL_BLUEMON   ; PERSIAN_A
 	db PAL_GREYMON   ; PERRSEKRER
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
@@ -99,26 +100,26 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; PSYDUCK
 	db PAL_GREENMON  ; WEIRDUCK
 	db PAL_CYANMON   ; GOLDUCK
-	db PAL_YELLOWMON ; ABRA
-	db PAL_YELLOWMON ; KADABRA
-	db PAL_YELLOWMON ; ALAKAZAM
 	db PAL_BLUEMON   ; POLIWAG
 	db PAL_BLUEMON   ; POLIWHIRL
 	db PAL_BLUEMON   ; POLIWRATH
 	db PAL_GREENMON  ; POLITOED
 	db PAL_GREENMON  ; RIBBITO
 	db PAL_GREENMON  ; CROAKOZUNA
+	db PAL_YELLOWMON ; DROWZEE
+	db PAL_YELLOWMON ; HYPNO
 	db PAL_PINKMON   ; LICKITUNG
 	db PAL_PINKMON   ; LICKILICKY
-	db PAL_GREYMON   ; ONIX
-	db PAL_GREYMON   ; STEELIX
+	db PAL_YELLOWMON ; ABRA
+	db PAL_YELLOWMON ; KADABRA
+	db PAL_YELLOWMON ; ALAKAZAM
 	db PAL_BROWNMON  ; DIGLETT
 	db PAL_BROWNMON  ; DUGTRIO
 	;	db PAL_BROWNMON  ; DUGTRIO_A
 	db PAL_PINKMON   ; WIGLETT
 	db PAL_PINKMON   ; WUGTRIO
-	db PAL_YELLOWMON ; DROWZEE
-	db PAL_YELLOWMON ; HYPNO
+	db PAL_GREYMON   ; ONIX
+	db PAL_GREYMON   ; STEELIX
 	db PAL_YELLOWMON ; KOTORA
 	db PAL_YELLOWMON ; GAOTORA
 	db PAL_YELLOWMON ; GOROTORA
@@ -250,6 +251,6 @@ MonsterPalettes:
 	db PAL_PINKMON   ; MOLTRES_G
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
-	; db PAL_YELLOWMON ; MELTAN
-	; db PAL_YELLOWMON ; MELMETAL
+	db PAL_YELLOWMON ; MELTAN
+	db PAL_YELLOWMON ; MELMETAL
 	assert_table_length NUM_POKEMON

engine/debug/debug_party.asm

@@ -21,9 +21,11 @@ SetIshiharaTeam:
 	jr .loop
 
 IshiharaTeam:
+	db EXEGGUTOR, 90
 	db SCREAM_TAIL, 90
+	db MELTAN, 50
 IF DEF(_DEBUG)
-	db RAICHU, 16
+	db RAICHU, 50
 ENDC
 	db -1 ; end
 
@@ -43,7 +45,7 @@ IF DEF(_DEBUG)
 
 	call SetIshiharaTeam
 
-	; Exeggutor gets four HM moves.
+	; Exeggutor (Pokemon 1) gets four HM moves.
 	ld hl, wPartyMon1Moves
 	ld a, FLY
 	ld [hli], a
@@ -62,7 +64,7 @@ IF DEF(_DEBUG)
 	ld [hli], a
 	ld [hl], a
 
-	; Jolteon gets Thunderbolt.
+	; Jolteon (Pokemon 3) gets Thunderbolt.
 	ld hl, wPartyMon3Moves + 3
 	ld a, THUNDERBOLT
 	ld [hl], a
@@ -70,7 +72,7 @@ IF DEF(_DEBUG)
 	ld a, 15
 	ld [hl], a
 
-	; Articuno gets Fly.
+	; Articuno (Pokemon 5) gets Fly.
 	ld hl, wPartyMon5Moves
 	ld a, FLY
 	ld [hl], a
@@ -78,7 +80,7 @@ IF DEF(_DEBUG)
 	ld a, 15
 	ld [hl], a
 
-	; Kadabra gets Flash and Teleport
+	; Kadabra (Pokemon 6) gets Flash and Teleport
 	ld hl, wPartyMon6Moves + 2
 	ld a, FLASH
 	ld [hl], a
@@ -139,7 +141,7 @@ DebugItemsList:
 	db RARE_CANDY, 99
 	db MASTER_BALL, 99
 	db ULTRA_BALL, 99
-	db GREAT_BALL, 99
+	db CANDY_JAR, 99
 	db SECRET_KEY, 1
 	db CARD_KEY, 1
 	db S_S_TICKET, 1

gfx/pics.asm

@@ -416,6 +416,10 @@ TangrowthPicFront::    INCBIN "gfx/pokemon/front/tangrowth.pic"
 TangrowthPicBack::     INCBIN "gfx/pokemon/back/tangrowthb.pic"
 LickilickyPicFront::   INCBIN "gfx/pokemon/front/lickilicky.pic"
 LickilickyPicBack::    INCBIN "gfx/pokemon/back/lickilickyb.pic"
+MeltanPicFront::	   INCBIN "gfx/pokemon/front/meltan.pic"
+MeltanPicBack::    	   INCBIN "gfx/pokemon/back/meltanb.pic"
+MelmetalPicFront::     INCBIN "gfx/pokemon/front/melmetal.pic"
+MelmetalPicBack::      INCBIN "gfx/pokemon/back/melmetalb.pic"
 
 SECTION "Pics 8", ROMX