API tools faq
paste
Advertisement
Guest User

Pokered Stuff

a guest
Mar 20th, 2016
269
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 89.16 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
  2. index 360fbb4..cec5d1c 100644
  3. --- a/constants/pokedex_constants.asm
  4. +++ b/constants/pokedex_constants.asm
  5. @@ -151,5 +151,6 @@ const_value = 1
  6. const DEX_DRAGONITE ; 149
  7. const DEX_MEWTWO ; 150
  8. const DEX_MEW ; 151
  9. + const DEX_MON152 ; 152
  10.  
  11. -NUM_POKEMON EQU 151
  12. +NUM_POKEMON EQU 152
  13. diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
  14. index 96d44ef..ac19dc7 100644
  15. --- a/constants/pokemon_constants.asm
  16. +++ b/constants/pokemon_constants.asm
  17. @@ -30,7 +30,7 @@ const_value = 1
  18. const BLASTOISE ; $1C
  19. const PINSIR ; $1D
  20. const TANGELA ; $1E
  21. - const MISSINGNO_1F ; $1F
  22. + const MON152 ; $1F
  23. const MISSINGNO_20 ; $20
  24. const GROWLITHE ; $21
  25. const ONIX ; $22
  26. diff --git a/constants/starter_mons.asm b/constants/starter_mons.asm
  27. index 16de35d..308c9d4 100755
  28. --- a/constants/starter_mons.asm
  29. +++ b/constants/starter_mons.asm
  30. @@ -1,3 +1,3 @@
  31. STARTER1 EQU CHARMANDER
  32. STARTER2 EQU SQUIRTLE
  33. -STARTER3 EQU BULBASAUR
  34. +STARTER3 EQU MON152
  35. diff --git a/constants/type_constants.asm b/constants/type_constants.asm
  36. index b36dc17..36865f8 100755
  37. --- a/constants/type_constants.asm
  38. +++ b/constants/type_constants.asm
  39. @@ -7,6 +7,7 @@ GROUND EQU $04
  40. ROCK EQU $05
  41. BUG EQU $07
  42. GHOST EQU $08
  43. +STEEL EQU $09
  44. FIRE EQU $14
  45. WATER EQU $15
  46. GRASS EQU $16
  47. @@ -14,3 +15,5 @@ ELECTRIC EQU $17
  48. PSYCHIC EQU $18
  49. ICE EQU $19
  50. DRAGON EQU $1A
  51. +DARK EQU $1B
  52. +FAIRY EQU $1C
  53. diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
  54. index 1a41bb5..119346d 100644
  55. --- a/data/baseStats/abra.asm
  56. +++ b/data/baseStats/abra.asm
  57. @@ -25,4 +25,4 @@ db 3 ; growth rate
  58. tmlearn 33,34,35,40
  59. tmlearn 44,45,46
  60. tmlearn 49,50,55
  61. -db 0 ; padding
  62. +db Bank(AbraPicFront) ; padding
  63. \ No newline at end of file
  64. diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm
  65. index 874dd57..cf6a33d 100644
  66. --- a/data/baseStats/aerodactyl.asm
  67. +++ b/data/baseStats/aerodactyl.asm
  68. @@ -25,4 +25,4 @@ db 5 ; growth rate
  69. tmlearn 33,34,38,39
  70. tmlearn 43,44
  71. tmlearn 50,52
  72. -db 0 ; padding
  73. +db Bank(AerodactylPicFront) ; padding
  74. diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
  75. index 6762eb8..0b52cd9 100644
  76. --- a/data/baseStats/alakazam.asm
  77. +++ b/data/baseStats/alakazam.asm
  78. @@ -30,4 +30,4 @@ db 3 ; growth rate
  79. tmlearn 33,34,35,40
  80. tmlearn 44,45,46
  81. tmlearn 49,50,55
  82. -db 0 ; padding
  83. +db Bank(AlakazamPicFront) ; padding
  84. diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm
  85. index 6beee56..312ca5c 100644
  86. --- a/data/baseStats/arbok.asm
  87. +++ b/data/baseStats/arbok.asm
  88. @@ -25,4 +25,4 @@ db 0 ; growth rate
  89. tmlearn 34,40
  90. tmlearn 44,48
  91. tmlearn 50,54
  92. -db 0 ; padding
  93. +db Bank(ArbokPicFront) ; padding
  94. diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm
  95. index 2a2dda3..c4c6b60 100644
  96. --- a/data/baseStats/arcanine.asm
  97. +++ b/data/baseStats/arcanine.asm
  98. @@ -25,4 +25,4 @@ db 5 ; growth rate
  99. tmlearn 33,34,38,39,40
  100. tmlearn 44
  101. tmlearn 50
  102. -db 0 ; padding
  103. +db Bank(ArcaninePicFront) ; padding
  104. diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm
  105. index ef79105..84329c3 100644
  106. --- a/data/baseStats/articuno.asm
  107. +++ b/data/baseStats/articuno.asm
  108. @@ -25,4 +25,4 @@ db 5 ; growth rate
  109. tmlearn 33,34,39
  110. tmlearn 43,44
  111. tmlearn 50,52
  112. -db 0 ; padding
  113. +db Bank(ArticunoPicFront) ; padding
  114. diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm
  115. index 6bf091b..6bb4d88 100644
  116. --- a/data/baseStats/beedrill.asm
  117. +++ b/data/baseStats/beedrill.asm
  118. @@ -25,4 +25,4 @@ db 0 ; growth rate
  119. tmlearn 33,34,39,40
  120. tmlearn 44
  121. tmlearn 50,51
  122. -db 0 ; padding
  123. +db Bank(BeedrillPicFront) ; padding
  124. diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm
  125. index 1c908bb..ee2e723 100644
  126. --- a/data/baseStats/bellsprout.asm
  127. +++ b/data/baseStats/bellsprout.asm
  128. @@ -25,4 +25,4 @@ db 3 ; growth rate
  129. tmlearn 33,34
  130. tmlearn 44
  131. tmlearn 50,51
  132. -db 0 ; padding
  133. +db Bank(BellsproutPicFront) ; padding
  134. diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm
  135. index eaf18b4..2b65937 100644
  136. --- a/data/baseStats/blastoise.asm
  137. +++ b/data/baseStats/blastoise.asm
  138. @@ -25,4 +25,4 @@ db 3 ; growth rate
  139. tmlearn 33,34,40
  140. tmlearn 44
  141. tmlearn 50,53,54
  142. -db 0 ; padding
  143. +db Bank(BlastoisePicFront) ; padding
  144. diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm
  145. index 7b3567b..1940d5f 100644
  146. --- a/data/baseStats/bulbasaur.asm
  147. +++ b/data/baseStats/bulbasaur.asm
  148. @@ -1,20 +1,20 @@
  149. MonBaseStats:
  150. db DEX_BULBASAUR ; pokedex id
  151. -db 45 ; base hp
  152. -db 49 ; base attack
  153. -db 49 ; base defense
  154. -db 45 ; base speed
  155. -db 65 ; base special
  156. -db GRASS ; species type 1
  157. -db POISON ; species type 2
  158. -db 45 ; catch rate
  159. -db 64 ; base exp yield
  160. -INCBIN "pic/bmon/bulbasaur.pic",0,1 ; 55, sprite dimensions
  161. +db 50 ; base hp
  162. +db 72 ; base attack
  163. +db 35 ; base defense
  164. +db 65 ; base speed
  165. +db 35 ; base special
  166. +db GROUND ; species type 1
  167. +db DARK ; species type 2
  168. +db 180 ; catch rate
  169. +db 58 ; base exp yield
  170. +INCBIN "pic/bmon/bulbasaur.pic",0,1 ; 66, sprite dimensions
  171. dw BulbasaurPicFront
  172. dw BulbasaurPicBack
  173. ; attacks known at lvl 0
  174. -db TACKLE
  175. -db GROWL
  176. +db SCRATCH
  177. +db LEER
  178. db 0
  179. db 0
  180. db 3 ; growth rate
  181. @@ -26,5 +26,5 @@ db 3 ; growth rate
  182. tmlearn 33,34
  183. tmlearn 44
  184. tmlearn 50,51
  185. -db 0 ; padding
  186. +db Bank(BulbasaurPicFront) ; padding
  187. MonBaseStatsEnd:
  188. diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
  189. index 75a0ee0..70a3df3 100644
  190. --- a/data/baseStats/butterfree.asm
  191. +++ b/data/baseStats/butterfree.asm
  192. @@ -29,4 +29,4 @@ IF DEF(_YELLOW)
  193. ELSE
  194. tmlearn 50
  195. ENDC
  196. -db 0 ; padding
  197. +db Bank(ButterfreePicFront) ; padding
  198. diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm
  199. index d26bc5d..5e06c6e 100644
  200. --- a/data/baseStats/caterpie.asm
  201. +++ b/data/baseStats/caterpie.asm
  202. @@ -25,4 +25,4 @@ db 0 ; growth rate
  203. tmlearn 0
  204. tmlearn 0
  205. tmlearn 0
  206. -db 0 ; padding
  207. +db Bank(CaterpiePicFront) ; padding
  208. diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm
  209. index d9b8513..2f2366a 100644
  210. --- a/data/baseStats/chansey.asm
  211. +++ b/data/baseStats/chansey.asm
  212. @@ -29,4 +29,4 @@ db 4 ; growth rate
  213. tmlearn 33,34,35,37,38,40
  214. tmlearn 41,44,45,46
  215. tmlearn 49,50,54,55
  216. -db 0 ; padding
  217. +db Bank(ChanseyPicFront) ; padding
  218. diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm
  219. index ea97815..cf39dd9 100644
  220. --- a/data/baseStats/charizard.asm
  221. +++ b/data/baseStats/charizard.asm
  222. @@ -1,21 +1,21 @@
  223. db DEX_CHARIZARD ; pokedex id
  224. -db 78 ; base hp
  225. -db 84 ; base attack
  226. -db 78 ; base defense
  227. -db 100 ; base speed
  228. -db 85 ; base special
  229. -db FIRE ; species type 1
  230. -db FLYING ; species type 2
  231. +db 71 ; base hp
  232. +db 95 ; base attack
  233. +db 85 ; base defense
  234. +db 79 ; base speed
  235. +db 110 ; base special
  236. +db ICE ; species type 1
  237. +db ICE ; species type 2
  238. db 45 ; catch rate
  239. db 209 ; base exp yield
  240. INCBIN "pic/bmon/charizard.pic",0,1 ; 77, sprite dimensions
  241. dw CharizardPicFront
  242. dw CharizardPicBack
  243. ; attacks known at lvl 0
  244. -db SCRATCH
  245. -db GROWL
  246. -db EMBER
  247. -db LEER
  248. +db TACKLE
  249. +db HARDEN
  250. +db SLAM
  251. +db ICE_BEAM
  252. db 3 ; growth rate
  253. ; learnset
  254. tmlearn 1,3,5,6,8
  255. @@ -29,4 +29,4 @@ IF DEF(_YELLOW)
  256. ELSE
  257. tmlearn 50,51,54
  258. ENDC
  259. -db 0 ; padding
  260. +db Bank(CharizardPicFront)
  261. diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm
  262. index ccd5345..157541a 100644
  263. --- a/data/baseStats/charmander.asm
  264. +++ b/data/baseStats/charmander.asm
  265. @@ -1,19 +1,19 @@
  266. db DEX_CHARMANDER ; pokedex id
  267. -db 39 ; base hp
  268. -db 52 ; base attack
  269. -db 43 ; base defense
  270. -db 65 ; base speed
  271. -db 50 ; base special
  272. -db FIRE ; species type 1
  273. -db FIRE ; species type 2
  274. -db 45 ; catch rate
  275. -db 65 ; base exp yield
  276. -INCBIN "pic/bmon/charmander.pic",0,1 ; 55, sprite dimensions
  277. +db 36 ; base hp
  278. +db 50 ; base attack
  279. +db 50 ; base defense
  280. +db 44 ; base speed
  281. +db 65 ; base special
  282. +db ICE ; species type 1
  283. +db ICE ; species type 2
  284. +db 255 ; catch rate
  285. +db 61 ; base exp yield
  286. +INCBIN "pic/bmon/charmander.pic",0,1 ; 66, sprite dimensions
  287. dw CharmanderPicFront
  288. dw CharmanderPicBack
  289. ; attacks known at lvl 0
  290. -db SCRATCH
  291. -db GROWL
  292. +db TACKLE
  293. +db HARDEN
  294. db 0
  295. db 0
  296. db 3 ; growth rate
  297. @@ -25,4 +25,4 @@ db 3 ; growth rate
  298. tmlearn 33,34,38,39,40
  299. tmlearn 44
  300. tmlearn 50,51,54
  301. -db 0 ; padding
  302. +db Bank(CharmanderPicFront) ; padding
  303. diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm
  304. index 80aa2bc..8dd3f8d 100644
  305. --- a/data/baseStats/charmeleon.asm
  306. +++ b/data/baseStats/charmeleon.asm
  307. @@ -1,20 +1,20 @@
  308. db DEX_CHARMELEON ; pokedex id
  309. -db 58 ; base hp
  310. -db 64 ; base attack
  311. -db 58 ; base defense
  312. -db 80 ; base speed
  313. -db 65 ; base special
  314. -db FIRE ; species type 1
  315. -db FIRE ; species type 2
  316. -db 45 ; catch rate
  317. -db 142 ; base exp yield
  318. +db 51 ; base hp
  319. +db 65 ; base attack
  320. +db 65 ; base defense
  321. +db 59 ; base speed
  322. +db 80 ; base special
  323. +db ICE ; species type 1
  324. +db ICE ; species type 2
  325. +db 120 ; catch rate
  326. +db 143 ; base exp yield
  327. INCBIN "pic/bmon/charmeleon.pic",0,1 ; 66, sprite dimensions
  328. dw CharmeleonPicFront
  329. dw CharmeleonPicBack
  330. ; attacks known at lvl 0
  331. db SCRATCH
  332. -db GROWL
  333. -db EMBER
  334. +db HARDEN
  335. +db SLAM
  336. db 0
  337. db 3 ; growth rate
  338. ; learnset
  339. @@ -25,4 +25,4 @@ db 3 ; growth rate
  340. tmlearn 33,34,38,39,40
  341. tmlearn 44
  342. tmlearn 50,51,54
  343. -db 0 ; padding
  344. +db Bank(CharmeleonPicFront) ; padding
  345. diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm
  346. index 17837da..aed8849 100644
  347. --- a/data/baseStats/clefable.asm
  348. +++ b/data/baseStats/clefable.asm
  349. @@ -25,4 +25,4 @@ db 4 ; growth rate
  350. tmlearn 33,34,35,38,40
  351. tmlearn 44,45,46
  352. tmlearn 49,50,54,55
  353. -db 0 ; padding
  354. +db Bank(ClefablePicFront) ; padding
  355. diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm
  356. index 952391c..92bff96 100644
  357. --- a/data/baseStats/clefairy.asm
  358. +++ b/data/baseStats/clefairy.asm
  359. @@ -25,4 +25,4 @@ db 4 ; growth rate
  360. tmlearn 33,34,35,38,40
  361. tmlearn 44,45,46
  362. tmlearn 49,50,54,55
  363. -db 0 ; padding
  364. +db Bank(ClefairyPicFront) ; padding
  365. diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm
  366. index 10f38bd..706e742 100644
  367. --- a/data/baseStats/cloyster.asm
  368. +++ b/data/baseStats/cloyster.asm
  369. @@ -25,4 +25,4 @@ db 5 ; growth rate
  370. tmlearn 33,34,36,39
  371. tmlearn 44,47
  372. tmlearn 49,50,53
  373. -db 0 ; padding
  374. +db Bank(CloysterPicFront) ; padding
  375. diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm
  376. index b1222d9..03c556a 100644
  377. --- a/data/baseStats/cubone.asm
  378. +++ b/data/baseStats/cubone.asm
  379. @@ -25,4 +25,4 @@ db 0 ; growth rate
  380. tmlearn 34,38,40
  381. tmlearn 44
  382. tmlearn 50,54
  383. -db 0 ; padding
  384. +db Bank(CubonePicFront) ; padding
  385. diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm
  386. index fb0cf2c..b9cd867 100644
  387. --- a/data/baseStats/dewgong.asm
  388. +++ b/data/baseStats/dewgong.asm
  389. @@ -25,4 +25,4 @@ db 0 ; growth rate
  390. tmlearn 34,40
  391. tmlearn 44
  392. tmlearn 50,53,54
  393. -db 0 ; padding
  394. +db Bank(DewgongPicFront) ; padding
  395. diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm
  396. index 173dfa3..60be2d1 100644
  397. --- a/data/baseStats/diglett.asm
  398. +++ b/data/baseStats/diglett.asm
  399. @@ -29,4 +29,4 @@ IF DEF(_YELLOW)
  400. ELSE
  401. tmlearn 50
  402. ENDC
  403. -db 0 ; padding
  404. +db Bank(DiglettPicFront) ; padding
  405. diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm
  406. index 90ea4c5..38c8b28 100644
  407. --- a/data/baseStats/ditto.asm
  408. +++ b/data/baseStats/ditto.asm
  409. @@ -12,10 +12,10 @@ INCBIN "pic/bmon/ditto.pic",0,1 ; 55, sprite dimensions
  410. dw DittoPicFront
  411. dw DittoPicBack
  412. ; attacks known at lvl 0
  413. +db POUND
  414. db TRANSFORM
  415. db 0
  416. db 0
  417. -db 0
  418. db 0 ; growth rate
  419. ; learnset
  420. tmlearn 0
  421. @@ -25,4 +25,4 @@ db 0 ; growth rate
  422. tmlearn 0
  423. tmlearn 0
  424. tmlearn 0
  425. -db 0 ; padding
  426. +db Bank(DittoPicFront) ; padding
  427. diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm
  428. index 99608f4..dfab9dd 100644
  429. --- a/data/baseStats/dodrio.asm
  430. +++ b/data/baseStats/dodrio.asm
  431. @@ -25,4 +25,4 @@ db 0 ; growth rate
  432. tmlearn 33,34,40
  433. tmlearn 43,44
  434. tmlearn 49,50,52
  435. -db 0 ; padding
  436. +db Bank(DodrioPicFront) ; padding
  437. diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm
  438. index 760c258..13e7133 100644
  439. --- a/data/baseStats/doduo.asm
  440. +++ b/data/baseStats/doduo.asm
  441. @@ -25,4 +25,4 @@ db 0 ; growth rate
  442. tmlearn 33,34,40
  443. tmlearn 43,44
  444. tmlearn 49,50,52
  445. -db 0 ; padding
  446. +db Bank(DoduoPicFront) ; padding
  447. diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm
  448. index 041300e..65c22c1 100644
  449. --- a/data/baseStats/dragonair.asm
  450. +++ b/data/baseStats/dragonair.asm
  451. @@ -25,4 +25,4 @@ db 5 ; growth rate
  452. tmlearn 33,34,38,39,40
  453. tmlearn 44,45
  454. tmlearn 50,53
  455. -db 0 ; padding
  456. +db Bank(DragonairPicFront) ; padding
  457. diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm
  458. index 442275b..23a0261 100644
  459. --- a/data/baseStats/dragonite.asm
  460. +++ b/data/baseStats/dragonite.asm
  461. @@ -25,4 +25,4 @@ db 5 ; growth rate
  462. tmlearn 33,34,38,39,40
  463. tmlearn 44,45
  464. tmlearn 50,53,54
  465. -db 0 ; padding
  466. +db Bank(DragonitePicFront) ; padding
  467. diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm
  468. index 5fb5c75..a000cdc 100644
  469. --- a/data/baseStats/dratini.asm
  470. +++ b/data/baseStats/dratini.asm
  471. @@ -25,4 +25,4 @@ db 5 ; growth rate
  472. tmlearn 33,34,38,39,40
  473. tmlearn 44,45
  474. tmlearn 50,53
  475. -db 0 ; padding
  476. +db Bank(DratiniPicFront) ; padding
  477. diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm
  478. index 452db1b..92d21e5 100644
  479. --- a/data/baseStats/drowzee.asm
  480. +++ b/data/baseStats/drowzee.asm
  481. @@ -25,4 +25,4 @@ db 0 ; growth rate
  482. tmlearn 33,34,35,40
  483. tmlearn 42,44,45,46
  484. tmlearn 49,50,55
  485. -db 0 ; padding
  486. +db Bank(DrowzeePicFront) ; padding
  487. diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm
  488. index b70b538..90dc2c7 100644
  489. --- a/data/baseStats/dugtrio.asm
  490. +++ b/data/baseStats/dugtrio.asm
  491. @@ -29,4 +29,4 @@ IF DEF(_YELLOW)
  492. ELSE
  493. tmlearn 50
  494. ENDC
  495. -db 0 ; padding
  496. +db Bank(DugtrioPicFront) ; padding
  497. diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm
  498. index 0fa869f..29487a6 100644
  499. --- a/data/baseStats/eevee.asm
  500. +++ b/data/baseStats/eevee.asm
  501. @@ -29,4 +29,4 @@ db 0 ; growth rate
  502. tmlearn 33,34,39,40
  503. tmlearn 44
  504. tmlearn 50
  505. -db 0 ; padding
  506. +db Bank(EeveePicFront) ; padding
  507. diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm
  508. index b029a67..d611ffd 100644
  509. --- a/data/baseStats/ekans.asm
  510. +++ b/data/baseStats/ekans.asm
  511. @@ -25,4 +25,4 @@ db 0 ; growth rate
  512. tmlearn 34,40
  513. tmlearn 44,48
  514. tmlearn 50,54
  515. -db 0 ; padding
  516. +db Bank(EkansPicFront) ; padding
  517. diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm
  518. index 4b44604..e335e2e 100644
  519. --- a/data/baseStats/electabuzz.asm
  520. +++ b/data/baseStats/electabuzz.asm
  521. @@ -25,4 +25,4 @@ db 0 ; growth rate
  522. tmlearn 33,34,35,39,40
  523. tmlearn 44,45,46
  524. tmlearn 50,54,55
  525. -db 0 ; padding
  526. +db Bank(ElectabuzzPicFront) ; padding
  527. diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm
  528. index 1b292f2..fd7832a 100644
  529. --- a/data/baseStats/electrode.asm
  530. +++ b/data/baseStats/electrode.asm
  531. @@ -25,4 +25,4 @@ db 0 ; growth rate
  532. tmlearn 33,34,36,39,40
  533. tmlearn 44,45,47
  534. tmlearn 50,55
  535. -db 0 ; padding
  536. +db Bank(ElectrodePicFront) ; padding
  537. diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm
  538. index 8503889..311a409 100644
  539. --- a/data/baseStats/exeggcute.asm
  540. +++ b/data/baseStats/exeggcute.asm
  541. @@ -25,4 +25,4 @@ db 5 ; growth rate
  542. tmlearn 33,34,36,37
  543. tmlearn 44,46,47
  544. tmlearn 50
  545. -db 0 ; padding
  546. +db Bank(ExeggcutePicFront) ; padding
  547. diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm
  548. index 4d73943..b53469e 100644
  549. --- a/data/baseStats/exeggutor.asm
  550. +++ b/data/baseStats/exeggutor.asm
  551. @@ -25,4 +25,4 @@ db 5 ; growth rate
  552. tmlearn 33,34,36,37
  553. tmlearn 44,46,47
  554. tmlearn 50,54
  555. -db 0 ; padding
  556. +db Bank(ExeggutorPicFront) ; padding
  557. diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm
  558. index 2aa7eca..24c6044 100644
  559. --- a/data/baseStats/farfetchd.asm
  560. +++ b/data/baseStats/farfetchd.asm
  561. @@ -25,4 +25,4 @@ db 0 ; growth rate
  562. tmlearn 33,34,39,40
  563. tmlearn 44
  564. tmlearn 50,51,52
  565. -db 0 ; padding
  566. +db Bank(FarfetchdPicFront) ; padding
  567. diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm
  568. index 4ad8872..782bc32 100644
  569. --- a/data/baseStats/fearow.asm
  570. +++ b/data/baseStats/fearow.asm
  571. @@ -25,4 +25,4 @@ db 0 ; growth rate
  572. tmlearn 34,39
  573. tmlearn 43,44
  574. tmlearn 50,52
  575. -db 0 ; padding
  576. +db Bank(FearowPicFront) ; padding
  577. diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm
  578. index c6c0c06..357223a 100644
  579. --- a/data/baseStats/flareon.asm
  580. +++ b/data/baseStats/flareon.asm
  581. @@ -29,4 +29,4 @@ db 0 ; growth rate
  582. tmlearn 33,34,38,39,40
  583. tmlearn 44
  584. tmlearn 50
  585. -db 0 ; padding
  586. +db Bank(FlareonPicFront) ; padding
  587. diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm
  588. index fdcaaa7..3d74eda 100644
  589. --- a/data/baseStats/gastly.asm
  590. +++ b/data/baseStats/gastly.asm
  591. @@ -25,4 +25,4 @@ db 3 ; growth rate
  592. tmlearn 34,36
  593. tmlearn 42,44,46,47
  594. tmlearn 50
  595. -db 0 ; padding
  596. +db Bank(GastlyPicFront) ; padding
  597. diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm
  598. index 0e3e877..17a8f01 100644
  599. --- a/data/baseStats/gengar.asm
  600. +++ b/data/baseStats/gengar.asm
  601. @@ -25,4 +25,4 @@ db 3 ; growth rate
  602. tmlearn 34,35,36,40
  603. tmlearn 42,44,46,47
  604. tmlearn 50,54
  605. -db 0 ; padding
  606. +db Bank(GengarPicFront) ; padding
  607. diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm
  608. index a47a993..bad2d84 100644
  609. --- a/data/baseStats/geodude.asm
  610. +++ b/data/baseStats/geodude.asm
  611. @@ -25,4 +25,4 @@ db 3 ; growth rate
  612. tmlearn 34,35,36,38
  613. tmlearn 44,47,48
  614. tmlearn 50,54
  615. -db 0 ; padding
  616. +db Bank(GeodudePicFront) ; padding
  617. diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm
  618. index f2153e5..07dcb28 100644
  619. --- a/data/baseStats/gloom.asm
  620. +++ b/data/baseStats/gloom.asm
  621. @@ -25,4 +25,4 @@ db 3 ; growth rate
  622. tmlearn 33,34
  623. tmlearn 44
  624. tmlearn 50,51
  625. -db 0 ; padding
  626. +db Bank(GloomPicFront) ; padding
  627. diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm
  628. index 845adf4..fa37c5f 100644
  629. --- a/data/baseStats/golbat.asm
  630. +++ b/data/baseStats/golbat.asm
  631. @@ -25,4 +25,4 @@ db 0 ; growth rate
  632. tmlearn 34,39
  633. tmlearn 44
  634. tmlearn 50
  635. -db 0 ; padding
  636. +db Bank(GolbatPicFront) ; padding
  637. diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm
  638. index ed3a4fd..7aa91ed 100644
  639. --- a/data/baseStats/goldeen.asm
  640. +++ b/data/baseStats/goldeen.asm
  641. @@ -25,4 +25,4 @@ db 0 ; growth rate
  642. tmlearn 34,39,40
  643. tmlearn 44
  644. tmlearn 50,53
  645. -db 0 ; padding
  646. +db Bank(GoldeenPicFront) ; padding
  647. diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm
  648. index cce89da..3e05073 100644
  649. --- a/data/baseStats/golduck.asm
  650. +++ b/data/baseStats/golduck.asm
  651. @@ -25,4 +25,4 @@ db 0 ; growth rate
  652. tmlearn 34,39,40
  653. tmlearn 44
  654. tmlearn 50,53,54
  655. -db 0 ; padding
  656. +db Bank(GolduckPicFront) ; padding
  657. diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm
  658. index 28f2a32..f571c3b 100644
  659. --- a/data/baseStats/golem.asm
  660. +++ b/data/baseStats/golem.asm
  661. @@ -25,4 +25,4 @@ db 3 ; growth rate
  662. tmlearn 34,35,36,38
  663. tmlearn 44,47,48
  664. tmlearn 50,54
  665. -db 0 ; padding
  666. +db Bank(GolemPicFront) ; padding
  667. diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm
  668. index 08776ab..d131184 100644
  669. --- a/data/baseStats/graveler.asm
  670. +++ b/data/baseStats/graveler.asm
  671. @@ -25,4 +25,4 @@ db 3 ; growth rate
  672. tmlearn 34,35,36,38
  673. tmlearn 44,47,48
  674. tmlearn 50,54
  675. -db 0 ; padding
  676. +db Bank(GravelerPicFront) ; padding
  677. diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm
  678. index 5f7a64a..50aa982 100644
  679. --- a/data/baseStats/grimer.asm
  680. +++ b/data/baseStats/grimer.asm
  681. @@ -25,4 +25,4 @@ db 0 ; growth rate
  682. tmlearn 34,36,38
  683. tmlearn 44,47
  684. tmlearn 50
  685. -db 0 ; padding
  686. +db Bank(GrimerPicFront) ; padding
  687. diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm
  688. index df30563..ff035d1 100644
  689. --- a/data/baseStats/growlithe.asm
  690. +++ b/data/baseStats/growlithe.asm
  691. @@ -25,4 +25,4 @@ db 5 ; growth rate
  692. tmlearn 33,34,38,39,40
  693. tmlearn 44
  694. tmlearn 50
  695. -db 0 ; padding
  696. +db Bank(GrowlithePicFront) ; padding
  697. diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm
  698. index 21214d0..3e09aeb 100644
  699. --- a/data/baseStats/gyarados.asm
  700. +++ b/data/baseStats/gyarados.asm
  701. @@ -32,4 +32,4 @@ db 5 ; growth rate
  702. tmlearn 33,34,38,40
  703. tmlearn 44
  704. tmlearn 50,53,54
  705. -db 0 ; padding
  706. +db Bank(GyaradosPicFront) ; padding
  707. diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm
  708. index bd39eaf..ad19b76 100644
  709. --- a/data/baseStats/haunter.asm
  710. +++ b/data/baseStats/haunter.asm
  711. @@ -25,4 +25,4 @@ db 3 ; growth rate
  712. tmlearn 34,36
  713. tmlearn 42,44,46,47
  714. tmlearn 50
  715. -db 0 ; padding
  716. +db Bank(HaunterPicFront) ; padding
  717. diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm
  718. index 37021f6..929e911 100644
  719. --- a/data/baseStats/hitmonchan.asm
  720. +++ b/data/baseStats/hitmonchan.asm
  721. @@ -25,4 +25,4 @@ db 0 ; growth rate
  722. tmlearn 34,35,39,40
  723. tmlearn 44
  724. tmlearn 50,54
  725. -db 0 ; padding
  726. +db Bank(HitmonchanPicFront) ; padding
  727. diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm
  728. index d16db13..8706421 100644
  729. --- a/data/baseStats/hitmonlee.asm
  730. +++ b/data/baseStats/hitmonlee.asm
  731. @@ -25,4 +25,4 @@ db 0 ; growth rate
  732. tmlearn 34,35,39,40
  733. tmlearn 44
  734. tmlearn 50,54
  735. -db 0 ; padding
  736. +db Bank(HitmonleePicFront) ; padding
  737. diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm
  738. index 01de3ff..ac5acc2 100644
  739. --- a/data/baseStats/horsea.asm
  740. +++ b/data/baseStats/horsea.asm
  741. @@ -25,4 +25,4 @@ db 0 ; growth rate
  742. tmlearn 34,39,40
  743. tmlearn 44
  744. tmlearn 50,53
  745. -db 0 ; padding
  746. +db Bank(HorseaPicFront) ; padding
  747. diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm
  748. index 4e4959b..78521bc 100644
  749. --- a/data/baseStats/hypno.asm
  750. +++ b/data/baseStats/hypno.asm
  751. @@ -25,4 +25,4 @@ db 0 ; growth rate
  752. tmlearn 33,34,35,40
  753. tmlearn 42,44,45,46
  754. tmlearn 49,50,55
  755. -db 0 ; padding
  756. +db Bank(HypnoPicFront) ; padding
  757. diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm
  758. index 3e19f2a..63fcd9f 100644
  759. --- a/data/baseStats/ivysaur.asm
  760. +++ b/data/baseStats/ivysaur.asm
  761. @@ -1,20 +1,20 @@
  762. db DEX_IVYSAUR ; pokedex id
  763. db 60 ; base hp
  764. -db 62 ; base attack
  765. +db 82 ; base attack
  766. db 63 ; base defense
  767. -db 60 ; base speed
  768. -db 80 ; base special
  769. -db GRASS ; species type 1
  770. -db POISON ; species type 2
  771. -db 45 ; catch rate
  772. +db 74 ; base speed
  773. +db 45 ; base special
  774. +db GROUND ; species type 1
  775. +db DARK ; species type 2
  776. +db 90 ; catch rate
  777. db 141 ; base exp yield
  778. INCBIN "pic/bmon/ivysaur.pic",0,1 ; 66, sprite dimensions
  779. dw IvysaurPicFront
  780. dw IvysaurPicBack
  781. ; attacks known at lvl 0
  782. -db TACKLE
  783. +db SCRATCH
  784. db GROWL
  785. -db LEECH_SEED
  786. +db LEER
  787. db 0
  788. db 3 ; growth rate
  789. ; learnset
  790. @@ -25,4 +25,4 @@ db 3 ; growth rate
  791. tmlearn 33,34
  792. tmlearn 44
  793. tmlearn 50,51
  794. -db 0 ; padding
  795. +db Bank(IvysaurPicFront) ; padding
  796. diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm
  797. index fac03fc..a939edb 100644
  798. --- a/data/baseStats/jigglypuff.asm
  799. +++ b/data/baseStats/jigglypuff.asm
  800. @@ -25,4 +25,4 @@ db 4 ; growth rate
  801. tmlearn 33,34,38,40
  802. tmlearn 44,45,46
  803. tmlearn 49,50,54,55
  804. -db 0 ; padding
  805. +db Bank(JigglypuffPicFront) ; padding
  806. diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm
  807. index eb0bf30..8595dac 100644
  808. --- a/data/baseStats/jolteon.asm
  809. +++ b/data/baseStats/jolteon.asm
  810. @@ -29,4 +29,4 @@ db 0 ; growth rate
  811. tmlearn 33,34,39,40
  812. tmlearn 44,45
  813. tmlearn 50,55
  814. -db 0 ; padding
  815. +db Bank(JolteonPicFront) ; padding
  816. diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm
  817. index e69b87b..cca891c 100644
  818. --- a/data/baseStats/jynx.asm
  819. +++ b/data/baseStats/jynx.asm
  820. @@ -25,4 +25,4 @@ db 0 ; growth rate
  821. tmlearn 33,34,35,40
  822. tmlearn 44,46
  823. tmlearn 50
  824. -db 0 ; padding
  825. +db Bank(JynxPicFront) ; padding
  826. diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm
  827. index 60f3e95..c9d3807 100644
  828. --- a/data/baseStats/kabuto.asm
  829. +++ b/data/baseStats/kabuto.asm
  830. @@ -25,4 +25,4 @@ db 0 ; growth rate
  831. tmlearn 33,34
  832. tmlearn 44
  833. tmlearn 50,53
  834. -db 0 ; padding
  835. +db Bank(KabutoPicFront) ; padding
  836. diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm
  837. index dbddab2..e1e194b 100644
  838. --- a/data/baseStats/kabutops.asm
  839. +++ b/data/baseStats/kabutops.asm
  840. @@ -25,4 +25,4 @@ db 0 ; growth rate
  841. tmlearn 33,34,40
  842. tmlearn 44
  843. tmlearn 50,53
  844. -db 0 ; padding
  845. +db Bank(KabutopsPicFront) ; padding
  846. diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
  847. index ad4ac7f..fc0d9ce 100644
  848. --- a/data/baseStats/kadabra.asm
  849. +++ b/data/baseStats/kadabra.asm
  850. @@ -30,4 +30,4 @@ db 3 ; growth rate
  851. tmlearn 33,34,35,40
  852. tmlearn 44,45,46
  853. tmlearn 49,50,55
  854. -db 0 ; padding
  855. +db Bank(KadabraPicFront) ; padding
  856. diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm
  857. index ec593f9..37ebfc5 100644
  858. --- a/data/baseStats/kakuna.asm
  859. +++ b/data/baseStats/kakuna.asm
  860. @@ -25,4 +25,4 @@ db 0 ; growth rate
  861. tmlearn 0
  862. tmlearn 0
  863. tmlearn 0
  864. -db 0 ; padding
  865. +db Bank(KakunaPicFront) ; padding
  866. diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm
  867. index 6dcd1e3..057c164 100644
  868. --- a/data/baseStats/kangaskhan.asm
  869. +++ b/data/baseStats/kangaskhan.asm
  870. @@ -25,4 +25,4 @@ db 0 ; growth rate
  871. tmlearn 34,38,40
  872. tmlearn 44,48
  873. tmlearn 50,53,54
  874. -db 0 ; padding
  875. +db Bank(KangaskhanPicFront) ; padding
  876. diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm
  877. index 8708d5c..53bfff1 100644
  878. --- a/data/baseStats/kingler.asm
  879. +++ b/data/baseStats/kingler.asm
  880. @@ -25,4 +25,4 @@ db 0 ; growth rate
  881. tmlearn 34
  882. tmlearn 44
  883. tmlearn 50,51,53,54
  884. -db 0 ; padding
  885. +db Bank(KinglerPicFront) ; padding
  886. diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm
  887. index fced624..7f97e79 100644
  888. --- a/data/baseStats/koffing.asm
  889. +++ b/data/baseStats/koffing.asm
  890. @@ -25,4 +25,4 @@ db 0 ; growth rate
  891. tmlearn 34,36,38
  892. tmlearn 44,47
  893. tmlearn 50
  894. -db 0 ; padding
  895. +db Bank(KoffingPicFront) ; padding
  896. diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm
  897. index 88d690b..affbd03 100644
  898. --- a/data/baseStats/krabby.asm
  899. +++ b/data/baseStats/krabby.asm
  900. @@ -25,4 +25,4 @@ db 0 ; growth rate
  901. tmlearn 34
  902. tmlearn 44
  903. tmlearn 50,51,53,54
  904. -db 0 ; padding
  905. +db Bank(KrabbyPicFront) ; padding
  906. diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm
  907. index 3a89752..42fd818 100644
  908. --- a/data/baseStats/lapras.asm
  909. +++ b/data/baseStats/lapras.asm
  910. @@ -25,4 +25,4 @@ db 5 ; growth rate
  911. tmlearn 33,34,40
  912. tmlearn 44,46
  913. tmlearn 50,53,54
  914. -db 0 ; padding
  915. +db Bank(LaprasPicFront) ; padding
  916. diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm
  917. index 0502062..0a32d45 100644
  918. --- a/data/baseStats/lickitung.asm
  919. +++ b/data/baseStats/lickitung.asm
  920. @@ -25,4 +25,4 @@ db 0 ; growth rate
  921. tmlearn 34,38,40
  922. tmlearn 44
  923. tmlearn 50,51,53,54
  924. -db 0 ; padding
  925. +db Bank(LickitungPicFront) ; padding
  926. diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm
  927. index b461d45..2fb30c7 100644
  928. --- a/data/baseStats/machamp.asm
  929. +++ b/data/baseStats/machamp.asm
  930. @@ -25,4 +25,4 @@ db 3 ; growth rate
  931. tmlearn 34,35,38,40
  932. tmlearn 44,48
  933. tmlearn 50,54
  934. -db 0 ; padding
  935. +db Bank(MachampPicFront) ; padding
  936. diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm
  937. index b8a41ef..4768c5f 100644
  938. --- a/data/baseStats/machoke.asm
  939. +++ b/data/baseStats/machoke.asm
  940. @@ -25,4 +25,4 @@ db 3 ; growth rate
  941. tmlearn 34,35,38,40
  942. tmlearn 44,48
  943. tmlearn 50,54
  944. -db 0 ; padding
  945. +db Bank(MachokePicFront) ; padding
  946. diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm
  947. index 9ed22dc..f0690bb 100644
  948. --- a/data/baseStats/machop.asm
  949. +++ b/data/baseStats/machop.asm
  950. @@ -25,4 +25,4 @@ db 3 ; growth rate
  951. tmlearn 34,35,38,40
  952. tmlearn 44,48
  953. tmlearn 50,54
  954. -db 0 ; padding
  955. +db Bank(MachopPicFront) ; padding
  956. diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm
  957. index 50cc651..f2058d3 100644
  958. --- a/data/baseStats/magikarp.asm
  959. +++ b/data/baseStats/magikarp.asm
  960. @@ -25,4 +25,4 @@ db 5 ; growth rate
  961. tmlearn 0
  962. tmlearn 0
  963. tmlearn 0
  964. -db 0 ; padding
  965. +db Bank(MagikarpPicFront) ; padding
  966. diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm
  967. index 379e91d..c8957aa 100644
  968. --- a/data/baseStats/magmar.asm
  969. +++ b/data/baseStats/magmar.asm
  970. @@ -25,4 +25,4 @@ db 0 ; growth rate
  971. tmlearn 34,35,38,40
  972. tmlearn 44,46
  973. tmlearn 50,54
  974. -db 0 ; padding
  975. +db Bank(MagmarPicFront) ; padding
  976. diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm
  977. index ce04245..f71967b 100644
  978. --- a/data/baseStats/magnemite.asm
  979. +++ b/data/baseStats/magnemite.asm
  980. @@ -25,4 +25,4 @@ db 0 ; growth rate
  981. tmlearn 33,34,39
  982. tmlearn 44,45
  983. tmlearn 50,55
  984. -db 0 ; padding
  985. +db Bank(MagnemitePicFront) ; padding
  986. diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm
  987. index a2890bb..3f5c379 100644
  988. --- a/data/baseStats/magneton.asm
  989. +++ b/data/baseStats/magneton.asm
  990. @@ -25,4 +25,4 @@ db 0 ; growth rate
  991. tmlearn 33,34,39
  992. tmlearn 44,45
  993. tmlearn 50,55
  994. -db 0 ; padding
  995. +db Bank(MagnetonPicFront) ; padding
  996. diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm
  997. index 406a136..ded44b1 100644
  998. --- a/data/baseStats/mankey.asm
  999. +++ b/data/baseStats/mankey.asm
  1000. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1001. tmlearn 34,35,39,40
  1002. tmlearn 44,48
  1003. tmlearn 50,54
  1004. -db 0 ; padding
  1005. +db Bank(MankeyPicFront) ; padding
  1006. diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm
  1007. index 152b4aa..ad27cc1 100644
  1008. --- a/data/baseStats/marowak.asm
  1009. +++ b/data/baseStats/marowak.asm
  1010. @@ -31,4 +31,4 @@ db 0 ; growth rate
  1011. tmlearn 34,38,40
  1012. tmlearn 44
  1013. tmlearn 50,54
  1014. -db 0 ; padding
  1015. +db Bank(MarowakPicFront) ; padding
  1016. diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm
  1017. index dc146cf..50553af 100644
  1018. --- a/data/baseStats/meowth.asm
  1019. +++ b/data/baseStats/meowth.asm
  1020. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1021. tmlearn 34,39,40
  1022. tmlearn 44
  1023. tmlearn 50
  1024. -db 0 ; padding
  1025. +db Bank(MeowthPicFront) ; padding
  1026. diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm
  1027. index 9da351a..3c59c95 100644
  1028. --- a/data/baseStats/metapod.asm
  1029. +++ b/data/baseStats/metapod.asm
  1030. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1031. tmlearn 0
  1032. tmlearn 0
  1033. tmlearn 0
  1034. -db 0 ; padding
  1035. +db Bank(MetapodPicFront) ; padding
  1036. diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm
  1037. index 6919fd0..0a1277a 100644
  1038. --- a/data/baseStats/mew.asm
  1039. +++ b/data/baseStats/mew.asm
  1040. @@ -27,3 +27,4 @@ db 3 ; growth rate
  1041. tmlearn 41,42,43,44,45,46,47,48
  1042. tmlearn 49,50,51,52,53,54,55,56
  1043. db %11111111 ; usually spacing
  1044. +db Bank(MewPicFront)
  1045. \ No newline at end of file
  1046. diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm
  1047. index dc59734..d187672 100644
  1048. --- a/data/baseStats/mewtwo.asm
  1049. +++ b/data/baseStats/mewtwo.asm
  1050. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1051. tmlearn 33,34,35,36,38,40
  1052. tmlearn 44,45,46
  1053. tmlearn 49,50,54,55
  1054. -db 0 ; padding
  1055. +db Bank(MewtwoPicFront) ; padding
  1056. diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm
  1057. index e943740..b1943dd 100644
  1058. --- a/data/baseStats/moltres.asm
  1059. +++ b/data/baseStats/moltres.asm
  1060. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1061. tmlearn 33,34,38,39
  1062. tmlearn 43,44
  1063. tmlearn 50,52
  1064. -db 0 ; padding
  1065. +db Bank(MoltresPicFront) ; padding
  1066. diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm
  1067. index 8640e34..3e8ca7f 100644
  1068. --- a/data/baseStats/mrmime.asm
  1069. +++ b/data/baseStats/mrmime.asm
  1070. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1071. tmlearn 33,34,35,40
  1072. tmlearn 44,45,46
  1073. tmlearn 50,55
  1074. -db 0 ; padding
  1075. +db Bank(MrMimePicFront) ; padding
  1076. diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm
  1077. index cb15563..135ff7a 100644
  1078. --- a/data/baseStats/muk.asm
  1079. +++ b/data/baseStats/muk.asm
  1080. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1081. tmlearn 34,36,38
  1082. tmlearn 44,47
  1083. tmlearn 50
  1084. -db 0 ; padding
  1085. +db Bank(MukPicFront) ; padding
  1086. diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm
  1087. index ebef096..913e6d9 100644
  1088. --- a/data/baseStats/nidoking.asm
  1089. +++ b/data/baseStats/nidoking.asm
  1090. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1091. tmlearn 33,34,38,40
  1092. tmlearn 44,48
  1093. tmlearn 50,53,54
  1094. -db 0 ; padding
  1095. +db Bank(NidokingPicFront) ; padding
  1096. diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm
  1097. index 9ea29a3..533c9b4 100644
  1098. --- a/data/baseStats/nidoqueen.asm
  1099. +++ b/data/baseStats/nidoqueen.asm
  1100. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1101. tmlearn 33,34,38,40
  1102. tmlearn 44,48
  1103. tmlearn 50,53,54
  1104. -db 0 ; padding
  1105. +db Bank(NidoqueenPicFront) ; padding
  1106. diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm
  1107. index 67832f1..7ff3afb 100644
  1108. --- a/data/baseStats/nidoranf.asm
  1109. +++ b/data/baseStats/nidoranf.asm
  1110. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1111. tmlearn 33,34,40
  1112. tmlearn 44
  1113. tmlearn 50
  1114. -db 0 ; padding
  1115. +db Bank(NidoranFPicFront) ; padding
  1116. diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm
  1117. index a788276..5cbf384 100644
  1118. --- a/data/baseStats/nidoranm.asm
  1119. +++ b/data/baseStats/nidoranm.asm
  1120. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1121. tmlearn 33,34,40
  1122. tmlearn 44
  1123. tmlearn 50
  1124. -db 0 ; padding
  1125. +db Bank(NidoranMPicFront) ; padding
  1126. diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm
  1127. index 0ddecf7..b649ae8 100644
  1128. --- a/data/baseStats/nidorina.asm
  1129. +++ b/data/baseStats/nidorina.asm
  1130. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1131. tmlearn 33,34,40
  1132. tmlearn 44
  1133. tmlearn 50
  1134. -db 0 ; padding
  1135. +db Bank(NidorinaPicFront) ; padding
  1136. diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm
  1137. index fc435fc..ffa15d3 100644
  1138. --- a/data/baseStats/nidorino.asm
  1139. +++ b/data/baseStats/nidorino.asm
  1140. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1141. tmlearn 33,34,40
  1142. tmlearn 44
  1143. tmlearn 50
  1144. -db 0 ; padding
  1145. +db Bank(NidorinoPicFront) ; padding
  1146. diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm
  1147. index e98028d..fbab5c9 100644
  1148. --- a/data/baseStats/ninetails.asm
  1149. +++ b/data/baseStats/ninetails.asm
  1150. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1151. tmlearn 33,34,38,39,40
  1152. tmlearn 44
  1153. tmlearn 50
  1154. -db 0 ; padding
  1155. +db Bank(NinetalesPicFront) ; padding
  1156. diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm
  1157. index c91c513..5f5da43 100644
  1158. --- a/data/baseStats/oddish.asm
  1159. +++ b/data/baseStats/oddish.asm
  1160. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1161. tmlearn 33,34
  1162. tmlearn 44
  1163. tmlearn 50,51
  1164. -db 0 ; padding
  1165. +db Bank(OddishPicFront) ; padding
  1166. diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm
  1167. index 3c46187..3301417 100644
  1168. --- a/data/baseStats/omanyte.asm
  1169. +++ b/data/baseStats/omanyte.asm
  1170. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1171. tmlearn 33,34
  1172. tmlearn 44
  1173. tmlearn 50,53
  1174. -db 0 ; padding
  1175. +db Bank(OmanytePicFront) ; padding
  1176. diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm
  1177. index 09a2ae7..73f1072 100644
  1178. --- a/data/baseStats/omastar.asm
  1179. +++ b/data/baseStats/omastar.asm
  1180. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1181. tmlearn 33,34,40
  1182. tmlearn 44
  1183. tmlearn 50,53
  1184. -db 0 ; padding
  1185. +db Bank(OmastarPicFront) ; padding
  1186. diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm
  1187. index 6f3be4d..2669a1f 100644
  1188. --- a/data/baseStats/onix.asm
  1189. +++ b/data/baseStats/onix.asm
  1190. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1191. tmlearn 34,36,40
  1192. tmlearn 44,47,48
  1193. tmlearn 50,54
  1194. -db 0 ; padding
  1195. +db Bank(OnixPicFront) ; padding
  1196. diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm
  1197. index 2c918e6..eeb43a5 100644
  1198. --- a/data/baseStats/paras.asm
  1199. +++ b/data/baseStats/paras.asm
  1200. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1201. tmlearn 33,34,40
  1202. tmlearn 44
  1203. tmlearn 50,51
  1204. -db 0 ; padding
  1205. +db Bank(ParasPicFront) ; padding
  1206. diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm
  1207. index dfa0c73..682465b 100644
  1208. --- a/data/baseStats/parasect.asm
  1209. +++ b/data/baseStats/parasect.asm
  1210. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1211. tmlearn 33,34,40
  1212. tmlearn 44
  1213. tmlearn 50,51
  1214. -db 0 ; padding
  1215. +db Bank(ParasectPicFront) ; padding
  1216. diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm
  1217. index 2f5ef12..f969110 100644
  1218. --- a/data/baseStats/persian.asm
  1219. +++ b/data/baseStats/persian.asm
  1220. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1221. tmlearn 34,39,40
  1222. tmlearn 44
  1223. tmlearn 50
  1224. -db 0 ; padding
  1225. +db Bank(PersianPicFront) ; padding
  1226. diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm
  1227. index 05350d0..a5f5262 100644
  1228. --- a/data/baseStats/pidgeot.asm
  1229. +++ b/data/baseStats/pidgeot.asm
  1230. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1231. tmlearn 33,34,39
  1232. tmlearn 43,44
  1233. tmlearn 50,52
  1234. -db 0 ; padding
  1235. +db Bank(PidgeotPicFront) ; padding
  1236. diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm
  1237. index 74440fc..313da70 100644
  1238. --- a/data/baseStats/pidgeotto.asm
  1239. +++ b/data/baseStats/pidgeotto.asm
  1240. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1241. tmlearn 33,34,39
  1242. tmlearn 43,44
  1243. tmlearn 50,52
  1244. -db 0 ; padding
  1245. +db Bank(PidgeottoPicFront) ; padding
  1246. diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm
  1247. index ec032d6..e1c45f2 100644
  1248. --- a/data/baseStats/pidgey.asm
  1249. +++ b/data/baseStats/pidgey.asm
  1250. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1251. tmlearn 33,34,39
  1252. tmlearn 43,44
  1253. tmlearn 50,52
  1254. -db 0 ; padding
  1255. +db Bank(PidgeyPicFront) ; padding
  1256. diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm
  1257. index 09971b7..1b66df8 100644
  1258. --- a/data/baseStats/pikachu.asm
  1259. +++ b/data/baseStats/pikachu.asm
  1260. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1261. tmlearn 33,34,39,40
  1262. tmlearn 44,45
  1263. tmlearn 50,55
  1264. -db 0 ; padding
  1265. +db Bank(PikachuPicFront) ; padding
  1266. diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm
  1267. index 08c0e95..e4dbdb8 100644
  1268. --- a/data/baseStats/pinsir.asm
  1269. +++ b/data/baseStats/pinsir.asm
  1270. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1271. tmlearn 34
  1272. tmlearn 44
  1273. tmlearn 50,51,54
  1274. -db 0 ; padding
  1275. +db Bank(PinsirPicFront) ; padding
  1276. diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm
  1277. index 8014811..edf14e6 100644
  1278. --- a/data/baseStats/poliwag.asm
  1279. +++ b/data/baseStats/poliwag.asm
  1280. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1281. tmlearn 34,40
  1282. tmlearn 44,46
  1283. tmlearn 50,53
  1284. -db 0 ; padding
  1285. +db Bank(PoliwagPicFront) ; padding
  1286. diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm
  1287. index 6209da6..6189bdd 100644
  1288. --- a/data/baseStats/poliwhirl.asm
  1289. +++ b/data/baseStats/poliwhirl.asm
  1290. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1291. tmlearn 34,35,40
  1292. tmlearn 44,46
  1293. tmlearn 50,53,54
  1294. -db 0 ; padding
  1295. +db Bank(PoliwhirlPicFront) ; padding
  1296. diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm
  1297. index 9489a6a..1cd1cd6 100644
  1298. --- a/data/baseStats/poliwrath.asm
  1299. +++ b/data/baseStats/poliwrath.asm
  1300. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1301. tmlearn 34,35,40
  1302. tmlearn 44,46
  1303. tmlearn 50,53,54
  1304. -db 0 ; padding
  1305. +db Bank(PoliwrathPicFront) ; padding
  1306. diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm
  1307. index a6ff9e4..c0e6ab6 100644
  1308. --- a/data/baseStats/ponyta.asm
  1309. +++ b/data/baseStats/ponyta.asm
  1310. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1311. tmlearn 33,34,38,39,40
  1312. tmlearn 44
  1313. tmlearn 50
  1314. -db 0 ; padding
  1315. +db Bank(PonytaPicFront) ; padding
  1316. diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm
  1317. index a049fa7..e063ad7 100644
  1318. --- a/data/baseStats/porygon.asm
  1319. +++ b/data/baseStats/porygon.asm
  1320. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1321. tmlearn 33,34,39,40
  1322. tmlearn 44,45,46
  1323. tmlearn 49,50,55
  1324. -db 0 ; padding
  1325. +db Bank(PorygonPicFront) ; padding
  1326. diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm
  1327. index 389aa7f..35de00c 100644
  1328. --- a/data/baseStats/primeape.asm
  1329. +++ b/data/baseStats/primeape.asm
  1330. @@ -30,4 +30,4 @@ db 0 ; growth rate
  1331. tmlearn 34,35,39,40
  1332. tmlearn 44,48
  1333. tmlearn 50,54
  1334. -db 0 ; padding
  1335. +db Bank(PrimeapePicFront) ; padding
  1336. diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm
  1337. index db3ac79..753dca2 100644
  1338. --- a/data/baseStats/psyduck.asm
  1339. +++ b/data/baseStats/psyduck.asm
  1340. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1341. tmlearn 34,39,40
  1342. tmlearn 44
  1343. tmlearn 50,53,54
  1344. -db 0 ; padding
  1345. +db Bank(PsyduckPicFront) ; padding
  1346. diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm
  1347. index c830483..2b3d874 100644
  1348. --- a/data/baseStats/raichu.asm
  1349. +++ b/data/baseStats/raichu.asm
  1350. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1351. tmlearn 33,34,39,40
  1352. tmlearn 44,45
  1353. tmlearn 50,55
  1354. -db 0 ; padding
  1355. +db Bank(RaichuPicFront) ; padding
  1356. diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm
  1357. index c452159..d293f23 100644
  1358. --- a/data/baseStats/rapidash.asm
  1359. +++ b/data/baseStats/rapidash.asm
  1360. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1361. tmlearn 33,34,38,39,40
  1362. tmlearn 44
  1363. tmlearn 50
  1364. -db 0 ; padding
  1365. +db Bank(RapidashPicFront) ; padding
  1366. diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm
  1367. index ff8373d..4c8fb5d 100644
  1368. --- a/data/baseStats/raticate.asm
  1369. +++ b/data/baseStats/raticate.asm
  1370. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1371. tmlearn 34,39,40
  1372. tmlearn 44
  1373. tmlearn 50
  1374. -db 0 ; padding
  1375. +db Bank(RaticatePicFront) ; padding
  1376. diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm
  1377. index 7edfb62..8dc9407 100644
  1378. --- a/data/baseStats/rattata.asm
  1379. +++ b/data/baseStats/rattata.asm
  1380. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1381. tmlearn 34,39,40
  1382. tmlearn 44
  1383. tmlearn 50
  1384. -db 0 ; padding
  1385. +db Bank(RattataPicFront) ; padding
  1386. diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm
  1387. index d706690..5782914 100644
  1388. --- a/data/baseStats/rhydon.asm
  1389. +++ b/data/baseStats/rhydon.asm
  1390. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1391. tmlearn 34,38,40
  1392. tmlearn 44,48
  1393. tmlearn 50,53,54
  1394. -db 0 ; padding
  1395. +db Bank(RhydonPicFront) ; padding
  1396. diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm
  1397. index a6491bd..c1e0ba3 100644
  1398. --- a/data/baseStats/rhyhorn.asm
  1399. +++ b/data/baseStats/rhyhorn.asm
  1400. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1401. tmlearn 34,38,40
  1402. tmlearn 44,48
  1403. tmlearn 50,54
  1404. -db 0 ; padding
  1405. +db Bank(RhyhornPicFront) ; padding
  1406. diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm
  1407. index a9875a8..8ad1f0a 100644
  1408. --- a/data/baseStats/sandshrew.asm
  1409. +++ b/data/baseStats/sandshrew.asm
  1410. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1411. tmlearn 34,39,40
  1412. tmlearn 44,48
  1413. tmlearn 50,51,54
  1414. -db 0 ; padding
  1415. +db Bank(SandshrewPicFront) ; padding
  1416. diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm
  1417. index 30477eb..f80e10f 100644
  1418. --- a/data/baseStats/sandslash.asm
  1419. +++ b/data/baseStats/sandslash.asm
  1420. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1421. tmlearn 34,39,40
  1422. tmlearn 44,48
  1423. tmlearn 50,51,54
  1424. -db 0 ; padding
  1425. +db Bank(SandslashPicFront) ; padding
  1426. diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm
  1427. index 13de0d2..9b6f96b 100644
  1428. --- a/data/baseStats/scyther.asm
  1429. +++ b/data/baseStats/scyther.asm
  1430. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1431. tmlearn 34,39,40
  1432. tmlearn 44
  1433. tmlearn 50,51
  1434. -db 0 ; padding
  1435. +db Bank(ScytherPicFront) ; padding
  1436. diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm
  1437. index 9f28001..960e31e 100644
  1438. --- a/data/baseStats/seadra.asm
  1439. +++ b/data/baseStats/seadra.asm
  1440. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1441. tmlearn 34,39,40
  1442. tmlearn 44
  1443. tmlearn 50,53
  1444. -db 0 ; padding
  1445. +db Bank(SeadraPicFront) ; padding
  1446. diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm
  1447. index d4fbe8e..3c98f2c 100644
  1448. --- a/data/baseStats/seaking.asm
  1449. +++ b/data/baseStats/seaking.asm
  1450. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1451. tmlearn 34,39,40
  1452. tmlearn 44
  1453. tmlearn 50,53
  1454. -db 0 ; padding
  1455. +db Bank(SeakingPicFront) ; padding
  1456. diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm
  1457. index ef9c289..05368e2 100644
  1458. --- a/data/baseStats/seel.asm
  1459. +++ b/data/baseStats/seel.asm
  1460. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1461. tmlearn 34,40
  1462. tmlearn 44
  1463. tmlearn 50,53,54
  1464. -db 0 ; padding
  1465. +db Bank(SeelPicFront) ; padding
  1466. diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm
  1467. index 7c2cdf9..400baed 100644
  1468. --- a/data/baseStats/shellder.asm
  1469. +++ b/data/baseStats/shellder.asm
  1470. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1471. tmlearn 33,34,36,39
  1472. tmlearn 44,47
  1473. tmlearn 49,50,53
  1474. -db 0 ; padding
  1475. +db Bank(ShellderPicFront) ; padding
  1476. diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm
  1477. index ffeda79..13ab7a3 100644
  1478. --- a/data/baseStats/slowbro.asm
  1479. +++ b/data/baseStats/slowbro.asm
  1480. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1481. tmlearn 33,34,38,39,40
  1482. tmlearn 44,45,46
  1483. tmlearn 49,50,53,54,55
  1484. -db 0 ; padding
  1485. +db Bank(SlowbroPicFront) ; padding
  1486. diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm
  1487. index ea238a6..b478da6 100644
  1488. --- a/data/baseStats/slowpoke.asm
  1489. +++ b/data/baseStats/slowpoke.asm
  1490. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1491. tmlearn 33,34,38,39,40
  1492. tmlearn 44,45,46
  1493. tmlearn 49,50,53,54,55
  1494. -db 0 ; padding
  1495. +db Bank(SlowpokePicFront) ; padding
  1496. diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm
  1497. index 2d1fd6e..abd843f 100644
  1498. --- a/data/baseStats/snorlax.asm
  1499. +++ b/data/baseStats/snorlax.asm
  1500. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1501. tmlearn 33,34,35,36,38,40
  1502. tmlearn 44,46,48
  1503. tmlearn 50,53,54
  1504. -db 0 ; padding
  1505. +db Bank(SnorlaxPicFront) ; padding
  1506. diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm
  1507. index eb8ab1e..15b120c 100644
  1508. --- a/data/baseStats/spearow.asm
  1509. +++ b/data/baseStats/spearow.asm
  1510. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1511. tmlearn 34,39
  1512. tmlearn 43,44
  1513. tmlearn 50,52
  1514. -db 0 ; padding
  1515. +db Bank(SpearowPicFront) ; padding
  1516. diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm
  1517. index f8dcd0a..db92f22 100644
  1518. --- a/data/baseStats/squirtle.asm
  1519. +++ b/data/baseStats/squirtle.asm
  1520. @@ -1,19 +1,19 @@
  1521. db DEX_SQUIRTLE ; pokedex id
  1522. -db 44 ; base hp
  1523. -db 48 ; base attack
  1524. -db 65 ; base defense
  1525. -db 43 ; base speed
  1526. -db 50 ; base special
  1527. -db WATER ; species type 1
  1528. -db WATER ; species type 2
  1529. -db 45 ; catch rate
  1530. -db 66 ; base exp yield
  1531. -INCBIN "pic/bmon/squirtle.pic",0,1 ; 55, sprite dimensions
  1532. +db 40 ; base hp
  1533. +db 55 ; base attack
  1534. +db 70 ; base defense
  1535. +db 30 ; base speed
  1536. +db 45 ; base special
  1537. +db STEEL ; species type 1
  1538. +db STEEL ; species type 2
  1539. +db 130 ; catch rate
  1540. +db 60 ; base exp yield
  1541. +INCBIN "pic/bmon/squirtle.pic",0,1 ; 66, sprite dimensions
  1542. dw SquirtlePicFront
  1543. dw SquirtlePicBack
  1544. ; attacks known at lvl 0
  1545. -db TACKLE
  1546. -db TAIL_WHIP
  1547. +db CONSTRICT
  1548. +db 0
  1549. db 0
  1550. db 0
  1551. db 3 ; growth rate
  1552. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1553. tmlearn 33,34,40
  1554. tmlearn 44
  1555. tmlearn 50,53,54
  1556. -db 0 ; padding
  1557. +db Bank(SquirtlePicFront) ; padding
  1558. diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm
  1559. index 686dfa5..5485c34 100644
  1560. --- a/data/baseStats/starmie.asm
  1561. +++ b/data/baseStats/starmie.asm
  1562. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1563. tmlearn 33,34,39,40
  1564. tmlearn 44,45,46
  1565. tmlearn 49,50,53,55
  1566. -db 0 ; padding
  1567. +db Bank(StarmiePicFront) ; padding
  1568. diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm
  1569. index 35f51a6..3e0776d 100644
  1570. --- a/data/baseStats/staryu.asm
  1571. +++ b/data/baseStats/staryu.asm
  1572. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1573. tmlearn 33,34,39,40
  1574. tmlearn 44,45,46
  1575. tmlearn 49,50,53,55
  1576. -db 0 ; padding
  1577. +db Bank(StaryuPicFront) ; padding
  1578. diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm
  1579. index b50a57b..594269e 100644
  1580. --- a/data/baseStats/tangela.asm
  1581. +++ b/data/baseStats/tangela.asm
  1582. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1583. tmlearn 34,40
  1584. tmlearn 44
  1585. tmlearn 50,51
  1586. -db 0 ; padding
  1587. +db Bank(TangelaPicFront) ; padding
  1588. diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm
  1589. index 87f28ec..c47996d 100644
  1590. --- a/data/baseStats/tauros.asm
  1591. +++ b/data/baseStats/tauros.asm
  1592. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1593. tmlearn 34,38,40
  1594. tmlearn 44
  1595. tmlearn 50,54
  1596. -db 0 ; padding
  1597. +db Bank(TaurosPicFront) ; padding
  1598. diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm
  1599. index 7237f08..b3de767 100644
  1600. --- a/data/baseStats/tentacool.asm
  1601. +++ b/data/baseStats/tentacool.asm
  1602. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1603. tmlearn 33,34,40
  1604. tmlearn 44
  1605. tmlearn 50,51,53
  1606. -db 0 ; padding
  1607. +db Bank(TentacoolPicFront) ; padding
  1608. diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm
  1609. index d3d9391..1945adf 100644
  1610. --- a/data/baseStats/tentacruel.asm
  1611. +++ b/data/baseStats/tentacruel.asm
  1612. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1613. tmlearn 33,34,40
  1614. tmlearn 44
  1615. tmlearn 50,51,53
  1616. -db 0 ; padding
  1617. +db Bank(TentacruelPicFront) ; padding
  1618. diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm
  1619. index 7243a39..7bea2a7 100644
  1620. --- a/data/baseStats/vaporeon.asm
  1621. +++ b/data/baseStats/vaporeon.asm
  1622. @@ -29,4 +29,4 @@ db 0 ; growth rate
  1623. tmlearn 33,34,39,40
  1624. tmlearn 44
  1625. tmlearn 50,53
  1626. -db 0 ; padding
  1627. +db Bank(VaporeonPicFront) ; padding
  1628. diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
  1629. index 01a6c3d..c550cf1 100644
  1630. --- a/data/baseStats/venomoth.asm
  1631. +++ b/data/baseStats/venomoth.asm
  1632. @@ -30,4 +30,4 @@ db 0 ; growth rate
  1633. tmlearn 33,34,39
  1634. tmlearn 44,46
  1635. tmlearn 50
  1636. -db 0 ; padding
  1637. +db Bank(VenomothPicFront) ; padding
  1638. diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm
  1639. index bc643c7..265c4be 100644
  1640. --- a/data/baseStats/venonat.asm
  1641. +++ b/data/baseStats/venonat.asm
  1642. @@ -32,4 +32,4 @@ ELSE
  1643. tmlearn 44,46
  1644. tmlearn 50
  1645. ENDC
  1646. -db 0 ; padding
  1647. +db Bank(VenonatPicFront) ; padding
  1648. diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm
  1649. index 0a45732..890f5d0 100644
  1650. --- a/data/baseStats/venusaur.asm
  1651. +++ b/data/baseStats/venusaur.asm
  1652. @@ -1,21 +1,21 @@
  1653. db DEX_VENUSAUR ; pokedex id
  1654. -db 80 ; base hp
  1655. -db 82 ; base attack
  1656. -db 83 ; base defense
  1657. -db 80 ; base speed
  1658. -db 100 ; base special
  1659. -db GRASS ; species type 1
  1660. -db POISON ; species type 2
  1661. +db 95 ; base hp
  1662. +db 117 ; base attack
  1663. +db 80 ; base defense
  1664. +db 92 ; base speed
  1665. +db 70 ; base special
  1666. +db GROUND ; species type 1
  1667. +db DARK ; species type 2
  1668. db 45 ; catch rate
  1669. db 208 ; base exp yield
  1670. INCBIN "pic/bmon/venusaur.pic",0,1 ; 77, sprite dimensions
  1671. dw VenusaurPicFront
  1672. dw VenusaurPicBack
  1673. ; attacks known at lvl 0
  1674. -db TACKLE
  1675. -db GROWL
  1676. -db LEECH_SEED
  1677. -db VINE_WHIP
  1678. +db SCRATCH
  1679. +db LEER
  1680. +db RAGE
  1681. +db BITE
  1682. db 3 ; growth rate
  1683. ; learnset
  1684. tmlearn 3,6,8
  1685. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1686. tmlearn 33,34
  1687. tmlearn 44
  1688. tmlearn 50,51
  1689. -db 0 ; padding
  1690. +db Bank(VenusaurPicFront) ; padding
  1691. diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm
  1692. index a56958e..5cd251e 100644
  1693. --- a/data/baseStats/victreebel.asm
  1694. +++ b/data/baseStats/victreebel.asm
  1695. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1696. tmlearn 33,34
  1697. tmlearn 44
  1698. tmlearn 50,51
  1699. -db 0 ; padding
  1700. +db Bank(VictreebelPicFront) ; padding
  1701. diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm
  1702. index 17bb973..6a5d1af 100644
  1703. --- a/data/baseStats/vileplume.asm
  1704. +++ b/data/baseStats/vileplume.asm
  1705. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1706. tmlearn 33,34
  1707. tmlearn 44
  1708. tmlearn 50,51
  1709. -db 0 ; padding
  1710. +db Bank(VileplumePicFront) ; padding
  1711. diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm
  1712. index 92d2ccb..7261157 100644
  1713. --- a/data/baseStats/voltorb.asm
  1714. +++ b/data/baseStats/voltorb.asm
  1715. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1716. tmlearn 33,34,36,39
  1717. tmlearn 44,45,47
  1718. tmlearn 50,55
  1719. -db 0 ; padding
  1720. +db Bank(VoltorbPicFront) ; padding
  1721. diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm
  1722. index 9577ae3..f909015 100644
  1723. --- a/data/baseStats/vulpix.asm
  1724. +++ b/data/baseStats/vulpix.asm
  1725. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1726. tmlearn 33,34,38,39,40
  1727. tmlearn 44
  1728. tmlearn 50
  1729. -db 0 ; padding
  1730. +db Bank(VulpixPicFront) ; padding
  1731. diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm
  1732. index bc86bd6..2755e9d 100644
  1733. --- a/data/baseStats/wartortle.asm
  1734. +++ b/data/baseStats/wartortle.asm
  1735. @@ -1,20 +1,20 @@
  1736. db DEX_WARTORTLE ; pokedex id
  1737. -db 59 ; base hp
  1738. -db 63 ; base attack
  1739. -db 80 ; base defense
  1740. -db 58 ; base speed
  1741. -db 65 ; base special
  1742. -db WATER ; species type 1
  1743. -db WATER ; species type 2
  1744. -db 45 ; catch rate
  1745. +db 51 ; base hp
  1746. +db 65 ; base attack
  1747. +db 65 ; base defense
  1748. +db 59 ; base speed
  1749. +db 80 ; base special
  1750. +db STEEL ; species type 1
  1751. +db STEEL ; species type 2
  1752. +db 120 ; catch rate
  1753. db 143 ; base exp yield
  1754. -INCBIN "pic/bmon/wartortle.pic",0,1 ; 66, sprite dimensions
  1755. +INCBIN "pic/bmon/wartortle.pic",0,1 ; 77, sprite dimensions
  1756. dw WartortlePicFront
  1757. dw WartortlePicBack
  1758. ; attacks known at lvl 0
  1759. -db TACKLE
  1760. -db TAIL_WHIP
  1761. -db BUBBLE
  1762. +db CONSTRICT
  1763. +db BIND
  1764. +db THUNDERSHOCK
  1765. db 0
  1766. db 3 ; growth rate
  1767. ; learnset
  1768. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1769. tmlearn 33,34,40
  1770. tmlearn 44
  1771. tmlearn 50,53,54
  1772. -db 0 ; padding
  1773. +db Bank(WartortlePicFront) ; padding
  1774. diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm
  1775. index 8370dc4..efb4c1a 100644
  1776. --- a/data/baseStats/weedle.asm
  1777. +++ b/data/baseStats/weedle.asm
  1778. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1779. tmlearn 0
  1780. tmlearn 0
  1781. tmlearn 0
  1782. -db 0 ; padding
  1783. +db Bank(WeedlePicFront) ; padding
  1784. diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm
  1785. index 735a453..b05c727 100644
  1786. --- a/data/baseStats/weepinbell.asm
  1787. +++ b/data/baseStats/weepinbell.asm
  1788. @@ -25,4 +25,4 @@ db 3 ; growth rate
  1789. tmlearn 33,34
  1790. tmlearn 44
  1791. tmlearn 50,51
  1792. -db 0 ; padding
  1793. +db Bank(WeepinbellPicFront) ; padding
  1794. diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm
  1795. index 0dd09df..62fa222 100644
  1796. --- a/data/baseStats/weezing.asm
  1797. +++ b/data/baseStats/weezing.asm
  1798. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1799. tmlearn 34,36,38
  1800. tmlearn 44,47
  1801. tmlearn 50
  1802. -db 0 ; padding
  1803. +db Bank(WeezingPicFront) ; padding
  1804. diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm
  1805. index d5fd08e..3d07b6c 100644
  1806. --- a/data/baseStats/wigglytuff.asm
  1807. +++ b/data/baseStats/wigglytuff.asm
  1808. @@ -25,4 +25,4 @@ db 4 ; growth rate
  1809. tmlearn 33,34,38,40
  1810. tmlearn 44,45,46
  1811. tmlearn 49,50,54,55
  1812. -db 0 ; padding
  1813. +db Bank(WigglytuffPicFront) ; padding
  1814. diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm
  1815. index 487052b..5313a55 100644
  1816. --- a/data/baseStats/zapdos.asm
  1817. +++ b/data/baseStats/zapdos.asm
  1818. @@ -25,4 +25,4 @@ db 5 ; growth rate
  1819. tmlearn 33,34,39
  1820. tmlearn 43,44,45
  1821. tmlearn 50,52,55
  1822. -db 0 ; padding
  1823. +db Bank(ZapdosPicFront) ; padding
  1824. diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm
  1825. index 1caa425..7239be0 100644
  1826. --- a/data/baseStats/zubat.asm
  1827. +++ b/data/baseStats/zubat.asm
  1828. @@ -25,4 +25,4 @@ db 0 ; growth rate
  1829. tmlearn 34,39
  1830. tmlearn 44
  1831. tmlearn 50
  1832. -db 0 ; padding
  1833. +db Bank(ZubatPicFront) ; padding
  1834. diff --git a/data/base_stats.asm b/data/base_stats.asm
  1835. index d7d2653..849971f 100755
  1836. --- a/data/base_stats.asm
  1837. +++ b/data/base_stats.asm
  1838. @@ -148,3 +148,5 @@ INCLUDE "data/baseStats/dratini.asm"
  1839. INCLUDE "data/baseStats/dragonair.asm"
  1840. INCLUDE "data/baseStats/dragonite.asm"
  1841. INCLUDE "data/baseStats/mewtwo.asm"
  1842. +INCLUDE "data/baseStats/mew.asm"
  1843. +INCLUDE "data/baseStats/mon152.asm"
  1844. diff --git a/data/cries.asm b/data/cries.asm
  1845. index 7d03b83..aabc014 100755
  1846. --- a/data/cries.asm
  1847. +++ b/data/cries.asm
  1848. @@ -30,7 +30,7 @@ CryData: ; 39446 (e:5446)
  1849. db $13, $00, $80; Blastoise
  1850. db $14, $00, $80; Pinsir
  1851. db $12, $00, $80; Tangela
  1852. - db $00, $00, $00; MissingNo.
  1853. + db $0F, $80, $01; Mon152
  1854. db $00, $00, $00; MissingNo.
  1855. db $1F, $20, $40; Growlithe
  1856. db $17, $FF, $C0; Onix
  1857. diff --git a/data/evos_moves.asm b/data/evos_moves.asm
  1858. index 29a3347..1043164 100755
  1859. --- a/data/evos_moves.asm
  1860. +++ b/data/evos_moves.asm
  1861. @@ -566,10 +566,15 @@ Mon114_EvosMoves: ; 3b362 (e:7362)
  1862. db 0
  1863.  
  1864. Mon152_EvosMoves: ; 3b370 (e:7370)
  1865. -;MISSINGNO
  1866. +;MON152
  1867. ;Evolutions
  1868. db 0
  1869. ;Learnset
  1870. + db 5,VINE_WHIP
  1871. + db 11,BITE
  1872. + db 15,LEECH_SEED
  1873. + db 20,PIN_MISSILE
  1874. + db 25,BODY_SLAM
  1875. db 0
  1876.  
  1877. Mon153_EvosMoves: ; 3b372 (e:7372)
  1878. diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm
  1879. index 4f977b2..57e70d1 100755
  1880. --- a/data/mapObjects/redshouse1f.asm
  1881. +++ b/data/mapObjects/redshouse1f.asm
  1882. @@ -4,7 +4,7 @@ RedsHouse1FObject: ; 481e4 (12:41e4)
  1883. db $3 ; warps
  1884. db $7, $2, $0, $FF ; exit1
  1885. db $7, $3, $0, $FF ; exit2
  1886. - db $1, $7, $0, REDS_HOUSE_2F ; staircase
  1887. + db $1, $5, $0, REDS_HOUSE_2F ; staircase
  1888.  
  1889. db $1 ; signs
  1890. db $1, $3, $2 ; TV
  1891. @@ -13,6 +13,6 @@ RedsHouse1FObject: ; 481e4 (12:41e4)
  1892. object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom
  1893.  
  1894. ; warp-to
  1895. - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2
  1896. - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3
  1897. - EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7
  1898. + EVENT_DISP REDS_HOUSE_1F_WIDTH, $5, $2
  1899. + EVENT_DISP REDS_HOUSE_1F_WIDTH, $5, $3
  1900. + EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $5
  1901. diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm
  1902. index d668d44..926fc9d 100755
  1903. --- a/data/mapObjects/redshouse2f.asm
  1904. +++ b/data/mapObjects/redshouse2f.asm
  1905. @@ -2,11 +2,11 @@ RedsHouse2FObject: ; 0x5c0d0
  1906. db $0A ; border block
  1907.  
  1908. db $1 ; warps
  1909. - db $1, $7, $2, REDS_HOUSE_1F
  1910. + db $1, $5, $2, REDS_HOUSE_1F
  1911.  
  1912. db $0 ; signs
  1913.  
  1914. db $0 ; objects
  1915.  
  1916. ; warp-to
  1917. - EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7
  1918. + EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $5
  1919. diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
  1920. index 8a8aecd..3711d0e 100755
  1921. --- a/data/mon_palettes.asm
  1922. +++ b/data/mon_palettes.asm
  1923. @@ -1,14 +1,14 @@
  1924. MonsterPalettes: ; 725c8 (1c:65c8)
  1925. db PAL_MEWMON ; MISSINGNO
  1926. - db PAL_GREENMON ; BULBASAUR
  1927. - db PAL_GREENMON ; IVYSAUR
  1928. - db PAL_GREENMON ; VENUSAUR
  1929. - db PAL_REDMON ; CHARMANDER
  1930. - db PAL_REDMON ; CHARMELEON
  1931. - db PAL_REDMON ; CHARIZARD
  1932. - db PAL_CYANMON ; SQUIRTLE
  1933. - db PAL_CYANMON ; WARTORTLE
  1934. - db PAL_CYANMON ; BLASTOISE
  1935. + db PAL_BROWNMON ; BULBASAUR
  1936. + db PAL_BROWNMON ; IVYSAUR
  1937. + db PAL_REDMON ; VENUSAUR
  1938. + db PAL_CYANMON ; CHARMANDER
  1939. + db PAL_CYANMON ; CHARMELEON
  1940. + db PAL_CYANMON ; CHARIZARD
  1941. + db PAL_GREYMON ; SQUIRTLE
  1942. + db PAL_GREYMON ; WARTORTLE
  1943. + db PAL_GREYMON ; BLASTOISE
  1944. db PAL_GREENMON ; CATERPIE
  1945. db PAL_GREENMON ; METAPOD
  1946. db PAL_CYANMON ; BUTTERFREE
  1947. @@ -151,3 +151,5 @@ MonsterPalettes: ; 725c8 (1c:65c8)
  1948. db PAL_BROWNMON ; DRAGONITE
  1949. db PAL_MEWMON ; MEWTWO
  1950. db PAL_MEWMON ; MEW
  1951. + db PAL_GREENMON ; MON152
  1952. +
  1953. \ No newline at end of file
  1954. diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
  1955. index 7e434dc..d649c49 100755
  1956. --- a/data/mon_party_sprites.asm
  1957. +++ b/data/mon_party_sprites.asm
  1958. @@ -1,9 +1,9 @@
  1959. MonPartyData: ; 7190d (1c:590d)
  1960. - dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur
  1961. - dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charma nder
  1962. - dn SPRITE_MON, SPRITE_MON ;Charmeleon/Char izard
  1963. - dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle
  1964. - dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Cater pie
  1965. + dn SPRITE_QUADRUPED, SPRITE_MON ;Bulbasaur/Ivysaur
  1966. + dn SPRITE_MON, SPRITE_FAIRY ;Venusaur/Charma nder
  1967. + dn SPRITE_FAIRY, SPRITE_FAIRY ;Charmeleon/Charizard
  1968. + dn SPRITE_BALL_M, SPRITE_BALL_M ;Squirtle/Wartortle
  1969. + dn SPRITE_BALL_M, SPRITE_BUG ;Blastoise/Caterpie
  1970. dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterf ree
  1971. dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
  1972. dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey
  1973. @@ -74,4 +74,5 @@ MonPartyData: ; 7190d (1c:590d)
  1974. dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
  1975. dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
  1976. dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtw o
  1977. - dn SPRITE_MON, 0 ;Mew/Pad ding
  1978. + dn SPRITE_MON, SPRITE_MON ;Mew/Mon152
  1979. + dn 0, 0 ;Padding/Padding
  1980. \ No newline at end of file
  1981. diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
  1982. index 6f06d69..85f66b0 100755
  1983. --- a/data/pokedex_entries.asm
  1984. +++ b/data/pokedex_entries.asm
  1985. @@ -29,7 +29,7 @@ PokedexEntryPointers: ; 4047e (10:447e)
  1986. dw BlastoiseDexEntry
  1987. dw PinsirDexEntry
  1988. dw TangelaDexEntry
  1989. - dw MissingNoDexEntry
  1990. + dw Mon152DexEntry
  1991. dw MissingNoDexEntry
  1992. dw GrowlitheDexEntry
  1993. dw OnixDexEntry
  1994. @@ -252,9 +252,9 @@ SlowbroDexEntry: ; 4066c (10:466c)
  1995. db "@"
  1996.  
  1997. IvysaurDexEntry: ; 40680 (10:4680)
  1998. - db "SEED@"
  1999. + db "DES. CROC@"
  2000. db 3,3
  2001. - dw 290
  2002. + dw 736
  2003. TX_FAR _IvysaurDexEntry
  2004. db "@"
  2005.  
  2006. @@ -404,6 +404,13 @@ TangelaDexEntry: ; 407e8 (10:47e8)
  2007. dw 770
  2008. TX_FAR _TangelaDexEntry
  2009. db "@"
  2010. +
  2011. +Mon152DexEntry: ; 407e8 (10:47e8)
  2012. + db "SPINY@"
  2013. + db 3,3
  2014. + dw 770
  2015. + TX_FAR _Mon152DexEntry
  2016. + db "@"
  2017.  
  2018. GrowlitheDexEntry: ; 407f6 (10:47f6)
  2019. db "PUPPY@"
  2020. @@ -1071,16 +1078,16 @@ StarmieDexEntry: ; 40e1f (10:4e1f)
  2021. db "@"
  2022.  
  2023. BulbasaurDexEntry: ; 40e33 (10:4e33)
  2024. - db "SEED@"
  2025. + db "DES. CROC@"
  2026. db 2,4
  2027. - dw 150
  2028. + dw 335
  2029. TX_FAR _BulbasaurDexEntry
  2030. db "@"
  2031.  
  2032. VenusaurDexEntry: ; 40e41 (10:4e41)
  2033. - db "SEED@"
  2034. - db 6,7
  2035. - dw 2210
  2036. + db "INTIMIDATE@"
  2037. + db 4,11
  2038. + dw 2123
  2039. TX_FAR _VenusaurDexEntry
  2040. db "@"
  2041.  
  2042. @@ -1176,37 +1183,37 @@ MagnemiteDexEntry: ; 40f1f (10:4f1f)
  2043. db "@"
  2044.  
  2045. CharmanderDexEntry: ; 40f2f (10:4f2f)
  2046. - db "LIZARD@"
  2047. - db 2,0
  2048. - dw 190
  2049. + db "FRESH SNOW@"
  2050. + db 1,4
  2051. + dw 126
  2052. TX_FAR _CharmanderDexEntry
  2053. db "@"
  2054.  
  2055. SquirtleDexEntry: ; 40f3f (10:4f3f)
  2056. - db "TINYTURTLE@"
  2057. - db 1,8
  2058. - dw 200
  2059. + db "GEAR@"
  2060. + db 1,0
  2061. + dw 463
  2062. TX_FAR _SquirtleDexEntry
  2063. db "@"
  2064.  
  2065. CharmeleonDexEntry: ; 40f53 (10:4f53)
  2066. - db "FLAME@"
  2067. + db "ICY SNOW@"
  2068. db 3,7
  2069. - dw 420
  2070. + dw 904
  2071. TX_FAR _CharmeleonDexEntry
  2072. db "@"
  2073.  
  2074. WartortleDexEntry: ; 40f62 (10:4f62)
  2075. - db "TURTLE@"
  2076. + db "GEAR@"
  2077. db 3,3
  2078. dw 500
  2079. TX_FAR _WartortleDexEntry
  2080. db "@"
  2081.  
  2082. CharizardDexEntry: ; 40f72 (10:4f72)
  2083. - db "FLAME@"
  2084. - db 5,7
  2085. - dw 2000
  2086. + db "SNOWSTORM@"
  2087. + db 4,3
  2088. + dw 1268
  2089. TX_FAR _CharizardDexEntry
  2090. db "@"
  2091.  
  2092. diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
  2093. index 3bd6a15..664cfee 100755
  2094. --- a/data/pokedex_order.asm
  2095. +++ b/data/pokedex_order.asm
  2096. @@ -29,7 +29,7 @@ PokedexOrder: ; 41024 (10:5024)
  2097. db DEX_BLASTOISE
  2098. db DEX_PINSIR
  2099. db DEX_TANGELA
  2100. - db 0 ; MISSINGNO.
  2101. + db DEX_MON152
  2102. db 0 ; MISSINGNO.
  2103. db DEX_GROWLITHE
  2104. db DEX_ONIX
  2105. diff --git a/data/sgb_border.asm b/data/sgb_border.asm
  2106. index e1da84a..9c59488 100755
  2107. --- a/data/sgb_border.asm
  2108. +++ b/data/sgb_border.asm
  2109. @@ -16,9 +16,9 @@ IF DEF(_RED)
  2110. ENDC
  2111. IF DEF(_BLUE)
  2112. RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O)
  2113. - RGB 10,17,26
  2114. - RGB 5,9,20
  2115. - RGB 16,20,27
  2116. + RGB 20,15,10 ; squirtle stuff
  2117. + RGB 5,5,5
  2118. + RGB 25,20,15 ; probably squirtle's secondary color
  2119. ENDC
  2120.  
  2121. ds $18
  2122. @@ -31,9 +31,9 @@ IF DEF(_RED)
  2123. ENDC
  2124. IF DEF(_BLUE)
  2125. RGB 30,29,29 ; PAL_SGB2
  2126. - RGB 27,11,6
  2127. - RGB 5,9,20
  2128. - RGB 28,25,15
  2129. + RGB 20,15,10 ; charmander's dark orange color - save for klink
  2130. + RGB 5,5,5 ; circle border color
  2131. + RGB 25,20,15, ;used on pokemon bodies/charmander's light orange
  2132. ENDC
  2133.  
  2134. ds $18
  2135. @@ -46,9 +46,9 @@ IF DEF(_RED)
  2136. ENDC
  2137. IF DEF(_BLUE)
  2138. RGB 30,29,29 ; PAL_SGB3
  2139. - RGB 12,15,11
  2140. - RGB 5,9,20
  2141. - RGB 14,22,17
  2142. + RGB 20,15,10 ; bulbasaur's dark green color - save for vanillite
  2143. + RGB 5,5,5 ; circle border color
  2144. + RGB 25,20,15 ; bulbasaur's light green
  2145. ENDC
  2146.  
  2147. ds $18
  2148. diff --git a/data/super_palettes.asm b/data/super_palettes.asm
  2149. index c1afb00..016dd6d 100755
  2150. --- a/data/super_palettes.asm
  2151. +++ b/data/super_palettes.asm
  2152. @@ -62,19 +62,19 @@ IF DEF(_BLUE)
  2153. RGB 31,29,31 ; PAL_LOGO1
  2154. RGB 30,30,17
  2155. RGB 21,0,4
  2156. - RGB 14,19,29
  2157. + RGB 15,10,5 ; version text color
  2158. ENDC
  2159. RGB 31,29,31 ; PAL_LOGO2
  2160. - RGB 30,30,17
  2161. - RGB 18,18,24
  2162. - RGB 7,7,16
  2163. + RGB 30,30,17 ; yellow coloring of POKEMON
  2164. + RGB 18,18,24 ; jpeg artifacts around POKEMON
  2165. + RGB 7,7,16 ; most likely the POKEMON outline
  2166. RGB 31,29,31 ; PAL_0F
  2167. RGB 24,20,30
  2168. RGB 11,20,30
  2169. RGB 3,2,2
  2170. - RGB 31,29,31 ; PAL_MEWMON
  2171. - RGB 30,22,17
  2172. - RGB 16,14,19
  2173. + RGB 31,29,31 ; PAL_MEWMON ; used on title screen for trainer/pokemon
  2174. + RGB 30,25,20
  2175. + RGB 20,15,10
  2176. RGB 3,2,2
  2177. RGB 31,29,31 ; PAL_BLUEMON
  2178. RGB 18,20,27
  2179. diff --git a/data/title_mons.asm b/data/title_mons.asm
  2180. index abcf1bb..d92add2 100755
  2181. --- a/data/title_mons.asm
  2182. +++ b/data/title_mons.asm
  2183. @@ -37,9 +37,9 @@ IF DEF(_GREEN)
  2184. db MAGIKARP
  2185. ENDC
  2186. IF DEF(_BLUE)
  2187. - db SQUIRTLE
  2188. - db CHARMANDER
  2189. db BULBASAUR
  2190. + db CHARMANDER
  2191. + db SQUIRTLE
  2192. db MANKEY
  2193. db HITMONLEE
  2194. db VULPIX
  2195. diff --git a/data/type_effects.asm b/data/type_effects.asm
  2196. index b3207c8..5d3c80a 100755
  2197. --- a/data/type_effects.asm
  2198. +++ b/data/type_effects.asm
  2199. @@ -49,7 +49,6 @@ TypeEffects: ; 3e474 (f:6474)
  2200. db POISON,GRASS,20
  2201. db POISON,POISON,05
  2202. db POISON,GROUND,05
  2203. - db POISON,BUG,20
  2204. db POISON,ROCK,05
  2205. db POISON,GHOST,05
  2206. db GROUND,FIRE,20
  2207. @@ -71,7 +70,7 @@ TypeEffects: ; 3e474 (f:6474)
  2208. db BUG,FLYING,05
  2209. db BUG,PSYCHIC,20
  2210. db BUG,GHOST,05
  2211. - db BUG,POISON,20
  2212. + db BUG,POISON,05
  2213. db ROCK,FIRE,20
  2214. db ROCK,FIGHTING,05
  2215. db ROCK,GROUND,05
  2216. @@ -79,11 +78,53 @@ TypeEffects: ; 3e474 (f:6474)
  2217. db ROCK,BUG,20
  2218. db ROCK,ICE,20
  2219. db GHOST,NORMAL,00
  2220. - db GHOST,PSYCHIC,00
  2221. + db GHOST,PSYCHIC,20
  2222. db FIRE,DRAGON,05
  2223. db WATER,DRAGON,05
  2224. db ELECTRIC,DRAGON,05
  2225. db GRASS,DRAGON,05
  2226. db ICE,DRAGON,20
  2227. db DRAGON,DRAGON,20
  2228. + db ICE,FIRE,05
  2229. + db DARK,FIGHTING,05
  2230. + db DARK,PSYCHIC,20
  2231. + db DARK,GHOST,20
  2232. + db DARK,DARK,05
  2233. + db DARK,FAIRY,05
  2234. + db FIGHTING,DARK,20
  2235. + db BUG,DARK,20
  2236. + db GHOST,DARK,05
  2237. + db PSYCHIC,DARK,00
  2238. + db FAIRY,DARK,20
  2239. + db STEEL,ROCK,20
  2240. + db STEEL,STEEL,05
  2241. + db STEEL,FIRE,05
  2242. + db STEEL,WATER,05
  2243. + db STEEL,ELECTRIC,05
  2244. + db STEEL,ICE,20
  2245. + db STEEL,FAIRY,20
  2246. + db NORMAL,STEEL,05
  2247. + db FIGHTING,STEEL,20
  2248. + db FLYING,STEEL,05
  2249. + db POISON,STEEL,00
  2250. + db GROUND,STEEL,20
  2251. + db ROCK,STEEL,05
  2252. + db BUG,STEEL,05
  2253. + db STEEL,STEEL,05
  2254. + db FIRE,STEEL,20
  2255. + db GRASS,STEEL,20
  2256. + db PSYCHIC,STEEL,05
  2257. + db ICE,STEEL,05
  2258. + db DRAGON,STEEL,05
  2259. + db FAIRY,STEEL,05
  2260. + db FAIRY,FIGHTING,05
  2261. + db FAIRY,POISON,05
  2262. + db FAIRY,STEEL,05
  2263. + db FAIRY,FIRE,05
  2264. + db FAIRY,DRAGON,20
  2265. + db FAIRY,DARK,20
  2266. + db FIGHTING,FAIRY,05
  2267. + db POISON,FAIRY,20
  2268. + db BUG,FAIRY,05
  2269. + db DRAGON,FAIRY,00
  2270. db $FF
  2271. diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
  2272. index cbe19d6..9c0de09 100755
  2273. --- a/engine/titlescreen.asm
  2274. +++ b/engine/titlescreen.asm
  2275. @@ -111,7 +111,7 @@ DisplayTitleScreen: ; 42dd (1:42dd)
  2276. jr .next
  2277.  
  2278. .tileScreenCopyrightTiles ; 437f (1:437f)
  2279. - db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'9 5.'96.'98 GAME FREAK inc.
  2280. + db $4C,$41,$42,$43,$44,$42,$43,$45,$4C,$46,$47,$48,$49,$4A,$4B,$4C ; ©20 15-2016 TOTESTIM
  2281.  
  2282. .next
  2283. call SaveScreenTilesToBuffer2
  2284. @@ -121,7 +121,7 @@ IF DEF(_RED)
  2285. ld a,CHARMANDER ; which Pokemon to show first on the title screen
  2286. ENDC
  2287. IF DEF(_BLUE)
  2288. - ld a,SQUIRTLE ; which Pokemon to show first on the title screen
  2289. + ld a,BULBASAUR ; which Pokemon to show first on the title screen
  2290. ENDC
  2291.  
  2292. ld [wTitleMonSpecies], a
  2293. @@ -377,9 +377,9 @@ LoadCopyrightTiles: ; 4541 (1:4541)
  2294. jp PlaceString
  2295.  
  2296. CopyrightTextString: ; 4556 (1:4556)
  2297. - db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo
  2298. - next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc.
  2299. - next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
  2300. + db $60,$61,$62,$63,$61,$62,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©2015-2016 Nintendo
  2301. + next $60,$61,$62,$63,$61,$62,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©2015-2016 Creatures inc.
  2302. + next $60,$61,$62,$63,$61,$62,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©2015-2016 GAME FREAK inc.
  2303. db "@"
  2304.  
  2305. INCLUDE "data/title_mons.asm"
  2306. diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png
  2307. index 74e6361..b12d6ad 100644
  2308. Binary files a/gfx/battle_hud1.png and b/gfx/battle_hud1.png differ
  2309. diff --git a/gfx/blue/blueversion.png b/gfx/blue/blueversion.png
  2310. index a9c87be..6dc99f6 100644
  2311. Binary files a/gfx/blue/blueversion.png and b/gfx/blue/blueversion.png differ
  2312. diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map
  2313. index b0b0b94..eb9ef4f 100644
  2314. Binary files a/gfx/blue/sgbborder.map and b/gfx/blue/sgbborder.map differ
  2315. diff --git a/gfx/blue/sgbborder.png b/gfx/blue/sgbborder.png
  2316. index 098df2b..184f991 100644
  2317. Binary files a/gfx/blue/sgbborder.png and b/gfx/blue/sgbborder.png differ
  2318. diff --git a/gfx/copyright.png b/gfx/copyright.png
  2319. index 4917434..41fc024 100644
  2320. Binary files a/gfx/copyright.png and b/gfx/copyright.png differ
  2321. diff --git a/gfx/font.png b/gfx/font.png
  2322. index 34e86b4..c32ce2e 100644
  2323. Binary files a/gfx/font.png and b/gfx/font.png differ
  2324. diff --git a/gfx/gamefreak.png b/gfx/gamefreak.png
  2325. index 509232b..db45988 100644
  2326. Binary files a/gfx/gamefreak.png and b/gfx/gamefreak.png differ
  2327. diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png
  2328. index 1a83283..61a7f65 100644
  2329. Binary files a/gfx/hp_bar_and_status.png and b/gfx/hp_bar_and_status.png differ
  2330. diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map
  2331. old mode 100644
  2332. new mode 100755
  2333. index 4077ed8..b0b0b94
  2334. Binary files a/gfx/red/sgbborder.map and b/gfx/red/sgbborder.map differ
  2335. diff --git a/gfx/red/sgbborder.png b/gfx/red/sgbborder.png
  2336. old mode 100644
  2337. new mode 100755
  2338. index 7549bb4..098df2b
  2339. Binary files a/gfx/red/sgbborder.png and b/gfx/red/sgbborder.png differ
  2340. diff --git a/gfx/text_box.png b/gfx/text_box.png
  2341. index 3673e74..83430ae 100644
  2342. Binary files a/gfx/text_box.png and b/gfx/text_box.png differ
  2343. diff --git a/gfx/trainer_info.png b/gfx/trainer_info.png
  2344. index d3ac169..e021f32 100644
  2345. Binary files a/gfx/trainer_info.png and b/gfx/trainer_info.png differ
  2346. diff --git a/home.asm b/home.asm
  2347. index 2090e59..eb2d9fb 100644
  2348. --- a/home.asm
  2349. +++ b/home.asm
  2350. @@ -724,41 +724,7 @@ UncompressMonSprite:: ; 1627 (0:1627)
  2351. ld [wSpriteInputPtr],a ; fetch sprite input pointer
  2352. ld a,[hl]
  2353. ld [wSpriteInputPtr+1],a
  2354. -; define (by index number) the bank that a pokemon's image is in
  2355. -; index = Mew, bank 1
  2356. -; index = Kabutops fossil, bank $B
  2357. -; index < $1F, bank 9
  2358. -; $1F ≤ index < $4A, bank $A
  2359. -; $4A ≤ index < $74, bank $B
  2360. -; $74 ≤ index < $99, bank $C
  2361. -; $99 ≤ index, bank $D
  2362. - ld a,[wcf91] ; XXX name for this ram location
  2363. - ld b,a
  2364. - cp MEW
  2365. - ld a,BANK(MewPicFront)
  2366. - jr z,.GotBank
  2367. - ld a,b
  2368. - cp FOSSIL_KABUTOPS
  2369. - ld a,BANK(FossilKabutopsPic)
  2370. - jr z,.GotBank
  2371. - ld a,b
  2372. - cp TANGELA + 1
  2373. - ld a,BANK(TangelaPicFront)
  2374. - jr c,.GotBank
  2375. - ld a,b
  2376. - cp MOLTRES + 1
  2377. - ld a,BANK(MoltresPicFront)
  2378. - jr c,.GotBank
  2379. - ld a,b
  2380. - cp BEEDRILL + 2
  2381. - ld a,BANK(BeedrillPicFront)
  2382. - jr c,.GotBank
  2383. - ld a,b
  2384. - cp STARMIE + 1
  2385. - ld a,BANK(StarmiePicFront)
  2386. - jr c,.GotBank
  2387. - ld a,BANK(VictreebelPicFront)
  2388. -.GotBank
  2389. + ld a, [wMonSpritesBank]
  2390. jp UncompressSpriteData
  2391.  
  2392. ; de: destination location
  2393. diff --git a/main.asm b/main.asm
  2394. index 8049b64..b585281 100755
  2395. --- a/main.asm
  2396. +++ b/main.asm
  2397. @@ -69,7 +69,6 @@ ResetStatusAndHalveMoneyOnBlackout::
  2398.  
  2399. MewPicFront:: INCBIN "pic/bmon/mew.pic"
  2400. MewPicBack:: INCBIN "pic/monback/mewb.pic"
  2401. -INCLUDE "data/baseStats/mew.asm"
  2402.  
  2403. INCLUDE "engine/battle/safari_zone.asm"
  2404.  
  2405. @@ -5488,7 +5487,8 @@ WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic"
  2406. WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic"
  2407. VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic"
  2408. VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic"
  2409. -
  2410. +Mon152PicFront:: INCBIN "pic/bmon/mon152.pic"
  2411. +Mon152PicBack:: INCBIN "pic/monback/mon152b.pic"
  2412.  
  2413. SECTION "Battle (bank D)", ROMX, BANK[$D]
  2414.  
  2415. diff --git a/maps/pallettown.blk b/maps/pallettown.blk
  2416. index 64e5b9c..ec8545b 100644
  2417. Binary files a/maps/pallettown.blk and b/maps/pallettown.blk differ
  2418. diff --git a/maps/redshouse1f.blk b/maps/redshouse1f.blk
  2419. index 1b7d4f0..0ede59c 100644
  2420. --- a/maps/redshouse1f.blk
  2421. +++ b/maps/redshouse1f.blk
  2422. @@ -1 +1 @@
  2423. -^D ^E^G^O^O^O^O^O^A^B^O^O^K^O^O
  2424. \ No newline at end of file
  2425. +^C ^G^D^R^O^O^O^R^A^B^O^R^K^O^O^O^O^O^O^R^K^O^O^R
  2426. \ No newline at end of file
  2427. diff --git a/maps/redshouse2f.blk b/maps/redshouse2f.blk
  2428. index dd9d1ea..1767e28 100644
  2429. --- a/maps/redshouse2f.blk
  2430. +++ b/maps/redshouse2f.blk
  2431. @@ -1 +1 @@
  2432. -^P^Q^E^H^O^O^O^O^O^M^O^O^L^O^O^R
  2433. \ No newline at end of file
  2434. +^P^D^H^E^N^O^O^O^O^M^O^L^R^O^O^O^O^O^O^O^R^O^O^L^L
  2435. \ No newline at end of file
  2436. diff --git a/maps/route3.blk b/maps/route3.blk
  2437. index a528435..00f387d 100644
  2438. --- a/maps/route3.blk
  2439. +++ b/maps/route3.blk
  2440. @@ -1,5 +1,8 @@
  2441. -,,,,,,,,,,,,,,,,,,,,,,,,,,,)m^A^A^A(,,,,,,+WWWWWWWWW*,+WWWWWWWW*,)
  2442. -^A^A^A(,,,,,,)
  2443. +,,,,,,,,,,,,,,,,,,,,,,,,,,,)m^A^A^A(,,,+WWWWWWWWWWWW*,+WWWWWWWW*,)
  2444. +^A^A^A(,,W%
  2445. +
  2446. +
  2447. +
  2448.  
  2449.  
  2450.  
  2451. @@ -16,8 +19,13 @@ t(,)
  2452.  
  2453.  
  2454. (,)
  2455. -^A>?,,,WWWW%/^G^GB^G^GB^G/$W%^G/>?;^G^G/(,)^G/$WW*,^A
  2456. -@
  2457. +^A>?,,,^A
  2458. +
  2459. +
  2460. +
  2461. +/^G^GB^G^GB^G/$W%^G/>?;^G^G/(,)^G/$WW*,^A
  2462. +
  2463. +
  2464.  
  2465.  
  2466.  
  2467. @@ -35,20 +43,34 @@ n
  2468.  
  2469.  
  2470. $W%
  2471. -V^K^K^K(,^A
  2472. -A
  2473. -n^G^G/B^G^GB^K^K^K^K^K^K^K(,)tt
  2474. +V^K^K^K(,?;
  2475. +
  2476. +n^G^G/B^G^GB^K
  2477. +
  2478. +
  2479. +
  2480. +
  2481. +
  2482. +(,)tt
  2483. +
  2484. +
  2485. +
  2486. +
  2487. +^K^K^K^K(,,,??;
  2488. +
  2489. +
  2490. +
  2491. +
  2492.  
  2493.  
  2494.  
  2495.  
  2496. -^K^K^K^K(,????;
  2497.  
  2498.  
  2499.  
  2500.  
  2501.  
  2502. -n^K^K^K^K^K^K^K(,)ttt
  2503. +(,)ttt
  2504.  
  2505.  
  2506.  
  2507. diff --git a/pic/bmon/bulbasaur.png b/pic/bmon/bulbasaur.png
  2508. old mode 100644
  2509. new mode 100755
  2510. index a2a924c..4aed5e1
  2511. Binary files a/pic/bmon/bulbasaur.png and b/pic/bmon/bulbasaur.png differ
  2512. diff --git a/pic/bmon/charizard.png b/pic/bmon/charizard.png
  2513. index ad29e48..7f6487b 100644
  2514. Binary files a/pic/bmon/charizard.png and b/pic/bmon/charizard.png differ
  2515. diff --git a/pic/bmon/charmander.png b/pic/bmon/charmander.png
  2516. index 12d16f0..721d2ef 100644
  2517. Binary files a/pic/bmon/charmander.png and b/pic/bmon/charmander.png differ
  2518. diff --git a/pic/bmon/charmeleon.png b/pic/bmon/charmeleon.png
  2519. index a5cff72..f46042b 100644
  2520. Binary files a/pic/bmon/charmeleon.png and b/pic/bmon/charmeleon.png differ
  2521. diff --git a/pic/bmon/ivysaur.png b/pic/bmon/ivysaur.png
  2522. index dad10ae..947e527 100644
  2523. Binary files a/pic/bmon/ivysaur.png and b/pic/bmon/ivysaur.png differ
  2524. diff --git a/pic/bmon/squirtle.png b/pic/bmon/squirtle.png
  2525. index bc0c997..77126bc 100644
  2526. Binary files a/pic/bmon/squirtle.png and b/pic/bmon/squirtle.png differ
  2527. diff --git a/pic/bmon/venusaur.png b/pic/bmon/venusaur.png
  2528. index dd39184..65849ab 100644
  2529. Binary files a/pic/bmon/venusaur.png and b/pic/bmon/venusaur.png differ
  2530. diff --git a/pic/bmon/wartortle.png b/pic/bmon/wartortle.png
  2531. index bd84456..f46042b 100644
  2532. Binary files a/pic/bmon/wartortle.png and b/pic/bmon/wartortle.png differ
  2533. diff --git a/pic/monback/bulbasaurb.png b/pic/monback/bulbasaurb.png
  2534. old mode 100644
  2535. new mode 100755
  2536. index dbe2e48..d01a51a
  2537. Binary files a/pic/monback/bulbasaurb.png and b/pic/monback/bulbasaurb.png diffe r
  2538. diff --git a/pic/monback/charizardb.png b/pic/monback/charizardb.png
  2539. index f554084..bcb94b2 100644
  2540. Binary files a/pic/monback/charizardb.png and b/pic/monback/charizardb.png diffe r
  2541. diff --git a/pic/monback/charmanderb.png b/pic/monback/charmanderb.png
  2542. index ed75d27..a858195 100644
  2543. Binary files a/pic/monback/charmanderb.png and b/pic/monback/charmanderb.png dif fer
  2544. diff --git a/pic/monback/charmeleonb.png b/pic/monback/charmeleonb.png
  2545. index fedd2f1..9f2d3f6 100644
  2546. Binary files a/pic/monback/charmeleonb.png and b/pic/monback/charmeleonb.png dif fer
  2547. diff --git a/pic/monback/ivysaurb.png b/pic/monback/ivysaurb.png
  2548. index c6070b7..13f249c 100644
  2549. Binary files a/pic/monback/ivysaurb.png and b/pic/monback/ivysaurb.png differ
  2550. diff --git a/pic/monback/squirtleb.png b/pic/monback/squirtleb.png
  2551. index a567929..538cf98 100644
  2552. Binary files a/pic/monback/squirtleb.png and b/pic/monback/squirtleb.png differ
  2553. diff --git a/pic/monback/venusaurb.png b/pic/monback/venusaurb.png
  2554. index f0f85d4..a04a617 100644
  2555. Binary files a/pic/monback/venusaurb.png and b/pic/monback/venusaurb.png differ
  2556. diff --git a/text/monster_names.asm b/text/monster_names.asm
  2557. index c7e0226..51e57bf 100755
  2558. --- a/text/monster_names.asm
  2559. +++ b/text/monster_names.asm
  2560. @@ -7,7 +7,7 @@ MonsterNames: ; 1c21e (7:421e)
  2561. db "VOLTORB@@@"
  2562. db "NIDOKING@@"
  2563. db "SLOWBRO@@@"
  2564. - db "IVYSAUR@@@"
  2565. + db "KROKOROK@@"
  2566. db "EXEGGUTOR@"
  2567. db "LICKITUNG@"
  2568. db "EXEGGCUTE@"
  2569. @@ -26,10 +26,10 @@ MonsterNames: ; 1c21e (7:421e)
  2570. db "GASTLY@@@@"
  2571. db "SCYTHER@@@"
  2572. db "STARYU@@@@"
  2573. - db "BLASTOISE@"
  2574. + db "KLINKLANG@"
  2575. db "PINSIR@@@@"
  2576. db "TANGELA@@@"
  2577. - db "MISSINGNO."
  2578. + db "QUILLADIN@"
  2579. db "MISSINGNO."
  2580. db "GROWLITHE@"
  2581. db "ONIX@@@@@@"
  2582. @@ -151,8 +151,8 @@ MonsterNames: ; 1c21e (7:421e)
  2583. db "PIDGEOTTO@"
  2584. db "PIDGEOT@@@"
  2585. db "STARMIE@@@"
  2586. - db "BULBASAUR@"
  2587. - db "VENUSAUR@@"
  2588. + db "SANDILE@@@"
  2589. + db "KROOKODILE"
  2590. db "TENTACRUEL"
  2591. db "MISSINGNO."
  2592. db "GOLDEEN@@@"
  2593. @@ -174,11 +174,11 @@ MonsterNames: ; 1c21e (7:421e)
  2594. db "MAGNEMITE@"
  2595. db "MISSINGNO."
  2596. db "MISSINGNO."
  2597. - db "CHARMANDER"
  2598. - db "SQUIRTLE@@"
  2599. - db "CHARMELEON"
  2600. - db "WARTORTLE@"
  2601. - db "CHARIZARD@"
  2602. + db "VANILLITE@"
  2603. + db "KLINK@@@@@"
  2604. + db "VANILLISH@"
  2605. + db "KLANG@@@@@"
  2606. + db "VANILLUXE@"
  2607. db "MISSINGNO."
  2608. db "MISSINGNO."
  2609. db "MISSINGNO."
  2610. diff --git a/text/pokedex.asm b/text/pokedex.asm
  2611. index 65f3d89..a0c39d4 100644
  2612. --- a/text/pokedex.asm
  2613. +++ b/text/pokedex.asm
  2614. @@ -79,13 +79,13 @@ _SlowbroDexEntry::
  2615. dex
  2616.  
  2617. _IvysaurDexEntry::
  2618. - text "When the bulb on"
  2619. - next "its back grows"
  2620. - next "large, it appears"
  2621. + text "They live in"
  2622. + next "groups of a few"
  2623. + next "individuals."
  2624.  
  2625. - page "to lose the"
  2626. - next "ability to stand"
  2627. - next "on its hind legs"
  2628. + page "Protective layers"
  2629. + next "shield their eyes"
  2630. + next "from sandstorms"
  2631. dex
  2632.  
  2633. _ExeggutorDexEntry::
  2634. @@ -298,6 +298,16 @@ _TangelaDexEntry::
  2635. next "shake as it walks"
  2636. dex
  2637.  
  2638. +_Mon152DexEntry::
  2639. + text "This is a"
  2640. + next "placeholder."
  2641. + next "ABCDEFGHIJKLMN"
  2642. +
  2643. + page "OPQRSTUVWXYZ?!"
  2644. + next "0123456789"
  2645. + next "Okay"
  2646. + dex
  2647. +
  2648. _GrowlitheDexEntry::
  2649. text "Very protective"
  2650. next "of its territory."
  2651. @@ -1249,23 +1259,23 @@ _StarmieDexEntry::
  2652. dex
  2653.  
  2654. _BulbasaurDexEntry::
  2655. - text "A strange seed was"
  2656. - next "planted on its"
  2657. - next "back at birth."
  2658. + text "They live buried"
  2659. + next "in the sands of"
  2660. + next "the desert."
  2661.  
  2662. - page "The plant sprouts"
  2663. - next "and grows with"
  2664. - next "this #MON"
  2665. + page "The sands prevent"
  2666. + next "their body heat"
  2667. + next "from dropping"
  2668. dex
  2669.  
  2670. _VenusaurDexEntry::
  2671. - text "The plant blooms"
  2672. - next "when it is"
  2673. - next "absorbing solar"
  2674. + text "They never allow"
  2675. + next "prey to escape."
  2676. + next "Their jaws are so"
  2677.  
  2678. - page "energy. It stays"
  2679. - next "on the move to"
  2680. - next "seek sunlight"
  2681. + page "powerful, they can"
  2682. + next "crush the bodies"
  2683. + next "of automobiles"
  2684. dex
  2685.  
  2686. _TentacruelDexEntry::
  2687. @@ -1399,53 +1409,53 @@ _MagnemiteDexEntry::
  2688. dex
  2689.  
  2690. _CharmanderDexEntry::
  2691. - text "Obviously prefers"
  2692. - next "hot places. When"
  2693. - next "it rains, steam"
  2694. + text "The temperature"
  2695. + next "of their breath"
  2696. + next "is -58 degrees F."
  2697.  
  2698. - page "is said to spout"
  2699. - next "from the tip of"
  2700. - next "its tail"
  2701. + page "They create snow"
  2702. + next "crystals and cause"
  2703. + next "snowfall nearby"
  2704. dex
  2705.  
  2706. _SquirtleDexEntry::
  2707. - text "After birth, its"
  2708. - next "back swells and"
  2709. - next "hardens into a"
  2710. + text "The two minigears"
  2711. + next "that mesh together"
  2712. + next "are predetermined."
  2713.  
  2714. - page "shell. Powerfully"
  2715. - next "sprays foam from"
  2716. - next "its mouth"
  2717. + page "Each will rebound"
  2718. + next "from other mini-"
  2719. + next "gears w/o meshing"
  2720. dex
  2721.  
  2722. _CharmeleonDexEntry::
  2723. - text "When it swings"
  2724. - next "its burning tail,"
  2725. - next "it elevates the"
  2726. + text "Snowy mountains"
  2727. + next "are its habitat."
  2728. + next "During an"
  2729.  
  2730. - page "temperature to"
  2731. - next "unbearably high"
  2732. - next "levels"
  2733. + page "ancient ice age,"
  2734. + next "they moved to"
  2735. + next "southern areas"
  2736. dex
  2737.  
  2738. _WartortleDexEntry::
  2739. - text "Often hides in"
  2740. - next "water to stalk"
  2741. - next "unwary prey. For"
  2742. + text "FIX THIS"
  2743. + next "are its habitat."
  2744. + next "During an"
  2745.  
  2746. - page "swimming fast, it"
  2747. - next "moves its ears to"
  2748. - next "maintain balance"
  2749. + page "ancient ice age,"
  2750. + next "they moved to"
  2751. + next "southern areas"
  2752. dex
  2753.  
  2754. _CharizardDexEntry::
  2755. - text "Spits fire that"
  2756. - next "is hot enough to"
  2757. - next "melt boulders."
  2758. + text "They make snow"
  2759. + next "clouds inside"
  2760. + next "their bodies to"
  2761.  
  2762. - page "Known to cause"
  2763. - next "forest fires"
  2764. - next "unintentionally"
  2765. + page "attack foes by"
  2766. + next "swallowing large"
  2767. + next "amounts of water"
  2768. dex
  2769.  
  2770. _OddishDexEntry::
  2771. diff --git a/text/type_names.asm b/text/type_names.asm
  2772. index d94675b..1376013 100755
  2773. --- a/text/type_names.asm
  2774. +++ b/text/type_names.asm
  2775. @@ -10,7 +10,7 @@ TypeNames:
  2776. dw .Bug
  2777. dw .Ghost
  2778.  
  2779. - dw .Normal
  2780. + dw .Steel
  2781. dw .Normal
  2782. dw .Normal
  2783. dw .Normal
  2784. @@ -29,6 +29,8 @@ TypeNames:
  2785. dw .Psychic
  2786. dw .Ice
  2787. dw .Dragon
  2788. + dw .Dark
  2789. + dw .Fairy
  2790.  
  2791. .Normal: db "NORMAL@"
  2792. .Fighting: db "FIGHTING@"
  2793. @@ -46,3 +48,6 @@ TypeNames:
  2794. .Bug: db "BUG@"
  2795. .Ghost: db "GHOST@"
  2796. .Dragon: db "DRAGON@"
  2797. +.Steel: db "STEEL@"
  2798. +.Dark: db "DARK@"
  2799. +.Fairy: db "FAIRY@"
  2800. \ No newline at end of file
  2801. diff --git a/wram.asm b/wram.asm
  2802. index 1bc8968..baf0585 100755
  2803. --- a/wram.asm
  2804. +++ b/wram.asm
  2805. @@ -2024,7 +2024,9 @@ wMonHGrowthRate:: ; d0cb
  2806. wMonHLearnset:: ; d0cc
  2807. ; bit field
  2808. flag_array 50 + 5
  2809. - ds 1
  2810. +
  2811. +wMonSpritesBank:: ; d0d3
  2812. + ds 1
  2813.  
  2814. wSavedTilesetType:: ; d0d4
  2815. ; saved at the start of a battle and then written back at the end of the battle
  2816. (END)
  2817. @@ -46,3 +48,6 @@ TypeNames:
  2818. .Bug: db "BUG@"
  2819. .Ghost: db "GHOST@"
  2820. .Dragon: db "DRAGON@"
  2821. +.Steel: db "STEEL@"
  2822. +.Dark: db "DARK@"
  2823. +.Fairy: db "FAIRY@"
  2824. \ No newline at end of file
  2825. diff --git a/wram.asm b/wram.asm
  2826. index 1bc8968..baf0585 100755
  2827. --- a/wram.asm
  2828. +++ b/wram.asm
  2829. @@ -2024,7 +2024,9 @@ wMonHGrowthRate:: ; d0cb
  2830. wMonHLearnset:: ; d0cc
  2831. ; bit field
  2832. flag_array 50 + 5
  2833. - ds 1
  2834. +
  2835. +wMonSpritesBank:: ; d0d3
  2836. + ds 1
  2837.  
  2838. wSavedTilesetType:: ; d0d4
  2839. ; saved at the start of a battle and then written back at the end of the battle
  2840. ~
  2841. ~
  2842. ~
  2843. ~
  2844. ~
  2845. ~
  2846. ~
  2847. ~
  2848. ~
  2849. ~
  2850. ~
  2851. ~
  2852. ~
  2853. ~
  2854. ~
  2855. ~
  2856. ~
  2857. ~
  2858. ~
  2859. ~
  2860. ~
  2861. ~
  2862. ~
  2863. ~
  2864. ~
  2865. ~
  2866. ~
  2867. ~
  2868. ~
  2869. ~
  2870. ~
  2871. ~
  2872. ~
  2873. ~
  2874. (END)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!