API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 20th, 2017
532
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 51.17 KB | None | 0 0
raw download clone embed print report
  1. https://hastebin.com/anuyuhobeh.hscommit 19ede667d0123923231a855e45be80bffcac3e5a
  2. Author: Saikode <sacredfire059@gmail.com>
  3. Date:   Sat Aug 19 21:35:06 2017 -0400
  4.  
  5.     updated readme
  6.  
  7. diff --git a/README.md b/README.md
  8. index 6e5b0c54..7cc7c899 100644
  9. --- a/README.md
  10. +++ b/README.md
  11. @@ -1,11 +1,6 @@
  12. -# Pokémon Crystal [![Build Status][travis-badge]][travis]
  13. +# Pokémon Crystal
  14.  
  15. -This is a disassembly of Pokémon Crystal.
  16. -
  17. -It builds the following roms:
  18. -
  19. -* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133`
  20. -* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb`
  21. +This is a work-in-progress improvement ROMhack of Pokemon Crystal version. Currently I'm feeling my way around the development process and my design goals are nebulous, so I'll fill in this section with more detail once things are a little further along.
  22.  
  23.  To set up the repository, see [INSTALL.md](INSTALL.md).
  24.  
  25. @@ -51,14 +46,8 @@ Updated attacks:
  26.  
  27.  BUGFIXES
  28.  ---
  29. -Moon Ball, Fast Ball and Love Ball now work as intended.
  30. -BRN/PAR/PSN now affect catch rate as intended.
  31. -The Dragon Fang's effect is no longer erroneously applied to the Dragon Scale (thus, the former is no longer useless)
  32. -Belly Drum no longer raises the user's Attack by 2 when it fails due to the user's HP being too low.
  33. -Nidorina and Nidoqueen are now able to breed, rather than only Nidoran-F. (Bug status is debatable, but it feels unjust to leave it be.)
  34. -
  35. -### irc: [freenode#pret][irc]
  36. -
  37. -[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
  38. -[travis]: https://travis-ci.org/pret/pokecrystal
  39. -[travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master
  40. +- Moon Ball, Fast Ball and Love Ball now work as intended.
  41. +- BRN/PAR/PSN now affect catch rate as intended.
  42. +- The Dragon Fang's effect is no longer erroneously applied to the Dragon Scale (thus, the former is no longer useless)
  43. +- Belly Drum no longer raises the user's Attack by 2 when it fails due to the user's HP being too low.
  44. +- Nidorina and Nidoqueen are now able to breed, rather than only Nidoran-F. (Bug status is debatable, but it feels unjust to leave it be.)
  45. \ No newline at end of file
  46.  
  47. commit 17b6d08561c5077f3d98e348c5bd41f6cd47f77c
  48. Author: Saikode <sacredfire059@gmail.com>
  49. Date:   Sat Aug 19 21:27:22 2017 -0400
  50.  
  51.     removing unused gfx
  52.  
  53. diff --git a/gfx/pics/lapras/anim0.asm b/gfx/pics/lapras/anim0.asm
  54. deleted file mode 100755
  55. index 9ae8f4e5..00000000
  56. --- a/gfx/pics/lapras/anim0.asm
  57. +++ /dev/null
  58. @@ -1,7 +0,0 @@
  59. -   frame 1, 10
  60. -   frame 2, 07
  61. -   frame 3, 40
  62. -   frame 2, 09
  63. -   frame 1, 10
  64. -   endanim
  65. -; 0xd1016
  66. diff --git a/gfx/pics/lapras/anim1.asm b/gfx/pics/lapras/anim1.asm
  67. deleted file mode 100755
  68. index 790cccf0..00000000
  69. --- a/gfx/pics/lapras/anim1.asm
  70. +++ /dev/null
  71. @@ -1,6 +0,0 @@
  72. -   frame 4, 10
  73. -   frame 5, 30
  74. -   frame 0, 12
  75. -   frame 5, 12
  76. -   endanim
  77. -; 0xd1dc0
  78. diff --git a/gfx/pics/lapras/back.2bpp.lz.d09351a1 b/gfx/pics/lapras/back.2bpp.lz.d09351a1
  79. deleted file mode 100755
  80. index 00f6b432..00000000
  81. Binary files a/gfx/pics/lapras/back.2bpp.lz.d09351a1 and /dev/null differ
  82. diff --git a/gfx/pics/lapras/back.png b/gfx/pics/lapras/back.png
  83. deleted file mode 100755
  84. index 9c17ce37..00000000
  85. Binary files a/gfx/pics/lapras/back.png and /dev/null differ
  86. diff --git a/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e b/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e
  87. deleted file mode 100755
  88. index 0c20fc0b..00000000
  89. Binary files a/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e and /dev/null differ
  90. diff --git a/gfx/pics/lapras/front.png b/gfx/pics/lapras/front.png
  91. deleted file mode 100755
  92. index f6c2c483..00000000
  93. Binary files a/gfx/pics/lapras/front.png and /dev/null differ
  94. diff --git a/gfx/pics/lapras/shiny.pal b/gfx/pics/lapras/shiny.pal
  95. deleted file mode 100755
  96. index 58fa3bc5..00000000
  97. --- a/gfx/pics/lapras/shiny.pal
  98. +++ /dev/null
  99. @@ -1,4 +0,0 @@
  100. -
  101. -   RGB 31, 13, 31
  102. -   RGB 16, 11, 31
  103. -
  104.  
  105. commit d6f5b6ee0fd9c7db87c4fbecd55d135a342c9f78
  106. Author: Saikode <sacredfire059@gmail.com>
  107. Date:   Sat Aug 19 21:24:57 2017 -0400
  108.  
  109.     First commit, details in readme.md
  110.  
  111. diff --git a/README.md b/README.md
  112. index 6a5cef33..6e5b0c54 100644
  113. --- a/README.md
  114. +++ b/README.md
  115. @@ -9,6 +9,54 @@ It builds the following roms:
  116.  
  117.  To set up the repository, see [INSTALL.md](INSTALL.md).
  118.  
  119. +Changelog:
  120. +
  121. +NEW FEATURES
  122. +---
  123. +
  124. +
  125. +ITEM CHANGES
  126. +---
  127. +Dragon Scale/Fang error fixed (see bugfixes section)
  128. +
  129. +
  130. +POKEMON CHANGES
  131. +---
  132. +A handful of Pokemon have been added, all of them cross-generational evolutions for existing Pokemon.
  133. +NOTE: Due to technical limitations, some Kanto Pokemon have been removed from the game to make room for the new ones.
  134. +
  135. +Lapras -> Mismagius
  136. +
  137. +MOVE CHANGES
  138. +---
  139. +Same deal as with Pokemon - useful moves from new generations have been backported, but old moves have to be removed to make room. Movesets will be changed to accomodate the changes, but that comes later.
  140. +
  141. +Added attacks:
  142. +- Bullet Seed
  143. +- Dragon Pulse
  144. +- Brave Bird
  145. +- Rock Blast
  146. +- Poison Jab
  147. +
  148. +Removed attacks:
  149. +- Barrage
  150. +- Sky Attack
  151. +- Twister
  152. +- Spike Cannon
  153. +- Egg Bomb
  154. +
  155. +Most attacks will be updated to their current stats as of Sun/Moon, with some additional tweaks for balance as I deem necessary.
  156. +Updated attacks:
  157. +- None yet.
  158. +
  159. +BUGFIXES
  160. +---
  161. +Moon Ball, Fast Ball and Love Ball now work as intended.
  162. +BRN/PAR/PSN now affect catch rate as intended.
  163. +The Dragon Fang's effect is no longer erroneously applied to the Dragon Scale (thus, the former is no longer useless)
  164. +Belly Drum no longer raises the user's Attack by 2 when it fails due to the user's HP being too low.
  165. +Nidorina and Nidoqueen are now able to breed, rather than only Nidoran-F. (Bug status is debatable, but it feels unjust to leave it be.)
  166. +
  167.  ### irc: [freenode#pret][irc]
  168.  
  169.  [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
  170. diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm
  171. index 733322f8..255ff881 100644
  172. --- a/battle/ai/scoring.asm
  173. +++ b/battle/ai/scoring.asm
  174. @@ -390,7 +390,7 @@ AI_Smart: ; 386be
  175.     dbw EFFECT_PSYCH_UP,         AI_Smart_PsychUp
  176.     dbw EFFECT_MIRROR_COAT,      AI_Smart_MirrorCoat
  177.     dbw EFFECT_SKULL_BASH,       AI_Smart_SkullBash
  178. -   dbw EFFECT_TWISTER,          AI_Smart_Twister
  179. +   ;dbw EFFECT_TWISTER,          AI_Smart_Twister
  180.     dbw EFFECT_EARTHQUAKE,       AI_Smart_Earthquake
  181.     dbw EFFECT_FUTURE_SIGHT,     AI_Smart_FutureSight
  182.     dbw EFFECT_GUST,             AI_Smart_Gust
  183. @@ -2771,7 +2771,7 @@ AI_Smart_MirrorCoat: ; 3918b
  184.  ; 391d5
  185.  
  186.  
  187. -AI_Smart_Twister:
  188. +;AI_Smart_Twister:
  189.  AI_Smart_Gust: ; 391d5
  190.  
  191.  ; Greatly encourage this move if the player is flying and the enemy is faster.
  192. diff --git a/battle/anims.asm b/battle/anims.asm
  193. index e0b7f001..1c0c192a 100644
  194. --- a/battle/anims.asm
  195. +++ b/battle/anims.asm
  196. @@ -120,7 +120,7 @@ BattleAnimations:: ; c906f
  197.     dw BattleAnim_Metronome
  198.     dw BattleAnim_MirrorMove
  199.     dw BattleAnim_Selfdestruct
  200. -   dw BattleAnim_EggBomb
  201. +   dw BattleAnim_PoisonJab
  202.     dw BattleAnim_Lick
  203.     dw BattleAnim_Smog
  204.     dw BattleAnim_Sludge
  205. @@ -130,7 +130,7 @@ BattleAnimations:: ; c906f
  206.     dw BattleAnim_Clamp
  207.     dw BattleAnim_Swift
  208.     dw BattleAnim_SkullBash
  209. -   dw BattleAnim_SpikeCannon
  210. +   dw BattleAnim_RockBlast
  211.     dw BattleAnim_Constrict
  212.     dw BattleAnim_Amnesia
  213.     dw BattleAnim_Kinesis
  214. @@ -139,10 +139,10 @@ BattleAnimations:: ; c906f
  215.     dw BattleAnim_Glare
  216.     dw BattleAnim_DreamEater
  217.     dw BattleAnim_PoisonGas
  218. -   dw BattleAnim_Barrage
  219. +   dw BattleAnim_BulletSeed
  220.     dw BattleAnim_LeechLife
  221.     dw BattleAnim_LovelyKiss
  222. -   dw BattleAnim_SkyAttack
  223. +   dw BattleAnim_BraveBird
  224.     dw BattleAnim_Transform
  225.     dw BattleAnim_Bubble
  226.     dw BattleAnim_DizzyPunch
  227. @@ -238,7 +238,7 @@ BattleAnimations:: ; c906f
  228.     dw BattleAnim_Moonlight
  229.     dw BattleAnim_HiddenPower
  230.     dw BattleAnim_CrossChop
  231. -   dw BattleAnim_Twister
  232. +   dw BattleAnim_DragonPulse
  233.     dw BattleAnim_RainDance
  234.     dw BattleAnim_SunnyDay
  235.     dw BattleAnim_Crunch
  236. @@ -1789,24 +1789,14 @@ BattleAnim_MegaDrain: ; c9f13
  237.     anim_ret
  238.  ; c9f55
  239.  
  240. -BattleAnim_EggBomb: ; c9f55
  241. -   anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION
  242. -   anim_sound 0, 0, SFX_SWITCH_POKEMON
  243. -   anim_obj ANIM_OBJ_46,   5, 4,  13, 0, $1
  244. -   anim_wait 128
  245. -   anim_wait 96
  246. -   anim_incobj  1
  247. -   anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $3
  248. -   anim_sound 0, 1, SFX_EGG_BOMB
  249. -   anim_obj ANIM_OBJ_18,  16, 0,   8, 0, $0
  250. -   anim_wait 8
  251. -   anim_sound 0, 1, SFX_EGG_BOMB
  252. -   anim_obj ANIM_OBJ_18, -14, 0,   8, 4, $0
  253. -   anim_wait 8
  254. -   anim_sound 0, 1, SFX_EGG_BOMB
  255. -   anim_obj ANIM_OBJ_18, -15, 0,   9, 0, $0
  256. -   anim_wait 24
  257. -   anim_ret
  258. +BattleAnim_PoisonJab: ; c9f55
  259. +   anim_2gfx ANIM_GFX_POISON, ANIM_GFX_HORN
  260. +    anim_obj ANIM_OBJ_60,   7, 0,  10, 4, $28
  261. +   anim_sound 0, 1, SFX_POISON_STING
  262. +    anim_wait 16
  263. +    anim_call BattleAnim_Toxic_branch_cbc15
  264. +    anim_wait 64
  265. +    anim_ret
  266.  ; c9f85
  267.  
  268.  BattleAnim_Softboiled: ; c9f85
  269. @@ -2473,23 +2463,17 @@ BattleAnim_PinMissile: ; ca4e7
  270.     anim_ret
  271.  ; ca51a
  272.  
  273. -BattleAnim_SpikeCannon: ; ca51a
  274. -   anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
  275. -.loop
  276. -   anim_obj ANIM_OBJ_60,   8, 0,  11, 4, $18
  277. -   anim_wait 8
  278. -   anim_obj ANIM_OBJ_60,   7, 0,  10, 4, $18
  279. -   anim_sound 0, 1, SFX_POISON_STING
  280. -   anim_obj ANIM_OBJ_05, -15, 0,   7, 0, $0
  281. -   anim_wait 8
  282. -   anim_obj ANIM_OBJ_60,   6, 4,  11, 0, $18
  283. -   anim_sound 0, 1, SFX_POISON_STING
  284. -   anim_obj ANIM_OBJ_05,  16, 0,   6, 0, $0
  285. -   anim_wait 8
  286. -   anim_sound 0, 1, SFX_POISON_STING
  287. -   anim_obj ANIM_OBJ_05, -16, 4,   6, 4, $0
  288. -   anim_loop 3, .loop
  289. -   anim_wait 16
  290. +BattleAnim_RockBlast: ; ca51a
  291. +   anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT
  292. +    anim_bgeffect ANIM_BG_1F, $14, $2, $0
  293. +    anim_call BattleAnim_FollowEnemyFeet_0
  294. +    anim_wait 4
  295. +    anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0
  296. +    anim_wait 8
  297. +    anim_sound 0, 1, SFX_STRENGTH
  298. +    anim_obj ANIM_OBJ_1D,  16, 0,   8, 4, $30
  299. +   anim_wait 32
  300. +   anim_call BattleAnim_ShowMon_0
  301.     anim_ret
  302.  ; ca54d
  303.  
  304. @@ -2522,14 +2506,33 @@ BattleAnim_PetalDance: ; ca564
  305.     anim_ret
  306.  ; ca580
  307.  
  308. -BattleAnim_Barrage: ; ca580
  309. -   anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION
  310. -   anim_sound 6, 2, SFX_THROW_BALL
  311. -   anim_obj ANIM_OBJ_62,   8, 0,  11, 4, $10
  312. -   anim_wait 36
  313. -   anim_sound 0, 1, SFX_EGG_BOMB
  314. -   anim_obj ANIM_OBJ_18, -15, 0,   7, 0, $0
  315. -   anim_wait 16
  316. +BattleAnim_BulletSeed: ; ca580
  317. +   anim_2gfx ANIM_GFX_PLANT, ANIM_GFX_HIT
  318. +   anim_sound 6, 2, SFX_RAZOR_WIND
  319. +    anim_obj ANIM_OBJ_LEECH_SEED, 8, 2,  8, 2, $22
  320. +    anim_wait 4
  321. +    anim_sound 6, 2, SFX_RAZOR_WIND
  322. +    anim_obj ANIM_OBJ_LEECH_SEED, 8, 2,  8, 2, $22
  323. +    anim_wait 4
  324. +    anim_sound 6, 2, SFX_RAZOR_WIND
  325. +    anim_obj ANIM_OBJ_LEECH_SEED, 8, 2,  8, 2, $22
  326. +    anim_wait 4
  327. +    anim_sound 6, 2, SFX_RAZOR_WIND
  328. +    anim_obj ANIM_OBJ_LEECH_SEED, 8, 2,  8, 2, $22
  329. +   anim_wait 20
  330. +   anim_sound 0, 1, SFX_BONE_CLUB
  331. +   anim_obj ANIM_OBJ_01, -15, 0,   7, 0, $0
  332. +    anim_wait 4
  333. +    anim_sound 0, 1, SFX_BONE_CLUB
  334. +   anim_obj ANIM_OBJ_01, -15, 0,   7, 0, $0
  335. +    anim_wait 4
  336. +    anim_sound 0, 1, SFX_BONE_CLUB
  337. +    anim_clearobjs
  338. +   anim_obj ANIM_OBJ_01, -15, 0,   7, 0, $0
  339. +    anim_wait 4
  340. +    anim_sound 0, 1, SFX_BONE_CLUB
  341. +   anim_obj ANIM_OBJ_01, -15, 0,   7, 0, $0
  342. +   anim_wait 8
  343.     anim_ret
  344.  ; ca596
  345.  
  346. @@ -2769,19 +2772,21 @@ BattleAnim_Minimize: ; ca78a
  347.     anim_ret
  348.  ; ca7a1
  349.  
  350. -BattleAnim_SkyAttack: ; ca7a1
  351. -   anim_if_param_equal $1, BattleAnim_SkyAttack_branch_c9fb5
  352. +BattleAnim_BraveBird: ; ca7a1
  353.     anim_1gfx ANIM_GFX_SKY_ATTACK
  354.     anim_bgeffect ANIM_BG_27, $0, $1, $0
  355. +    anim_sound 0, 0, SFX_SWORDS_DANCE
  356.     anim_wait 32
  357. -   anim_sound 0, 0, SFX_HYPER_BEAM
  358.     anim_obj ANIM_OBJ_SKY_ATTACK_FEAROW,   6, 0,  11, 0, $40
  359.     anim_wait 64
  360.     anim_incobj  1
  361. -   anim_wait 21
  362. -   anim_sound 0, 1, SFX_HYPER_BEAM
  363.     anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
  364. -   anim_wait 64
  365. +    anim_sound 0, 1, SFX_WING_ATTACK
  366. +    anim_wait 12
  367. +    anim_sound 0, 1, SFX_WING_ATTACK
  368. +    anim_wait 12
  369. +    anim_sound 0, 1, SFX_EGG_BOMB
  370. +    anim_wait 17
  371.     anim_incobj  1
  372.     anim_wait 32
  373.     anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
  374. @@ -4651,48 +4656,23 @@ BattleAnim_CrossChop: ; cb83a
  375.     anim_ret
  376.  ; cb85a
  377.  
  378. -BattleAnim_Twister: ; cb85a
  379. -   anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT
  380. -.loop1
  381. -   anim_sound 0, 0, SFX_RAZOR_WIND
  382. -   anim_obj ANIM_OBJ_GUST,   8, 0,  14, 0, $0
  383. -   anim_wait 6
  384. -   anim_loop 9, .loop1
  385. -.loop2
  386. -   anim_sound 0, 0, SFX_RAZOR_WIND
  387. -   anim_wait 8
  388. -   anim_loop 8, .loop2
  389. -   anim_incobj  1
  390. -   anim_incobj  2
  391. -   anim_incobj  3
  392. -   anim_incobj  4
  393. -   anim_incobj  5
  394. -   anim_incobj  6
  395. -   anim_incobj  7
  396. -   anim_incobj  8
  397. -   anim_incobj  9
  398. +BattleAnim_DragonPulse: ; cb85a
  399. +   anim_1gfx ANIM_GFX_PSYCHIC
  400. +    anim_bgeffect ANIM_BG_1A, $0, $1, $20
  401. +   anim_sound 0, 0, SFX_RAGE
  402.     anim_wait 64
  403. -   anim_obj ANIM_OBJ_01, -14, 0,   8, 0, $18
  404. -.loop3
  405. -   anim_sound 0, 1, SFX_RAZOR_WIND
  406. -   anim_wait 8
  407. -   anim_loop 4, .loop3
  408. -   anim_obj ANIM_OBJ_01,  16, 0,   4, 0, $18
  409. -.loop4
  410. -   anim_sound 0, 1, SFX_RAZOR_WIND
  411. -   anim_wait 8
  412. -   anim_loop 4, .loop4
  413. -   anim_incobj  1
  414. -   anim_incobj  2
  415. -   anim_incobj  3
  416. -   anim_incobj  4
  417. -   anim_incobj  5
  418. -   anim_incobj  6
  419. -   anim_incobj  7
  420. -   anim_incobj  8
  421. -   anim_incobj  9
  422. -   anim_wait 32
  423. +    anim_incbgeffect ANIM_BG_1A
  424. +    anim_call BattleAnim_ShowMon_0
  425. +    anim_bgeffect ANIM_BG_1F, $60, $4, $10
  426. +.loop
  427. +    anim_sound 6, 2, SFX_SLUDGE_BOMB
  428. +   anim_obj ANIM_OBJ_4C,   8, 0,  11, 0, $4
  429. +   anim_wait 4
  430. +   anim_loop 10, .loop
  431. +    anim_sound 6, 2, SFX_SLUDGE_BOMB
  432. +   anim_wait 48
  433.     anim_ret
  434. +    ;SFX_HYPER_BEAM
  435.  ; cb8b3
  436.  
  437.  BattleAnim_RainDance: ; cb8b3
  438. diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
  439. index 221570d7..f0800b42 100644
  440. --- a/battle/effect_commands.asm
  441. +++ b/battle/effect_commands.asm
  442. @@ -1165,7 +1165,7 @@ BattleCommand_DoTurn: ; 34555
  443.  
  444.  .continuousmoves ; 34602
  445.     db EFFECT_RAZOR_WIND
  446. -   db EFFECT_SKY_ATTACK
  447. +   ;db EFFECT_SKY_ATTACK
  448.     db EFFECT_SKULL_BASH
  449.     db EFFECT_SOLARBEAM
  450.     db EFFECT_FLY
  451. @@ -1890,8 +1890,8 @@ BattleCommand_CheckHit: ; 34d32
  452.     ret z
  453.     cp THUNDER
  454.     ret z
  455. -   cp TWISTER
  456. -   ret
  457. +;  cp TWISTER
  458. +;  ret
  459.  
  460.  .DigMoves:
  461.     ld a, BATTLE_VARS_MOVE_ANIM
  462. @@ -2081,8 +2081,8 @@ BattleCommand_LowerSub: ; 34eee
  463.     call GetBattleVar
  464.     cp EFFECT_RAZOR_WIND
  465.     jr z, .charge_turn
  466. -   cp EFFECT_SKY_ATTACK
  467. -   jr z, .charge_turn
  468. +;  cp EFFECT_SKY_ATTACK
  469. +;  jr z, .charge_turn
  470.     cp EFFECT_SKULL_BASH
  471.     jr z, .charge_turn
  472.     cp EFFECT_SOLARBEAM
  473. @@ -4527,8 +4527,8 @@ BattleCommand_SleepTalk: ; 35b33
  474.     ret z
  475.     cp EFFECT_RAZOR_WIND
  476.     ret z
  477. -   cp EFFECT_SKY_ATTACK
  478. -   ret z
  479. +;  cp EFFECT_SKY_ATTACK
  480. +;  ret z
  481.     cp EFFECT_SOLARBEAM
  482.     ret z
  483.     cp EFFECT_FLY
  484. @@ -7375,9 +7375,9 @@ BattleCommand_Charge: ; 36b4d
  485.     ld hl, .SkullBash
  486.     jr z, .done
  487.  
  488. -   cp SKY_ATTACK
  489. -   ld hl, .SkyAttack
  490. -   jr z, .done
  491. +   ;cp SKY_ATTACK
  492. +   ;ld hl, .SkyAttack
  493. +   ;jr z, .done
  494.  
  495.     cp FLY
  496.     ld hl, .Fly
  497. @@ -7404,10 +7404,10 @@ BattleCommand_Charge: ; 36b4d
  498.     text_jump UnknownText_0x1c0d3a
  499.     db "@"
  500.  
  501. -.SkyAttack:
  502. +;.SkyAttack:
  503.  ; 'is glowing!'
  504. -   text_jump UnknownText_0x1c0d4e
  505. -   db "@"
  506. +;  text_jump UnknownText_0x1c0d4e
  507. +;  db "@"
  508.  
  509.  .Fly:
  510.  ; 'flew up high!'
  511. @@ -9468,6 +9468,17 @@ BattleCommand_BellyDrum: ; 37c1a
  512.  ; This command is buggy because it raises the user's attack
  513.  ; before checking that it has enough HP to use the move.
  514.  ; Swap the order of these two blocks to fix.
  515. +
  516. +.max_attack_loop
  517. +   push af
  518. +   call BattleCommand_AttackUp2
  519. +   pop af
  520. +   dec a
  521. +   jr nz, .max_attack_loop
  522. +
  523. +   ld hl, BellyDrumText
  524. +   jp StdBattleTextBox
  525. +    
  526.     call BattleCommand_AttackUp2
  527.     ld a, [AttackMissed]
  528.     and a
  529. @@ -9482,17 +9493,7 @@ BattleCommand_BellyDrum: ; 37c1a
  530.     pop bc
  531.     callab SubtractHPFromUser
  532.     call UpdateUserInParty
  533. -   ld a, 5
  534. -
  535. -.max_attack_loop
  536. -   push af
  537. -   call BattleCommand_AttackUp2
  538. -   pop af
  539. -   dec a
  540. -   jr nz, .max_attack_loop
  541. -
  542. -   ld hl, BellyDrumText
  543. -   jp StdBattleTextBox
  544. +   ld a, 5    
  545.  
  546.  .failed
  547.     call AnimateFailedMove
  548. diff --git a/battle/move_names.asm b/battle/move_names.asm
  549. index e4470a99..93eb3e06 100644
  550. --- a/battle/move_names.asm
  551. +++ b/battle/move_names.asm
  552. @@ -118,7 +118,7 @@
  553.     db "METRONOME@"
  554.     db "MIRROR MOVE@"
  555.     db "SELFDESTRUCT@"
  556. -   db "EGG BOMB@"
  557. +   db "POISON JAB@"
  558.     db "LICK@"
  559.     db "SMOG@"
  560.     db "SLUDGE@"
  561. @@ -128,7 +128,7 @@
  562.     db "CLAMP@"
  563.     db "SWIFT@"
  564.     db "SKULL BASH@"
  565. -   db "SPIKE CANNON@"
  566. +   db "ROCK BLAST@"
  567.     db "CONSTRICT@"
  568.     db "AMNESIA@"
  569.     db "KINESIS@"
  570. @@ -137,10 +137,10 @@
  571.     db "GLARE@"
  572.     db "DREAM EATER@"
  573.     db "POISON GAS@"
  574. -   db "BARRAGE@"
  575. +   db "BULLET SEED@"
  576.     db "LEECH LIFE@"
  577.     db "LOVELY KISS@"
  578. -   db "SKY ATTACK@"
  579. +   db "BRAVE BIRD@"
  580.     db "TRANSFORM@"
  581.     db "BUBBLE@"
  582.     db "DIZZY PUNCH@"
  583. @@ -236,7 +236,7 @@
  584.     db "MOONLIGHT@"
  585.     db "HIDDEN POWER@"
  586.     db "CROSS CHOP@"
  587. -   db "TWISTER@"
  588. +   db "DRAGON PULSE@"
  589.     db "RAIN DANCE@"
  590.     db "SUNNY DAY@"
  591.     db "CRUNCH@"
  592. diff --git a/battle/moves/move_descriptions.asm b/battle/moves/move_descriptions.asm
  593. index df31fd38..7a6908d6 100644
  594. --- a/battle/moves/move_descriptions.asm
  595. +++ b/battle/moves/move_descriptions.asm
  596. @@ -119,7 +119,7 @@
  597.     dw MetronomeDescription
  598.     dw MirrorMoveDescription
  599.     dw SelfdestructDescription
  600. -   dw EggBombDescription
  601. +   dw PoisonJabDescription
  602.     dw LickDescription
  603.     dw SmogDescription
  604.     dw SludgeDescription
  605. @@ -129,7 +129,7 @@
  606.     dw ClampDescription
  607.     dw SwiftDescription
  608.     dw SkullBashDescription
  609. -   dw SpikeCannonDescription
  610. +   dw RockBlastDescription
  611.     dw ConstrictDescription
  612.     dw AmnesiaDescription
  613.     dw KinesisDescription
  614. @@ -138,10 +138,10 @@
  615.     dw GlareDescription
  616.     dw DreamEaterDescription
  617.     dw PoisonGasDescription
  618. -   dw BarrageDescription
  619. +   dw BulletSeedDescription
  620.     dw LeechLifeDescription
  621.     dw LovelyKissDescription
  622. -   dw SkyAttackDescription
  623. +   dw BraveBirdDescription
  624.     dw TransformDescription
  625.     dw BubbleDescription
  626.     dw DizzyPunchDescription
  627. @@ -237,7 +237,7 @@
  628.     dw MoonlightDescription
  629.     dw HiddenPowerDescription
  630.     dw CrossChopDescription
  631. -   dw TwisterDescription
  632. +   dw DragonPulseDescription
  633.     dw RainDanceDescription
  634.     dw SunnyDayDescription
  635.     dw CrunchDescription
  636. @@ -745,9 +745,9 @@ SelfdestructDescription:
  637.     db   "Powerful but makes"
  638.     next "the user faint.@"
  639.  
  640. -EggBombDescription:
  641. -   db   "Eggs are hurled at"
  642. -   next "the foe.@"
  643. +PoisonJabDescription:
  644. +   db   "A venomous stab."
  645. +   next "May cause poison.@"
  646.  
  647.  LickDescription:
  648.     db   "An attack that may"
  649. @@ -785,8 +785,8 @@ SkullBashDescription:
  650.     db   "1st turn: Prepare"
  651.     next "2nd turn: Attack@"
  652.  
  653. -SpikeCannonDescription:
  654. -   db   "Fires spikes to"
  655. +RockBlastDescription:
  656. +   db   "Fires stones to"
  657.     next "hit 2-5 times.@"
  658.  
  659.  ConstrictDescription:
  660. @@ -821,9 +821,9 @@ PoisonGasDescription:
  661.     db   "A move that may"
  662.     next "poison the foe.@"
  663.  
  664. -BarrageDescription:
  665. -   db   "Throws orbs to hit"
  666. -   next "2-5 times.@"
  667. +BulletSeedDescription:
  668. +   db   "Shoots seeds to"
  669. +   next "hit foe 2-5 times.@"
  670.  
  671.  LeechLifeDescription:
  672.     db   "Steals 1/2 of the"
  673. @@ -833,9 +833,10 @@ LovelyKissDescription:
  674.     db   "May cause the foe"
  675.     next "to fall asleep.@"
  676.  
  677. -SkyAttackDescription:
  678. -   db   "1st turn: Prepare"
  679. -   next "2nd turn: Attack@"
  680. +BraveBirdDescription:
  681. +   db   "A powerful charge."
  682. +   next "Also hurts user.@"
  683. +    
  684.  TransformDescription:
  685.     db   "The user assumes"
  686.     next "the foe's guise.@"
  687. @@ -1216,9 +1217,9 @@ CrossChopDescription:
  688.     db   "Has a high criti-"
  689.     next "cal hit ratio.@"
  690.  
  691. -TwisterDescription:
  692. -   db   "Whips up a tornado"
  693. -   next "to attack.@"
  694. +DragonPulseDescription:
  695. +   db   "Attacks with pulse"
  696. +   next "of dragon energy.@"
  697.  
  698.  RainDanceDescription:
  699.     db   "Boosts water-type"
  700. diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm
  701. index 2d4c06a3..91aeb0e1 100644
  702. --- a/battle/moves/move_effects.asm
  703. +++ b/battle/moves/move_effects.asm
  704. @@ -18,7 +18,7 @@ DrillPeck:
  705.  Strength:
  706.  RazorLeaf:
  707.  RockThrow:
  708. -EggBomb:
  709. +PoisonJab:
  710.  Waterfall:
  711.  Crabhammer:
  712.  Slash:
  713. @@ -947,8 +947,8 @@ Doubleslap:
  714.  CometPunch:
  715.  FuryAttack:
  716.  PinMissile:
  717. -SpikeCannon:
  718. -Barrage:
  719. +RockBlast:
  720. +BulletSeed:
  721.  FurySwipes:
  722.  BoneRush:
  723.  DoubleKick:
  724. @@ -1204,30 +1204,7 @@ DoParalyze:
  725.     paralyze
  726.     endmove
  727.  
  728. -SkyAttack:
  729. -   checkcharge
  730. -   checkobedience
  731. -   doturn
  732. -   charge
  733. -   usedmovetext
  734. -   critical
  735. -   damagestats
  736. -   damagecalc
  737. -   stab
  738. -   damagevariation
  739. -   checkhit
  740. -   effectchance
  741. -   hittarget
  742. -   failuretext
  743. -   checkfaint
  744. -   criticaltext
  745. -   supereffectivetext
  746. -   checkdestinybond
  747. -   buildopponentrage
  748. -   flinchtarget
  749. -   kingsrock
  750. -   endmove
  751. -
  752. +BraveBird:
  753.  Substitute:
  754.     checkobedience
  755.     usedmovetext
  756. @@ -2044,28 +2021,7 @@ SkullBash:
  757.     statupmessage
  758.     endmove
  759.  
  760. -Twister:
  761. -   checkobedience
  762. -   usedmovetext
  763. -   doturn
  764. -   critical
  765. -   damagestats
  766. -   damagecalc
  767. -   stab
  768. -   damagevariation
  769. -   doubleflyingdamage
  770. -   checkhit
  771. -   effectchance
  772. -   hittarget
  773. -   failuretext
  774. -   checkfaint
  775. -   criticaltext
  776. -   supereffectivetext
  777. -   checkdestinybond
  778. -   buildopponentrage
  779. -   flinchtarget
  780. -   endmove
  781. -
  782. +DragonPulse:
  783.  Earthquake:
  784.     checkobedience
  785.     usedmovetext
  786. diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm
  787. index 3f364f52..c3e8a728 100644
  788. --- a/battle/moves/move_effects_pointers.asm
  789. +++ b/battle/moves/move_effects_pointers.asm
  790. @@ -73,7 +73,7 @@
  791.     dw SpecialDefenseDownHit
  792.     dw AccuracyDownHit
  793.     dw EvasionDownHit
  794. -   dw SkyAttack
  795. +   dw BraveBird
  796.     dw ConfuseHit
  797.     dw Twineedle
  798.     dw NormalHit
  799. @@ -144,7 +144,7 @@
  800.     dw PsychUp
  801.     dw MirrorCoat
  802.     dw SkullBash
  803. -   dw Twister
  804. +   dw DragonPulse
  805.     dw Earthquake
  806.     dw FutureSight
  807.     dw Gust
  808. diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm
  809. index ac9f4930..bd4e7d00 100644
  810. --- a/battle/moves/moves.asm
  811. +++ b/battle/moves/moves.asm
  812. @@ -131,7 +131,7 @@ ENDM
  813.     move METRONOME,    EFFECT_METRONOME,           0, NORMAL,   100, 10,   0
  814.     move MIRROR_MOVE,  EFFECT_MIRROR_MOVE,         0, FLYING,   100, 20,   0
  815.     move SELFDESTRUCT, EFFECT_EXPLOSION,         200, NORMAL,   100,  5,   0
  816. -   move EGG_BOMB,     EFFECT_NORMAL_HIT,        100, NORMAL,    75, 10,   0
  817. +   move POISON_JAB,   EFFECT_POISON_HIT,        100, POISON,    80, 20,  30
  818.     move LICK,         EFFECT_PARALYZE_HIT,       20, GHOST,    100, 30,  30
  819.     move SMOG,         EFFECT_POISON_HIT,         20, POISON,    70, 20,  40
  820.     move SLUDGE,       EFFECT_POISON_HIT,         65, POISON,   100, 20,  30
  821. @@ -141,7 +141,7 @@ ENDM
  822.     move CLAMP,        EFFECT_BIND,               35, WATER,     75, 10,   0
  823.     move SWIFT,        EFFECT_ALWAYS_HIT,         60, NORMAL,   100, 20,   0
  824.     move SKULL_BASH,   EFFECT_SKULL_BASH,        100, NORMAL,   100, 15,   0
  825. -   move SPIKE_CANNON, EFFECT_MULTI_HIT,          20, NORMAL,   100, 15,   0
  826. +   move ROCK_BLAST,   EFFECT_MULTI_HIT,          20, ROCK,     90, 10,   0
  827.     move CONSTRICT,    EFFECT_SPEED_DOWN_HIT,     10, NORMAL,   100, 35,  10
  828.     move AMNESIA,      EFFECT_SP_DEF_UP_2,         0, PSYCHIC,  100, 20,   0
  829.     move KINESIS,      EFFECT_ACCURACY_DOWN,       0, PSYCHIC,   80, 15,   0
  830. @@ -150,10 +150,10 @@ ENDM
  831.     move GLARE,        EFFECT_PARALYZE,            0, NORMAL,    75, 30,   0
  832.     move DREAM_EATER,  EFFECT_DREAM_EATER,       100, PSYCHIC,  100, 15,   0
  833.     move POISON_GAS,   EFFECT_POISON,              0, POISON,    55, 40,   0
  834. -   move BARRAGE,      EFFECT_MULTI_HIT,          15, NORMAL,    85, 20,   0
  835. +   move BULLET_SEED,  EFFECT_MULTI_HIT,          25, GRASS,    100, 30,   0
  836.     move LEECH_LIFE,   EFFECT_LEECH_HIT,          20, BUG,      100, 15,   0
  837.     move LOVELY_KISS,  EFFECT_SLEEP,               0, NORMAL,    75, 10,   0
  838. -   move SKY_ATTACK,   EFFECT_SKY_ATTACK,        140, FLYING,    90,  5,   0
  839. +   move BRAVE_BIRD,   EFFECT_RECOIL_HIT,        120, FLYING,   100,  15,  0
  840.     move TRANSFORM,    EFFECT_TRANSFORM,           0, NORMAL,   100, 10,   0
  841.     move BUBBLE,       EFFECT_SPEED_DOWN_HIT,     20, WATER,    100, 30,  10
  842.     move DIZZY_PUNCH,  EFFECT_CONFUSE_HIT,        70, NORMAL,   100, 10,  20
  843. @@ -249,7 +249,7 @@ ENDM
  844.     move MOONLIGHT,    EFFECT_MOONLIGHT,           0, NORMAL,   100,  5,   0
  845.     move HIDDEN_POWER, EFFECT_HIDDEN_POWER,        1, NORMAL,   100, 15,   0
  846.     move CROSS_CHOP,   EFFECT_NORMAL_HIT,        100, FIGHTING,  80,  5,   0
  847. -   move TWISTER,      EFFECT_TWISTER,            40, DRAGON,   100, 20,  20
  848. +   move DRAGON_PULSE, EFFECT_NORMAL_HIT,         80, DRAGON,   100, 10,   0
  849.     move RAIN_DANCE,   EFFECT_RAIN_DANCE,          0, WATER,     90,  5,   0
  850.     move SUNNY_DAY,    EFFECT_SUNNY_DAY,           0, FIRE,      90,  5,   0
  851.     move CRUNCH,       EFFECT_SP_DEF_DOWN_HIT,    80, DARK,     100, 15,  20
  852. diff --git a/battle/used_move_text.asm b/battle/used_move_text.asm
  853. index 5b7fcef1..2b4dceb6 100755
  854. --- a/battle/used_move_text.asm
  855. +++ b/battle/used_move_text.asm
  856. @@ -195,7 +195,7 @@ MoveGrammar: ; 105e7a
  857.     db SMOKESCREEN
  858.     db WITHDRAW
  859.     db DEFENSE_CURL
  860. -   db EGG_BOMB
  861. +   db POISON_JAB
  862.     db SMOG
  863.     db BONE_CLUB
  864.     db FLASH
  865. @@ -232,7 +232,7 @@ MoveGrammar: ; 105e7a
  866.     db AGILITY
  867.     db MIMIC
  868.     db DOUBLE_TEAM
  869. -   db BARRAGE
  870. +   db BULLET_SEED
  871.     db TRANSFORM
  872.     db STRUGGLE
  873.     db SCARY_FACE
  874. diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
  875. index 79365091..1333d3d8 100644
  876. --- a/constants/battle_constants.asm
  877. +++ b/constants/battle_constants.asm
  878. @@ -310,7 +310,7 @@ SUBSTATUS_CURLED       EQU 0
  879.     const EFFECT_PSYCH_UP
  880.     const EFFECT_MIRROR_COAT
  881.     const EFFECT_SKULL_BASH
  882. -   const EFFECT_TWISTER
  883. +;  const EFFECT_TWISTER
  884.     const EFFECT_EARTHQUAKE
  885.     const EFFECT_FUTURE_SIGHT
  886.     const EFFECT_GUST
  887. diff --git a/constants/move_constants.asm b/constants/move_constants.asm
  888. index 8492c241..fc17db34 100644
  889. --- a/constants/move_constants.asm
  890. +++ b/constants/move_constants.asm
  891. @@ -121,7 +121,7 @@
  892.     const METRONOME    ; $76
  893.     const MIRROR_MOVE  ; $77
  894.     const SELFDESTRUCT ; $78
  895. -   const EGG_BOMB     ; $79
  896. +   const POISON_JAB   ; $79
  897.     const LICK         ; $7a
  898.     const SMOG         ; $7b
  899.     const SLUDGE       ; $7c
  900. @@ -131,7 +131,7 @@
  901.     const CLAMP        ; $80
  902.     const SWIFT        ; $81
  903.     const SKULL_BASH   ; $82
  904. -   const SPIKE_CANNON ; $83
  905. +   const ROCK_BLAST   ; $83
  906.     const CONSTRICT    ; $84
  907.     const AMNESIA      ; $85
  908.     const KINESIS      ; $86
  909. @@ -140,10 +140,10 @@
  910.     const GLARE        ; $89
  911.     const DREAM_EATER  ; $8a
  912.     const POISON_GAS   ; $8b
  913. -   const BARRAGE      ; $8c
  914. +   const BULLET_SEED  ; $8c
  915.     const LEECH_LIFE   ; $8d
  916.     const LOVELY_KISS  ; $8e
  917. -   const SKY_ATTACK   ; $8f
  918. +   const BRAVE_BIRD   ; $8f
  919.     const TRANSFORM    ; $90
  920.     const BUBBLE       ; $91
  921.     const DIZZY_PUNCH  ; $92
  922. @@ -239,7 +239,7 @@
  923.     const MOONLIGHT    ; $ec
  924.     const HIDDEN_POWER ; $ed
  925.     const CROSS_CHOP   ; $ee
  926. -   const TWISTER      ; $ef
  927. +   const DRAGON_PULSE ; $ef
  928.     const RAIN_DANCE   ; $f0
  929.     const SUNNY_DAY    ; $f1
  930.     const CRUNCH       ; $f2
  931. diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
  932. index 5041f706..30428172 100644
  933. --- a/constants/pokemon_constants.asm
  934. +++ b/constants/pokemon_constants.asm
  935. @@ -131,7 +131,7 @@ const_value set 1
  936.     const TAUROS
  937.     const MAGIKARP
  938.     const GYARADOS
  939. -   const LAPRAS
  940. +   const MISMAGIUS
  941.     const DITTO
  942.     const EEVEE
  943.     const VAPOREON
  944. diff --git a/data/base_stats.asm b/data/base_stats.asm
  945. index b3e67d9a..66e4129a 100644
  946. --- a/data/base_stats.asm
  947. +++ b/data/base_stats.asm
  948. @@ -130,7 +130,7 @@ INCLUDE "data/base_stats/pinsir.asm"
  949.  INCLUDE "data/base_stats/tauros.asm"
  950.  INCLUDE "data/base_stats/magikarp.asm"
  951.  INCLUDE "data/base_stats/gyarados.asm"
  952. -INCLUDE "data/base_stats/lapras.asm"
  953. +INCLUDE "data/base_stats/mismagius.asm"
  954.  INCLUDE "data/base_stats/ditto.asm"
  955.  INCLUDE "data/base_stats/eevee.asm"
  956.  INCLUDE "data/base_stats/vaporeon.asm"
  957. diff --git a/data/base_stats/lapras.asm b/data/base_stats/mismagius.asm
  958. similarity index 75%
  959. rename from data/base_stats/lapras.asm
  960. rename to data/base_stats/mismagius.asm
  961. index e57154bc..3c1e0a47 100644
  962. --- a/data/base_stats/lapras.asm
  963. +++ b/data/base_stats/mismagius.asm
  964. @@ -1,21 +1,21 @@
  965. -   db LAPRAS ; 131
  966. +   db MISMAGIUS ; 131
  967.  
  968. -   db 130,  85,  80,  60,  85,  95
  969. +   db 60,  60,  60,  105,  105,  105
  970.     ;   hp  atk  def  spd  sat  sdf
  971.  
  972. -   db WATER, ICE
  973. +   db GHOST, GHOST
  974.     db 45 ; catch rate
  975. -   db 219 ; base exp
  976. +   db 187 ; base exp
  977.     db NO_ITEM ; item 1
  978.     db NO_ITEM ; item 2
  979.     db 127 ; gender
  980.     db 100 ; unknown
  981. -   db 40 ; step cycles to hatch
  982. +   db 25 ; step cycles to hatch
  983.     db 5 ; unknown
  984.     INCBIN "gfx/pics/lapras/front.dimensions"
  985.     db 0, 0, 0, 0 ; padding
  986. -   db SLOW ; growth rate
  987. -   dn MONSTER, AMPHIBIAN ; egg groups
  988. +   db FAST ; growth rate
  989. +   dn AMORPHOUS, AMORPHOUS ; egg groups
  990.  
  991.     ; tmhm
  992.     tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM
  993. diff --git a/data/base_stats/nidoqueen.asm b/data/base_stats/nidoqueen.asm
  994. index cf888b7e..d33dc065 100644
  995. --- a/data/base_stats/nidoqueen.asm
  996. +++ b/data/base_stats/nidoqueen.asm
  997. @@ -15,7 +15,7 @@
  998.     INCBIN "gfx/pics/nidoqueen/front.dimensions"
  999.     db 0, 0, 0, 0 ; padding
  1000.     db MEDIUM_SLOW ; growth rate
  1001. -   dn NO_EGGS, NO_EGGS ; egg groups
  1002. +   dn MONSTER, FIELD ; egg groups
  1003.  
  1004.     ; tmhm
  1005.     tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
  1006. diff --git a/data/base_stats/nidorina.asm b/data/base_stats/nidorina.asm
  1007. index 3ca843e8..95c5e1e1 100644
  1008. --- a/data/base_stats/nidorina.asm
  1009. +++ b/data/base_stats/nidorina.asm
  1010. @@ -15,7 +15,7 @@
  1011.     INCBIN "gfx/pics/nidorina/front.dimensions"
  1012.     db 0, 0, 0, 0 ; padding
  1013.     db MEDIUM_SLOW ; growth rate
  1014. -   dn NO_EGGS, NO_EGGS ; egg groups
  1015. +   dn MONSTER, FIELD ; egg groups
  1016.  
  1017.     ; tmhm
  1018.     tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
  1019. diff --git a/data/battle_tower.asm b/data/battle_tower.asm
  1020. index 8997a53b..3b3690ee 100644
  1021. --- a/data/battle_tower.asm
  1022. +++ b/data/battle_tower.asm
  1023. @@ -505,7 +505,7 @@ BattleTowerMons1:
  1024.     db "PUTERA@@@@@"
  1025.  
  1026.  
  1027. -   db LAPRAS
  1028. +   db MISMAGIUS
  1029.     db MIRACLEBERRY
  1030.     db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M
  1031.     dw 0 ; OT ID
  1032. @@ -1130,7 +1130,7 @@ BattleTowerMons2:
  1033.     db "HAPINASU@@@"
  1034.  
  1035.  
  1036. -   db LAPRAS
  1037. +   db MISMAGIUS
  1038.     db GOLD_BERRY
  1039.     db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY
  1040.     dw 0 ; OT ID
  1041. @@ -1782,7 +1782,7 @@ BattleTowerMons3:
  1042.     db "MARUMAIN@@@"
  1043.  
  1044.  
  1045. -   db LAPRAS
  1046. +   db MISMAGIUS
  1047.     db LEFTOVERS
  1048.     db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH
  1049.     dw 0 ; OT ID
  1050. @@ -2083,7 +2083,7 @@ BattleTowerMons4:
  1051.     db "KABIGON@@@@"
  1052.  
  1053.  
  1054. -   db LAPRAS
  1055. +   db MISMAGIUS
  1056.     db LEFTOVERS
  1057.     db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF
  1058.     dw 0 ; OT ID
  1059. @@ -2463,7 +2463,7 @@ BattleTowerMons4:
  1060.  
  1061.     db EXEGGUTOR
  1062.     db BRIGHTPOWDER
  1063. -   db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION
  1064. +   db POISON_JAB, STOMP, PSYCH_UP, CONFUSION
  1065.     dw 0 ; OT ID
  1066.     dt 64000 ; Exp
  1067.     ; Stat exp
  1068. @@ -2681,7 +2681,7 @@ BattleTowerMons5:
  1069.     db "KABIGON@@@@"
  1070.  
  1071.  
  1072. -   db LAPRAS
  1073. +   db MISMAGIUS
  1074.     db GOLD_BERRY
  1075.     db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD
  1076.     dw 0 ; OT ID
  1077. @@ -4394,7 +4394,7 @@ BattleTowerMons8:
  1078.     db "KENTAROSU@@"
  1079.  
  1080.  
  1081. -   db LAPRAS
  1082. +   db MISMAGIUS
  1083.     db MINT_BERRY
  1084.     db REST, SURF, CONFUSE_RAY, PSYCHIC_M
  1085.     dw 0 ; OT ID
  1086. @@ -4666,7 +4666,7 @@ BattleTowerMons8:
  1087.  
  1088.     db MOLTRES
  1089.     db CHARCOAL
  1090. -   db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM
  1091. +   db FLAMETHROWER, BRAVE_BIRD, STEEL_WING, HYPER_BEAM
  1092.     dw 0 ; OT ID
  1093.     dt 512000 ; Exp
  1094.     ; Stat exp
  1095. @@ -5073,7 +5073,7 @@ BattleTowerMons9:
  1096.     db "BANGIRASU@@"
  1097.  
  1098.  
  1099. -   db LAPRAS
  1100. +   db MISMAGIUS
  1101.     db MINT_BERRY
  1102.     db REST, SURF, THUNDERBOLT, PSYCHIC_M
  1103.     dw 0 ; OT ID
  1104. diff --git a/data/egg_move_pointers.asm b/data/egg_move_pointers.asm
  1105. index 11665f23..b3b6942d 100644
  1106. --- a/data/egg_move_pointers.asm
  1107. +++ b/data/egg_move_pointers.asm
  1108. @@ -133,7 +133,7 @@ endc
  1109.     dw NoEggMoves
  1110.     dw NoEggMoves
  1111.     dw NoEggMoves
  1112. -   dw LaprasEggMoves
  1113. +   dw NoEggMoves
  1114.     dw NoEggMoves
  1115.     dw EeveeEggMoves
  1116.     dw NoEggMoves
  1117. diff --git a/data/egg_moves.asm b/data/egg_moves.asm
  1118. index d48f3698..6b24dd24 100644
  1119. --- a/data/egg_moves.asm
  1120. +++ b/data/egg_moves.asm
  1121. @@ -433,11 +433,6 @@ PinsirEggMoves:
  1122.     db FLAIL
  1123.     db $ff
  1124.  
  1125. -LaprasEggMoves:
  1126. -   db AURORA_BEAM
  1127. -   db FORESIGHT
  1128. -   db $ff
  1129. -
  1130.  EeveeEggMoves:
  1131.     db FLAIL
  1132.     db CHARM
  1133. @@ -526,7 +521,7 @@ HoothootEggMoves:
  1134.     db WING_ATTACK
  1135.     db WHIRLWIND
  1136.  if _CRYSTAL
  1137. -   db SKY_ATTACK
  1138. +   db BRAVE_BIRD
  1139.  endc
  1140.     db $ff
  1141.  
  1142. @@ -653,7 +648,7 @@ MurkrowEggMoves:
  1143.     db MIRROR_MOVE
  1144.     db WING_ATTACK
  1145.  if _CRYSTAL
  1146. -   db SKY_ATTACK
  1147. +   db BRAVE_BIRD
  1148.  endc
  1149.     db $ff
  1150.  
  1151. @@ -776,7 +771,7 @@ DelibirdEggMoves:
  1152.     db $ff
  1153.  
  1154.  MantineEggMoves:
  1155. -   db TWISTER
  1156. +   db DRAGON_PULSE
  1157.     db HYDRO_PUMP
  1158.     db HAZE
  1159.     db SLAM
  1160. @@ -787,7 +782,7 @@ SkarmoryEggMoves:
  1161.     db PURSUIT
  1162.     db WHIRLWIND
  1163.  if _CRYSTAL
  1164. -   db SKY_ATTACK
  1165. +   db BRAVE_BIRD
  1166.  endc
  1167.     db $ff
  1168.  
  1169. diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm
  1170. index 0a0bba54..27838d35 100644
  1171. --- a/data/evos_attacks.asm
  1172. +++ b/data/evos_attacks.asm
  1173. @@ -1230,7 +1230,7 @@ CloysterEvosAttacks:
  1174.  if _CRYSTAL
  1175.     db 33, SPIKES
  1176.  endc
  1177. -   db 41, SPIKE_CANNON
  1178. +   db 41, ROCK_BLAST
  1179.     db 0 ; no more level-up moves
  1180.  
  1181.  GastlyEvosAttacks:
  1182. @@ -1380,7 +1380,7 @@ ElectrodeEvosAttacks:
  1183.  ExeggcuteEvosAttacks:
  1184.     db EVOLVE_ITEM, LEAF_STONE, EXEGGUTOR
  1185.     db 0 ; no more evolutions
  1186. -   db 1, BARRAGE
  1187. +   db 1, BULLET_SEED
  1188.     db 1, HYPNOSIS
  1189.     db 7, REFLECT
  1190.     db 13, LEECH_SEED
  1191. @@ -1393,11 +1393,11 @@ ExeggcuteEvosAttacks:
  1192.  
  1193.  ExeggutorEvosAttacks:
  1194.     db 0 ; no more evolutions
  1195. -   db 1, BARRAGE
  1196. +   db 1, BULLET_SEED
  1197.     db 1, HYPNOSIS
  1198.     db 1, CONFUSION
  1199.     db 19, STOMP
  1200. -   db 31, EGG_BOMB
  1201. +   db 31, POISON_JAB
  1202.     db 0 ; no more level-up moves
  1203.  
  1204.  CuboneEvosAttacks:
  1205. @@ -1541,7 +1541,7 @@ ChanseyEvosAttacks:
  1206.     db 17, DOUBLESLAP
  1207.     db 23, MINIMIZE
  1208.     db 29, SING
  1209. -   db 35, EGG_BOMB
  1210. +   db 35, POISON_JAB
  1211.     db 41, DEFENSE_CURL
  1212.     db 49, LIGHT_SCREEN
  1213.     db 57, DOUBLE_EDGE
  1214. @@ -1581,7 +1581,7 @@ HorseaEvosAttacks:
  1215.     db 8, SMOKESCREEN
  1216.     db 15, LEER
  1217.     db 22, WATER_GUN
  1218. -   db 29, TWISTER
  1219. +   db 29, DRAGON_PULSE
  1220.     db 36, AGILITY
  1221.     db 43, HYDRO_PUMP
  1222.     db 0 ; no more level-up moves
  1223. @@ -1596,7 +1596,7 @@ SeadraEvosAttacks:
  1224.     db 8, SMOKESCREEN
  1225.     db 15, LEER
  1226.     db 22, WATER_GUN
  1227. -   db 29, TWISTER
  1228. +   db 29, DRAGON_PULSE
  1229.     db 40, AGILITY
  1230.     db 51, HYDRO_PUMP
  1231.     db 0 ; no more level-up moves
  1232. @@ -1767,25 +1767,22 @@ GyaradosEvosAttacks:
  1233.     db 20, BITE
  1234.     db 25, DRAGON_RAGE
  1235.     db 30, LEER
  1236. -   db 35, TWISTER
  1237. +   db 35, DRAGON_PULSE
  1238.     db 40, HYDRO_PUMP
  1239.     db 45, RAIN_DANCE
  1240.     db 50, HYPER_BEAM
  1241.     db 0 ; no more level-up moves
  1242.  
  1243. -LaprasEvosAttacks:
  1244. +MismagiusEvosAttacks:
  1245.     db 0 ; no more evolutions
  1246. -   db 1, WATER_GUN
  1247.     db 1, GROWL
  1248. -   db 1, SING
  1249. -   db 8, MIST
  1250. -   db 15, BODY_SLAM
  1251. -   db 22, CONFUSE_RAY
  1252. -   db 29, PERISH_SONG
  1253. -   db 36, ICE_BEAM
  1254. -   db 43, RAIN_DANCE
  1255. -   db 50, SAFEGUARD
  1256. -   db 57, HYDRO_PUMP
  1257. +   db 1, PSYWAVE
  1258. +   db 6, SPITE
  1259. +   db 12, CONFUSE_RAY
  1260. +   db 19, MEAN_LOOK
  1261. +   db 27, PSYBEAM
  1262. +   db 36, PAIN_SPLIT
  1263. +   db 46, PERISH_SONG
  1264.     db 0 ; no more level-up moves
  1265.  
  1266.  DittoEvosAttacks:
  1267. @@ -1893,7 +1890,7 @@ OmastarEvosAttacks:
  1268.     db 19, WATER_GUN
  1269.     db 31, LEER
  1270.     db 37, PROTECT
  1271. -   db 40, SPIKE_CANNON
  1272. +   db 40, ROCK_BLAST
  1273.     db 54, ANCIENTPOWER
  1274.     db 65, HYDRO_PUMP
  1275.     db 0 ; no more level-up moves
  1276. @@ -1984,7 +1981,7 @@ MoltresEvosAttacks:
  1277.     db 37, ENDURE
  1278.     db 49, FLAMETHROWER
  1279.     db 61, SAFEGUARD
  1280. -   db 73, SKY_ATTACK
  1281. +   db 73, BRAVE_BIRD
  1282.     db 0 ; no more level-up moves
  1283.  
  1284.  DratiniEvosAttacks:
  1285. @@ -1993,7 +1990,7 @@ DratiniEvosAttacks:
  1286.     db 1, WRAP
  1287.     db 1, LEER
  1288.     db 8, THUNDER_WAVE
  1289. -   db 15, TWISTER
  1290. +   db 15, DRAGON_PULSE
  1291.     db 22, DRAGON_RAGE
  1292.     db 29, SLAM
  1293.     db 36, AGILITY
  1294. @@ -2008,9 +2005,9 @@ DragonairEvosAttacks:
  1295.     db 1, WRAP
  1296.     db 1, LEER
  1297.     db 1, THUNDER_WAVE
  1298. -   db 1, TWISTER
  1299. +   db 1, DRAGON_PULSE
  1300.     db 8, THUNDER_WAVE
  1301. -   db 15, TWISTER
  1302. +   db 15, DRAGON_PULSE
  1303.     db 22, DRAGON_RAGE
  1304.     db 29, SLAM
  1305.     db 38, AGILITY
  1306. @@ -2024,9 +2021,9 @@ DragoniteEvosAttacks:
  1307.     db 1, WRAP
  1308.     db 1, LEER
  1309.     db 1, THUNDER_WAVE
  1310. -   db 1, TWISTER
  1311. +   db 1, DRAGON_PULSE
  1312.     db 8, THUNDER_WAVE
  1313. -   db 15, TWISTER
  1314. +   db 15, DRAGON_PULSE
  1315.     db 22, DRAGON_RAGE
  1316.     db 29, SLAM
  1317.     db 38, AGILITY
  1318. @@ -2064,8 +2061,9 @@ MewEvosAttacks:
  1319.  ChikoritaEvosAttacks:
  1320.     db EVOLVE_LEVEL, 16, BAYLEEF
  1321.     db 0 ; no more evolutions
  1322. -   db 1, TACKLE
  1323. -   db 1, GROWL
  1324. +   db 1, BULLET_SEED
  1325. +    db 1, ROCK_BLAST
  1326. +   db 1, BRAVE_BIRD
  1327.     db 8, RAZOR_LEAF
  1328.     db 12, REFLECT
  1329.     db 15, POISONPOWDER
  1330. @@ -2153,8 +2151,8 @@ TyphlosionEvosAttacks:
  1331.  TotodileEvosAttacks:
  1332.     db EVOLVE_LEVEL, 18, CROCONAW
  1333.     db 0 ; no more evolutions
  1334. -   db 1, SCRATCH
  1335. -   db 1, LEER
  1336. +   db 1, POISON_JAB
  1337. +   db 1, DRAGON_PULSE
  1338.     db 7, RAGE
  1339.     db 13, WATER_GUN
  1340.     db 20, BITE
  1341. @@ -2718,6 +2716,7 @@ SlowkingEvosAttacks:
  1342.     db 0 ; no more level-up moves
  1343.  
  1344.  MisdreavusEvosAttacks:
  1345. +    db EVOLVE_HAPPINESS, TR_NITE, MISMAGIUS
  1346.     db 0 ; no more evolutions
  1347.     db 1, GROWL
  1348.     db 1, PSYWAVE
  1349. @@ -3009,7 +3008,7 @@ CorsolaEvosAttacks:
  1350.     db 13, BUBBLE
  1351.     db 19, RECOVER
  1352.     db 25, BUBBLEBEAM
  1353. -   db 31, SPIKE_CANNON
  1354. +   db 31, ROCK_BLAST
  1355.     db 37, MIRROR_COAT
  1356.     db 43, ANCIENTPOWER
  1357.     db 0 ; no more level-up moves
  1358. @@ -3102,7 +3101,7 @@ KingdraEvosAttacks:
  1359.     db 8, SMOKESCREEN
  1360.     db 15, LEER
  1361.     db 22, WATER_GUN
  1362. -   db 29, TWISTER
  1363. +   db 29, DRAGON_PULSE
  1364.     db 40, AGILITY
  1365.     db 51, HYDRO_PUMP
  1366.     db 0 ; no more level-up moves
  1367. @@ -3256,7 +3255,7 @@ BlisseyEvosAttacks:
  1368.     db 13, DOUBLESLAP
  1369.     db 18, MINIMIZE
  1370.     db 23, SING
  1371. -   db 28, EGG_BOMB
  1372. +   db 28, POISON_JAB
  1373.     db 33, DEFENSE_CURL
  1374.     db 40, LIGHT_SCREEN
  1375.     db 47, DOUBLE_EDGE
  1376. diff --git a/data/evos_attacks_pointers.asm b/data/evos_attacks_pointers.asm
  1377. index 4ce10b10..706f1ff8 100644
  1378. --- a/data/evos_attacks_pointers.asm
  1379. +++ b/data/evos_attacks_pointers.asm
  1380. @@ -133,7 +133,7 @@ EvosAttacksPointers:: ; 0x425b1
  1381.     dw TaurosEvosAttacks
  1382.     dw MagikarpEvosAttacks
  1383.     dw GyaradosEvosAttacks
  1384. -   dw LaprasEvosAttacks
  1385. +   dw MismagiusEvosAttacks
  1386.     dw DittoEvosAttacks
  1387.     dw EeveeEvosAttacks
  1388.     dw VaporeonEvosAttacks
  1389. diff --git a/data/pokedex/entries/131.asm b/data/pokedex/entries/131.asm
  1390. index 612207ba..9eac3203 100644
  1391. --- a/data/pokedex/entries/131.asm
  1392. +++ b/data/pokedex/entries/131.asm
  1393. @@ -1,10 +1,13 @@
  1394. -; LaprasPokedexEntry: ; 0x1cc0cd
  1395. -   db "TRANSPORT@" ; species name
  1396. -   dw 802, 4850 ; height, width
  1397. +; MismagiusPokedexEntry: ; 0x1cc0cd
  1398. +   db "MAGICAL@" ; species name
  1399. +   dw 211, 97 ; height, width
  1400.  
  1401. -   db   "This gentle"
  1402. -   next "#MON loves to"
  1403. -   next "give people rides"
  1404. -   page "and provides a ve-"
  1405. -   next "ry comfortable way"
  1406. -   next "to get around.@"
  1407. +   db   "Its cry sounds"
  1408. +   next "like incantations"
  1409. +   next "to torment the"
  1410. +   page "foe. It appears"
  1411. +   next "when you least"
  1412. +   next "expect it."
  1413. +    page "You can also have"
  1414. +    next "another page in"
  1415. +    next "a Dex entry.@"
  1416. \ No newline at end of file
  1417. diff --git a/data/pokedex/entries_3.asm b/data/pokedex/entries_3.asm
  1418. index 8aa1c28c..1aae5c58 100644
  1419. --- a/data/pokedex/entries_3.asm
  1420. +++ b/data/pokedex/entries_3.asm
  1421. @@ -1,6 +1,6 @@
  1422.  MagikarpPokedexEntry::   INCLUDE "data/pokedex/entries/129.asm"
  1423.  GyaradosPokedexEntry::   INCLUDE "data/pokedex/entries/130.asm"
  1424. -LaprasPokedexEntry::     INCLUDE "data/pokedex/entries/131.asm"
  1425. +MismagiusPokedexEntry::  INCLUDE "data/pokedex/entries/131.asm"
  1426.  DittoPokedexEntry::      INCLUDE "data/pokedex/entries/132.asm"
  1427.  EeveePokedexEntry::      INCLUDE "data/pokedex/entries/133.asm"
  1428.  VaporeonPokedexEntry::   INCLUDE "data/pokedex/entries/134.asm"
  1429. diff --git a/data/pokedex/entry_pointers.asm b/data/pokedex/entry_pointers.asm
  1430. index 5a432e66..df271aee 100644
  1431. --- a/data/pokedex/entry_pointers.asm
  1432. +++ b/data/pokedex/entry_pointers.asm
  1433. @@ -202,7 +202,7 @@ PokedexDataPointerTable: ; 0x44378
  1434.     dw TaurosPokedexEntry
  1435.     dw MagikarpPokedexEntry
  1436.     dw GyaradosPokedexEntry
  1437. -   dw LaprasPokedexEntry
  1438. +   dw MismagiusPokedexEntry
  1439.     dw DittoPokedexEntry
  1440.     dw EeveePokedexEntry
  1441.     dw VaporeonPokedexEntry
  1442. diff --git a/data/pokedex/order_alpha.asm b/data/pokedex/order_alpha.asm
  1443. index bab0a981..0fde8c26 100644
  1444. --- a/data/pokedex/order_alpha.asm
  1445. +++ b/data/pokedex/order_alpha.asm
  1446. @@ -107,7 +107,7 @@
  1447.     db KOFFING
  1448.     db KRABBY
  1449.     db LANTURN
  1450. -   db LAPRAS
  1451. +   db MISMAGIUS
  1452.     db LARVITAR
  1453.     db LEDIAN
  1454.     db LEDYBA
  1455. diff --git a/data/pokedex/order_new.asm b/data/pokedex/order_new.asm
  1456. index a98a658c..f997b9ca 100644
  1457. --- a/data/pokedex/order_new.asm
  1458. +++ b/data/pokedex/order_new.asm
  1459. @@ -218,7 +218,7 @@
  1460.     db PORYGON2
  1461.     db CHANSEY
  1462.     db BLISSEY
  1463. -   db LAPRAS
  1464. +   db MISMAGIUS
  1465.     db OMANYTE
  1466.     db OMASTAR
  1467.     db KABUTO
  1468. diff --git a/data/pokemon_names.asm b/data/pokemon_names.asm
  1469. index 06b1a6e5..00532df9 100644
  1470. --- a/data/pokemon_names.asm
  1471. +++ b/data/pokemon_names.asm
  1472. @@ -128,7 +128,7 @@
  1473.     db "TAUROS@@@@"
  1474.     db "MAGIKARP@@"
  1475.     db "GYARADOS@@"
  1476. -   db "LAPRAS@@@@"
  1477. +    db "MISMAGIUS@"
  1478.     db "DITTO@@@@@"
  1479.     db "EEVEE@@@@@"
  1480.     db "VAPOREON@@"
  1481. diff --git a/engine/decorations.asm b/engine/decorations.asm
  1482. index 4bd99c0a..708b2a27 100755
  1483. --- a/engine/decorations.asm
  1484. +++ b/engine/decorations.asm
  1485. @@ -577,7 +577,7 @@ DecorationAttributes: ; 26a4f
  1486.     decoration DECO_PLANT,    PUT_IT_AWAY,       PUT_AWAY_BIG_DOLL,  EVENT_GAVE_KURT_APRICORNS,                         $00
  1487.     decoration DECO_BIGDOLL,  SNORLAX,           SET_UP_BIG_DOLL,    EVENT_DECO_BIG_SNORLAX_DOLL,       SPRITE_BIG_SNORLAX
  1488.     decoration DECO_BIGDOLL,  ONIX,              SET_UP_BIG_DOLL,    EVENT_DECO_BIG_ONIX_DOLL,          SPRITE_BIG_ONIX
  1489. -   decoration DECO_BIGDOLL,  LAPRAS,            SET_UP_BIG_DOLL,    EVENT_DECO_BIG_LAPRAS_DOLL,        SPRITE_BIG_LAPRAS
  1490. +   decoration DECO_BIGDOLL,  MISMAGIUS,         SET_UP_BIG_DOLL,    EVENT_DECO_BIG_LAPRAS_DOLL,        SPRITE_BIG_LAPRAS
  1491.     decoration DECO_PLANT,    PUT_IT_AWAY,       PUT_AWAY_DOLL,      EVENT_GAVE_KURT_APRICORNS,                         $00
  1492.     decoration DECO_DOLL,     PIKACHU,           SET_UP_DOLL,        EVENT_DECO_PIKACHU_DOLL,           SPRITE_PIKACHU
  1493.     decoration DECO_PLANT,    SURF_PIKA_DOLL,    SET_UP_DOLL,        EVENT_DECO_SURFING_PIKACHU_DOLL,   SPRITE_SURFING_PIKACHU
  1494. diff --git a/engine/overworld.asm b/engine/overworld.asm
  1495. index 4d22e55b..3b017fa2 100755
  1496. --- a/engine/overworld.asm
  1497. +++ b/engine/overworld.asm
  1498. @@ -771,7 +771,7 @@ SpriteMons: ; 14495
  1499.     db TAUROS
  1500.     db MACHOP
  1501.     db VOLTORB
  1502. -   db LAPRAS
  1503. +   db MISMAGIUS
  1504.     db RHYDON
  1505.     db MOLTRES
  1506.     db SNORLAX
  1507. diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm
  1508. index 56172107..1ad49f08 100755
  1509. --- a/engine/time_capsule/conversion.asm
  1510. +++ b/engine/time_capsule/conversion.asm
  1511. @@ -445,7 +445,7 @@ Pokered_MonIndices: ; fb91c
  1512.     db NIDOQUEEN
  1513.     db CUBONE
  1514.     db RHYHORN
  1515. -   db LAPRAS
  1516. +   db MISMAGIUS
  1517.     db ARCANINE
  1518.     db MEW
  1519.     db GYARADOS
  1520. diff --git a/event/dratini.asm b/event/dratini.asm
  1521. index f110b34a..554772f5 100644
  1522. --- a/event/dratini.asm
  1523. +++ b/event/dratini.asm
  1524. @@ -73,7 +73,7 @@ SpecialDratini: ; 0x8b170
  1525.  ; Dratini does not normally learn Extremespeed. This is a special gift.
  1526.     db WRAP
  1527.     db THUNDER_WAVE
  1528. -   db TWISTER
  1529. +   db DRAGON_PULSE
  1530.     db EXTREMESPEED
  1531.     db 0
  1532.  .Moveset1:
  1533. @@ -81,7 +81,7 @@ SpecialDratini: ; 0x8b170
  1534.     db WRAP
  1535.     db LEER
  1536.     db THUNDER_WAVE
  1537. -   db TWISTER
  1538. +   db DRAGON_PULSE
  1539.     db 0
  1540.  
  1541.  .GetNthPartyMon: ; 0x8b1ce
  1542. diff --git a/gfx/pics/lapras/anim0.asm b/gfx/pics/lapras/anim0.asm
  1543. old mode 100644
  1544. new mode 100755
  1545. diff --git a/gfx/pics/lapras/anim1.asm b/gfx/pics/lapras/anim1.asm
  1546. old mode 100644
  1547. new mode 100755
  1548. diff --git a/gfx/pics/lapras/back.2bpp.lz.d09351a1 b/gfx/pics/lapras/back.2bpp.lz.d09351a1
  1549. old mode 100644
  1550. new mode 100755
  1551. diff --git a/gfx/pics/lapras/back.png b/gfx/pics/lapras/back.png
  1552. old mode 100644
  1553. new mode 100755
  1554. diff --git a/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e b/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e
  1555. old mode 100644
  1556. new mode 100755
  1557. diff --git a/gfx/pics/lapras/front.png b/gfx/pics/lapras/front.png
  1558. old mode 100644
  1559. new mode 100755
  1560. diff --git a/gfx/pics/lapras/shiny.pal b/gfx/pics/lapras/shiny.pal
  1561. old mode 100644
  1562. new mode 100755
  1563. diff --git a/gfx/pics/mismagius/anim0.asm b/gfx/pics/mismagius/anim0.asm
  1564. new file mode 100644
  1565. index 00000000..9ae8f4e5
  1566. --- /dev/null
  1567. +++ b/gfx/pics/mismagius/anim0.asm
  1568. @@ -0,0 +1,7 @@
  1569. +   frame 1, 10
  1570. +   frame 2, 07
  1571. +   frame 3, 40
  1572. +   frame 2, 09
  1573. +   frame 1, 10
  1574. +   endanim
  1575. +; 0xd1016
  1576. diff --git a/gfx/pics/mismagius/anim1.asm b/gfx/pics/mismagius/anim1.asm
  1577. new file mode 100644
  1578. index 00000000..790cccf0
  1579. --- /dev/null
  1580. +++ b/gfx/pics/mismagius/anim1.asm
  1581. @@ -0,0 +1,6 @@
  1582. +   frame 4, 10
  1583. +   frame 5, 30
  1584. +   frame 0, 12
  1585. +   frame 5, 12
  1586. +   endanim
  1587. +; 0xd1dc0
  1588. diff --git a/gfx/pics/mismagius/back.2bpp.lz.d09351a1 b/gfx/pics/mismagius/back.2bpp.lz.d09351a1
  1589. new file mode 100644
  1590. index 00000000..00f6b432
  1591. Binary files /dev/null and b/gfx/pics/mismagius/back.2bpp.lz.d09351a1 differ
  1592. diff --git a/gfx/pics/mismagius/back.png b/gfx/pics/mismagius/back.png
  1593. new file mode 100644
  1594. index 00000000..9c17ce37
  1595. Binary files /dev/null and b/gfx/pics/mismagius/back.png differ
  1596. diff --git a/gfx/pics/mismagius/front.animated.2bpp.lz.8290ef8e b/gfx/pics/mismagius/front.animated.2bpp.lz.8290ef8e
  1597. new file mode 100644
  1598. index 00000000..0c20fc0b
  1599. Binary files /dev/null and b/gfx/pics/mismagius/front.animated.2bpp.lz.8290ef8e differ
  1600. diff --git a/gfx/pics/mismagius/front.png b/gfx/pics/mismagius/front.png
  1601. new file mode 100755
  1602. index 00000000..144680ea
  1603. Binary files /dev/null and b/gfx/pics/mismagius/front.png differ
  1604. diff --git a/items/item_attributes.asm b/items/item_attributes.asm
  1605. index b0ba5feb..2fd68c52 100644
  1606. --- a/items/item_attributes.asm
  1607. +++ b/items/item_attributes.asm
  1608. @@ -439,7 +439,7 @@ Item2Attributes:
  1609.     item_attribute   100, HELD_STEEL_BOOST,    10,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1610.  
  1611.  ; DRAGON FANG
  1612. -   item_attribute   100, 0,                 0,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1613. +   item_attribute   100, HELD_DRAGON_BOOST,                 0,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1614.  
  1615.  ; TERU-SAMA
  1616.     item_attribute $9999, 0,                 0,                       0, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1617. @@ -460,7 +460,7 @@ Item2Attributes:
  1618.     item_attribute    10, HELD_RESTORE_PP,     -1,             CANT_SELECT, ITEM,     ITEMMENU_PARTY,   ITEMMENU_PARTY
  1619.  
  1620.  ; DRAGON SCALE
  1621. -   item_attribute  2100, HELD_DRAGON_BOOST,   10,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1622. +   item_attribute  2100, 0,   10,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1623.  
  1624.  ; BERSERK GENE
  1625.     item_attribute   200, 0,                 0,             CANT_SELECT, ITEM,     ITEMMENU_NOUSE,   ITEMMENU_NOUSE
  1626. diff --git a/items/item_effects.asm b/items/item_effects.asm
  1627. index c13568a5..fbcbb19f 100644
  1628. --- a/items/item_effects.asm
  1629. +++ b/items/item_effects.asm
  1630. @@ -342,7 +342,7 @@ ParkBall: ; e8a2
  1631.     and 1 << FRZ | SLP
  1632.     ld c, 10
  1633.     jr nz, .addstatus
  1634. -   ; ld a, [EnemyMonStatus]
  1635. +   ld a, [EnemyMonStatus]
  1636.     and a
  1637.     ld c, 5
  1638.     jr nz, .addstatus
  1639. @@ -367,7 +367,7 @@ ParkBall: ; e8a2
  1640.     ; Uncomment the line below to fix.
  1641.  
  1642.     ld a, [BattleMonItem]
  1643. -;  ld b, a
  1644. +   ld b, a
  1645.     callba GetItemHeldEffect
  1646.     ld a, b
  1647.     cp HELD_CATCH_CHANCE
  1648. @@ -947,7 +947,7 @@ GLOBAL EvosAttacksPointers
  1649.     push bc
  1650.     ld a, BANK(EvosAttacks)
  1651.     call GetFarByte
  1652. -   cp MOON_STONE_RED ; BURN_HEAL
  1653. +   cp MOON_STONE ; BURN_HEAL (fixed)
  1654.     pop bc
  1655.     ret nz
  1656.  
  1657. @@ -1006,7 +1006,7 @@ LoveBallMultiplier:
  1658.     pop de
  1659.     cp d
  1660.     pop bc
  1661. -   ret nz ; for the intended effect, this should be ΓÇ£ret zΓÇ¥
  1662. +   ret z ; for the intended effect, this should be ΓÇ£ret zΓÇ¥
  1663.  
  1664.     sla b
  1665.     jr c, .max
  1666. @@ -1044,7 +1044,7 @@ FastBallMultiplier:
  1667.     cp -1
  1668.     jr z, .next
  1669.     cp c
  1670. -   jr nz, .next ; for the intended effect, this should be ΓÇ£jr nz, .loopΓÇ¥
  1671. +   jr nz, .loop ; for the intended effect, this should be ΓÇ£jr nz, .loopΓÇ¥
  1672.     sla b
  1673.     jr c, .max
  1674.  
  1675. diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
  1676. index 68b3147f..121ee7ee 100644
  1677. --- a/maps/UnionCaveB2F.asm
  1678. +++ b/maps/UnionCaveB2F.asm
  1679. @@ -32,8 +32,8 @@ UnionCaveB2F_MapScriptHeader:
  1680.  
  1681.  UnionCaveLapras:
  1682.     faceplayer
  1683. -   cry LAPRAS
  1684. -   loadwildmon LAPRAS, 20
  1685. +   cry MISMAGIUS
  1686. +   loadwildmon MISMAGIUS, 20
  1687.     startbattle
  1688.     disappear UNIONCAVEB2F_LAPRAS
  1689.     setflag ENGINE_UNION_CAVE_LAPRAS
  1690. diff --git a/menu/mon_icons.asm b/menu/mon_icons.asm
  1691. index aeb75828..6c8a6583 100644
  1692. --- a/menu/mon_icons.asm
  1693. +++ b/menu/mon_icons.asm
  1694. @@ -144,7 +144,7 @@ MonMenuIcons: ; 8eac4
  1695.     db ICON_EQUINE       ; TAUROS
  1696.     db ICON_FISH         ; MAGIKARP
  1697.     db ICON_GYARADOS     ; GYARADOS
  1698. -   db ICON_LAPRAS       ; LAPRAS
  1699. +   db ICON_GHOST        ; LAPRAS
  1700.     db ICON_BLOB         ; DITTO
  1701.     db ICON_FOX          ; EEVEE
  1702.     db ICON_FOX          ; VAPOREON
  1703. diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm
  1704. index b471ff01..405e0b13 100755
  1705. --- a/misc/fixed_words.asm
  1706. +++ b/misc/fixed_words.asm
  1707. @@ -3417,7 +3417,7 @@ SortedPokemon:
  1708.             db -1
  1709.  .yo        db LARVITAR, NOCTOWL
  1710.             db -1
  1711. -.ra        db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN
  1712. +.ra        db RAIKOU, RAICHU, CHANSEY, RATICATE, MISMAGIUS, VILEPLUME, LANTURN
  1713.             db -1
  1714.  .ri        db CHARMELEON, CHARIZARD, URSARING
  1715.             db -1
  1716. diff --git a/trainers/trainers.asm b/trainers/trainers.asm
  1717. index 2b4a6847..11c07e42 100644
  1718. --- a/trainers/trainers.asm
  1719. +++ b/trainers/trainers.asm
  1720. @@ -748,7 +748,7 @@ WillGroup:
  1721.     db 41, EXEGGUTOR
  1722.         db REFLECT
  1723.         db LEECH_SEED
  1724. -       db EGG_BOMB
  1725. +       db POISON_JAB
  1726.         db PSYCHIC_M
  1727.  
  1728.     db 41, SLOWBRO
  1729. @@ -970,13 +970,13 @@ ChampionGroup:
  1730.  
  1731.     db 47, DRAGONITE
  1732.         db THUNDER_WAVE
  1733. -       db TWISTER
  1734. +       db DRAGON_PULSE
  1735.         db THUNDER
  1736.         db HYPER_BEAM
  1737.  
  1738.     db 47, DRAGONITE
  1739.         db THUNDER_WAVE
  1740. -       db TWISTER
  1741. +       db DRAGON_PULSE
  1742.         db BLIZZARD
  1743.         db HYPER_BEAM
  1744.  
  1745. @@ -1030,7 +1030,7 @@ BrockGroup:
  1746.         db BITE
  1747.         db SURF
  1748.         db PROTECT
  1749. -       db SPIKE_CANNON
  1750. +       db ROCK_BLAST
  1751.  
  1752.     db 44, ONIX
  1753.         db BIND
  1754. @@ -1072,7 +1072,7 @@ MistyGroup:
  1755.         db EARTHQUAKE
  1756.         db RAIN_DANCE
  1757.  
  1758. -   db 44, LAPRAS
  1759. +   db 44, MISMAGIUS
  1760.         db SURF
  1761.         db PERISH_SONG
  1762.         db BLIZZARD
  1763. @@ -3040,19 +3040,19 @@ CooltrainerFGroup:
  1764.         db SMOKESCREEN
  1765.         db LEER
  1766.         db WHIRLPOOL
  1767. -       db TWISTER
  1768. +       db DRAGON_PULSE
  1769.  
  1770.     db 33, HORSEA
  1771.         db SMOKESCREEN
  1772.         db LEER
  1773.         db WHIRLPOOL
  1774. -       db TWISTER
  1775. +       db DRAGON_PULSE
  1776.  
  1777.     db 35, SEADRA
  1778.         db SWIFT
  1779.         db LEER
  1780.         db WATERFALL
  1781. -       db TWISTER
  1782. +       db DRAGON_PULSE
  1783.  
  1784.     db $ff ; end
  1785.  
  1786. @@ -3452,7 +3452,7 @@ PokemaniacGroup:
  1787.     db 41, CHANSEY
  1788.         db ROLLOUT
  1789.         db ATTRACT
  1790. -       db EGG_BOMB
  1791. +       db POISON_JAB
  1792.         db SOFTBOILED
  1793.  
  1794.     db $ff ; end
  1795. @@ -5134,7 +5134,7 @@ SwimmerFGroup:
  1796.     ; party
  1797.     db 29, MARILL
  1798.     db 29, MARILL
  1799. -   db 32, LAPRAS
  1800. +   db 32, MISMAGIUS
  1801.  
  1802.     db $ff ; end
  1803.  
  1804. @@ -5549,7 +5549,7 @@ SuperNerdGroup:
  1805.  
  1806.     db 39, SEADRA
  1807.         db SMOKESCREEN
  1808. -       db TWISTER
  1809. +       db DRAGON_PULSE
  1810.         db SURF
  1811.         db WATERFALL
  1812.  
  1813. @@ -8471,13 +8471,13 @@ TwinsGroup:
  1814.  
  1815.     db 35, DRATINI
  1816.         db THUNDER_WAVE
  1817. -       db TWISTER
  1818. +       db DRAGON_PULSE
  1819.         db FLAMETHROWER
  1820.         db HEADBUTT
  1821.  
  1822.     db 35, DRATINI
  1823.         db THUNDER_WAVE
  1824. -       db TWISTER
  1825. +       db DRAGON_PULSE
  1826.         db ICE_BEAM
  1827.         db HEADBUTT
  1828.  
  1829. @@ -8493,13 +8493,13 @@ TwinsGroup:
  1830.  
  1831.     db 38, DRATINI
  1832.         db THUNDER_WAVE
  1833. -       db TWISTER
  1834. +       db DRAGON_PULSE
  1835.         db ICE_BEAM
  1836.         db HEADBUTT
  1837.  
  1838.     db 38, DRATINI
  1839.         db THUNDER_WAVE
  1840. -       db TWISTER
  1841. +       db DRAGON_PULSE
  1842.         db FLAMETHROWER
  1843.         db HEADBUTT
  1844.  
  1845. @@ -8666,7 +8666,7 @@ BlueGroup:
  1846.         db EARTHQUAKE
  1847.  
  1848.     db 58, GYARADOS
  1849. -       db TWISTER
  1850. +       db DRAGON_PULSE
  1851.         db HYDRO_PUMP
  1852.         db RAIN_DANCE
  1853.         db HYPER_BEAM
  1854. @@ -8674,7 +8674,7 @@ BlueGroup:
  1855.     db 58, EXEGGUTOR
  1856.         db SUNNY_DAY
  1857.         db LEECH_SEED
  1858. -       db EGG_BOMB
  1859. +       db POISON_JAB
  1860.         db SOLARBEAM
  1861.  
  1862.     db 58, ARCANINE
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!