diff options
Diffstat (limited to 'data')
329 files changed, 8452 insertions, 6179 deletions
diff --git a/data/animated_objects_3e_1.asm b/data/animated_objects_3e_1.asm new file mode 100755 index 00000000..07b17ce5 --- /dev/null +++ b/data/animated_objects_3e_1.asm @@ -0,0 +1,383 @@ +SurfingPikachuFrames: + dw Unkn_f943d ; 00 + dw Unkn_f9440 ; 01 + dw Unkn_f9445 ; 02 + dw Unkn_f944a ; 03 + dw Unkn_f944f ; 04 + dw Unkn_f9454 ; 05 + dw Unkn_f9459 ; 06 + dw Unkn_f945e ; 07 + dw Unkn_f9463 ; 08 + dw Unkn_f9468 ; 09 + dw Unkn_f946d ; 0a + dw Unkn_f9472 ; 0b + dw Unkn_f9477 ; 0c + dw Unkn_f947c ; 0d + dw Unkn_f9481 ; 0e + dw Unkn_f9486 ; 0f + dw Unkn_f948b ; 10 + dw Unkn_f9494 ; 11 + dw Unkn_f9499 ; 12 + dw Unkn_f949e ; 13 + dw Unkn_f94fb ; 14 + dw Unkn_f94a1 ; 15 + dw Unkn_f94b0 ; 16 + dw Unkn_f94bf ; 17 + dw Unkn_f94ce ; 18 + dw Unkn_f94dd ; 19 + dw Unkn_f94ec ; 1a + dw Unkn_f94fe ; 1b + +Unkn_f943d: + frame $00, 32 + endanim + +Unkn_f9440: + frame $01, 8 + frame $02, 8 + dorestart + +Unkn_f9445: + frame $03, 8 + frame $04, 8 + dorestart + +Unkn_f944a: + frame $05, 8 + frame $06, 8 + dorestart + +Unkn_f944f: + frame $07, 8 + frame $08, 8 + dorestart + +Unkn_f9454: + frame $09, 8 + frame $0a, 8 + dorestart + +Unkn_f9459: + frame $0b, 8 + frame $0c, 8 + dorestart + +Unkn_f945e: + frame $0d, 8 + frame $0e, 8 + dorestart + +Unkn_f9463: + frame $01, 8, OAM_HFLIP, OAM_VFLIP + frame $02, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9468: + frame $03, 8, OAM_HFLIP, OAM_VFLIP + frame $04, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f946d: + frame $05, 8, OAM_HFLIP, OAM_VFLIP + frame $06, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9472: + frame $07, 8, OAM_HFLIP, OAM_VFLIP + frame $08, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9477: + frame $09, 8, OAM_HFLIP, OAM_VFLIP + frame $0a, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f947c: + frame $0b, 8, OAM_HFLIP, OAM_VFLIP + frame $0c, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9481: + frame $0d, 8, OAM_HFLIP, OAM_VFLIP + frame $0e, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9486: + frame $11, 7 + frame $12, 7 + dorestart + +Unkn_f948b: + frame $13, 2 + frame $14, 2 + dorepeat 8 + frame $15, 2 + endanim + +Unkn_f9494: + frame $16, 32 + frame $16, 32 + delanim + +Unkn_f9499: + frame $17, 32 + frame $17, 32 + delanim + +Unkn_f949e: + frame $18, 32 + endanim + +Unkn_f94a1: + frame $1a, 4 + dorepeat 1 + frame $1a, 3 + dorepeat 1 + frame $1a, 2 + dorepeat 1 + frame $1a, 1 + delanim + +Unkn_f94b0: + frame $1b, 4 + dorepeat 1 + frame $1b, 3 + dorepeat 1 + frame $1b, 2 + dorepeat 1 + frame $1b, 1 + delanim + +Unkn_f94bf: + frame $1c, 4 + dorepeat 1 + frame $1c, 3 + dorepeat 1 + frame $1c, 2 + dorepeat 1 + frame $1c, 1 + delanim + +Unkn_f94ce: + frame $1d, 4 + dorepeat 1 + frame $1d, 3 + dorepeat 1 + frame $1d, 2 + dorepeat 1 + frame $1d, 1 + delanim + +Unkn_f94dd: + frame $1e, 4 + dorepeat 1 + frame $1e, 3 + dorepeat 1 + frame $1e, 2 + dorepeat 1 + frame $1e, 1 + delanim + +Unkn_f94ec: + frame $1f, 4 + dorepeat 1 + frame $1f, 3 + dorepeat 1 + frame $1f, 2 + dorepeat 1 + frame $1f, 1 + delanim + +Unkn_f94fb: + frame $19, 1 + delanim + +Unkn_f94fe: + frame $20, 7 + frame $21, 7 + frame $22, 7 + frame $23, 7 + dorestart + +SurfingPikachuOAMData: + dbw $00, .Frame0 + dbw $00, .Frame1 + dbw $36, .Frame2 + dbw $03, .Frame3 + dbw $39, .Frame4 + dbw $06, .Frame5 + dbw $3c, .Frame6 + dbw $09, .Frame7 + dbw $60, .Frame8 + dbw $0c, .Frame9 + dbw $63, .Frame10 + dbw $30, .Frame11 + dbw $66, .Frame12 + dbw $33, .Frame13 + dbw $69, .Frame14 + dbw $6c, .Frame15 + dbw $9c, .Frame16 + dbw $a0, .Frame17 + dbw $a3, .Frame18 + dbw $a7, .Frame19 + dbw $a8, .Frame20 + dbw $98, .Frame21 + dbw $e0, .Frame22 + dbw $e6, .Frame23 + dbw $ca, .Frame24 + dbw $a7, .Frame25 + dbw $00, .Frame26 + dbw $00, .Frame27 + dbw $00, .Frame28 + dbw $00, .Frame29 + dbw $00, .Frame30 + dbw $00, .Frame31 + dbw $80, .Frame32 + dbw $84, .Frame33 + dbw $88, .Frame34 + dbw $8c, .Frame35 + +.Frame0: + db 1 + db $fc, $fc, $00, $00 + +.Frame1: +.Frame2: +.Frame3: +.Frame4: +.Frame5: +.Frame6: +.Frame7: +.Frame8: +.Frame9: +.Frame10: +.Frame11: +.Frame12: +.Frame13: +.Frame14: +.Frame15: +.Frame16: +.Frame17: +.Frame18: + db 9 + db $f4, $f4, $00, $00 + db $f4, $fc, $01, $00 + db $f4, $04, $02, $00 + db $fc, $f4, $10, $00 + db $fc, $fc, $11, $00 + db $fc, $04, $12, $00 + db $04, $f4, $20, $00 + db $04, $fc, $21, $00 + db $04, $04, $22, $00 + +.Frame22: +.Frame23: +.Frame24: + db 12 + db $f8, $e8, $00, $00 + db $f8, $f0, $01, $00 + db $f8, $f8, $02, $00 + db $f8, $00, $03, $00 + db $f8, $08, $04, $00 + db $f8, $10, $05, $00 + db $00, $e8, $10, $00 + db $00, $f0, $11, $00 + db $00, $f8, $12, $00 + db $00, $00, $13, $00 + db $00, $08, $14, $00 + db $00, $10, $15, $00 + +.Frame25: + db 3 + db $fc, $0b, $00, $10 + db $04, $03, $0f, $10 + db $04, $0b, $10, $10 + +.Frame19: + db 6 + db $fc, $f0, $00, $30 + db $fc, $08, $00, $10 + db $04, $f0, $10, $30 + db $04, $f8, $0f, $30 + db $04, $00, $0f, $10 + db $04, $08, $10, $10 + +.Frame20: + db 12 + db $f4, $f0, $00, $10 + db $f4, $f8, $01, $10 + db $f4, $00, $01, $30 + db $f4, $08, $00, $30 + db $fc, $f0, $10, $10 + db $fc, $f8, $11, $10 + db $fc, $00, $11, $30 + db $fc, $08, $10, $30 + db $04, $f0, $20, $10 + db $04, $f8, $21, $10 + db $04, $00, $21, $30 + db $04, $08, $20, $30 + +.Frame21: + db 3 + db $04, $f4, $00, $00 + db $04, $fc, $01, $00 + db $04, $04, $02, $00 + +.Frame26: + db 3 + db $fc, $f4, $bf, $00 + db $fc, $fc, $d5, $00 + db $fc, $04, $d0, $00 + +.Frame27: + db 4 + db $fc, $f0, $bf, $00 + db $fc, $f8, $d1, $00 + db $fc, $00, $d5, $00 + db $fc, $08, $d0, $00 + +.Frame28: + db 4 + db $fc, $f0, $bf, $00 + db $fc, $f8, $d3, $00 + db $fc, $00, $d5, $00 + db $fc, $08, $d0, $00 + +.Frame29: + db 4 + db $fc, $f0, $bf, $00 + db $fc, $f8, $d7, $00 + db $fc, $00, $d5, $00 + db $fc, $08, $d0, $00 + +.Frame30: + db 4 + db $fc, $f0, $bf, $00 + db $fc, $f8, $d1, $00 + db $fc, $00, $d8, $00 + db $fc, $08, $d0, $00 + +.Frame31: + db 4 + db $fc, $f0, $bf, $00 + db $fc, $f8, $d5, $00 + db $fc, $00, $d0, $00 + db $fc, $08, $d0, $00 + +.Frame32: +.Frame33: +.Frame34: +.Frame35: + db 12 + db $f4, $f0, $03, $20 + db $f4, $f8, $02, $20 + db $f4, $00, $01, $20 + db $f4, $08, $00, $20 + db $fc, $f0, $13, $20 + db $fc, $f8, $12, $20 + db $fc, $00, $11, $20 + db $fc, $08, $10, $20 + db $04, $f0, $23, $20 + db $04, $f8, $22, $20 + db $04, $00, $21, $20 + db $04, $08, $20, $20 diff --git a/data/animated_objects_3e_2.asm b/data/animated_objects_3e_2.asm new file mode 100755 index 00000000..4e9f5b3c --- /dev/null +++ b/data/animated_objects_3e_2.asm @@ -0,0 +1,236 @@ +YellowIntro_AnimatedObjectFramesData: + dw Unkn_fa100 + dw Unkn_fa103 + dw Unkn_fa10a + dw Unkn_fa111 + dw Unkn_fa118 + dw Unkn_fa11b + dw Unkn_fa11e + dw Unkn_fa121 + dw Unkn_fa124 + dw Unkn_fa127 + dw Unkn_fa138 + +Unkn_fa100: + frame $00, 32 + endanim + +Unkn_fa103: + frame $01, 4 + frame $02, 4 + frame $03, 4 + dorestart + +Unkn_fa10a: + frame $04, 4 + frame $05, 4 + frame $06, 4 + dorestart + +Unkn_fa111: + frame $07, 4 + frame $08, 4 + frame $09, 4 + dorestart + +Unkn_fa118: + frame $0a, 32 + endanim + +Unkn_fa11b: + frame $0b, 32 + endanim + +Unkn_fa11e: + frame $0c, 32 + endanim + +Unkn_fa121: + frame $0d, 32 + endanim + +Unkn_fa124: + frame $0e, 32 + endanim + +Unkn_fa127: + frame $0f, 31 + frame $11, 2 + frame $0f, 2 + frame $11, 2 + frame $0f, 31 + frame $11, 2 + frame $0f, 23 + frame $10, 32 + endanim + +Unkn_fa138: + frame $12, 4 + frame $13, 4 + dorestart + +YellowIntro_AnimatedObjectOAMData: + dbw $00, Unkn_fa179 + dbw $96, Unkn_fa17e + dbw $98, Unkn_fa17e + dbw $9a, Unkn_fa17e + dbw $0c, Unkn_fa18f + dbw $0e, Unkn_fa18f + dbw $3c, Unkn_fa18f + dbw $60, Unkn_fa1b0 + dbw $70, Unkn_fa1b0 + dbw $80, Unkn_fa1b0 + dbw $90, Unkn_fa201 + dbw $00, Unkn_fa201 + dbw $06, Unkn_fa201 + dbw $c6, Unkn_fa292 + dbw $6d, Unkn_fa2f7 + dbw $f0, Unkn_fa308 + dbw $f4, Unkn_fa308 + dbw $f8, Unkn_fa308 + dbw $9c, Unkn_fa329 + dbw $ec, Unkn_fa329 + +Unkn_fa179: + db 1 + db $fc, $fc, $00, $00 +Unkn_fa17e: + db 4 + db $f8, $f8, $00, $00 + db $f8, $00, $01, $00 + db $00, $f8, $10, $00 + db $00, $00, $11, $00 + +Unkn_fa18f: + db 8 + db $f0, $f8, $00, $00 + db $f0, $00, $01, $00 + db $f8, $f8, $10, $00 + db $f8, $00, $11, $00 + db $00, $f8, $20, $00 + db $00, $00, $20, $20 + db $08, $f8, $21, $00 + db $08, $00, $21, $20 + +Unkn_fa1b0: + db 20 + db $e8, $f8, $00, $00 + db $e8, $00, $01, $00 + db $f0, $f8, $02, $00 + db $f0, $00, $03, $00 + db $f8, $f0, $04, $00 + db $f8, $f8, $05, $00 + db $f8, $00, $06, $00 + db $f8, $08, $04, $20 + db $00, $f0, $07, $00 + db $00, $f8, $08, $00 + db $00, $00, $08, $20 + db $00, $08, $07, $20 + db $08, $f0, $09, $00 + db $08, $f8, $0a, $00 + db $08, $00, $0a, $20 + db $08, $08, $09, $20 + db $10, $f0, $0b, $00 + db $10, $f8, $0c, $00 + db $10, $00, $0c, $20 + db $10, $08, $0b, $20 + +Unkn_fa201: + db 36 + db $e8, $e8, $00, $00 + db $e8, $f0, $01, $00 + db $e8, $f8, $02, $00 + db $e8, $00, $03, $00 + db $e8, $08, $04, $00 + db $e8, $10, $05, $00 + db $f0, $e8, $10, $00 + db $f0, $f0, $11, $00 + db $f0, $f8, $12, $00 + db $f0, $00, $13, $00 + db $f0, $08, $14, $00 + db $f0, $10, $15, $00 + db $f8, $e8, $20, $00 + db $f8, $f0, $21, $00 + db $f8, $f8, $22, $00 + db $f8, $00, $23, $00 + db $f8, $08, $24, $00 + db $f8, $10, $25, $00 + db $00, $e8, $30, $00 + db $00, $f0, $31, $00 + db $00, $f8, $32, $00 + db $00, $00, $33, $00 + db $00, $08, $34, $00 + db $00, $10, $35, $00 + db $08, $e8, $40, $00 + db $08, $f0, $41, $00 + db $08, $f8, $42, $00 + db $08, $00, $43, $00 + db $08, $08, $44, $00 + db $08, $10, $45, $00 + db $10, $e8, $50, $00 + db $10, $f0, $51, $00 + db $10, $f8, $52, $00 + db $10, $00, $53, $00 + db $10, $08, $54, $00 + db $10, $10, $55, $00 + +Unkn_fa292: + db 25 + db $ec, $f0, $00, $00 + db $ec, $f8, $01, $00 + db $ec, $00, $02, $00 + db $ec, $08, $03, $00 + db $ec, $10, $04, $00 + db $f4, $f0, $05, $00 + db $f4, $f8, $06, $00 + db $f4, $00, $07, $00 + db $f4, $08, $08, $00 + db $f4, $10, $09, $00 + db $fc, $f0, $10, $00 + db $fc, $f8, $11, $00 + db $fc, $00, $12, $00 + db $fc, $08, $13, $00 + db $fc, $10, $14, $00 + db $04, $f0, $15, $00 + db $04, $f8, $16, $00 + db $04, $00, $17, $00 + db $04, $08, $18, $00 + db $04, $10, $19, $00 + db $0c, $f0, $20, $00 + db $0c, $f8, $21, $00 + db $0c, $00, $22, $00 + db $0c, $08, $23, $00 + db $0c, $10, $24, $00 + +Unkn_fa2f7: + db 4 + db $fc, $f0, $00, $00 + db $fc, $f8, $01, $00 + db $fc, $00, $01, $20 + db $fc, $08, $00, $20 + +Unkn_fa308: + db 8 + db $f8, $e8, $00, $10 + db $f8, $f0, $01, $10 + db $00, $e8, $02, $10 + db $00, $f0, $03, $10 + db $f8, $08, $01, $30 + db $f8, $10, $00, $30 + db $00, $08, $03, $30 + db $00, $10, $02, $30 + +Unkn_fa329: + db 12 + db $f8, $d8, $00, $10 + db $f8, $e0, $01, $10 + db $f8, $e8, $02, $10 + db $00, $d8, $10, $10 + db $00, $e0, $11, $10 + db $00, $e8, $12, $10 + db $f8, $10, $02, $30 + db $f8, $18, $01, $30 + db $f8, $20, $00, $30 + db $00, $10, $12, $30 + db $00, $18, $11, $30 + db $00, $20, $10, $30 diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm index 98385d47..dd73ff8d 100644 --- a/data/battle_anims/special_effects.asm +++ b/data/battle_anims/special_effects.asm @@ -18,7 +18,7 @@ AnimationIdSpecialEffects: anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks anim_special_effect REFLECT, AnimationFlashScreen anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects - anim_special_effect SPORE, AnimationFlashScreen + anim_special_effect SPORE, FlashScreenEveryFourFrameBlocks anim_special_effect EXPLOSION, DoExplodeSpecialEffects anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon diff --git a/data/bg_map_attributes.asm b/data/bg_map_attributes.asm new file mode 100644 index 00000000..81535e72 --- /dev/null +++ b/data/bg_map_attributes.asm @@ -0,0 +1,506 @@ +BGMapAttributes_Unknown1: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_Unknown2: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_GameFreakIntro: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$01,$01,$01,$02,$02,$00,$00,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$01,$01,$01,$02,$02,$00,$00,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$01,$01,$01,$02,$02,$00,$00,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_TrainerCard: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$00,$00,$03,$03,$00,$00,$00,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$01,$01,$00,$00,$03,$03,$00,$01,$01,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$02,$02,$00,$00,$03,$03,$00,$00,$02,$02,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$02,$02,$00,$00,$03,$03,$00,$00,$02,$02,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_PartyMenu: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_NidorinoIntro: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_TitleScreen: + db $23 + dw $024d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 +; vBGMap1 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_Slots: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_Pokedex: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_StatusScreen: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_Battle: + db $23 + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_WholeScreen: + db $3f + dw $000d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + +BGMapAttributes_Unknown13: + db $23 + dw $024d + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$03,$03,$03,$03,$03,$03,$03,$03,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 +; vBGMap1 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index 23142f9f..15212048 100755 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -14,3 +14,7 @@ CreditsMons: db VILEPLUME db NIDOKING db PARASECT + +rept 9 + db GENGAR +endr diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index f8454e91..c2b5e523 100755 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -2,39 +2,36 @@ CreditsOrder: ; subsequent credits elements will be displayed on separate lines. ; CRED_TEXT, CRED_TEXT_FADE, CRED_TEXT_MON, and CRED_TEXT_FADE_MON are ; commands that are used to go to the next set of credits texts. - db CRED_MON, CRED_VERSION, CRED_TEXT_FADE_MON + db CRED_POKEMON, CRED_VERSION, CRED_TEXT_FADE_MON db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON - db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, CRED_TEXT_FADE - db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, CRED_TEXT_MON - db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON - db CRED_MUSIC, CRED_MASUDE, CRED_TEXT_FADE - db CRED_SOUND_EFFECTS, CRED_MASUDE, CRED_TEXT_MON - db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_TEXT_FADE_MON - db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, CRED_TEXT_FADE - db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, CRED_TEXT_MON - db CRED_GAME_SCENE, CRED_TAJIRI, CRED_TEXT_FADE - db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, CRED_TEXT_MON - db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, CRED_TEXT_FADE_MON - db CRED_MAP, CRED_TAJIRI, CRED_NISINO, CRED_TEXT_FADE - db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, CRED_TEXT_MON - db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, CRED_TEXT_FADE - db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, CRED_TEXT_MON - db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, CRED_TEXT_FADE - db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, CRED_TEXT - db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, CRED_TEXT_MON - db CRED_PRODUCERS, CRED_MIYAMOTO, CRED_TEXT_FADE - db CRED_PRODUCERS, CRED_KAWAGUCHI, CRED_TEXT - db CRED_PRODUCERS, CRED_ISHIHARA, CRED_TEXT_MON - db CRED_US_STAFF, CRED_TEXT_FADE - db CRED_US_COORD, CRED_TILDEN, CRED_TEXT_FADE - db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_TEXT - db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, CRED_TEXT - db CRED_TRANS, CRED_OGASAWARA, CRED_TEXT_FADE - db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE - db CRED_SPECIAL, CRED_IWATA, CRED_TEXT_FADE - db CRED_SPECIAL, CRED_HARADA, CRED_TEXT - db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_OOTA, CRED_MORIMOTO, CRED_WATANABE, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_MASUDA, CRED_TAMADA, CRED_TEXT_MON + db CRED_CHARACTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON + db CRED_MUSIC, CRED_MASUDA, CRED_TEXT_FADE + db CRED_SOUND_EFFECTS, CRED_MASUDA, CRED_WATANABE, CRED_TEXT_MON + db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_TEXT_FADE_MON + db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_YOSHIDA, CRED_TEXT_FADE_MON + db CRED_GAME_SCENARIO, CRED_TAJIRI, CRED_TEXT_FADE + db CRED_GAME_SCENARIO, CRED_MATSUMITA, CRED_TEXT_MON + db CRED_PARAMETRIC_DESIGN, CRED_NISHINO, CRED_TEXT_FADE_MON + db CRED_MAP_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_SEYA, CRED_TEXT_FADE_MON + db CRED_TESTING, CRED_SEKINE, CRED_SEYA, CRED_TEXT_FADE + db CRED_TESTING, CRED_SHIMAMURA, CRED_SHIMOYAMADA, CRED_TEXT_MON + db CRED_SPECIAL_THANKS, CRED_SHOGAKUKAN, CRED_TEXT_FADE_MON + db CRED_PIKACHU_VOICE, CRED_OOTANI, CRED_TEXT_FADE_MON db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE - db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON + db CRED_PRODUCER, CRED_KAWAGUCHI, CRED_TEXT + db CRED_PRODUCER, CRED_ISHIHARA, CRED_TEXT_MON + db CRED_U_S_STAFF, CRED_TEXT_FADE + db CRED_U_S_COORD, CRED_TILDEN, CRED_TEXT_FADE + db CRED_U_S_COORD, CRED_KAWAKAMI, CRED_NAKAMURA2, CRED_TEXT + db CRED_U_S_COORD, CRED_SHOEMAKE, CRED_OSBORNE, CRED_TEXT + db CRED_TRANSLATION, CRED_OGASAWARA, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE + db CRED_CHARACTER_DESIGN, CRED_HOSOKAWA, CRED_TEXT_FADE + db CRED_SPECIAL_THANKS, CRED_OKUBO, CRED_HARADA2, CRED_TEXT_FADE + db CRED_SPECIAL_THANKS, CRED_NAKAMICHI, CRED_YOSHIMURA, CRED_YAMAZAKI, CRED_TEXT + db CRED_TESTING, CRED_PAAD, CRED_SUPER_MARIO_CLUB2, CRED_TEXT_FADE + db CRED_EXECUTIVE_PRODUCER, CRED_YAMAUCHI, CRED_TEXT_FADE_MON db CRED_COPYRIGHT, CRED_TEXT_FADE_MON db CRED_THE_END diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index ded7f5d6..766690df 100755 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -1,200 +1,265 @@ CreditsTextPointers: ; entries correspond to CRED_* constants - dw CredVersion - dw CredTajiri - dw CredTaOota - dw CredMorimoto - dw CredWatanabe - dw CredMasuda - dw CredNisino - dw CredSugimori - dw CredNishida - dw CredMiyamoto - dw CredKawaguchi - dw CredIshihara - dw CredYamauchi - dw CredZinnai - dw CredHishida - dw CredSakai - dw CredYamaguchi - dw CredYamamoto - dw CredTaniguchi - dw CredNonomura - dw CredFuziwara - dw CredMatsusima - dw CredTomisawa - dw CredKawamoto - dw CredKakei - dw CredTsuchiya - dw CredTaNakamura - dw CredYuda - dw CredMon - dw CredDirector - dw CredProgrammers - dw CredCharDesign - dw CredMusic - dw CredSoundEffects - dw CredGameDesign - dw CredMonsterDesign - dw CredGameScene - dw CredParam - dw CredMap - dw CredTest - dw CredSpecial - dw CredProducers - dw CredProducer - dw CredExecutive - dw CredTamada - dw CredSaOota - dw CredYoshikawa - dw CredToOota - dw CredUSStaff - dw CredUSCoord - dw CredTilden - dw CredKawakami - dw CredHiNakamura - dw CredGiese - dw CredOsborne - dw CredTrans - dw CredOgasawara - dw CredIwata - dw CredIzushi - dw CredHarada - dw CredMurakawa - dw CredFukui - dw CredClub - dw CredPAAD + dw CreditsText_Version + dw CreditsText_Tajiri + dw CreditsText_Oota + dw CreditsText_Morimoto + dw CreditsText_Watanabe + dw CreditsText_Masuda + dw CreditsText_Nishino + dw CreditsText_Sugimori + dw CreditsText_Nishida + dw CreditsText_Miyamoto + dw CreditsText_Kawaguchi + dw CreditsText_Ishihara + dw CreditsText_Yamauchi + dw CreditsText_Zinnai + dw CreditsText_Hishida + dw CreditsText_Sakai + dw CreditsText_Yamaguchi + dw CreditsText_Yamamoto + dw CreditsText_Taniguchi + dw CreditsText_Nonomura + dw CreditsText_Fuziwara + dw CreditsText_Matsusima + dw CreditsText_Tomisawa + dw CreditsText_Kawamoto + dw CreditsText_Kakei + dw CreditsText_Tsuchiya + dw CreditsText_Nakamura + dw CreditsText_Yuda + dw CreditsText_Pokemon + dw CreditsText_Director + dw CreditsText_Programmers + dw CreditsText_CharacterDesign + dw CreditsText_Music + dw CreditsText_SoundEffects + dw CreditsText_GameDesign + dw CreditsText_MonsterDesign + dw CreditsText_GameScenario + dw CreditsText_ParametricDesign + dw CreditsText_MapDesign + dw CreditsText_Testing + dw CreditsText_SpecialThanks + dw CreditsText_Producer + dw CreditsText_ExecutiveProducer + dw CreditsText_Tamada + dw CreditsText_Oota2 + dw CreditsText_Yoshikawa + dw CreditsText_Oota23 + dw CreditsText_Yoshida + dw CreditsText_Matsumita + dw CreditsText_Seya + dw CreditsText_Sekine + dw CreditsText_Shimamura + dw CreditsText_Shimoyamada + dw CreditsText_SuperMarioClub + dw CreditsText_Izushi + dw CreditsText_Nomura + dw CreditsText_Harada + dw CreditsText_Yamagami + dw CreditsText_Nishimura + dw CreditsText_Saeki + dw CreditsText_Fuzii + dw CreditsText_Shogakukan + dw CreditsText_Ootani + dw CreditsText_PikachuVoice + dw CreditsText_USStaff + dw CreditsText_USCoord + dw CreditsText_Tilden + dw CreditsText_Kawakami + dw CreditsText_Nakamura2 + dw CreditsText_Shoemake + dw CreditsText_Osborne + dw CreditsText_Translation + dw CreditsText_Ogasawara + dw CreditsText_Iwata + dw CreditsText_Izushi2 + dw CreditsText_Harada2 + dw CreditsText_Murakawa + dw CreditsText_Fukui + dw CreditsText_SuperMarioClub2 + dw CreditsText_Paad + dw CreditsText_Producers + dw CreditsText_Hosokawa + dw CreditsText_Okubo + dw CreditsText_Nakamichi + dw CreditsText_Yoshimura + dw CreditsText_Yamazaki -CredVersion: ; this 1 byte difference makes all bank addresses offset by 1 in the blue version -IF DEF(_RED) - db -8, "RED VERSION STAFF@" -ENDC -IF DEF(_BLUE) - db -8, "BLUE VERSION STAFF@" -ENDC -CredTajiri: +CreditsText_Version: + db -6, "YELLOW VERSION" + next " STAFF@" +CreditsText_Tajiri: db -6, "SATOSHI TAJIRI@" -CredTaOota: +CreditsText_Oota: db -6, "TAKENORI OOTA@" -CredMorimoto: +CreditsText_Morimoto: db -7, "SHIGEKI MORIMOTO@" -CredWatanabe: +CreditsText_Watanabe: db -7, "TETSUYA WATANABE@" -CredMasuda: +CreditsText_Masuda: db -6, "JUNICHI MASUDA@" -CredNisino: - db -5, "KOHJI NISINO@" -CredSugimori: +CreditsText_Nishino: + db -5, "KOHJI NISHINO@" +CreditsText_Sugimori: db -5, "KEN SUGIMORI@" -CredNishida: +CreditsText_Nishida: db -6, "ATSUKO NISHIDA@" -CredMiyamoto: +CreditsText_Miyamoto: db -7, "SHIGERU MIYAMOTO@" -CredKawaguchi: +CreditsText_Kawaguchi: db -8, "TAKASHI KAWAGUCHI@" -CredIshihara: +CreditsText_Ishihara: db -8, "TSUNEKAZU ISHIHARA@" -CredYamauchi: +CreditsText_Yamauchi: db -7, "HIROSHI YAMAUCHI@" -CredZinnai: +CreditsText_Zinnai: db -7, "HIROYUKI ZINNAI@" -CredHishida: +CreditsText_Hishida: db -7, "TATSUYA HISHIDA@" -CredSakai: +CreditsText_Sakai: db -6, "YASUHIRO SAKAI@" -CredYamaguchi: +CreditsText_Yamaguchi: db -7, "WATARU YAMAGUCHI@" -CredYamamoto: +CreditsText_Yamamoto: db -8, "KAZUYUKI YAMAMOTO@" -CredTaniguchi: +CreditsText_Taniguchi: db -8, "RYOHSUKE TANIGUCHI@" -CredNonomura: +CreditsText_Nonomura: db -8, "FUMIHIRO NONOMURA@" -CredFuziwara: +CreditsText_Fuziwara: db -7, "MOTOFUMI FUZIWARA@" -CredMatsusima: +CreditsText_Matsusima: db -7, "KENJI MATSUSIMA@" -CredTomisawa: +CreditsText_Tomisawa: db -7, "AKIHITO TOMISAWA@" -CredKawamoto: +CreditsText_Kawamoto: db -7, "HIROSHI KAWAMOTO@" -CredKakei: +CreditsText_Kakei: db -6, "AKIYOSHI KAKEI@" -CredTsuchiya: +CreditsText_Tsuchiya: db -7, "KAZUKI TSUCHIYA@" -CredTaNakamura: +CreditsText_Nakamura: db -6, "TAKEO NAKAMURA@" -CredYuda: +CreditsText_Yuda: db -6, "MASAMITSU YUDA@" -CredMon: +CreditsText_Pokemon: db -3, "#MON@" -CredDirector: +CreditsText_Director: db -3, "DIRECTOR@" -CredProgrammers: +CreditsText_Programmers: db -5, "PROGRAMMERS@" -CredCharDesign: +CreditsText_CharacterDesign: db -7, "CHARACTER DESIGN@" -CredMusic: +CreditsText_Music: db -2, "MUSIC@" -CredSoundEffects: +CreditsText_SoundEffects: db -6, "SOUND EFFECTS@" -CredGameDesign: +CreditsText_GameDesign: db -5, "GAME DESIGN@" -CredMonsterDesign: +CreditsText_MonsterDesign: db -6, "MONSTER DESIGN@" -CredGameScene: +CreditsText_GameScenario: db -6, "GAME SCENARIO@" -CredParam: - db -8, "PARAMETRIC DESIGN@" -CredMap: +CreditsText_ParametricDesign: + db -7, "PARAMETRIC DESIGN@" +CreditsText_MapDesign: db -4, "MAP DESIGN@" -CredTest: - db -7, "PRODUCT TESTING@" -CredSpecial: +CreditsText_Testing: + db -6, "PRODUCT TESTING@" +CreditsText_SpecialThanks: db -6, "SPECIAL THANKS@" -CredProducers: +CreditsText_Producers: db -4, "PRODUCERS@" -CredProducer: - db -4, "PRODUCER@" -CredExecutive: +CreditsText_Producer: + db -3, "PRODUCER@" +CreditsText_ExecutiveProducer: db -8, "EXECUTIVE PRODUCER@" -CredTamada: +CreditsText_Tamada: db -6, "SOUSUKE TAMADA@" -CredSaOota: +CreditsText_Oota2: db -5, "SATOSHI OOTA@" -CredYoshikawa: +CreditsText_Yoshikawa: db -6, "RENA YOSHIKAWA@" -CredToOota: +CreditsText_Oota23: db -6, "TOMOMICHI OOTA@" -CredUSStaff: +CreditsText_Matsumita: + db -8, "TOSHINOBU MATSUMIYA@" +CreditsText_Seya: + db -5, "NOBUHIRO SEYA@" +CreditsText_Yoshida: + db -7, "HIRONOBU YOSHIDA@" +CreditsText_Sekine: + db -6, "KAZUHITO SEKINE@" +CreditsText_Shimamura: + db -7, "KAZUSHI SHIMAMURA@" +CreditsText_Shimoyamada: + db -9, "TERUYUKI SHIMOYAMADA@" +CreditsText_SuperMarioClub: + db -9, "NCL SUPER MARIO CLUB@" +CreditsText_Izushi: + db -7, "TAKEHIRO IZUSHI@" +CreditsText_Nomura: + db -5, "FUZIKO NOMURA@" +CreditsText_Harada: + db -6, "TAKAHIRO HARADA@" +CreditsText_Yamagami: + db -7, "HITOSHI YAMAGAMI@" +CreditsText_Nishimura: + db -8, "KENTAROU NISHIMURA@" +CreditsText_Saeki: + db -5, "NAOKO SAEKI@" +CreditsText_Fuzii: + db -5, "TAKAYA FUZII@" +CreditsText_Shogakukan: + db -4, "SHOGAKUKAN" + next "PRODUCTION@" +CreditsText_Ootani: + db -5, "IKUE OOTANI@" +CreditsText_PikachuVoice: + db -6, "PIKACHU VOICE@" + + db -3, "××××××××@" +CreditsText_USStaff: db -7, "US VERSION STAFF@" -CredUSCoord: +CreditsText_USCoord: db -7, "US COORDINATION@" -CredTilden: +CreditsText_Tilden: db -5, "GAIL TILDEN@" -CredKawakami: +CreditsText_Kawakami: db -6, "NAOKO KAWAKAMI@" -CredHiNakamura: +CreditsText_Nakamura2: db -6, "HIRO NAKAMURA@" -CredGiese: - db -6, "WILLIAM GIESE@" -CredOsborne: +CreditsText_Shoemake: + db -6, "RANDY SHOEMAKE@" +CreditsText_Osborne: db -5, "SARA OSBORNE@" -CredTrans: +CreditsText_Translation: db -7, "TEXT TRANSLATION@" -CredOgasawara: +CreditsText_Ogasawara: db -6, "NOB OGASAWARA@" -CredIwata: +CreditsText_Iwata: db -5, "SATORU IWATA@" -CredIzushi: +CreditsText_Izushi2: db -7, "TAKEHIRO IZUSHI@" -CredHarada: +CreditsText_Harada2: db -7, "TAKAHIRO HARADA@" -CredMurakawa: +CreditsText_Murakawa: db -7, "TERUKI MURAKAWA@" -CredFukui: +CreditsText_Fukui: db -5, "KOHTA FUKUI@" -CredClub: +CreditsText_SuperMarioClub2: db -9, "NCL SUPER MARIO CLUB@" -CredPAAD: +CreditsText_Paad: db -5, "PAAD TESTING@" +CreditsText_Hosokawa: + db -8, "TAKEHIKO HOSOKAWA@" +CreditsText_Okubo: + db -5, "KENJI OKUBO@" +CreditsText_Nakamichi: + db -7, "KIMIKO NAKAMICHI@" +CreditsText_Yoshimura: + db -6, "KAMON YOSHIMURA@" +CreditsText_Yamazaki: + db -6, "SAKAE YAMAZAKI@" diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm index 2e7eeb2a..f597a26d 100644 --- a/data/events/bench_guys.asm +++ b/data/events/bench_guys.asm @@ -5,16 +5,19 @@ ENDM BenchGuyTextPointers: ; map id, player facing direction, predef text - bench_guy_text VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT, ViridianCityPokecenterBenchGuyText - bench_guy_text PEWTER_POKECENTER, SPRITE_FACING_LEFT, PewterCityPokecenterBenchGuyText - bench_guy_text CERULEAN_POKECENTER, SPRITE_FACING_LEFT, CeruleanCityPokecenterBenchGuyText - bench_guy_text LAVENDER_POKECENTER, SPRITE_FACING_LEFT, LavenderCityPokecenterBenchGuyText - bench_guy_text VERMILION_POKECENTER, SPRITE_FACING_LEFT, VermilionCityPokecenterBenchGuyText - bench_guy_text CELADON_POKECENTER, SPRITE_FACING_LEFT, CeladonCityPokecenterBenchGuyText - bench_guy_text CELADON_HOTEL, SPRITE_FACING_LEFT, CeladonCityHotelText - bench_guy_text FUCHSIA_POKECENTER, SPRITE_FACING_LEFT, FuchsiaCityPokecenterBenchGuyText - bench_guy_text CINNABAR_POKECENTER, SPRITE_FACING_LEFT, CinnabarIslandPokecenterBenchGuyText - bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText - bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText - bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText + bench_guy_text VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT, ViridianCityPokecenterBenchGuyText + bench_guy_text PEWTER_POKECENTER, SPRITE_FACING_LEFT, PewterCityPokecenterBenchGuyText + bench_guy_text CERULEAN_POKECENTER, SPRITE_FACING_LEFT, CeruleanCityPokecenterBenchGuyText + bench_guy_text LAVENDER_POKECENTER, SPRITE_FACING_LEFT, LavenderCityPokecenterBenchGuyText + bench_guy_text VERMILION_POKECENTER, SPRITE_FACING_LEFT, VermilionCityPokecenterBenchGuyText + bench_guy_text CELADON_POKECENTER, SPRITE_FACING_LEFT, CeladonCityPokecenterBenchGuyText + bench_guy_text CELADON_HOTEL, SPRITE_FACING_LEFT, CeladonCityHotelText + bench_guy_text FUCHSIA_POKECENTER, SPRITE_FACING_LEFT, FuchsiaCityPokecenterBenchGuyText + bench_guy_text CINNABAR_POKECENTER, SPRITE_FACING_LEFT, CinnabarIslandPokecenterBenchGuyText + bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText + bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText + bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText + bench_guy_text SAFARI_ZONE_WEST_REST_HOUSE, SPRITE_FACING_LEFT, UnusedBenchGuyText1 + bench_guy_text SAFARI_ZONE_EAST_REST_HOUSE, SPRITE_FACING_LEFT, UnusedBenchGuyText2 + bench_guy_text SAFARI_ZONE_NORTH_REST_HOUSE, SPRITE_FACING_LEFT, UnusedBenchGuyText3 db -1 ; end diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 115f53aa..5705feed 100755 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -4,58 +4,59 @@ ENDM HiddenItemCoords: ; map id, x, y + hidden_item SILPH_CO_5F, 12, 3 + hidden_item SILPH_CO_9F, 2, 15 + hidden_item POKEMON_MANSION_3F, 1, 9 + hidden_item POKEMON_MANSION_B1F, 1, 9 + hidden_item SAFARI_ZONE_WEST, 6, 5 + hidden_item CERULEAN_CAVE_2F, 16, 13 + hidden_item CERULEAN_CAVE_B1F, 8, 14 + hidden_item UNUSED_MAP_6F, 14, 11 + hidden_item SEAFOAM_ISLANDS_B2F, 15, 15 + hidden_item SEAFOAM_ISLANDS_B3F, 9, 16 + hidden_item SEAFOAM_ISLANDS_B4F, 25, 17 hidden_item VIRIDIAN_FOREST, 1, 18 hidden_item VIRIDIAN_FOREST, 16, 42 hidden_item MT_MOON_B2F, 18, 12 - hidden_item ROUTE_25, 38, 3 - hidden_item ROUTE_9, 14, 7 - hidden_item SS_ANNE_KITCHEN, 13, 9 + hidden_item MT_MOON_B2F, 33, 9 hidden_item SS_ANNE_B1F_ROOMS, 3, 1 - hidden_item ROUTE_10, 9, 17 - hidden_item ROUTE_10, 16, 53 + hidden_item SS_ANNE_KITCHEN, 13, 9 + hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 3, 4 + hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 4, 34 + hidden_item UNDERGROUND_PATH_WEST_EAST, 12, 2 + hidden_item UNDERGROUND_PATH_WEST_EAST, 21, 5 hidden_item ROCKET_HIDEOUT_B1F, 21, 15 hidden_item ROCKET_HIDEOUT_B3F, 27, 17 hidden_item ROCKET_HIDEOUT_B4F, 25, 1 - hidden_item POKEMON_TOWER_5F, 4, 12 - hidden_item ROUTE_13, 1, 14 - hidden_item ROUTE_13, 16, 13 - hidden_item POKEMON_MANSION_B1F, 1, 9 - hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible - hidden_item SAFARI_ZONE_WEST, 6, 5 - hidden_item SILPH_CO_5F, 12, 3 - hidden_item SILPH_CO_9F, 2, 15 - hidden_item COPYCATS_HOUSE_2F, 1, 1 - hidden_item CERULEAN_CAVE_1F, 14, 11 - hidden_item CERULEAN_CAVE_B1F, 27, 3 + hidden_item ROUTE_10, 9, 17 + hidden_item ROUTE_10, 16, 53 hidden_item POWER_PLANT, 17, 16 hidden_item POWER_PLANT, 12, 1 - hidden_item SEAFOAM_ISLANDS_B2F, 15, 15 - hidden_item SEAFOAM_ISLANDS_B4F, 25, 17 - hidden_item POKEMON_MANSION_1F, 8, 16 - hidden_item POKEMON_MANSION_3F, 1, 9 - hidden_item ROUTE_23, 9, 44 - hidden_item ROUTE_23, 19, 70 - hidden_item ROUTE_23, 8, 90 - hidden_item VICTORY_ROAD_2F, 5, 2 - hidden_item VICTORY_ROAD_2F, 26, 7 - hidden_item UNUSED_MAP_6F, 14, 11 - hidden_item VIRIDIAN_CITY, 14, 4 hidden_item ROUTE_11, 48, 5 hidden_item ROUTE_12, 2, 63 + hidden_item ROUTE_13, 1, 14 + hidden_item ROUTE_13, 16, 13 hidden_item ROUTE_17, 15, 14 hidden_item ROUTE_17, 8, 45 hidden_item ROUTE_17, 17, 72 hidden_item ROUTE_17, 4, 91 hidden_item ROUTE_17, 8, 121 - hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 3, 4 - hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 4, 34 - hidden_item UNDERGROUND_PATH_WEST_EAST, 12, 2 - hidden_item UNDERGROUND_PATH_WEST_EAST, 21, 5 - hidden_item CELADON_CITY, 48, 15 + hidden_item ROUTE_23, 9, 44 + hidden_item ROUTE_23, 19, 70 + hidden_item ROUTE_23, 8, 90 + hidden_item VICTORY_ROAD_2F, 5, 2 + hidden_item VICTORY_ROAD_2F, 26, 7 + hidden_item ROUTE_25, 38, 3 hidden_item ROUTE_25, 10, 1 - hidden_item MT_MOON_B2F, 33, 9 - hidden_item SEAFOAM_ISLANDS_B3F, 9, 16 - hidden_item VERMILION_CITY, 14, 11 - hidden_item CERULEAN_CITY, 15, 8 hidden_item ROUTE_4, 40, 3 + hidden_item ROUTE_9, 14, 7 + hidden_item COPYCATS_HOUSE_2F, 1, 1 + hidden_item VIRIDIAN_CITY, 14, 4 + hidden_item CERULEAN_CITY, 15, 8 + hidden_item CERULEAN_CAVE_1F, 18, 7 + hidden_item POKEMON_TOWER_5F, 4, 12 + hidden_item VERMILION_CITY, 14, 11 + hidden_item CELADON_CITY, 48, 15 + hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible + hidden_item POKEMON_MANSION_1F, 8, 16 db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index efb99026..2afd1275 100755 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -1,178 +1,86 @@ HiddenObjectMaps: - db REDS_HOUSE_2F - db BLUES_HOUSE - db OAKS_LAB - db VIRIDIAN_POKECENTER - db VIRIDIAN_MART - db VIRIDIAN_SCHOOL_HOUSE - db VIRIDIAN_GYM - db MUSEUM_1F - db PEWTER_GYM - db PEWTER_MART - db PEWTER_POKECENTER - db CERULEAN_POKECENTER - db CERULEAN_GYM - db CERULEAN_MART - db LAVENDER_POKECENTER - db VERMILION_POKECENTER - db VERMILION_GYM - db CELADON_MANSION_2F - db CELADON_POKECENTER - db CELADON_GYM - db GAME_CORNER - db CELADON_HOTEL - db FUCHSIA_POKECENTER - db FUCHSIA_GYM - db CINNABAR_GYM - db CINNABAR_POKECENTER - db SAFFRON_GYM - db MT_MOON_POKECENTER - db ROCK_TUNNEL_POKECENTER - db TRADE_CENTER - db COLOSSEUM - db VIRIDIAN_FOREST - db MT_MOON_B2F - db INDIGO_PLATEAU - db ROUTE_25 - db ROUTE_9 - db SS_ANNE_KITCHEN - db SS_ANNE_B1F_ROOMS - db ROCKET_HIDEOUT_B1F - db ROCKET_HIDEOUT_B3F - db ROCKET_HIDEOUT_B4F - db SAFFRON_POKECENTER - db POKEMON_TOWER_5F - db ROUTE_13 - db SAFARI_ZONE_GATE - db SAFARI_ZONE_WEST - db SILPH_CO_5F - db SILPH_CO_9F - db COPYCATS_HOUSE_2F - db CERULEAN_CAVE_1F - db CERULEAN_CAVE_B1F - db POWER_PLANT - db SEAFOAM_ISLANDS_B2F - db SEAFOAM_ISLANDS_B4F - db POKEMON_MANSION_1F - db POKEMON_MANSION_3F - db ROUTE_23 - db VICTORY_ROAD_2F - db UNUSED_MAP_6F - db BILLS_HOUSE - db VIRIDIAN_CITY - db SAFARI_ZONE_WEST_REST_HOUSE - db SAFARI_ZONE_EAST_REST_HOUSE - db SAFARI_ZONE_NORTH_REST_HOUSE - db ROUTE_15_GATE_2F - db MR_FUJIS_HOUSE - db CELADON_MANSION_ROOF_HOUSE - db FIGHTING_DOJO - db ROUTE_10 - db INDIGO_PLATEAU_LOBBY - db CINNABAR_LAB_FOSSIL_ROOM - db BIKE_SHOP - db ROUTE_11 - db ROUTE_12 - db POKEMON_MANSION_2F - db POKEMON_MANSION_B1F - db SILPH_CO_11F - db ROUTE_17 - db UNDERGROUND_PATH_NORTH_SOUTH - db UNDERGROUND_PATH_WEST_EAST - db CELADON_CITY - db SEAFOAM_ISLANDS_B3F - db VERMILION_CITY - db CERULEAN_CITY - db ROUTE_4 - db -1 ; end - -HiddenObjectPointers: -; each of these pointers is for the corresponding map in HiddenObjectMaps - dw RedsHouse2FHiddenObjects - dw BluesHouseHiddenObjects - dw OaksLabHiddenObjects - dw ViridianPokecenterHiddenObjects - dw ViridianMartHiddenObjects - dw ViridianSchoolHiddenObjects - dw ViridianGymHiddenObjects - dw Museum1FHiddenObjects - dw PewterGymHiddenObjects - dw PewterMartHiddenObjects - dw PewterPokecenterHiddenObjects - dw CeruleanPokecenterHiddenObjects - dw CeruleanGymHiddenObjects - dw CeruleanMartHiddenObjects - dw LavenderPokecenterHiddenObjects - dw VermilionPokecenterHiddenObjects - dw VermilionGymHiddenObjects - dw CeladonMansion2HiddenObjects - dw CeladonPokecenterHiddenObjects - dw CeladonGymHiddenObjects - dw GameCornerHiddenObjects - dw CeladonHotelHiddenObjects - dw FuchsiaPokecenterHiddenObjects - dw FuchsiaGymHiddenObjects - dw CinnabarGymHiddenObjects - dw CinnabarPokecenterHiddenObjects - dw SaffronGymHiddenObjects - dw MtMoonPokecenterHiddenObjects - dw RockTunnelPokecenterHiddenObjects - dw TradeCenterHiddenObjects - dw ColosseumHiddenObjects - dw ViridianForestHiddenObjects - dw MtMoon3HiddenObjects - dw IndigoPlateauHiddenObjects - dw Route25HiddenObjects - dw Route9HiddenObjects - dw SSAnne6HiddenObjects - dw SSAnne10HiddenObjects - dw RocketHideout1HiddenObjects - dw RocketHideout3HiddenObjects - dw RocketHideout4HiddenObjects - dw SaffronPokecenterHiddenObjects - dw PokemonTower5HiddenObjects - dw Route13HiddenObjects - dw SafariZoneEntranceHiddenObjects - dw SafariZoneWestHiddenObjects - dw SilphCo5FHiddenObjects - dw SilphCo9FHiddenObjects - dw CopycatsHouse2FHiddenObjects - dw CeruleanCave1HiddenObjects - dw CeruleanCave3HiddenObjects - dw PowerPlantHiddenObjects - dw SeafoamIslands3HiddenObjects - dw SeafoamIslands5HiddenObjects - dw Mansion1HiddenObjects - dw Mansion3HiddenObjects - dw Route23HiddenObjects - dw VictoryRoad2HiddenObjects - dw Unused6FHiddenObjects - dw BillsHouseHiddenObjects - dw ViridianCityHiddenObjects - dw SafariZoneRestHouse2HiddenObjects - dw SafariZoneRestHouse3HiddenObjects - dw SafariZoneRestHouse4HiddenObjects - dw Route15GateUpstairsHiddenObjects - dw LavenderHouse1HiddenObjects - dw CeladonMansion5HiddenObjects - dw FightingDojoHiddenObjects - dw Route10HiddenObjects - dw IndigoPlateauLobbyHiddenObjects - dw CinnabarLab4HiddenObjects - dw BikeShopHiddenObjects - dw Route11HiddenObjects - dw Route12HiddenObjects - dw Mansion2HiddenObjects - dw Mansion4HiddenObjects - dw SilphCo11FHiddenObjects - dw Route17HiddenObjects - dw UndergroundPathNsHiddenObjects - dw UndergroundPathWeHiddenObjects - dw CeladonCityHiddenObjects - dw SeafoamIslands4HiddenObjects - dw VermilionCityHiddenObjects - dw CeruleanCityHiddenObjects - dw Route4HiddenObjects + dbw SILPH_CO_11F, SilphCo11FHiddenObjects + dbw SILPH_CO_5F, SilphCo5FHiddenObjects + dbw SILPH_CO_9F, SilphCo9FHiddenObjects + dbw POKEMON_MANSION_2F, Mansion2HiddenObjects + dbw POKEMON_MANSION_3F, Mansion3HiddenObjects + dbw POKEMON_MANSION_B1F, Mansion4HiddenObjects + dbw SAFARI_ZONE_WEST, SafariZoneWestHiddenObjects + dbw CERULEAN_CAVE_2F, CeruleanCave2HiddenObjects + dbw CERULEAN_CAVE_B1F, CeruleanCave3HiddenObjects + dbw UNUSED_MAP_6F, UnusedMap6FHiddenObjects + dbw SEAFOAM_ISLANDS_B2F, SeafoamIslands3HiddenObjects + dbw SEAFOAM_ISLANDS_B3F, SeafoamIslands4HiddenObjects + dbw SEAFOAM_ISLANDS_B4F, SeafoamIslands5HiddenObjects + dbw VIRIDIAN_FOREST, ViridianForestHiddenObjects + dbw MT_MOON_B2F, MtMoon3HiddenObjects + dbw SS_ANNE_B1F_ROOMS, SSAnne10HiddenObjects + dbw SS_ANNE_KITCHEN, SSAnne6HiddenObjects + dbw UNDERGROUND_PATH_NORTH_SOUTH, UndergroundPathNsHiddenObjects + dbw UNDERGROUND_PATH_WEST_EAST, UndergroundPathWeHiddenObjects + dbw ROCKET_HIDEOUT_B1F, RocketHideout1HiddenObjects + dbw ROCKET_HIDEOUT_B3F, RocketHideout3HiddenObjects + dbw ROCKET_HIDEOUT_B4F, RocketHideout4HiddenObjects + dbw ROUTE_10, Route10HiddenObjects + dbw ROCK_TUNNEL_POKECENTER, RockTunnelPokecenterHiddenObjects + dbw POWER_PLANT, PowerPlantHiddenObjects + dbw ROUTE_11, Route11HiddenObjects + dbw ROUTE_12, Route12HiddenObjects + dbw ROUTE_13, Route13HiddenObjects + dbw ROUTE_15_GATE_2F, Route15Gate2FHiddenObjects + dbw ROUTE_17, Route17HiddenObjects + dbw ROUTE_23, Route23HiddenObjects + dbw VICTORY_ROAD_2F, VictoryRoad2HiddenObjects + dbw ROUTE_25, Route25HiddenObjects + dbw BILLS_HOUSE, BillsHouseHiddenObjects + dbw ROUTE_4, Route4HiddenObjects + dbw MT_MOON_POKECENTER, MtMoonPokecenterHiddenObjects + dbw ROUTE_9, Route9HiddenObjects + dbw TRADE_CENTER, TradeCenterHiddenObjects + dbw COLOSSEUM, ColosseumHiddenObjects + dbw INDIGO_PLATEAU, IndigoPlateauHiddenObjects + dbw INDIGO_PLATEAU_LOBBY, IndigoPlateauLobbyHiddenObjects + dbw COPYCATS_HOUSE_2F, CopycatsHouse2FHiddenObjects + dbw FIGHTING_DOJO, FightingDojoHiddenObjects + dbw SAFFRON_GYM, SaffronGymHiddenObjects + dbw SAFFRON_POKECENTER, SaffronPokecenterHiddenObjects + dbw REDS_HOUSE_2F, RedsHouse2FHiddenObjects + dbw BLUES_HOUSE, BluesHouseHiddenObjects + dbw OAKS_LAB, OaksLabHiddenObjects + dbw VIRIDIAN_CITY, ViridianCityHiddenObjects + dbw VIRIDIAN_POKECENTER, ViridianPokecenterHiddenObjects + dbw VIRIDIAN_SCHOOL_HOUSE, ViridianSchoolHiddenObjects + dbw VIRIDIAN_GYM, ViridianGymHiddenObjects + dbw MUSEUM_1F, Museum1FHiddenObjects + dbw PEWTER_GYM, PewterGymHiddenObjects + dbw PEWTER_POKECENTER, PewterPokecenterHiddenObjects + dbw CERULEAN_CITY, CeruleanCityHiddenObjects + dbw CERULEAN_POKECENTER, CeruleanPokecenterHiddenObjects + dbw CERULEAN_GYM, CeruleanGymHiddenObjects + dbw BIKE_SHOP, BikeShopHiddenObjects + dbw CERULEAN_CAVE_1F, CeruleanCave1HiddenObjects + dbw LAVENDER_POKECENTER, LavenderPokecenterHiddenObjects + dbw POKEMON_TOWER_5F, Pokemontower5HiddenObjects + dbw MR_FUJIS_HOUSE, LavenderHouse1HiddenObjects + dbw VERMILION_CITY, VermilionCityHiddenObjects + dbw VERMILION_POKECENTER, VermilionPokecenterHiddenObjects + dbw POKEMON_FAN_CLUB, PokemonFanClubHiddenObjects + dbw VERMILION_GYM, VermilionGymHiddenObjects + dbw CELADON_CITY, CeladonCityHiddenObjects + dbw CELADON_HOTEL, CeladonHotelHiddenObjects + dbw CELADON_MANSION_2F, CeladonMansion2HiddenObjects + dbw CELADON_MANSION_ROOF_HOUSE, CeladonMansion5HiddenObjects + dbw CELADON_POKECENTER, CeladonPokecenterHiddenObjects + dbw CELADON_GYM, CeladonGymHiddenObjects + dbw GAME_CORNER, GameCornerHiddenObjects + dbw FUCHSIA_POKECENTER, FuchsiaPokecenterHiddenObjects + dbw SAFARI_ZONE_GATE, SafariZoneEntranceHiddenObjects + dbw FUCHSIA_GYM, FuchsiaGymHiddenObjects + dbw POKEMON_MANSION_1F, Mansion1HiddenObjects + dbw CINNABAR_GYM, CinnabarGymHiddenObjects + dbw CINNABAR_LAB_FOSSIL_ROOM, CinnabarLab4HiddenObjects + dbw CINNABAR_POKECENTER, CinnabarPokecenterHiddenObjects + db -1 ; end hidden_object: MACRO db \2 ; y coord @@ -193,6 +101,176 @@ ENDM ; from interacting with them in any direction. ANY_FACING EQU $d0 +SilphCo11FHiddenObjects: + hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +SilphCo5FHiddenObjects: + hidden_object 12, 3, ELIXER, HiddenItems + db -1 ; end + +SilphCo9FHiddenObjects: + hidden_object 2, 15, MAX_POTION, HiddenItems + db -1 ; end + +Mansion2HiddenObjects: + hidden_object 2, 11, SPRITE_FACING_UP, Mansion2Script_Switches + db -1 ; end + +Mansion3HiddenObjects: + hidden_object 1, 9, MAX_REVIVE, HiddenItems + hidden_object 10, 5, SPRITE_FACING_UP, Mansion3Script_Switches + db -1 ; end + +Mansion4HiddenObjects: + hidden_object 1, 9, RARE_CANDY, HiddenItems + hidden_object 20, 3, SPRITE_FACING_UP, Mansion4Script_Switches + hidden_object 18, 25, SPRITE_FACING_UP, Mansion4Script_Switches + db -1 ; end + +SafariZoneWestHiddenObjects: + hidden_object 6, 5, REVIVE, HiddenItems + db -1 ; end + +CeruleanCave2HiddenObjects: + hidden_object 16, 13, PP_UP, HiddenItems + db -1 ; end + +CeruleanCave3HiddenObjects: + hidden_object 8, 14, PP_UP, HiddenItems + db -1 ; end + +UnusedMap6FHiddenObjects: + hidden_object 14, 11, MAX_ELIXER, HiddenItems + db -1 ; end + +SeafoamIslands3HiddenObjects: + hidden_object 15, 15, NUGGET, HiddenItems + db -1 ; end + +SeafoamIslands4HiddenObjects: + hidden_object 9, 16, MAX_ELIXER, HiddenItems + db -1 ; end + +SeafoamIslands5HiddenObjects: + hidden_object 25, 17, ULTRA_BALL, HiddenItems + db -1 ; end + +ViridianForestHiddenObjects: + hidden_object 1, 18, POTION, HiddenItems + hidden_object 16, 42, ANTIDOTE, HiddenItems + db -1 ; end + +MtMoon3HiddenObjects: + hidden_object 18, 12, MOON_STONE, HiddenItems + hidden_object 33, 9, ETHER, HiddenItems + db -1 ; end + +SSAnne10HiddenObjects: + hidden_object 3, 1, HYPER_POTION, HiddenItems + db -1 ; end + +SSAnne6HiddenObjects: + hidden_object 13, 5, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 13, 7, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 13, 9, GREAT_BALL, HiddenItems + db -1 ; end + +UndergroundPathNsHiddenObjects: + hidden_object 3, 4, FULL_RESTORE, HiddenItems + hidden_object 4, 34, X_SPECIAL, HiddenItems + db -1 ; end + +UndergroundPathWeHiddenObjects: + hidden_object 12, 2, NUGGET, HiddenItems + hidden_object 21, 5, ELIXER, HiddenItems + db -1 ; end + +RocketHideout1HiddenObjects: + hidden_object 21, 15, PP_UP, HiddenItems + db -1 ; end + +RocketHideout3HiddenObjects: + hidden_object 27, 17, NUGGET, HiddenItems + db -1 ; end + +RocketHideout4HiddenObjects: + hidden_object 25, 1, SUPER_POTION, HiddenItems + db -1 ; end + +Route10HiddenObjects: + hidden_object 9, 17, SUPER_POTION, HiddenItems + hidden_object 16, 53, MAX_ETHER, HiddenItems + db -1 ; end + +RockTunnelPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +PowerPlantHiddenObjects: + hidden_object 17, 16, MAX_ELIXER, HiddenItems + hidden_object 12, 1, PP_UP, HiddenItems + db -1 ; end + +Route11HiddenObjects: + hidden_object 48, 5, ESCAPE_ROPE, HiddenItems + db -1 ; end + +Route12HiddenObjects: + hidden_object 2, 63, HYPER_POTION, HiddenItems + db -1 ; end + +Route13HiddenObjects: + hidden_object 1, 14, PP_UP, HiddenItems + hidden_object 16, 13, CALCIUM, HiddenItems + db -1 ; end + +Route15Gate2FHiddenObjects: + hidden_object 1, 2, SPRITE_FACING_UP, Route15GateLeftBinoculars + db -1 ; end + +Route17HiddenObjects: + hidden_object 15, 14, RARE_CANDY, HiddenItems + hidden_object 8, 45, FULL_RESTORE, HiddenItems + hidden_object 17, 72, PP_UP, HiddenItems + hidden_object 4, 91, MAX_REVIVE, HiddenItems + hidden_object 8, 121, MAX_ELIXER, HiddenItems + db -1 ; end + +Route23HiddenObjects: + hidden_object 9, 44, FULL_RESTORE, HiddenItems + hidden_object 19, 70, ULTRA_BALL, HiddenItems + hidden_object 8, 90, MAX_ETHER, HiddenItems + db -1 ; end + +VictoryRoad2HiddenObjects: + hidden_object 5, 2, ULTRA_BALL, HiddenItems + hidden_object 26, 7, FULL_RESTORE, HiddenItems + db -1 ; end + +Route25HiddenObjects: + hidden_object 38, 3, ETHER, HiddenItems + hidden_object 10, 1, ELIXER, HiddenItems + db -1 ; end + +BillsHouseHiddenObjects: + hidden_object 1, 4, SPRITE_FACING_UP, BillsHousePC + db -1 ; end + +Route4HiddenObjects: + hidden_object 40, 3, GREAT_BALL, HiddenItems + db -1 ; end + +MtMoonPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +Route9HiddenObjects: + hidden_object 14, 7, ETHER, HiddenItems + db -1 ; end + TradeCenterHiddenObjects: hidden_object 5, 4, ANY_FACING, CableClubRightGameboy hidden_object 4, 4, ANY_FACING, CableClubLeftGameboy @@ -203,6 +281,35 @@ ColosseumHiddenObjects: hidden_object 4, 4, ANY_FACING, CableClubLeftGameboy db -1 ; end +IndigoPlateauHiddenObjects: + hidden_object 8, 13, $ff, PrintIndigoPlateauHQText ; inaccessible + hidden_object 11, 13, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText ; inaccessible + db -1 ; end + +IndigoPlateauLobbyHiddenObjects: + hidden_object 15, 7, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CopycatsHouse2FHiddenObjects: + hidden_object 1, 1, NUGGET, HiddenItems + db -1 ; end + +FightingDojoHiddenObjects: + hidden_object 3, 9, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 6, 9, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 4, 0, SPRITE_FACING_UP, PrintFightingDojoText2 + hidden_object 5, 0, SPRITE_FACING_UP, PrintFightingDojoText3 + db -1 ; end + +SaffronGymHiddenObjects: + hidden_object 9, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +SaffronPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + RedsHouse2FHiddenObjects: hidden_object 0, 1, SPRITE_FACING_UP, OpenRedsPC hidden_object 3, 5, ANY_FACING, PrintRedSNESText @@ -221,14 +328,15 @@ OaksLabHiddenObjects: hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText db -1 ; end +ViridianCityHiddenObjects: + hidden_object 14, 4, POTION, HiddenItems + db -1 ; end + ViridianPokecenterHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end -ViridianMartHiddenObjects: - db -1 ; end - ViridianSchoolHiddenObjects: hidden_text_predef 3, 4, ViridianSchoolNotebook, PrintNotebookText hidden_text_predef 3, 0, ViridianSchoolBlackboard, PrintBlackboardLinkCableText @@ -249,14 +357,15 @@ PewterGymHiddenObjects: hidden_object 6, 10, SPRITE_FACING_UP, GymStatues db -1 ; end -PewterMartHiddenObjects: - db -1 ; end - PewterPokecenterHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end +CeruleanCityHiddenObjects: + hidden_object 15, 8, RARE_CANDY, HiddenItems + db -1 ; end + CeruleanPokecenterHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC @@ -267,7 +376,17 @@ CeruleanGymHiddenObjects: hidden_object 6, 11, SPRITE_FACING_UP, GymStatues db -1 ; end -CeruleanMartHiddenObjects: +BikeShopHiddenObjects: + hidden_object 1, 0, ANY_FACING, PrintNewBikeText + hidden_object 2, 1, ANY_FACING, PrintNewBikeText + hidden_object 1, 2, ANY_FACING, PrintNewBikeText + hidden_object 3, 2, ANY_FACING, PrintNewBikeText + hidden_object 0, 4, ANY_FACING, PrintNewBikeText + hidden_object 1, 5, ANY_FACING, PrintNewBikeText + db -1 ; end + +CeruleanCave1HiddenObjects: + hidden_object 18, 7, PP_UP, HiddenItems db -1 ; end LavenderPokecenterHiddenObjects: @@ -275,11 +394,30 @@ LavenderPokecenterHiddenObjects: hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end +Pokemontower5HiddenObjects: + hidden_object 4, 12, ELIXER, HiddenItems + db -1 ; end + +LavenderHouse1HiddenObjects: + hidden_object 0, 1, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 1, 1, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 7, 1, SPRITE_FACING_DOWN, PrintMagazinesText + db -1 ; end + +VermilionCityHiddenObjects: + hidden_object 14, 11, MAX_ETHER, HiddenItems + db -1 ; end + VermilionPokecenterHiddenObjects: hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText db -1 ; end +PokemonFanClubHiddenObjects: + hidden_object 1, 0, SPRITE_FACING_UP, FanClubPicture1 + hidden_object 6, 0, SPRITE_FACING_UP, FanClubPicture2 + db -1 ; end + VermilionGymHiddenObjects: hidden_object 3, 14, SPRITE_FACING_UP, GymStatues hidden_object 6, 14, SPRITE_FACING_UP, GymStatues @@ -302,10 +440,24 @@ VermilionGymHiddenObjects: hidden_object 9, 11, 14, GymTrashScript db -1 ; end +CeladonCityHiddenObjects: + hidden_object 48, 15, PP_UP, HiddenItems + db -1 ; end + +CeladonHotelHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + db -1 ; end + CeladonMansion2HiddenObjects: hidden_object 0, 5, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end +CeladonMansion5HiddenObjects: + hidden_text_predef 3, 0, LinkCableHelp, PrintBlackboardLinkCableText + hidden_text_predef 4, 0, LinkCableHelp, PrintBlackboardLinkCableText + hidden_text_predef 3, 4, TMNotebook, PrintNotebookText + db -1 ; end + CeladonPokecenterHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC @@ -367,21 +519,25 @@ GameCornerHiddenObjects: hidden_object 12, 15, COIN+10, HiddenCoins db -1 ; end -CeladonHotelHiddenObjects: - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - db -1 ; end - FuchsiaPokecenterHiddenObjects: hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText db -1 ; end +SafariZoneEntranceHiddenObjects: + hidden_object 10, 1, NUGGET, HiddenItems ; inaccessible + db -1 ; end + FuchsiaGymHiddenObjects: hidden_object 3, 15, SPRITE_FACING_UP, GymStatues hidden_object 6, 15, SPRITE_FACING_UP, GymStatues db -1 ; end +Mansion1HiddenObjects: + hidden_object 8, 16, MOON_STONE, HiddenItems + hidden_object 2, 5, SPRITE_FACING_UP, Mansion1Script_Switches + db -1 ; end + CinnabarGymHiddenObjects: hidden_object 17, 13, SPRITE_FACING_UP, GymStatues ; third param: ([hGymGateAnswer] << 4) | [hGymGateIndex] @@ -393,276 +549,12 @@ CinnabarGymHiddenObjects: hidden_object 1, 7, (TRUE << 4) | 6, PrintCinnabarQuiz db -1 ; end -CinnabarPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -SaffronGymHiddenObjects: - hidden_object 9, 15, SPRITE_FACING_UP, GymStatues - db -1 ; end - -MtMoonPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -RockTunnelPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -ViridianForestHiddenObjects: - hidden_object 1, 18, POTION, HiddenItems - hidden_object 16, 42, ANTIDOTE, HiddenItems - db -1 ; end - -MtMoon3HiddenObjects: - hidden_object 18, 12, MOON_STONE, HiddenItems - hidden_object 33, 9, ETHER, HiddenItems - db -1 ; end - -IndigoPlateauHiddenObjects: - hidden_object 8, 13, $ff, PrintIndigoPlateauHQText ; inaccessible - hidden_object 11, 13, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText ; inaccessible - db -1 ; end - -Route25HiddenObjects: - hidden_object 38, 3, ETHER, HiddenItems - hidden_object 10, 1, ELIXER, HiddenItems - db -1 ; end - -Route9HiddenObjects: - hidden_object 14, 7, ETHER, HiddenItems - db -1 ; end - -SSAnne6HiddenObjects: - hidden_object 13, 5, SPRITE_FACING_DOWN, PrintTrashText - hidden_object 13, 7, SPRITE_FACING_DOWN, PrintTrashText - hidden_object 13, 9, GREAT_BALL, HiddenItems - db -1 ; end - -SSAnne10HiddenObjects: - hidden_object 3, 1, HYPER_POTION, HiddenItems - db -1 ; end - -Route10HiddenObjects: - hidden_object 9, 17, SUPER_POTION, HiddenItems - hidden_object 16, 53, MAX_ETHER, HiddenItems - db -1 ; end - -RocketHideout1HiddenObjects: - hidden_object 21, 15, PP_UP, HiddenItems - db -1 ; end - -RocketHideout3HiddenObjects: - hidden_object 27, 17, NUGGET, HiddenItems - db -1 ; end - -RocketHideout4HiddenObjects: - hidden_object 25, 1, SUPER_POTION, HiddenItems - db -1 ; end - -SaffronPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -PokemonTower5HiddenObjects: - hidden_object 4, 12, ELIXER, HiddenItems - db -1 ; end - -Route13HiddenObjects: - hidden_object 1, 14, PP_UP, HiddenItems - hidden_object 16, 13, CALCIUM, HiddenItems - db -1 ; end - -SafariZoneEntranceHiddenObjects: - hidden_object 10, 1, NUGGET, HiddenItems ; inaccessible - db -1 ; end - -SafariZoneWestHiddenObjects: - hidden_object 6, 5, REVIVE, HiddenItems - db -1 ; end - -SilphCo5FHiddenObjects: - hidden_object 12, 3, ELIXER, HiddenItems - db -1 ; end - -SilphCo9FHiddenObjects: - hidden_object 2, 15, MAX_POTION, HiddenItems - db -1 ; end - -CopycatsHouse2FHiddenObjects: - hidden_object 1, 1, NUGGET, HiddenItems - db -1 ; end - -CeruleanCave1HiddenObjects: - hidden_object 14, 11, RARE_CANDY, HiddenItems - db -1 ; end - -CeruleanCave3HiddenObjects: - hidden_object 27, 3, ULTRA_BALL, HiddenItems - db -1 ; end - -PowerPlantHiddenObjects: - hidden_object 17, 16, MAX_ELIXER, HiddenItems - hidden_object 12, 1, PP_UP, HiddenItems - db -1 ; end - -SeafoamIslands3HiddenObjects: - hidden_object 15, 15, NUGGET, HiddenItems - db -1 ; end - -SeafoamIslands5HiddenObjects: - hidden_object 25, 17, ULTRA_BALL, HiddenItems - db -1 ; end - -Mansion1HiddenObjects: - hidden_object 8, 16, MOON_STONE, HiddenItems - hidden_object 2, 5, SPRITE_FACING_UP, Mansion1Script_Switches - db -1 ; end - -Mansion2HiddenObjects: - hidden_object 2, 11, SPRITE_FACING_UP, Mansion2Script_Switches - db -1 ; end - -Mansion3HiddenObjects: - hidden_object 1, 9, MAX_REVIVE, HiddenItems - hidden_object 10, 5, SPRITE_FACING_UP, Mansion3Script_Switches - db -1 ; end - -Mansion4HiddenObjects: - hidden_object 1, 9, RARE_CANDY, HiddenItems - hidden_object 20, 3, SPRITE_FACING_UP, Mansion4Script_Switches - hidden_object 18, 25, SPRITE_FACING_UP, Mansion4Script_Switches - db -1 ; end - -Route23HiddenObjects: - hidden_object 9, 44, FULL_RESTORE, HiddenItems - hidden_object 19, 70, ULTRA_BALL, HiddenItems - hidden_object 8, 90, MAX_ETHER, HiddenItems - db -1 ; end - -VictoryRoad2HiddenObjects: - hidden_object 5, 2, ULTRA_BALL, HiddenItems - hidden_object 26, 7, FULL_RESTORE, HiddenItems - db -1 ; end - -Unused6FHiddenObjects: - hidden_object 14, 11, MAX_ELIXER, HiddenItems - db -1 ; end - -BillsHouseHiddenObjects: - hidden_object 1, 4, SPRITE_FACING_UP, BillsHousePC - db -1 ; end - -ViridianCityHiddenObjects: - hidden_object 14, 4, POTION, HiddenItems - db -1 ; end - -SafariZoneRestHouse2HiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -SafariZoneRestHouse3HiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -SafariZoneRestHouse4HiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -Route15GateUpstairsHiddenObjects: - hidden_object 1, 2, SPRITE_FACING_UP, Route15GateLeftBinoculars - db -1 ; end - -LavenderHouse1HiddenObjects: - hidden_object 0, 1, SPRITE_FACING_DOWN, PrintMagazinesText - hidden_object 1, 1, SPRITE_FACING_DOWN, PrintMagazinesText - hidden_object 7, 1, SPRITE_FACING_DOWN, PrintMagazinesText - db -1 ; end - -CeladonMansion5HiddenObjects: - hidden_text_predef 3, 0, LinkCableHelp, PrintBlackboardLinkCableText - hidden_text_predef 4, 0, LinkCableHelp, PrintBlackboardLinkCableText - hidden_text_predef 3, 4, TMNotebook, PrintNotebookText - db -1 ; end - -FightingDojoHiddenObjects: - hidden_object 3, 9, SPRITE_FACING_UP, PrintFightingDojoText - hidden_object 6, 9, SPRITE_FACING_UP, PrintFightingDojoText - hidden_object 4, 0, SPRITE_FACING_UP, PrintFightingDojoText2 - hidden_object 5, 0, SPRITE_FACING_UP, PrintFightingDojoText3 - db -1 ; end - -IndigoPlateauLobbyHiddenObjects: - hidden_object 15, 7, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - CinnabarLab4HiddenObjects: hidden_object 0, 4, SPRITE_FACING_UP, OpenPokemonCenterPC hidden_object 2, 4, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end -BikeShopHiddenObjects: - hidden_object 1, 0, ANY_FACING, PrintNewBikeText - hidden_object 2, 1, ANY_FACING, PrintNewBikeText - hidden_object 1, 2, ANY_FACING, PrintNewBikeText - hidden_object 3, 2, ANY_FACING, PrintNewBikeText - hidden_object 0, 4, ANY_FACING, PrintNewBikeText - hidden_object 1, 5, ANY_FACING, PrintNewBikeText - db -1 ; end - -Route11HiddenObjects: - hidden_object 48, 5, ESCAPE_ROPE, HiddenItems - db -1 ; end - -Route12HiddenObjects: - hidden_object 2, 63, HYPER_POTION, HiddenItems - db -1 ; end - -SilphCo11FHiddenObjects: - hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -Route17HiddenObjects: - hidden_object 15, 14, RARE_CANDY, HiddenItems - hidden_object 8, 45, FULL_RESTORE, HiddenItems - hidden_object 17, 72, PP_UP, HiddenItems - hidden_object 4, 91, MAX_REVIVE, HiddenItems - hidden_object 8, 121, MAX_ELIXER, HiddenItems - db -1 ; end - -UndergroundPathNsHiddenObjects: - hidden_object 3, 4, FULL_RESTORE, HiddenItems - hidden_object 4, 34, X_SPECIAL, HiddenItems - db -1 ; end - -UndergroundPathWeHiddenObjects: - hidden_object 12, 2, NUGGET, HiddenItems - hidden_object 21, 5, ELIXER, HiddenItems - db -1 ; end - -CeladonCityHiddenObjects: - hidden_object 48, 15, PP_UP, HiddenItems - db -1 ; end - -SeafoamIslands4HiddenObjects: - hidden_object 9, 16, MAX_ELIXER, HiddenItems - db -1 ; end - -VermilionCityHiddenObjects: - hidden_object 14, 11, MAX_ETHER, HiddenItems - db -1 ; end - -CeruleanCityHiddenObjects: - hidden_object 15, 8, RARE_CANDY, HiddenItems - db -1 ; end - -Route4HiddenObjects: - hidden_object 40, 3, GREAT_BALL, HiddenItems +CinnabarPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end diff --git a/data/events/prize_mon_levels.asm b/data/events/prize_mon_levels.asm index eb30ac80..53a2a966 100755 --- a/data/events/prize_mon_levels.asm +++ b/data/events/prize_mon_levels.asm @@ -1,19 +1,8 @@ PrizeMonLevelDictionary: -IF DEF(_RED) - db ABRA, 9 - db CLEFAIRY, 8 - db NIDORINA, 17 + db ABRA, 15 + db VULPIX, 18 + db WIGGLYTUFF, 22 - db DRATINI, 18 - db SCYTHER, 25 - db PORYGON, 26 -ENDC -IF DEF(_BLUE) - db ABRA, 6 - db CLEFAIRY, 12 - db NIDORINO, 17 - - db PINSIR, 20 - db DRATINI, 24 - db PORYGON, 18 -ENDC + db SCYTHER, 30 + db PINSIR, 30 + db PORYGON, 26 diff --git a/data/events/prizes.asm b/data/events/prizes.asm index 684add94..61d7b5f5 100755 --- a/data/events/prizes.asm +++ b/data/events/prizes.asm @@ -3,55 +3,28 @@ PrizeDifferentMenuPtrs: dw PrizeMenuMon2Entries, PrizeMenuMon2Cost dw PrizeMenuTMsEntries, PrizeMenuTMsCost -NoThanksText: - db "NO THANKS@" - PrizeMenuMon1Entries: db ABRA - db CLEFAIRY -IF DEF(_RED) - db NIDORINA -ENDC -IF DEF(_BLUE) - db NIDORINO -ENDC + db VULPIX + db WIGGLYTUFF db "@" PrizeMenuMon1Cost: -IF DEF(_RED) - coins 180 - coins 500 -ENDC -IF DEF(_BLUE) - coins 120 - coins 750 -ENDC - coins 1200 + coins 230 + coins 1000 + coins 2680 db "@" PrizeMenuMon2Entries: -IF DEF(_RED) - db DRATINI db SCYTHER -ENDC -IF DEF(_BLUE) db PINSIR - db DRATINI -ENDC db PORYGON db "@" PrizeMenuMon2Cost: -IF DEF(_RED) - coins 2800 - coins 5500 - coins 9999 -ENDC -IF DEF(_BLUE) - coins 2500 - coins 4600 coins 6500 -ENDC + coins 6500 + coins 9999 db "@" PrizeMenuTMsEntries: diff --git a/data/events/trades.asm b/data/events/trades.asm index 7018c22f..44f7ec21 100755 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -1,13 +1,13 @@ TradeMons: ; entries correspond to TRADE_FOR_* constants ; give mon, get mon, dialog id, nickname - db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@" - db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" - db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" - db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@" - db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@" - db POLIWHIRL, JYNX, TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@" - db RAICHU, ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@" - db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@" + db LICKITUNG, DUGTRIO, TRADE_DIALOGSET_CASUAL, "GURIO@@@@@@" + db CLEFAIRY, MR_MIME, TRADE_DIALOGSET_CASUAL, "MILES@@@@@@" + db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "STINGER@@@@" + db KANGASKHAN, MUK, TRADE_DIALOGSET_CASUAL, "STICKY@@@@@" + db MEW, MEW, TRADE_DIALOGSET_HAPPY, "BART@@@@@@@" + db TANGELA, PARASECT, TRADE_DIALOGSET_CASUAL, "SPIKE@@@@@@" + db PIDGEOT, PIDGEOT, TRADE_DIALOGSET_POLITE, "MARTY@@@@@@" + db GOLDUCK, RHYDON, TRADE_DIALOGSET_POLITE, "BUFFY@@@@@@" + db GROWLITHE, DEWGONG, TRADE_DIALOGSET_HAPPY, "CEZANNE@@@@" + db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm index 79db936e..9092e1b1 100644 --- a/data/icon_pointers.asm +++ b/data/icon_pointers.asm @@ -20,6 +20,7 @@ MonPartySpritePointers: mon_icon_header SnakeIconFrame1, 1, 1, ICON_SNAKE << 2 + 2 mon_icon_header QuadrupedIconFrame1, 0, 1, ICON_QUADRUPED << 2 mon_icon_header QuadrupedIconFrame1, 1, 1, ICON_QUADRUPED << 2 + 2 + mon_icon_header PikachuSprite, 0, 4, ICON_PIKACHU << 2 mon_icon_header TradeBubbleIconGFX, 0, 4, ICON_TRADEBUBBLE << 2 mon_icon_header MonsterSprite, 0, 4, ICONOFFSET + ICON_MON << 2 mon_icon_header PokeBallSprite, 0, 8, ICONOFFSET + ICON_BALL << 2 @@ -34,4 +35,5 @@ MonPartySpritePointers: mon_icon_header SnakeIconFrame2, 1, 1, ICONOFFSET + ICON_SNAKE << 2 + 2 mon_icon_header QuadrupedIconFrame2, 0, 1, ICONOFFSET + ICON_QUADRUPED << 2 mon_icon_header QuadrupedIconFrame2, 1, 1, ICONOFFSET + ICON_QUADRUPED << 2 + 2 + mon_icon_header PikachuSprite, 12, 4, ICONOFFSET + ICON_PIKACHU << 2 mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2 diff --git a/data/items/marts.asm b/data/items/marts.asm index 80d62931..30eb7d9a 100755 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -3,7 +3,7 @@ ; Viridian ViridianCashierText:: - script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL + script_mart POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL ; Pewter PewterCashierText:: @@ -11,7 +11,7 @@ PewterCashierText:: ; Cerulean CeruleanCashierText:: - script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL + script_mart POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL ; Bike shop script_mart BICYCLE @@ -46,7 +46,7 @@ CeladonMart5Clerk2Text:: ; Fuchsia FuchsiaCashierText:: - script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL + script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL ; unused? script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE diff --git a/data/maps/headers/BeachHouse.asm b/data/maps/headers/BeachHouse.asm new file mode 100644 index 00000000..b1b69e5a --- /dev/null +++ b/data/maps/headers/BeachHouse.asm @@ -0,0 +1,8 @@ +BeachHouse_h: + db BEACH_HOUSE_TILESET + db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) + dw BeachHouse_Blocks ; blocks + dw BeachHouse_TextPointers ; texts + dw BeachHouse_Script ; scripts + db 0 ; connections + dw BeachHouse_Object ; objects diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index fa0599f4..0e26900f 100755 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -65,7 +65,7 @@ MapHSPointers: dw NoHS dw MtMoonB2FHS dw NoHS - dw NoHS + dw CeruleanTradeHouseHS dw NoHS dw NoHS dw NoHS @@ -250,6 +250,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS + dw NoHS ; beach house dw -1 ; end NoHS: @@ -264,6 +265,7 @@ PalletTownHS: ViridianCityHS: db VIRIDIAN_CITY, $05, SHOW db VIRIDIAN_CITY, $07, HIDE + db VIRIDIAN_CITY, $08, HIDE PewterCityHS: db PEWTER_CITY, $03, SHOW db PEWTER_CITY, $05, SHOW @@ -319,21 +321,22 @@ BluesHouseHS: OaksLabHS: db OAKS_LAB, $01, SHOW db OAKS_LAB, $02, SHOW - db OAKS_LAB, $03, SHOW + db OAKS_LAB, $03, HIDE db OAKS_LAB, $04, SHOW - db OAKS_LAB, $05, HIDE - db OAKS_LAB, $06, SHOW - db OAKS_LAB, $07, SHOW - db OAKS_LAB, $08, HIDE + db OAKS_LAB, $05, SHOW + db OAKS_LAB, $06, HIDE ViridianGymHS: db VIRIDIAN_GYM, $01, SHOW db VIRIDIAN_GYM, $0B, SHOW Museum1FHS: db MUSEUM_1F, $05, SHOW +CeruleanTradeHouseHS: ; bulbasaur adoption house + db CERULEAN_TRADE_HOUSE, $02, SHOW CeruleanCaveHS: db CERULEAN_CAVE_1F, $01, SHOW db CERULEAN_CAVE_1F, $02, SHOW db CERULEAN_CAVE_1F, $03, SHOW + db CERULEAN_CAVE_1F, $04, SHOW PokemonTower2FHS: db POKEMON_TOWER_2F, $01, SHOW PokemonTower3FHS: @@ -348,10 +351,9 @@ PokemonTower6FHS: db POKEMON_TOWER_6F, $04, SHOW db POKEMON_TOWER_6F, $05, SHOW PokemonTower7FHS: - db POKEMON_TOWER_7F, $01, SHOW - db POKEMON_TOWER_7F, $02, SHOW + db POKEMON_TOWER_7F, $01, HIDE ; jessie & james? + db POKEMON_TOWER_7F, $02, HIDE db POKEMON_TOWER_7F, $03, SHOW - db POKEMON_TOWER_7F, $04, SHOW MrFujisHouseHS: db MR_FUJIS_HOUSE, $05, HIDE CeladonMansionRoofHouseHS: @@ -395,9 +397,9 @@ BillsHouseHS: db BILLS_HOUSE, $02, HIDE db BILLS_HOUSE, $03, HIDE ViridianForestHS: - db VIRIDIAN_FOREST, $05, SHOW - db VIRIDIAN_FOREST, $06, SHOW db VIRIDIAN_FOREST, $07, SHOW + db VIRIDIAN_FOREST, $08, SHOW + db VIRIDIAN_FOREST, $09, SHOW MtMoon1FHS: db MT_MOON_1F, $08, SHOW db MT_MOON_1F, $09, SHOW @@ -406,10 +408,12 @@ MtMoon1FHS: db MT_MOON_1F, $0C, SHOW db MT_MOON_1F, $0D, SHOW MtMoonB2FHS: - db MT_MOON_B2F, $06, SHOW + db MT_MOON_B2F, $02, HIDE + db MT_MOON_B2F, $06, HIDE db MT_MOON_B2F, $07, SHOW db MT_MOON_B2F, $08, SHOW db MT_MOON_B2F, $09, SHOW + db MT_MOON_B2F, $0A, SHOW SSAnne2FHS: db SS_ANNE_2F, $02, HIDE SSAnne1FRoomsHS: @@ -438,6 +442,8 @@ RocketHideoutB3FHS: db ROCKET_HIDEOUT_B3F, $04, SHOW RocketHideoutB4FHS: db ROCKET_HIDEOUT_B4F, $01, SHOW + db ROCKET_HIDEOUT_B4F, $02, HIDE + db ROCKET_HIDEOUT_B4F, $03, HIDE db ROCKET_HIDEOUT_B4F, $05, SHOW db ROCKET_HIDEOUT_B4F, $06, SHOW db ROCKET_HIDEOUT_B4F, $07, SHOW @@ -502,6 +508,7 @@ SilphCo11FHS: db SILPH_CO_11F, $03, SHOW db SILPH_CO_11F, $04, SHOW db SILPH_CO_11F, $05, SHOW + db SILPH_CO_11F, $06, SHOW UnusedMapF4HS: db UNUSED_MAP_F4, $02, SHOW PokemonMansion2FHS: @@ -534,10 +541,13 @@ CeruleanCave2FHS: db CERULEAN_CAVE_2F, $01, SHOW db CERULEAN_CAVE_2F, $02, SHOW db CERULEAN_CAVE_2F, $03, SHOW + db CERULEAN_CAVE_2F, $04, SHOW CeruleanCaveB1FHS: db CERULEAN_CAVE_B1F, $01, SHOW db CERULEAN_CAVE_B1F, $02, SHOW db CERULEAN_CAVE_B1F, $03, SHOW + db CERULEAN_CAVE_B1F, $04, SHOW + db CERULEAN_CAVE_B1F, $05, SHOW VictoryRoad1FHS: db VICTORY_ROAD_1F, $03, SHOW db VICTORY_ROAD_1F, $04, SHOW @@ -561,4 +571,11 @@ SeafoamIslandsB4FHS: db SEAFOAM_ISLANDS_B4F, $01, HIDE db SEAFOAM_ISLANDS_B4F, $02, HIDE db SEAFOAM_ISLANDS_B4F, $03, SHOW - db $FF, $01, SHOW ; end + +BluesHouseHSCopy: +; doesn't seem to be referenced + db BLUES_HOUSE, $01, SHOW + db BLUES_HOUSE, $02, HIDE + db BLUES_HOUSE, $03, SHOW + + db $FF, $01, SHOW diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index d698cfee..98e5b5f5 100755..100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -248,3 +248,4 @@ MapHeaderBanks:: db BANK(LoreleisRoom_h) db BANK(BrunosRoom_h) db BANK(AgathasRoom_h) + db BANK(BeachHouse_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 9d85eaae..6ea31795 100755..100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -248,3 +248,4 @@ MapHeaderPointers:: dw LoreleisRoom_h dw BrunosRoom_h dw AgathasRoom_h ;247 + dw BeachHouse_h diff --git a/data/maps/objects/BeachHouse.asm b/data/maps/objects/BeachHouse.asm new file mode 100644 index 00000000..1ba99f87 --- /dev/null +++ b/data/maps/objects/BeachHouse.asm @@ -0,0 +1,18 @@ +BeachHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + + def_signs + sign 3, 0, 3 + sign 7, 0, 4 + sign 11, 0, 5 + sign 13, 1, 6 + + def_objects + object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude + object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu + + def_warps_to BEACH_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 4858b785..f4931a47 100755 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -8,7 +8,7 @@ BluesHouse_Object: def_signs def_objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1, 0 ; Daisy, sitting by map object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 65a04a1c..0a298fd0 100755 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -9,8 +9,9 @@ CeladonPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person object SPRITE_BEAUTY, 10, 5, WALK, ANY_DIR, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 7e5e8c85..8c3d260e 100755 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -15,8 +15,9 @@ CeruleanCave1F_Object: def_signs def_objects - object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET + object SPRITE_POKE_BALL, 29, 16, STAY, NONE, 1, RARE_CANDY + object SPRITE_POKE_BALL, 7, 11, STAY, NONE, 2, MAX_ELIXER + object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 18, 3, STAY, NONE, 4, ULTRA_BALL def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 6622bb77..787ae539 100755 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -12,8 +12,9 @@ CeruleanCave2F_Object: def_signs def_objects - object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + object SPRITE_POKE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY + object SPRITE_POKE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 886238c2..3493ab7e 100755 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -8,7 +8,9 @@ CeruleanCaveB1F_Object: def_objects object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 26, 1, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 3, ULTRA_BALL + object SPRITE_POKE_BALL, 3, 13, STAY, NONE, 4, MAX_REVIVE + object SPRITE_POKE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER def_warps_to CERULEAN_CAVE_B1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 9b15c1c5..fae56fc1 100755 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,5 +1,5 @@ CeruleanCity_Object: - db $f ; border block + db $a ; border block def_warps warp 27, 11, 0, CERULEAN_TRASHED_HOUSE @@ -27,11 +27,11 @@ CeruleanCity_Object: object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person object SPRITE_SUPER_NERD, 15, 18, WALK, UP_DOWN, 4 ; person object SPRITE_SUPER_NERD, 9, 21, WALK, LEFT_RIGHT, 5 ; person - object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_OFFICER_JENNY, 28, 12, STAY, DOWN, 6 ; person object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_POKE_BALL, 28, 26, STAY, DOWN, 8 ; person object SPRITE_COOLTRAINER_F, 9, 27, WALK, LEFT_RIGHT, 9 ; person object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person - object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person + object SPRITE_OFFICER_JENNY, 27, 12, STAY, DOWN, 11 ; person def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index af6c0ac3..b90db6a5 100755 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -10,7 +10,8 @@ CeruleanPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_SUPER_NERD, 10, 5, WALK, ANY_DIR, 2 ; person - object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person + object SPRITE_GENTLEMAN, 4, 3, STAY, UP, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 04638ded..a52548fe 100755 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -8,7 +8,9 @@ CeruleanTradeHouse_Object: def_signs def_objects - object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person + object SPRITE_GIRL, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BULBASAUR, 4, 1, STAY, DOWN, 2 ; person + object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person + object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person def_warps_to CERULEAN_TRADE_HOUSE diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index b2dccbd3..a680d3fd 100755 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -8,7 +8,7 @@ CinnabarGym_Object: def_signs def_objects - object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 + object SPRITE_SILPH_PRESIDENT, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index b1d89678..0a2a11aa 100755 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -12,5 +12,6 @@ CinnabarPokecenter_Object: object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to CINNABAR_POKECENTER diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index dac9bc09..dac9bc09 100755..100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index c1250c91..bc635385 100755 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -11,6 +11,6 @@ CopycatsHouse1F_Object: def_objects object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_FAIRY, 1, 4, WALK, UP_DOWN, 3 ; person + object SPRITE_CHANSEY, 1, 4, STAY, NONE, 3 ; person def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index d0230a01..a601a896 100755 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -33,7 +33,7 @@ FuchsiaCity_Object: object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person - object SPRITE_FAIRY, 31, 5, WALK, ANY_DIR, 5 ; person + object SPRITE_CHANSEY, 31, 5, STAY, DOWN, 5 ; person object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person object SPRITE_MONSTER, 12, 6, WALK, LEFT_RIGHT, 7 ; person object SPRITE_MONSTER, 30, 12, WALK, LEFT_RIGHT, 8 ; person diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index a48794ff..95b2e42e 100755 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -8,7 +8,7 @@ FuchsiaGym_Object: def_signs def_objects - object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_SILPH_WORKER, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 54c5952b..4eb9d196 100755 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -9,8 +9,9 @@ FuchsiaPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person + object SPRITE_ROCKER, 4, 3, STAY, UP, 2 ; person object SPRITE_COOLTRAINER_F, 6, 5, WALK, LEFT_RIGHT, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to FUCHSIA_POKECENTER diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 90708941..4e425e86 100755 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -18,8 +18,8 @@ GameCorner_Object: object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_CLERK, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person + object SPRITE_MIDDLE_AGED_MAN, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_FISHING_GURU, 17, 13, STAY, RIGHT, 10 ; person object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 def_warps_to GAME_CORNER diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 3244b4ad..db101be0 100755 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -14,5 +14,6 @@ IndigoPlateauLobby_Object: object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person + object SPRITE_CHANSEY, 8, 5, STAY, DOWN, 6 ; person def_warps_to INDIGO_PLATEAU_LOBBY diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 98975531..667b584f 100755 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -10,7 +10,8 @@ LavenderPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person - object SPRITE_LITTLE_GIRL, 2, 6, WALK, UP_DOWN, 3 ; person + object SPRITE_LITTLE_GIRL, 10, 5, WALK, LEFT_RIGHT, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 7b2e7e5a..b2c1ff1d 100755 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -11,13 +11,14 @@ MtMoonB2F_Object: def_objects object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 + object SPRITE_JESSIE, 9, 3, STAY, LEFT, 2 object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 - object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person - object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person - object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH + object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 1 + object SPRITE_JAMES, 9, 4, STAY, LEFT, 6 + object SPRITE_FOSSIL, 12, 6, STAY, NONE, 7 ; person + object SPRITE_FOSSIL, 13, 6, STAY, NONE, 8 ; person + object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 9, HP_UP + object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 10, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 5648de6e..e94dd27d 100755 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -14,5 +14,6 @@ MtMoonPokecenter_Object: object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, LEFT_RIGHT, 4 ; person object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 7 ; person def_warps_to MT_MOON_POKECENTER diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index e7f3701c..366fc894 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -9,15 +9,13 @@ OaksLab_Object: def_objects object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 - object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person - object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person - object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person - object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person - object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person - object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person - object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person - object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 9 ; person - object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person - object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person + object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 2 ; person + object SPRITE_OAK, 5, 2, STAY, DOWN, 3 ; person + object SPRITE_POKEDEX, 2, 1, STAY, NONE, 4 ; person + object SPRITE_POKEDEX, 3, 1, STAY, NONE, 5 ; person + object SPRITE_OAK, 5, 10, STAY, UP, 6 ; person + object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 7 ; person + object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 8 ; person + object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 9 ; person def_warps_to OAKS_LAB diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index d362b2c9..c84dc921 100755 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -13,7 +13,7 @@ PalletTown_Object: sign 11, 5, 7 ; PalletTownText7 def_objects - object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person + object SPRITE_OAK, 10, 4, STAY, NONE, 1 ; person object SPRITE_GIRL, 3, 8, WALK, ANY_DIR, 2 ; person object SPRITE_FISHER, 11, 14, WALK, ANY_DIR, 3 ; person diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 8d41a155..e9a40d20 100755 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -10,7 +10,9 @@ PewterPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person + object SPRITE_JIGGLYPUFF, 1, 3, STAY, DOWN, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_COOLTRAINER_F, 4, 3, STAY, UP, 5 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 6 ; person def_warps_to PEWTER_POKECENTER diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 19fbb129..eb3e945e 100755 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -6,13 +6,11 @@ PokemonFanClub_Object: warp 3, 7, 1, LAST_MAP def_signs - sign 1, 0, 7 ; FanClubText7 - sign 6, 0, 8 ; FanClubText8 def_objects object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 6d258f0d..e5fe486b 100755 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -7,9 +7,8 @@ PokemonTower7F_Object: def_signs def_objects - object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 - object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 - object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 - object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person + object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1 + object SPRITE_JAMES, 11, 8, STAY, DOWN, 2 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3 def_warps_to POKEMON_TOWER_7F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 4f5a1906..7b99d491 100755 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -9,8 +9,9 @@ RockTunnelPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person object SPRITE_FISHER, 2, 5, STAY, NONE, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 5dcf107f..3541befc 100755 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -10,8 +10,8 @@ RocketHideoutB4F_Object: def_objects object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 - object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 + object SPRITE_JAMES, 25, 10, STAY, DOWN, 2 + object SPRITE_JESSIE, 24, 10, STAY, DOWN, 3 object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index ce7d3490..0814aeb1 100755 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -3,9 +3,9 @@ Route11_Object: def_warps warp 49, 8, 0, ROUTE_11_GATE_1F - warp 49, 9, 1, ROUTE_11_GATE_1F + warp 49, 9, 0, ROUTE_11_GATE_1F warp 58, 8, 2, ROUTE_11_GATE_1F - warp 58, 9, 3, ROUTE_11_GATE_1F + warp 58, 9, 2, ROUTE_11_GATE_1F warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 def_signs diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 22ac15e8..bdb74d68 100755 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -3,7 +3,7 @@ Route12_Object: def_warps warp 10, 15, 0, ROUTE_12_GATE_1F - warp 11, 15, 1, ROUTE_12_GATE_1F + warp 11, 15, 0, ROUTE_12_GATE_1F warp 10, 21, 2, ROUTE_12_GATE_1F warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index d145dbfb..884e1704 100755 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -3,9 +3,9 @@ Route15_Object: def_warps warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 1, ROUTE_15_GATE_1F + warp 7, 9, 0, ROUTE_15_GATE_1F warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 3, ROUTE_15_GATE_1F + warp 14, 9, 2, ROUTE_15_GATE_1F def_signs sign 39, 9, 12 ; Route15Text12 diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index 44e2de01..50a8a4bf 100755 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -3,13 +3,13 @@ Route16_Object: def_warps warp 17, 10, 0, ROUTE_16_GATE_1F - warp 17, 11, 1, ROUTE_16_GATE_1F + warp 17, 11, 0, ROUTE_16_GATE_1F warp 24, 10, 2, ROUTE_16_GATE_1F - warp 24, 11, 3, ROUTE_16_GATE_1F + warp 24, 11, 2, ROUTE_16_GATE_1F warp 17, 4, 4, ROUTE_16_GATE_1F - warp 17, 5, 5, ROUTE_16_GATE_1F + warp 17, 5, 4, ROUTE_16_GATE_1F warp 24, 4, 6, ROUTE_16_GATE_1F - warp 24, 5, 7, ROUTE_16_GATE_1F + warp 24, 5, 6, ROUTE_16_GATE_1F warp 7, 5, 0, ROUTE_16_FLY_HOUSE def_signs diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index eafdf1d0..cbb881fe 100755 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -3,9 +3,9 @@ Route18_Object: def_warps warp 33, 8, 0, ROUTE_18_GATE_1F - warp 33, 9, 1, ROUTE_18_GATE_1F + warp 33, 9, 0, ROUTE_18_GATE_1F warp 40, 8, 2, ROUTE_18_GATE_1F - warp 40, 9, 3, ROUTE_18_GATE_1F + warp 40, 9, 2, ROUTE_18_GATE_1F def_signs sign 43, 7, 4 ; Route18Text4 diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 2fa6fd58..a2080d46 100755 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -9,6 +9,6 @@ Route18Gate2F_Object: sign 6, 2, 3 ; Route18GateUpstairsText3 def_objects - object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_COOK, 4, 2, WALK, LEFT_RIGHT, 1 ; person def_warps_to ROUTE_18_GATE_2F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 224b2cbb..340c48f0 100755 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -2,17 +2,18 @@ Route19_Object: db $43 ; border block def_warps + warp 5, 9, 0, BEACH_HOUSE def_signs - sign 11, 9, 11 ; Route19Text11 + sign 11, 11, 11 def_objects - object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_COOLTRAINER_M, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_COOLTRAINER_M, 9, 7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_COOLTRAINER_M, 12, 9, STAY, LEFT, 2, OPP_SWIMMER, 3 object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 - object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 + object SPRITE_SWIMMER, 9, 13, STAY, DOWN, 6, OPP_SWIMMER, 7 object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 66f9ff1e..e939b0dd 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -8,6 +8,7 @@ Route2_Object: warp 16, 35, 1, ROUTE_2_GATE warp 15, 39, 2, ROUTE_2_GATE warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE + warp 17, 35, 1, ROUTE_2_GATE def_signs sign 5, 65, 3 ; Route2Text3 @@ -21,7 +22,8 @@ Route2_Object: ; unused warp_to 2, 7, 4 - db $12, $c7, $9, $7 + dw $c712 + db $9, $7 warp_to 2, 7, 4 warp_to 2, 7, 4 warp_to 2, 7, 4 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 68593daa..53944c52 100755 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -5,7 +5,7 @@ Route22Gate_Object: warp 4, 7, 0, LAST_MAP warp 5, 7, 0, LAST_MAP warp 4, 0, 0, LAST_MAP - warp 5, 0, 1, LAST_MAP + warp 5, 0, 0, LAST_MAP def_signs diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index d621e2b3..b3cf1298 100755 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -14,5 +14,6 @@ Route24_Object: object SPRITE_COOLTRAINER_F, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 object SPRITE_YOUNGSTER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 object SPRITE_POKE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE + object SPRITE_COOLTRAINER_M, 6, 5, STAY, DOWN, 9 def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 75f4a629..98f76683 100755 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -2,7 +2,7 @@ Route5_Object: db $a ; border block def_warps - warp 10, 29, 3, ROUTE_5_GATE + warp 10, 29, 2, ROUTE_5_GATE warp 9, 29, 2, ROUTE_5_GATE warp 10, 33, 0, ROUTE_5_GATE warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index bafcdf90..f18c66f5 100755 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -11,8 +11,8 @@ Route6_Object: sign 19, 15, 7 ; Route6Text7 def_objects - object SPRITE_COOLTRAINER_M, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object SPRITE_COOLTRAINER_F, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_COOLTRAINER_M, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 10 + object SPRITE_COOLTRAINER_F, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 25 object SPRITE_YOUNGSTER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 object SPRITE_COOLTRAINER_M, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 object SPRITE_COOLTRAINER_F, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index d2346f2c..64b0387f 100755 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -3,9 +3,9 @@ Route7_Object: def_warps warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 3, ROUTE_7_GATE + warp 18, 10, 2, ROUTE_7_GATE warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 1, ROUTE_7_GATE + warp 11, 10, 0, ROUTE_7_GATE warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 def_signs diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 2b165016..85064914 100755 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -4,7 +4,7 @@ Route7Gate_Object: def_warps warp 0, 3, 3, LAST_MAP warp 0, 4, 3, LAST_MAP - warp 5, 3, 0, LAST_MAP + warp 5, 3, 1, LAST_MAP warp 5, 4, 1, LAST_MAP def_signs diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index d375b23e..aaa69ea2 100755 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -3,9 +3,9 @@ Route8_Object: def_warps warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 1, ROUTE_8_GATE + warp 1, 10, 0, ROUTE_8_GATE warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 3, ROUTE_8_GATE + warp 8, 10, 2, ROUTE_8_GATE warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 def_signs diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index f03530b5..64b935da 100755 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -2,9 +2,9 @@ Route8Gate_Object: db $a ; border block def_warps - warp 0, 3, 0, LAST_MAP + warp 0, 3, 1, LAST_MAP warp 0, 4, 1, LAST_MAP - warp 5, 3, 2, LAST_MAP + warp 5, 3, 3, LAST_MAP warp 5, 4, 3, LAST_MAP def_signs diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 8d110629..f67f337b 100755 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -8,7 +8,7 @@ Route9_Object: def_objects object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_YOUNGSTER, 14 object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 object SPRITE_COOLTRAINER_F, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 3a1fc459..afb30af4 100755 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -19,7 +19,7 @@ SSAnne1FRooms_Object: object SPRITE_GIRL, 22, 3, WALK, UP_DOWN, 5 ; person object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_JIGGLYPUFF, 3, 11, STAY, DOWN, 8 ; person object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM object SPRITE_GENTLEMAN, 21, 13, WALK, LEFT_RIGHT, 11 ; person diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index f69b3333..49f94706 100755 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -38,6 +38,5 @@ SaffronCity_Object: object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person - object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 9623440a..8cec0421 100755 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -38,7 +38,7 @@ SaffronGym_Object: def_signs def_objects - object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 + object SPRITE_COOLTRAINER_F, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 object SPRITE_CHANNELER, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index aa6161ca..ab52a72c 100755 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -12,5 +12,6 @@ SaffronPokecenter_Object: object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index 3d92f199..913ca7c7 100755 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -17,7 +17,3 @@ SeafoamIslands1F_Object: object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person def_warps_to SEAFOAM_ISLANDS_1F - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index fd1167f0..dab1144c 100755 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -13,7 +13,8 @@ SilphCo11F_Object: object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 + object SPRITE_JAMES, 2, 8, STAY, UP, 4 object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 + object SPRITE_JESSIE, 3, 8, STAY, UP, 6 def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index ff74a4fa..ff74a4fa 100755..100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 1b989ad7..3ea219c3 100755 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -13,20 +13,21 @@ VermilionCity_Object: warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE def_signs - sign 27, 3, 7 ; VermilionCityText7 - sign 37, 13, 8 ; VermilionCityText8 - sign 24, 13, 9 ; MartSignText - sign 12, 3, 10 ; PokeCenterSignText - sign 7, 13, 11 ; VermilionCityText11 - sign 7, 19, 12 ; VermilionCityText12 - sign 29, 15, 13 ; VermilionCityText13 + sign 27, 3, 8 ; VermilionCityText7 + sign 37, 13, 9 ; VermilionCityText8 + sign 24, 13, 10 ; MartSignText + sign 12, 3, 11 ; PokeCenterSignText + sign 7, 13, 12 ; VermilionCityText11 + sign 7, 19, 13 ; VermilionCityText12 + sign 29, 15, 14 ; VermilionCityText13 def_objects - object SPRITE_BEAUTY, 19, 7, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_COOLTRAINER_F, 19, 7, WALK, LEFT_RIGHT, 1 ; person object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person object SPRITE_MONSTER, 29, 9, WALK, UP_DOWN, 5 ; person object SPRITE_SAILOR, 25, 27, WALK, LEFT_RIGHT, 6 ; person + object SPRITE_OFFICER_JENNY, 19, 15, STAY, NONE, 7 ; person def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index e656b80c..f52bf24e 100755 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -12,5 +12,6 @@ VermilionPokecenter_Object: object SPRITE_FISHING_GURU, 10, 5, STAY, NONE, 2 ; person object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index ec60415f..5eace66e 100755 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -8,6 +8,6 @@ VermilionTradeHouse_Object: def_signs def_objects - object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person + object SPRITE_GENTLEMAN, 3, 5, STAY, UP, 1 ; person def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index c4ee9b69..9e3e30bb 100755 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -9,12 +9,12 @@ ViridianCity_Object: warp 32, 7, 0, VIRIDIAN_GYM def_signs - sign 17, 17, 8 ; ViridianCityText8 - sign 19, 1, 9 ; ViridianCityText9 - sign 21, 29, 10 ; ViridianCityText10 - sign 30, 19, 11 ; MartSignText - sign 24, 25, 12 ; PokeCenterSignText - sign 27, 7, 13 ; ViridianCityText13 + sign 17, 17, 9 ; ViridianCityText8 + sign 19, 1, 10 ; ViridianCityText9 + sign 21, 29, 11 ; ViridianCityText10 + sign 30, 19, 12 ; MartSignText + sign 24, 25, 13 ; PokeCenterSignText + sign 27, 7, 14 ; ViridianCityText13 def_objects object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person @@ -24,5 +24,6 @@ ViridianCity_Object: object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person + object SPRITE_GAMBLER, 18, 9, STAY, NONE, 8 def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 22d0b67a..56d48f6d 100755 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -3,28 +3,30 @@ ViridianForest_Object: def_warps warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE - warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE + warp 2, 0, 2, VIRIDIAN_FOREST_NORTH_GATE warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE def_signs - sign 24, 40, 9 ; ViridianForestText9 - sign 16, 32, 10 ; ViridianForestText10 - sign 26, 17, 11 ; ViridianForestText11 - sign 4, 24, 12 ; ViridianForestText12 - sign 18, 45, 13 ; ViridianForestText13 - sign 2, 1, 14 ; ViridianForestText14 + sign 24, 40, 11 ; ViridianForestText9 + sign 16, 32, 12 ; ViridianForestText10 + sign 26, 17, 13 ; ViridianForestText11 + sign 4, 24, 14 ; ViridianForestText12 + sign 18, 45, 15 ; ViridianForestText13 + sign 2, 1, 16 ; ViridianForestText14 def_objects object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person + object SPRITE_COOLTRAINER_F, 2, 41, STAY, NONE, 5, OPP_LASS, 19 + object SPRITE_YOUNGSTER, 13, 17, STAY, RIGHT, 6, OPP_BUG_CATCHER, 15 + object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 7, POTION + object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 8, POTION + object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 9, POKE_BALL + object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 10 ; person def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 3693e7ec..c73205cd 100755 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -3,7 +3,7 @@ ViridianForestSouthGate_Object: def_warps warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 4, VIRIDIAN_FOREST + warp 5, 0, 3, VIRIDIAN_FOREST warp 4, 7, 5, LAST_MAP warp 5, 7, 5, LAST_MAP diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 889281e1..ef510f72 100755 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -10,7 +10,8 @@ ViridianPokecenter_Object: def_objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 10, 5, WALK, UP_DOWN, 2 ; person - object SPRITE_COOLTRAINER_M, 4, 3, STAY, NONE, 3 ; person + object SPRITE_COOLTRAINER_M, 4, 3, STAY, UP, 3 ; person object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 8f228632..632baaba 100755 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -10,5 +10,6 @@ ViridianSchoolHouse_Object: def_objects object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person object SPRITE_COOLTRAINER_F, 4, 1, STAY, DOWN, 2 ; person + object SPRITE_LITTLE_GIRL, 4, 5, STAY, UP, 3 ; person def_warps_to VIRIDIAN_SCHOOL_HOUSE diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 28e17223..1b043bfa 100755..100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -247,3 +247,4 @@ MapSongBanks:: db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM + db MUSIC_ROUTES3, BANK(Music_Routes3) ; BEACH_HOUSE diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index b2c9371c..cce86d1a 100755 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -61,32 +61,33 @@ SplitMapSpriteSets: SpriteSets: ; sprite set $01 + db SPRITE_PIKACHU db SPRITE_BLUE db SPRITE_YOUNGSTER db SPRITE_GIRL db SPRITE_FISHER db SPRITE_COOLTRAINER_M db SPRITE_GAMBLER - db SPRITE_SEEL db SPRITE_OAK db SPRITE_SWIMMER db SPRITE_POKE_BALL db SPRITE_GAMBLER_ASLEEP ; sprite set $02 + db SPRITE_PIKACHU db SPRITE_YOUNGSTER db SPRITE_ROCKET db SPRITE_SUPER_NERD db SPRITE_HIKER - db SPRITE_MONSTER db SPRITE_BLUE - db SPRITE_GUARD + db SPRITE_OFFICER_JENNY db SPRITE_COOLTRAINER_F db SPRITE_COOLTRAINER_M db SPRITE_POKE_BALL db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $03 + db SPRITE_PIKACHU db SPRITE_LITTLE_GIRL db SPRITE_GIRL db SPRITE_SUPER_NERD @@ -95,17 +96,16 @@ SpriteSets: db SPRITE_MONSTER db SPRITE_COOLTRAINER_F db SPRITE_COOLTRAINER_M - db SPRITE_GUARD db SPRITE_POKE_BALL db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $04 - db SPRITE_BEAUTY + db SPRITE_PIKACHU + db SPRITE_OFFICER_JENNY db SPRITE_SUPER_NERD db SPRITE_YOUNGSTER db SPRITE_GAMBLER db SPRITE_MONSTER - db SPRITE_GUARD db SPRITE_SAILOR db SPRITE_COOLTRAINER_F db SPRITE_COOLTRAINER_M @@ -113,6 +113,7 @@ SpriteSets: db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $05 + db SPRITE_PIKACHU db SPRITE_LITTLE_GIRL db SPRITE_LITTLE_BOY db SPRITE_GIRL @@ -120,13 +121,12 @@ SpriteSets: db SPRITE_MIDDLE_AGED_MAN db SPRITE_GRAMPS db SPRITE_MONSTER - db SPRITE_GUARD db SPRITE_ROCKET db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $06 - db SPRITE_YOUNGSTER + db SPRITE_PIKACHU db SPRITE_GYM_GUIDE db SPRITE_MONSTER db SPRITE_BLUE @@ -139,6 +139,7 @@ SpriteSets: db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $07 + db SPRITE_PIKACHU db SPRITE_ROCKET db SPRITE_SCIENTIST db SPRITE_SILPH_WORKER @@ -147,11 +148,11 @@ SpriteSets: db SPRITE_BIRD db SPRITE_ROCKER db SPRITE_COOLTRAINER_M - db SPRITE_MONSTER db SPRITE_POKE_BALL db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $08 + db SPRITE_PIKACHU db SPRITE_BIKER db SPRITE_SUPER_NERD db SPRITE_MIDDLE_AGED_MAN @@ -160,11 +161,11 @@ SpriteSets: db SPRITE_BEAUTY db SPRITE_FISHER db SPRITE_ROCKER - db SPRITE_MONSTER db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $09 + db SPRITE_PIKACHU db SPRITE_BIKER db SPRITE_COOLTRAINER_M db SPRITE_SILPH_WORKER @@ -173,14 +174,13 @@ SpriteSets: db SPRITE_HIKER db SPRITE_GAMBLER db SPRITE_MIDDLE_AGED_MAN - db SPRITE_SUPER_NERD db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $0a - db SPRITE_BIRD + db SPRITE_PIKACHU db SPRITE_COOLTRAINER_M - db SPRITE_FAIRY + db SPRITE_CHANSEY db SPRITE_FISHER db SPRITE_GAMBLER db SPRITE_MONSTER diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 9b0cde26..6e754558 100755 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -114,4 +114,5 @@ InternalMapEntries: internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName + internal_map BEACH_HOUSE, 6, 15, Route19Name db -1 ; end diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 8249c50d..34191472 100755 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -201,7 +201,6 @@ AttackAnimationPointers: dw HidePicAnim dw ThrowRockAnim dw ThrowBaitAnim - dw ZigZagScreenAnim ; each animation is a list of subanimations ; and/or special effects, terminated by -1 @@ -222,10 +221,6 @@ battle_anim: MACRO ENDC ENDM -ZigZagScreenAnim: - battle_anim NO_MOVE, SE_WAVY_SCREEN - db -1 ; end - PoundAnim: StruggleAnim: battle_anim POUND, SUBANIM_01, 0, 8 diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index bc3d1dc6..5855c98c 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -1,4 +1,6 @@ ExclamationPointMoveSets: +; a grammar mistake was fixed (only concerning japanese) +; BIDE is in category 3, moved from category 2 ; set 0 db SWORDS_DANCE db GROWTH @@ -6,7 +8,6 @@ ExclamationPointMoveSets: ; set 1 db RECOVER - db BIDE db SELFDESTRUCT db AMNESIA db 0 ; end set @@ -17,6 +18,7 @@ ExclamationPointMoveSets: db TELEPORT db MIMIC db DOUBLE_TEAM + db BIDE db BARRAGE db 0 ; end set diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index a5b0bfec..a313af28 100755 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -26,3 +26,5 @@ ENDC PURGE MOVE_FOR_HM n = n + 1 ENDR + + db -1 ; end diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm new file mode 100755 index 00000000..f72beaa4 --- /dev/null +++ b/data/pikachu_emotions.asm @@ -0,0 +1,266 @@ +PikachuEmotion0: + db $ff + +PikachuEmotion2: + pikaemotion_dummy2 + pikaemotion_emotebubble SMILE_BUBBLE + pikaemotion_pcm PikachuCry35 + pikaemotion_pikapic PikaPicAnimScript2 + db $ff + +PikachuEmotion10: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_emotebubble HEART_BUBBLE + pikaemotion_pcm PikachuCry5 + pikaemotion_pikapic PikaPicAnimScript10 + db $ff + +PikachuEmotion7: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_movement PikachuMovementData_fd224 + pikaemotion_pcm PikachuCry1 + pikaemotion_movement PikachuMovementData_fd224 + pikaemotion_pikapic PikaPicAnimScript7 + db $ff + +PikachuEmotion4: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_movement PikachuMovementData_fd230 + pikaemotion_pcm PikachuCry29 + pikaemotion_pikapic PikaPicAnimScript4 + db $ff + +PikachuEmotion1: + pikaemotion_dummy2 + pikaemotion_pcm + pikaemotion_pikapic PikaPicAnimScript1 + db $ff + +PikachuEmotion8: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry39 + pikaemotion_pikapic PikaPicAnimScript8 + db $ff + +PikachuEmotion5: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry31 + pikaemotion_pikapic PikaPicAnimScript5 + db $ff + +PikachuEmotion6: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_pcm + pikaemotion_movement PikachuMovementData_fd21e + pikaemotion_emotebubble SKULL_BUBBLE + pikaemotion_pikapic PikaPicAnimScript6 + db $ff + +PikachuEmotion3: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry40 + pikaemotion_pikapic PikaPicAnimScript3 + db $ff + +PikachuEmotion9: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_pcm PikachuCry6 + pikaemotion_movement PikachuMovementData_fd218 + pikaemotion_emotebubble SKULL_BUBBLE + pikaemotion_pikapic PikaPicAnimScript9 + db $ff + +PikachuEmotion11: + pikaemotion_emotebubble ZZZ_BUBBLE + pikaemotion_pcm PikachuCry37 + pikaemotion_pikapic PikaPicAnimScript11 + db $ff + +PikachuEmotion12: + pikaemotion_dummy2 + pikaemotion_pcm + pikaemotion_pikapic PikaPicAnimScript12 + db $ff + +PikachuEmotion13: + pikaemotion_dummy2 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES + pikaemotion_movement PikachuMovementData_fd21e + pikaemotion_pikapic PikaPicAnimScript13 + db $ff + +PikachuEmotion14: + pikaemotion_dummy2 + pikaemotion_emotebubble BOLT_BUBBLE + pikaemotion_pcm PikachuCry10 + pikaemotion_pikapic PikaPicAnimScript14 + db $ff + +PikachuEmotion15: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry34 + pikaemotion_pikapic PikaPicAnimScript15 + db $ff + +PikachuEmotion16: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry33 + pikaemotion_pikapic PikaPicAnimScript16 + db $ff + +PikachuEmotion17: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry13 + pikaemotion_pikapic PikaPicAnimScript17 + db $ff + +PikachuEmotion18: + pikaemotion_dummy2 + pikaemotion_pcm + pikaemotion_pikapic PikaPicAnimScript18 + db $ff + +PikachuEmotion19: + pikaemotion_dummy2 + pikaemotion_emotebubble HEART_BUBBLE + pikaemotion_pcm PikachuCry33 + pikaemotion_pikapic PikaPicAnimScript19 + db $ff + +PikachuEmotion20: + pikaemotion_dummy2 + pikaemotion_emotebubble HEART_BUBBLE + pikaemotion_pcm PikachuCry5 + pikaemotion_pikapic PikaPicAnimScript20 + db $ff + +PikachuEmotion21: + pikaemotion_dummy2 + pikaemotion_emotebubble FISH_BUBBLE + pikaemotion_pcm + pikaemotion_pikapic PikaPicAnimScript21 + db $ff + +PikachuEmotion22: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry4 + pikaemotion_pikapic PikaPicAnimScript22 + db $ff + +PikachuEmotion23: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry19 + pikaemotion_pikapic PikaPicAnimScript23 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW + db $ff + +PikachuEmotion24: + pikaemotion_dummy2 + pikaemotion_emotebubble EXCLAMATION_BUBBLE + pikaemotion_pcm + pikaemotion_pikapic PikaPicAnimScript24 + db $ff + +PikachuEmotion25: + pikaemotion_dummy2 + pikaemotion_emotebubble BOLT_BUBBLE + pikaemotion_pcm PikachuCry35 + pikaemotion_pikapic PikaPicAnimScript25 + db $ff + +PikachuEmotion26: + pikaemotion_dummy2 + pikaemotion_emotebubble ZZZ_BUBBLE + pikaemotion_pcm PikachuCry37 + pikaemotion_pikapic PikaPicAnimScript26 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW + pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER + db $ff + +PikachuEmotion27: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry9 + pikaemotion_pikapic PikaPicAnimScript27 + db $ff + +PikachuEmotion28: + pikaemotion_dummy2 + pikaemotion_pcm PikachuCry15 + pikaemotion_pikapic PikaPicAnimScript28 + db $ff + +PikachuEmotion29: + pikaemotion_pcm PikachuCry5 + pikaemotion_pikapic PikaPicAnimScript10 + db $ff + +PikachuEmotion30: + pikaemotion_9 + pikaemotion_emotebubble HEART_BUBBLE + pikaemotion_pcm PikachuCry5 + pikaemotion_pikapic PikaPicAnimScript20 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW + pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADFONT + pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER + db $ff + +PikachuEmotion31: + pikaemotion_pcm PikachuCry19 + pikaemotion_pikapic PikaPicAnimScript23 + pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW + pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE + db $ff + +PikachuEmotion32: + pikaemotion_pcm PikachuCry26 + pikaemotion_pikapic PikaPicAnimScript23 + db $ff + +PikachuMovementData_fd218: + db $00 + db $39, 2 - 1 + db $3e, 31 - 1 + db $3f + +PikachuMovementData_fd21e: + db $00 + db $39, 1 - 1 + db $3e, 31 - 1 + db $3f + +PikachuMovementData_fd224: + db $00 + db $3c, 8 - 1, (2 << 4) | (16 - 1) + db $3c, 8 - 1, (2 << 4) | (16 - 1) + db $3f + +PikachuMovementData_fd22c: + db $3b, 32 - 1, 4 - 1 + db $3f + +PikachuMovementData_fd230: + db $00 + db $3c, 16 - 1, (1 << 4) | (16 - 1) + db $3c, 16 - 1, (1 << 4) | (16 - 1) + db $3f + +PikachuMovementData_fd238: + db $00 + db $05, 8 - 1 + db $39, 1 - 1 + db $05, 8 - 1 + db $06, 8 - 1 + db $39, 1 - 1 + db $06, 8 - 1 + db $08, 8 - 1 + db $39, 1 - 1 + db $08, 8 - 1 + db $07, 8 - 1 + db $39, 1 - 1 + db $07, 8 - 1 + db $3f diff --git a/data/pikachu_pic_animation.asm b/data/pikachu_pic_animation.asm new file mode 100755 index 00000000..d10f65dd --- /dev/null +++ b/data/pikachu_pic_animation.asm @@ -0,0 +1,399 @@ +PikaPicAnimThunderboltPals: + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db 4, %11000000 + db 4, %11100100 + db $ff + +Data_fe26b: + pikapic_loadgfx Pic_e4000 + pikapic_loadgfx Pic_e49d1 + pikapic_loadgfx PikachuSprite + pikapic_animation PikaPicAnimBGFrames_1, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_2, $b2, $5, $5 + pikapic_animation PikaPicAnimBGFrames_3, $b6, $5, $5 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript0: +PikaPicAnimScript1: +PikaPicAnimScript29: + pikapic_setduration 40 + pikapic_loadgfx Pic_e4000 + pikapic_loadgfx GFX_e40cc + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_6, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry PikachuCry3 + pikapic_looptofinish + +PikaPicAnimScript2: + pikapic_setduration 44 + pikapic_loadgfx Pic_e411c + pikapic_loadgfx GFX_e41d2 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_7, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript3: + pikapic_setduration 80 + pikapic_loadgfx Pic_e4272 + pikapic_loadgfx GFX_e4323 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_8, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript4: + pikapic_setduration 70 + pikapic_loadgfx Pic_e4383 + pikapic_loadgfx GFX_e444b + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_9, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript5: + pikapic_setduration 32 + pikapic_loadgfx Pic_e458b + pikapic_loadgfx GFX_e463b + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_10, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript6: + pikapic_setduration 50 + pikapic_loadgfx Pic_e467b + pikapic_loadgfx GFX_e472e + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_11, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry PikachuCry38 + pikapic_looptofinish + +PikaPicAnimScript7: + pikapic_setduration 58 + pikapic_loadgfx Pic_e476e + pikapic_loadgfx GFX_e4841 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_12, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript8: + pikapic_setduration 44 + pikapic_loadgfx Pic_e49d1 + pikapic_loadgfx GFX_e4a99 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_13, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript9: + pikapic_setduration 56 + pikapic_loadgfx Pic_e4b39 + pikapic_loadgfx GFX_e4bde + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_14, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript10: + pikapic_setduration 56 + pikapic_loadgfx Pic_e4c3e + pikapic_loadgfx GFX_e4ce0 + pikapic_loadgfx GFX_e4e70 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_16, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript11: + pikapic_setduration 100 + pikapic_loadgfx Pic_e5000 + pikapic_loadgfx GFX_e50af + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_17, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript12: + pikapic_setduration 50 + pikapic_loadgfx Pic_e523f + pikapic_loadgfx GFX_e52fe + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_18, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry PikachuCry25 + pikapic_looptofinish + +PikaPicAnimScript13: + pikapic_setduration 50 + pikapic_loadgfx Pic_e548e + pikapic_loadgfx GFX_e5541 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_19, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript14: + pikapic_setduration 40 + pikapic_loadgfx Pic_e56d1 + pikapic_loadgfx GFX_e5794 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_20, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript15: + pikapic_setduration 50 + pikapic_loadgfx Pic_e5924 + pikapic_loadgfx GFX_e59ed + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_21, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript16: + pikapic_setduration 32 + pikapic_loadgfx Pic_e5b7d + pikapic_loadgfx GFX_e5c4d + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_22, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript17: + pikapic_setduration 100 + pikapic_loadgfx Pic_e5ddd + pikapic_loadgfx GFX_e5e90 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_23, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript18: + pikapic_setduration 32 + pikapic_loadgfx GFX_e6020 + pikapic_loadgfx GFX_e61b0 + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_24, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry PikachuCry18 + pikapic_looptofinish + +PikaPicAnimScript19: + pikapic_setduration 44 + pikapic_loadgfx Pic_e6340 + pikapic_loadgfx GFX_e63f7 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_25, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript20: + pikapic_setduration 50 + pikapic_loadgfx Pic_e6587 + pikapic_loadgfx GFX_e6646 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_26, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript21: + pikapic_setduration 40 + pikapic_loadgfx Pic_e67d6 + pikapic_loadgfx GFX_e682f + pikapic_loadgfx GFX_e69bf + pikapic_loadgfx GFX_e6b4f + pikapic_loadgfx GFX_e6cdf + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_27, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry PikachuCry20 + pikapic_looptofinish + +PikaPicAnimScript22: + pikapic_setduration 40 + pikapic_loadgfx GFX_e6e6f + pikapic_loadgfx GFX_e6fff + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_28, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript23: + pikapic_setduration 70 + pikapic_loadgfx GFX_e718f + pikapic_loadgfx GFX_e731f + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_29, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript24: + pikapic_setduration 60 + pikapic_loadgfx GFX_e74af + pikapic_loadgfx GFX_e763f + pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_30, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript25: + pikapic_setduration 50 + pikapic_loadgfx Pic_e77cf + pikapic_loadgfx GFX_e7863 + pikapic_loadgfx GFX_e79f3 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_31, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_writebyte 13 + pikapic_waitbgmap + pikapic_thunderbolt + pikapic_ret + +Data_fe51f: + pikapic_waitbgmap +PikaPicAnimScript26: + pikapic_setduration 100 + pikapic_loadgfx Pic_e5000 + pikapic_loadgfx GFX_e50af + pikapic_loadgfx GFX_e7b83 + pikapic_loadgfx GFX_e7d13 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_32, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript27: + pikapic_setduration 30 + pikapic_loadgfx Pic_f0abf + pikapic_loadgfx GFX_f0b64 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_33, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimScript28: + pikapic_setduration 64 + pikapic_loadgfx Pic_f0cf4 + pikapic_loadgfx GFX_f0d82 + pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0 + pikapic_animation PikaPicAnimBGFrames_34, $99, $0, $0 + pikapic_waitbgmap + pikapic_cry + pikapic_looptofinish + +PikaPicAnimGFXHeaders: +pikapicanimgfx: MACRO +\2_id:: + db \1 ; size (-1 if compressed) + dba \2 ; pointer + endm + +PikaPicAnimGFX_Null_id:: + dbbw 1, $39,$0000 ; 00 + pikapicanimgfx -1, Pic_e4000 ; 01 + pikapicanimgfx 5, GFX_e40cc ; 02 + pikapicanimgfx -1, Pic_e411c ; 03 + pikapicanimgfx 10, GFX_e41d2 ; 04 + pikapicanimgfx -1, Pic_e4272 ; 05 + pikapicanimgfx 6, GFX_e4323 ; 06 + pikapicanimgfx -1, Pic_e4383 ; 07 + pikapicanimgfx 20, GFX_e444b ; 08 + pikapicanimgfx -1, Pic_e458b ; 09 + pikapicanimgfx 4, GFX_e463b ; 0a + pikapicanimgfx -1, Pic_e467b ; 0b + pikapicanimgfx 4, GFX_e472e ; 0c + pikapicanimgfx -1, Pic_e476e ; 0d + pikapicanimgfx 25, GFX_e4841 ; 0e + pikapicanimgfx -1, Pic_e49d1 ; 0f + pikapicanimgfx 10, GFX_e4a99 ; 00 + pikapicanimgfx -1, Pic_e4b39 ; 11 + pikapicanimgfx 6, GFX_e4bde ; 12 + pikapicanimgfx -1, Pic_e4c3e ; 13 + pikapicanimgfx 25, GFX_e4ce0 ; 14 + pikapicanimgfx 25, GFX_e4e70 ; 15 + pikapicanimgfx -1, Pic_e5000 ; 16 + pikapicanimgfx 25, GFX_e50af ; 17 + pikapicanimgfx -1, Pic_e523f ; 18 + pikapicanimgfx 25, GFX_e52fe ; 19 + pikapicanimgfx -1, Pic_e548e ; 1a + pikapicanimgfx 25, GFX_e5541 ; 1b + pikapicanimgfx -1, Pic_e56d1 ; 1c + pikapicanimgfx 25, GFX_e5794 ; 1d + pikapicanimgfx -1, Pic_e5924 ; 1e + pikapicanimgfx 25, GFX_e59ed ; 1f + pikapicanimgfx -1, Pic_e5b7d ; 20 + pikapicanimgfx 25, GFX_e5c4d ; 21 + pikapicanimgfx -1, Pic_e5ddd ; 22 + pikapicanimgfx 25, GFX_e5e90 ; 23 + pikapicanimgfx 25, GFX_e6020 ; 24 + pikapicanimgfx 25, GFX_e61b0 ; 25 + pikapicanimgfx -1, Pic_e6340 ; 26 + pikapicanimgfx 25, GFX_e63f7 ; 27 + pikapicanimgfx -1, Pic_e6587 ; 28 + pikapicanimgfx 25, GFX_e6646 ; 29 + pikapicanimgfx -1, Pic_e67d6 ; 2a + pikapicanimgfx 25, GFX_e682f ; 2b + pikapicanimgfx 25, GFX_e69bf ; 2c + pikapicanimgfx 25, GFX_e6b4f ; 2d + pikapicanimgfx 25, GFX_e6cdf ; 2e + pikapicanimgfx 25, GFX_e6e6f ; 2f + pikapicanimgfx 25, GFX_e6fff ; 30 + pikapicanimgfx 25, GFX_e718f ; 31 + pikapicanimgfx 25, GFX_e731f ; 32 + pikapicanimgfx 25, GFX_e74af ; 33 + pikapicanimgfx 25, GFX_e763f ; 34 + pikapicanimgfx -1, Pic_e77cf ; 35 + pikapicanimgfx 25, GFX_e7863 ; 36 + pikapicanimgfx 25, GFX_e79f3 ; 37 + pikapicanimgfx 25, GFX_e7b83 ; 38 + pikapicanimgfx 25, GFX_e7d13 ; 39 + pikapicanimgfx -1, Pic_f0abf ; 3a + pikapicanimgfx 25, GFX_f0b64 ; 3b + pikapicanimgfx -1, Pic_f0cf4 ; 3c + pikapicanimgfx 25, GFX_f0d82 ; 3d + pikapicanimgfx 24, PikachuSprite ; 3e diff --git a/data/pikachu_pic_objects.asm b/data/pikachu_pic_objects.asm new file mode 100755 index 00000000..940c1141 --- /dev/null +++ b/data/pikachu_pic_objects.asm @@ -0,0 +1,300 @@ +PikaPicAnimBGFramesPointers: +pikaanim_def: macro +\1_id: dw \1 + endm + + pikaanim_def PikaPicAnimBGFrames_0 ; 00 + pikaanim_def PikaPicAnimBGFrames_1 ; 01 + pikaanim_def PikaPicAnimBGFrames_2 ; 02 + pikaanim_def PikaPicAnimBGFrames_3 ; 03 + pikaanim_def PikaPicAnimBGFrames_4 ; 04 + pikaanim_def PikaPicAnimBGFrames_5 ; 05 + pikaanim_def PikaPicAnimBGFrames_6 ; 06 + pikaanim_def PikaPicAnimBGFrames_7 ; 07 + pikaanim_def PikaPicAnimBGFrames_8 ; 08 + pikaanim_def PikaPicAnimBGFrames_9 ; 09 + pikaanim_def PikaPicAnimBGFrames_10 ; 0a + pikaanim_def PikaPicAnimBGFrames_11 ; 0b + pikaanim_def PikaPicAnimBGFrames_12 ; 0c + pikaanim_def PikaPicAnimBGFrames_13 ; 0d + pikaanim_def PikaPicAnimBGFrames_14 ; 0e + pikaanim_def PikaPicAnimBGFrames_15 ; 0f + pikaanim_def PikaPicAnimBGFrames_16 ; 10 + pikaanim_def PikaPicAnimBGFrames_17 ; 11 + pikaanim_def PikaPicAnimBGFrames_18 ; 12 + pikaanim_def PikaPicAnimBGFrames_19 ; 13 + pikaanim_def PikaPicAnimBGFrames_20 ; 14 + pikaanim_def PikaPicAnimBGFrames_21 ; 15 + pikaanim_def PikaPicAnimBGFrames_22 ; 16 + pikaanim_def PikaPicAnimBGFrames_23 ; 17 + pikaanim_def PikaPicAnimBGFrames_24 ; 18 + pikaanim_def PikaPicAnimBGFrames_25 ; 19 + pikaanim_def PikaPicAnimBGFrames_26 ; 1a + pikaanim_def PikaPicAnimBGFrames_27 ; 1b + pikaanim_def PikaPicAnimBGFrames_28 ; 1c + pikaanim_def PikaPicAnimBGFrames_29 ; 1d + pikaanim_def PikaPicAnimBGFrames_30 ; 1e + pikaanim_def PikaPicAnimBGFrames_31 ; 1f + pikaanim_def PikaPicAnimBGFrames_32 ; 20 + pikaanim_def PikaPicAnimBGFrames_33 ; 21 + pikaanim_def PikaPicAnimBGFrames_34 ; 22 + pikaanim_def PikaPicAnimBGFrames_35 ; 23 + +PikaPicAnimBGFrames_0: +PikaPicAnimBGFrames_1: + ; Tilemap idx, duration + pikaframe PikaAnimTilemap_1, 20 + pikaframe PikaAnimTilemap_7, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_7, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_7, 8 + pikaframeend + +PikaPicAnimBGFrames_fdc1e: ; unreferenced + pikaframe PikaAnimTilemap_2, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_2, 2 + pikaframe PikaAnimTilemap_1, 1 + pikaframe PikaAnimTilemap_2, 8 + pikaframeend + +PikaPicAnimBGFrames_2: + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframeend + +PikaPicAnimBGFrames_3: + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframe PikaAnimTilemap_8, 8 + pikaframedelay 8 + pikaframeend + +PikaPicAnimBGFrames_4: +PikaPicAnimBGFrames_35: + pikaframe PikaAnimTilemap_1, 0 + pikaframeend + +PikaPicAnimBGFrames_5: + pikaframe PikaAnimTilemap_9, 0 + pikaframeend + +PikaPicAnimBGFrames_6: + pikaframedelay 2 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 64 + pikaframe PikaAnimTilemap_14, 4 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_7: + pikaframedelay 4 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 4 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_15, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_15, 4 + pikaframeend + +PikaPicAnimBGFrames_8: + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 1 + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 64 + pikaframe PikaAnimTilemap_16, 1 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_9: + pikaframedelay 8 + pikaframe PikaAnimTilemap_17, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_17, 8 + pikaframeend + +PikaPicAnimBGFrames_10: + pikaframedelay 2 + pikaframe PikaAnimTilemap_18, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_18, 64 + pikaframedelay 3 + pikaframe PikaAnimTilemap_18, 64 + pikaframeend + +PikaPicAnimBGFrames_11: + pikaframedelay 8 + pikaframe PikaAnimTilemap_19, 64 + pikaframedelay 4 + pikaframe PikaAnimTilemap_19, 64 + pikaframeend + +PikaPicAnimBGFrames_12: + pikaframe PikaAnimTilemap_20, 8 + pikaframedelay 2 + pikaframe PikaAnimTilemap_20, 8 + pikaframedelay 2 + pikaframe PikaAnimTilemap_20, 8 + pikaframeend + +PikaPicAnimBGFrames_13: + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 8 + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 64 + pikaframe PikaAnimTilemap_21, 4 + pikaframedelay 64 + pikaframeend + +PikaPicAnimBGFrames_14: + pikaframedelay 2 + pikaframe PikaAnimTilemap_22, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_22, 2 + pikaframedelay 20 + pikaframe PikaAnimTilemap_22, 2 + pikaframeend + +PikaPicAnimBGFrames_15: + pikaframedelay 8 + pikaframe PikaAnimTilemap_23, 8 + pikaframeend + +PikaPicAnimBGFrames_16: + pikaframedelay 8 + pikaframe PikaAnimTilemap_23, 3 + pikaframe PikaAnimTilemap_24, 5 + pikaframe PikaAnimTilemap_23, 3 + pikaframedelay 5 + pikaframeend + +PikaPicAnimBGFrames_17: + pikaframedelay 20 + pikaframe PikaAnimTilemap_25, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_25, 8 + pikaframeend + +PikaPicAnimBGFrames_18: + pikaframedelay 13 + pikaframe PikaAnimTilemap_26, 12 + pikaframedelay 100 + pikaframe PikaAnimTilemap_26, 8 + pikaframeend + +PikaPicAnimBGFrames_19: + pikaframedelay 5 + pikaframe PikaAnimTilemap_27, 5 + pikaframedelay 5 + pikaframe PikaAnimTilemap_27, 5 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_20: + pikaframedelay 2 + pikaframe PikaAnimTilemap_28, 2 + pikaframedelay 2 + pikaframe PikaAnimTilemap_28, 2 + pikaframeend + +PikaPicAnimBGFrames_21: + pikaframedelay 5 + pikaframe PikaAnimTilemap_29, 5 + pikaframedelay 5 + pikaframe PikaAnimTilemap_29, 5 + pikaframeend + +PikaPicAnimBGFrames_22: + pikaframe PikaAnimTilemap_30, 8 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_23: + pikaframedelay 10 + pikaframe PikaAnimTilemap_31, 3 + pikaframedelay 3 + pikaframe PikaAnimTilemap_31, 3 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_24: + pikaframedelay 3 + pikaframe PikaAnimTilemap_32, 100 + pikaframedelay 8 + pikaframe PikaAnimTilemap_32, 8 + pikaframeend + +PikaPicAnimBGFrames_25: + pikaframe PikaAnimTilemap_33, 6 + pikaframedelay 6 + pikaframe PikaAnimTilemap_33, 6 + pikaframedelay 6 + pikaframeend + +PikaPicAnimBGFrames_26: + pikaframedelay 8 + pikaframe PikaAnimTilemap_34, 12 + pikaframedelay 8 + pikaframe PikaAnimTilemap_34, 12 + pikaframeend + +PikaPicAnimBGFrames_27: + pikaframedelay 8 + pikaframe PikaAnimTilemap_9, 2 + pikaframe PikaAnimTilemap_10, 1 + pikaframe PikaAnimTilemap_11, 1 + pikaframe PikaAnimTilemap_12, 100 + pikaframeend + +PikaPicAnimBGFrames_28: + pikaframedelay 8 + pikaframe PikaAnimTilemap_36, 100 + pikaframeend + +PikaPicAnimBGFrames_29: + pikaframedelay 16 + pikaframe PikaAnimTilemap_37, 16 + pikaframedelay 16 + pikaframe PikaAnimTilemap_37, 16 + pikaframeend + +PikaPicAnimBGFrames_30: + pikaframedelay 6 + pikaframe PikaAnimTilemap_38, 6 + pikaframedelay 6 + pikaframe PikaAnimTilemap_38, 6 + pikaframedelay 100 + pikaframeend + +PikaPicAnimBGFrames_31: + pikaframedelay 6 + pikaframe PikaAnimTilemap_9, 6 + pikaframe PikaAnimTilemap_10, 100 + pikaframeend + +PikaPicAnimBGFrames_32: + pikaframedelay 20 + pikaframe PikaAnimTilemap_9, 8 + pikaframedelay 20 + pikaframe PikaAnimTilemap_9, 8 + pikaframe PikaAnimTilemap_10, 8 + pikaframe PikaAnimTilemap_11, 100 + pikaframeend + +PikaPicAnimBGFrames_33: + pikaframedelay 4 + pikaframe PikaAnimTilemap_9, 100 + pikaframeend + +PikaPicAnimBGFrames_34: + pikaframedelay 12 + pikaframe PikaAnimTilemap_9, 12 + pikaframedelay 12 + pikaframe PikaAnimTilemap_9, 100 + pikaframeend diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu_pic_tilemaps.asm new file mode 100755 index 00000000..95882711 --- /dev/null +++ b/data/pikachu_pic_tilemaps.asm @@ -0,0 +1,253 @@ +PikaPicTilemapPointers: +pikatilemap_def: macro +\1_id: dw \1 + endm + + pikatilemap_def PikaAnimTilemap_0 + pikatilemap_def PikaAnimTilemap_1 + pikatilemap_def PikaAnimTilemap_2 + pikatilemap_def PikaAnimTilemap_3 + pikatilemap_def PikaAnimTilemap_4 + pikatilemap_def PikaAnimTilemap_5 + pikatilemap_def PikaAnimTilemap_6 + pikatilemap_def PikaAnimTilemap_7 + pikatilemap_def PikaAnimTilemap_8 + pikatilemap_def PikaAnimTilemap_9 + pikatilemap_def PikaAnimTilemap_10 + pikatilemap_def PikaAnimTilemap_11 + pikatilemap_def PikaAnimTilemap_12 + pikatilemap_def PikaAnimTilemap_13 + pikatilemap_def PikaAnimTilemap_14 + pikatilemap_def PikaAnimTilemap_15 + pikatilemap_def PikaAnimTilemap_16 + pikatilemap_def PikaAnimTilemap_17 + pikatilemap_def PikaAnimTilemap_18 + pikatilemap_def PikaAnimTilemap_19 + pikatilemap_def PikaAnimTilemap_20 + pikatilemap_def PikaAnimTilemap_21 + pikatilemap_def PikaAnimTilemap_22 + pikatilemap_def PikaAnimTilemap_23 + pikatilemap_def PikaAnimTilemap_24 + pikatilemap_def PikaAnimTilemap_25 + pikatilemap_def PikaAnimTilemap_26 + pikatilemap_def PikaAnimTilemap_27 + pikatilemap_def PikaAnimTilemap_28 + pikatilemap_def PikaAnimTilemap_29 + pikatilemap_def PikaAnimTilemap_30 + pikatilemap_def PikaAnimTilemap_31 + pikatilemap_def PikaAnimTilemap_32 + pikatilemap_def PikaAnimTilemap_33 + pikatilemap_def PikaAnimTilemap_34 + pikatilemap_def PikaAnimTilemap_35 + pikatilemap_def PikaAnimTilemap_36 + pikatilemap_def PikaAnimTilemap_37 + pikatilemap_def PikaAnimTilemap_38 + pikatilemap_def PikaAnimTilemap_39 + pikatilemap_def PikaAnimTilemap_40 + pikatilemap_def PikaAnimTilemap_41 + pikatilemap_def PikaAnimTilemap_42 + +PikaAnimTilemap_0: + db $ff ; unused + + + ; $ff inhibits overwriting that tile +PikaAnimTilemap_1: +PikaAnimTilemap_42: + db 5, 5 + db $00, $05, $0a, $0f, $14 + db $01, $06, $0b, $10, $15 + db $02, $07, $0c, $11, $16 + db $03, $08, $0d, $12, $17 + db $04, $09, $0e, $13, $18 + +PikaAnimTilemap_2: + db 5, 5 + db $19, $1e, $23, $28, $2d + db $1a, $1f, $24, $29, $2e + db $1b, $20, $25, $2a, $2f + db $1c, $21, $26, $2b, $30 + db $1d, $22, $27, $2c, $31 + +PikaAnimTilemap_7: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $20, $25, $ff, $ff + db $ff, $21, $26, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_3: + db 1, 1 + db $00 + +PikaAnimTilemap_4: + db 2, 1 + db $00 + db $01 + +PikaAnimTilemap_5: + db 1, 2 + db $00, $01 + +PikaAnimTilemap_6: +PikaAnimTilemap_8: + db 2, 2 + db $00, $01 + db $02, $03 + +PikaAnimTilemap_fde71: ; unused + db 3, 2 + db $00, $01 + db $02, $03 + db $04, $05 + +PikaAnimTilemap_fde79: ; unused + db 2, 3 + db $00, $01, $02 + db $03, $04, $05 + +PikaAnimTilemap_14: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_15: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + +PikaAnimTilemap_16: + db 5, 5 + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $04, $05, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_17: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + +PikaAnimTilemap_18: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $00, $01 + db $ff, $ff, $ff, $02, $03 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_19: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_20: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_21: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $ff, $ff, $ff, $ff, $ff + +PikaAnimTilemap_22: + db 5, 5 + db $ff, $ff, $ff, $ff, $ff + db $ff, $ff, $ff, $ff, $ff + db $00, $01, $ff, $ff, $ff + db $02, $03, $ff, $ff, $ff + db $04, $05, $ff, $ff, $ff + +PikaAnimTilemap_23: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_24: + db 5, 5 + db $19, $1a, $1b, $1c, $1d + db $1e, $1f, $20, $21, $22 + db $23, $24, $25, $26, $27 + db $28, $29, $2a, $2b, $2c + db $2d, $2e, $2f, $30, $31 + +PikaAnimTilemap_9: +PikaAnimTilemap_25: +PikaAnimTilemap_26: +PikaAnimTilemap_27: +PikaAnimTilemap_28: +PikaAnimTilemap_29: +PikaAnimTilemap_30: +PikaAnimTilemap_31: +PikaAnimTilemap_32: +PikaAnimTilemap_33: +PikaAnimTilemap_34: +PikaAnimTilemap_35: +PikaAnimTilemap_36: +PikaAnimTilemap_37: +PikaAnimTilemap_38: +PikaAnimTilemap_39: + db 5, 5 + db $00, $01, $02, $03, $04 + db $05, $06, $07, $08, $09 + db $0a, $0b, $0c, $0d, $0e + db $0f, $10, $11, $12, $13 + db $14, $15, $16, $17, $18 + +PikaAnimTilemap_10: +PikaAnimTilemap_40: + db 5, 5 + db $19, $1a, $1b, $1c, $1d + db $1e, $1f, $20, $21, $22 + db $23, $24, $25, $26, $27 + db $28, $29, $2a, $2b, $2c + db $2d, $2e, $2f, $30, $31 + +PikaAnimTilemap_11: +PikaAnimTilemap_41: + db 5, 5 + db $32, $33, $34, $35, $36 + db $37, $38, $39, $3a, $3b + db $3c, $3d, $3e, $3f, $40 + db $41, $42, $43, $44, $45 + db $46, $47, $48, $49, $4a + +PikaAnimTilemap_12: + db 5, 5 + db $4b, $4c, $4d, $4e, $4f + db $50, $51, $52, $53, $54 + db $55, $56, $57, $58, $59 + db $5a, $5b, $5c, $5d, $5e + db $5f, $60, $61, $62, $63 + +PikaAnimTilemap_13: + db 5, 5 + db $64, $65, $66, $67, $68 + db $69, $6a, $6b, $6c, $6d + db $6e, $6f, $70, $71, $72 + db $73, $74, $75, $76, $77 + db $78, $79, $7a, $7b, $7c diff --git a/data/player_names.asm b/data/player_names.asm index f57c9877..cf461a7a 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,7 +1,6 @@ -IF DEF(_RED) DefaultNamesPlayer: db "NEW NAME" - next "RED" + next "YELLOW" next "ASH" next "JACK" db "@" @@ -12,20 +11,3 @@ DefaultNamesRival: next "GARY" next "JOHN" db "@" -ENDC - -IF DEF(_BLUE) -DefaultNamesPlayer: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" -ENDC diff --git a/data/player_names_list.asm b/data/player_names_list.asm index 56075df0..a5f38919 100644 --- a/data/player_names_list.asm +++ b/data/player_names_list.asm @@ -1,7 +1,6 @@ -IF DEF(_RED) DefaultNamesPlayerList: db "NEW NAME@" - db "RED@" + db "YELLOW@" db "ASH@" db "JACK@" @@ -10,18 +9,3 @@ DefaultNamesRivalList: db "BLUE@" db "GARY@" db "JOHN@" -ENDC - -IF DEF(_BLUE) -DefaultNamesPlayerList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" - -DefaultNamesRivalList: - db "NEW NAME@" - db "RED@" - db "ASH@" - db "JACK@" -ENDC diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 809ae8eb..b4360286 100755 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -151,3 +151,4 @@ INCLUDE "data/pokemon/base_stats/dratini.asm" INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" +INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 3c69c7c7..54c9a9c9 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -7,17 +7,17 @@ db 200 ; catch rate db 73 ; base exp - INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/abra.pic", 0, 1 ; sprite dimensions dw AbraPicFront, AbraPicBack db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index aad1aff5..5ed73b3e 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 202 ; base exp - INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic", 0, 1 ; sprite dimensions dw AerodactylPicFront, AerodactylPicBack db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ HYPER_BEAM, RAGE, DRAGON_RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 0064416f..c3e1c4cd 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -7,18 +7,18 @@ db 50 ; catch rate db 186 ; base exp - INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/alakazam.pic", 0, 1 ; sprite dimensions dw AlakazamPicFront, AlakazamPicBack - db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index c34316ce..f981efae 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 147 ; base exp - INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/arbok.pic", 0, 1 ; sprite dimensions dw ArbokPicFront, ArbokPicBack db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index d21ec31b..380be0a8 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 213 ; base exp - INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/arcanine.pic", 0, 1 ; sprite dimensions dw ArcaninePicFront, ArcaninePicBack db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index c40d5326..d53fc4fc 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 215 ; base exp - INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/articuno.pic", 0, 1 ; sprite dimensions dw ArticunoPicFront, ArticunoPicBack db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 328538a3..ac1c5757 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 159 ; base exp - INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/beedrill.pic", 0, 1 ; sprite dimensions dw BeedrillPicFront, BeedrillPicBack db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 075598db..8b46be24 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 84 ; base exp - INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/bellsprout.pic", 0, 1 ; sprite dimensions dw BellsproutPicFront, BellsproutPicBack db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 512c66a3..041db750 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 210 ; base exp - INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/blastoise.pic", 0, 1 ; sprite dimensions dw BlastoisePicFront, BlastoisePicBack db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index e2796f9e..a20d2744 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions dw BulbasaurPicFront, BulbasaurPicBack db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index f18cf5e9..ca480b58 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 160 ; base exp - INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, REST, PSYWAVE, SUBSTITUTE + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index e9c196ab..1f048547 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 53 ; base exp - INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/caterpie.pic", 0, 1 ; sprite dimensions dw CaterpiePicFront, CaterpiePicBack db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index fc1fcb71..81da1513 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -7,20 +7,20 @@ db 30 ; catch rate db 255 ; base exp - INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/chansey.pic", 0, 1 ; sprite dimensions dw ChanseyPicFront, ChanseyPicBack - db POUND, DOUBLESLAP, NO_MOVE, NO_MOVE ; level 1 learnset + db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 715e0f7f..7154f472 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 209 ; base exp - INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charizard.pic", 0, 1 ; sprite dimensions dw CharizardPicFront, CharizardPicBack db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ - CUT, STRENGTH + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + CUT, FLY, STRENGTH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index acf364ed..4e3a7f59 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 65 ; base exp - INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charmander.pic", 0, 1 ; sprite dimensions dw CharmanderPicFront, CharmanderPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 0305197e..e85ef0de 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 142 ; base exp - INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charmeleon.pic", 0, 1 ; sprite dimensions dw CharmeleonPicFront, CharmeleonPicBack db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 0aef8405..c01ac2e6 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -7,19 +7,19 @@ db 25 ; catch rate db 129 ; base exp - INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/clefable.pic", 0, 1 ; sprite dimensions dw ClefablePicFront, ClefablePicBack db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 136b30be..a00ccafe 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -7,19 +7,19 @@ db 150 ; catch rate db 68 ; base exp - INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/clefairy.pic", 0, 1 ; sprite dimensions dw ClefairyPicFront, ClefairyPicBack db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 8b75cb0e..eb691a50 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -7,17 +7,17 @@ db 60 ; catch rate db 203 ; base exp - INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/cloyster.pic", 0, 1 ; sprite dimensions dw CloysterPicFront, CloysterPicBack db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ - SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ + SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 6a813ab6..53224fb8 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 87 ; base exp - INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/cubone.pic", 0, 1 ; sprite dimensions dw CubonePicFront, CubonePicBack - db BONE_CLUB, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 822189a9..7bb63662 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 176 ; base exp - INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dewgong.pic", 0, 1 ; sprite dimensions dw DewgongPicFront, DewgongPicBack db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index c8ee014b..76721d69 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 81 ; base exp - INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/diglett.pic", 0, 1 ; sprite dimensions dw DiglettPicFront, DiglettPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, REST, ROCK_SLIDE, SUBSTITUTE + BIDE, REST, ROCK_SLIDE, SUBSTITUTE, CUT ; end db 0 ; padding diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index a3d919f4..a8a175ec 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -7,7 +7,7 @@ db 35 ; catch rate db 61 ; base exp - INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ditto.pic", 0, 1 ; sprite dimensions dw DittoPicFront, DittoPicBack db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index a3e95545..481c021b 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 158 ; base exp - INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dodrio.pic", 0, 1 ; sprite dimensions dw DodrioPicFront, DodrioPicBack db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 9803960b..af9e2cf7 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 96 ; base exp - INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/doduo.pic", 0, 1 ; sprite dimensions dw DoduoPicFront, DoduoPicBack db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 1178ebcc..c50c8e74 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -4,10 +4,10 @@ ; hp atk def spd spc db DRAGON, DRAGON ; type - db 45 ; catch rate + db 27 ; catch rate db 144 ; base exp - INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions dw DragonairPicFront, DragonairPicBack db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index 968d53b6..ff4aa45a 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -4,21 +4,21 @@ ; hp atk def spd spc db DRAGON, FLYING ; type - db 45 ; catch rate + db 9 ; catch rate db 218 ; base exp - INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dragonite.pic", 0, 1 ; sprite dimensions dw DragonitePicFront, DragonitePicBack db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ + tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 42a93822..28ac755b 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 67 ; base exp - INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dratini.pic", 0, 1 ; sprite dimensions dw DratiniPicFront, DratiniPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, DRAGON_RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 047b9f8e..0c71b320 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 102 ; base exp - INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/drowzee.pic", 0, 1 ; sprite dimensions dw DrowzeePicFront, DrowzeePicBack db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index cffc8750..e29c120b 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -7,16 +7,17 @@ db 50 ; catch rate db 153 ; base exp - INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dugtrio.pic", 0, 1 ; sprite dimensions dw DugtrioPicFront, DugtrioPicBack db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE, \ + CUT ; end db 0 ; padding diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index a3a6ed4c..add50a6d 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 92 ; base exp - INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/eevee.pic", 0, 1 ; sprite dimensions dw EeveePicFront, EeveePicBack - db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 878d223f..0b6a8945 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 62 ; base exp - INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ekans.pic", 0, 1 ; sprite dimensions dw EkansPicFront, EkansPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 8378cc52..dfd153bb 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 156 ; base exp - INCBIN "gfx/pokemon/front/electabuzz.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/electabuzz.pic", 0, 1 ; sprite dimensions dw ElectabuzzPicFront, ElectabuzzPicBack db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 59f21767..ae2e6cf4 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 150 ; base exp - INCBIN "gfx/pokemon/front/electrode.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/electrode.pic", 0, 1 ; sprite dimensions dw ElectrodePicFront, ElectrodePicBack db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, EXPLOSION, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 8eea9e3a..418c3948 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 98 ; base exp - INCBIN "gfx/pokemon/front/exeggcute.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/exeggcute.pic", 0, 1 ; sprite dimensions dw ExeggcutePicFront, ExeggcutePicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index cb4d3ee6..236d706e 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 212 ; base exp - INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/exeggutor.pic", 0, 1 ; sprite dimensions dw ExeggutorPicFront, ExeggutorPicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm index 8e0d79e4..d608b3fb 100644 --- a/data/pokemon/base_stats/farfetchd.asm +++ b/data/pokemon/base_stats/farfetchd.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 94 ; base exp - INCBIN "gfx/pokemon/front/farfetchd.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/farfetchd.pic", 0, 1 ; sprite dimensions dw FarfetchdPicFront, FarfetchdPicBack db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ + tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ TAKE_DOWN, DOUBLE_EDGE, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 33ad5c5a..afb89921 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 162 ; base exp - INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/fearow.pic", 0, 1 ; sprite dimensions dw FearowPicFront, FearowPicBack db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 5ccf33ef..0a714783 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 198 ; base exp - INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/flareon.pic", 0, 1 ; sprite dimensions dw FlareonPicFront, FlareonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, EMBER ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, EMBER ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index f48b4234..fc8c86ef 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 95 ; base exp - INCBIN "gfx/pokemon/front/gastly.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gastly.pic", 0, 1 ; sprite dimensions dw GastlyPicFront, GastlyPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 3a07a441..dc9105c6 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 190 ; base exp - INCBIN "gfx/pokemon/front/gengar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gengar.pic", 0, 1 ; sprite dimensions dw GengarPicFront, GengarPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ - SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ + SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 849e1234..a2225f5c 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 86 ; base exp - INCBIN "gfx/pokemon/front/geodude.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/geodude.pic", 0, 1 ; sprite dimensions dw GeodudePicFront, GeodudePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 7526d5ef..8c24985c 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 132 ; base exp - INCBIN "gfx/pokemon/front/gloom.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gloom.pic", 0, 1 ; sprite dimensions dw GloomPicFront, GloomPicBack db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 9c852c91..6eb60490 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 171 ; base exp - INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golbat.pic", 0, 1 ; sprite dimensions dw GolbatPicFront, GolbatPicBack db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 35ea2418..662c6c93 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 111 ; base exp - INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/goldeen.pic", 0, 1 ; sprite dimensions dw GoldeenPicFront, GoldeenPicBack db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index eb79d100..b7c035c6 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 174 ; base exp - INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index adcefb3f..a8f5cbf9 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 177 ; base exp - INCBIN "gfx/pokemon/front/golem.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golem.pic", 0, 1 ; sprite dimensions dw GolemPicFront, GolemPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index af0b3dcc..d5dfda81 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 134 ; base exp - INCBIN "gfx/pokemon/front/graveler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/graveler.pic", 0, 1 ; sprite dimensions dw GravelerPicFront, GravelerPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 24e972ce..b2e0f08a 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 90 ; base exp - INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions dw GrimerPicFront, GrimerPicBack db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index efc1059f..2c70184f 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 91 ; base exp - INCBIN "gfx/pokemon/front/growlithe.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/growlithe.pic", 0, 1 ; sprite dimensions dw GrowlithePicFront, GrowlithePicBack db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index f08d29c9..13c30ff8 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 214 ; base exp - INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gyarados.pic", 0, 1 ; sprite dimensions dw GyaradosPicFront, GyaradosPicBack - db BITE, DRAGON_RAGE, LEER, HYDRO_PUMP ; level 1 learnset + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 71e94347..cf9df9ec 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 126 ; base exp - INCBIN "gfx/pokemon/front/haunter.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/haunter.pic", 0, 1 ; sprite dimensions dw HaunterPicFront, HaunterPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 407e5e32..1b7651ff 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 140 ; base exp - INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic", 0, 1 ; sprite dimensions dw HitmonchanPicFront, HitmonchanPicBack db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index e39ceecd..51da5f75 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 139 ; base exp - INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic", 0, 1 ; sprite dimensions dw HitmonleePicFront, HitmonleePicBack db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 9520ad59..1a5a5aff 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 83 ; base exp - INCBIN "gfx/pokemon/front/horsea.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/horsea.pic", 0, 1 ; sprite dimensions dw HorseaPicFront, HorseaPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, RAGE, MIMIC, DOUBLE_TEAM, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 760276db..b43cd961 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 165 ; base exp - INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hypno.pic", 0, 1 ; sprite dimensions dw HypnoPicFront, HypnoPicBack db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 3601a924..3d69a8d7 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 141 ; base exp - INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ivysaur.pic", 0, 1 ; sprite dimensions dw IvysaurPicFront, IvysaurPicBack db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index c249d93d..8348431d 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -7,19 +7,19 @@ db 170 ; catch rate db 76 ; base exp - INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic", 0, 1 ; sprite dimensions dw JigglypuffPicFront, JigglypuffPicBack db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index cb7e989e..3db8c96a 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 197 ; base exp - INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jolteon.pic", 0, 1 ; sprite dimensions dw JolteonPicFront, JolteonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 1700c890..f4fe28c7 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 137 ; base exp - INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jynx.pic", 0, 1 ; sprite dimensions dw JynxPicFront, JynxPicBack db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 407c78f5..d5d96d1f 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 119 ; base exp - INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kabuto.pic", 0, 1 ; sprite dimensions dw KabutoPicFront, KabutoPicBack db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 62585d70..f067949e 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 201 ; base exp - INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kabutops.pic", 0, 1 ; sprite dimensions dw KabutopsPicFront, KabutopsPicBack db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ - REST, SUBSTITUTE, SURF + tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, SURF ; end db 0 ; padding diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 51fc6a91..30d2feef 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -7,17 +7,17 @@ db 100 ; catch rate db 145 ; base exp - INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kadabra.pic", 0, 1 ; sprite dimensions dw KadabraPicFront, KadabraPicBack - db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ DIG, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index c0cfb63c..39870dc4 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 71 ; base exp - INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kakuna.pic", 0, 1 ; sprite dimensions dw KakunaPicFront, KakunaPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index ccd36041..7d3cf971 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 175 ; base exp - INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions dw KangaskhanPicFront, KangaskhanPicBack db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ - DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ + DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index d3b3b80e..c0d75d62 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 206 ; base exp - INCBIN "gfx/pokemon/front/kingler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kingler.pic", 0, 1 ; sprite dimensions dw KinglerPicFront, KinglerPicBack db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index b9b63812..5b63ebc8 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 114 ; base exp - INCBIN "gfx/pokemon/front/koffing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/koffing.pic", 0, 1 ; sprite dimensions dw KoffingPicFront, KoffingPicBack db TACKLE, SMOG, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ + tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index 6bd1c197..dd0f739a 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -7,7 +7,7 @@ db 225 ; catch rate db 115 ; base exp - INCBIN "gfx/pokemon/front/krabby.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/krabby.pic", 0, 1 ; sprite dimensions dw KrabbyPicFront, KrabbyPicBack db BUBBLE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 5e31f7f5..eb45e08c 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 219 ; base exp - INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/lapras.pic", 0, 1 ; sprite dimensions dw LaprasPicFront, LaprasPicBack db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 45826b40..eef13946 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 127 ; base exp - INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/lickitung.pic", 0, 1 ; sprite dimensions dw LickitungPicFront, LickitungPicBack db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index f750f9fa..e00ccea6 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 193 ; base exp - INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machamp.pic", 0, 1 ; sprite dimensions dw MachampPicFront, MachampPicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index b52772ef..0e1a1d46 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -7,17 +7,17 @@ db 90 ; catch rate db 146 ; base exp - INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machoke.pic", 0, 1 ; sprite dimensions dw MachokePicFront, MachokePicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 20fe0e6e..3c7b8491 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -7,17 +7,17 @@ db 180 ; catch rate db 88 ; base exp - INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machop.pic", 0, 1 ; sprite dimensions dw MachopPicFront, MachopPicBack db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index c2c2f8c2..8d7eef46 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 20 ; base exp - INCBIN "gfx/pokemon/front/magikarp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magikarp.pic", 0, 1 ; sprite dimensions dw MagikarpPicFront, MagikarpPicBack db SPLASH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index b402cfa3..1619e211 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 167 ; base exp - INCBIN "gfx/pokemon/front/magmar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magmar.pic", 0, 1 ; sprite dimensions dw MagmarPicFront, MagmarPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 6242d692..cb249496 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 89 ; base exp - INCBIN "gfx/pokemon/front/magnemite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magnemite.pic", 0, 1 ; sprite dimensions dw MagnemitePicFront, MagnemitePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 13d2e595..36db2428 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 161 ; base exp - INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magneton.pic", 0, 1 ; sprite dimensions dw MagnetonPicFront, MagnetonPicBack db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ + REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index ea529243..cb60435b 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 74 ; base exp - INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mankey.pic", 0, 1 ; sprite dimensions dw MankeyPicFront, MankeyPicBack db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index 3d22e68a..bdd1636e 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 124 ; base exp - INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/marowak.pic", 0, 1 ; sprite dimensions dw MarowakPicFront, MarowakPicBack - db BONE_CLUB, GROWL, LEER, FOCUS_ENERGY ; level 1 learnset + db BONE_CLUB, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 31a59bd5..9b06043b 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 69 ; base exp - INCBIN "gfx/pokemon/front/meowth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/meowth.pic", 0, 1 ; sprite dimensions dw MeowthPicFront, MeowthPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index e20b08bf..5d3d1740 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 72 ; base exp - INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/metapod.pic", 0, 1 ; sprite dimensions dw MetapodPicFront, MetapodPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 82a7ec47..caa7fb85 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -7,25 +7,24 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front/mew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mew.pic", 0, 1 ; sprite dimensions dw MewPicFront, MewPicBack db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ - SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ - PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ - CUT, FLY, SURF, STRENGTH, FLASH, \ - UNUSED + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ + SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ + CUT, FLY, SURF, STRENGTH, FLASH ; end - db %11111111 ; padding + db 0 ; padding diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 5b276291..99ff53fe 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -7,21 +7,20 @@ db 3 ; catch rate db 220 ; base exp - INCBIN "gfx/pokemon/front/mewtwo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mewtwo.pic", 0, 1 ; sprite dimensions dw MewtwoPicFront, MewtwoPicBack db CONFUSION, DISABLE, SWIFT, PSYCHIC_M ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ - FLASH + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 58745a29..50b23fd8 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 217 ; base exp - INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/moltres.pic", 0, 1 ; sprite dimensions dw MoltresPicFront, MoltresPicBack db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm index 20c96508..e6cdba21 100644 --- a/data/pokemon/base_stats/mrmime.asm +++ b/data/pokemon/base_stats/mrmime.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 136 ; base exp - INCBIN "gfx/pokemon/front/mr.mime.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mr.mime.pic", 0, 1 ; sprite dimensions dw MrMimePicFront, MrMimePicBack db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 901421ec..42885050 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -7,15 +7,15 @@ db 75 ; catch rate db 157 ; base exp - INCBIN "gfx/pokemon/front/muk.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/muk.pic", 0, 1 ; sprite dimensions dw MukPicFront, MukPicBack db POUND, DISABLE, POISON_GAS, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 2e0d4177..602ed2ff 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 195 ; base exp - INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 9b249f98..5fba3fed 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 194 ; base exp - INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic", 0, 1 ; sprite dimensions dw NidoqueenPicFront, NidoqueenPicBack db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm index 8ba4316c..814e2dd7 100644 --- a/data/pokemon/base_stats/nidoranf.asm +++ b/data/pokemon/base_stats/nidoranf.asm @@ -7,14 +7,14 @@ db 235 ; catch rate db 59 ; base exp - INCBIN "gfx/pokemon/front/nidoranf.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoranf.pic", 0, 1 ; sprite dimensions dw NidoranFPicFront, NidoranFPicBack db GROWL, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm index 2b412640..05b3050a 100644 --- a/data/pokemon/base_stats/nidoranm.asm +++ b/data/pokemon/base_stats/nidoranm.asm @@ -7,7 +7,7 @@ db 235 ; catch rate db 60 ; base exp - INCBIN "gfx/pokemon/front/nidoranm.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoranm.pic", 0, 1 ; sprite dimensions dw NidoranMPicFront, NidoranMPicBack db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 4345aeb7..9831db3e 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 117 ; base exp - INCBIN "gfx/pokemon/front/nidorina.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidorina.pic", 0, 1 ; sprite dimensions dw NidorinaPicFront, NidorinaPicBack db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 44a11559..d8abd036 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 118 ; base exp - INCBIN "gfx/pokemon/front/nidorino.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidorino.pic", 0, 1 ; sprite dimensions dw NidorinoPicFront, NidorinoPicBack db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 2c2bc615..7373d2e9 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 178 ; base exp - INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ninetales.pic", 0, 1 ; sprite dimensions dw NinetalesPicFront, NinetalesPicBack db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 60172ea4..de1498b9 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 78 ; base exp - INCBIN "gfx/pokemon/front/oddish.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/oddish.pic", 0, 1 ; sprite dimensions dw OddishPicFront, OddishPicBack db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 258b2706..1dff5d20 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 120 ; base exp - INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/omanyte.pic", 0, 1 ; sprite dimensions dw OmanytePicFront, OmanytePicBack db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 8ba4113e..1deaf789 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 199 ; base exp - INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/omastar.pic", 0, 1 ; sprite dimensions dw OmastarPicFront, OmastarPicBack db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 29d2f677..96048ee5 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 108 ; base exp - INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/onix.pic", 0, 1 ; sprite dimensions dw OnixPicFront, OnixPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ + BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 0a36e229..82e9920e 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 70 ; base exp - INCBIN "gfx/pokemon/front/paras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/paras.pic", 0, 1 ; sprite dimensions dw ParasPicFront, ParasPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index 5fa09fc9..bcd47673 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 128 ; base exp - INCBIN "gfx/pokemon/front/parasect.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/parasect.pic", 0, 1 ; sprite dimensions dw ParasectPicFront, ParasectPicBack db SCRATCH, STUN_SPORE, LEECH_LIFE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index ec214ead..4da05861 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 148 ; base exp - INCBIN "gfx/pokemon/front/persian.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/persian.pic", 0, 1 ; sprite dimensions dw PersianPicFront, PersianPicBack db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 9be82174..b4370201 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 172 ; base exp - INCBIN "gfx/pokemon/front/pidgeot.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgeot.pic", 0, 1 ; sprite dimensions dw PidgeotPicFront, PidgeotPicBack db GUST, SAND_ATTACK, QUICK_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 2b99e4a6..c44325db 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 113 ; base exp - INCBIN "gfx/pokemon/front/pidgeotto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic", 0, 1 ; sprite dimensions dw PidgeottoPicFront, PidgeottoPicBack db GUST, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 04d23804..0c1c241b 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 55 ; base exp - INCBIN "gfx/pokemon/front/pidgey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgey.pic", 0, 1 ; sprite dimensions dw PidgeyPicFront, PidgeyPicBack db GUST, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 4a7f5e80..8bef5f8b 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 82 ; base exp - INCBIN "gfx/pokemon/front/pikachu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pikachu.pic", 0, 1 ; sprite dimensions dw PikachuPicFront, PikachuPicBack db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 946feaf1..e67a2896 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 200 ; base exp - INCBIN "gfx/pokemon/front/pinsir.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pinsir.pic", 0, 1 ; sprite dimensions dw PinsirPicFront, PinsirPicBack db VICEGRIP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index f13b4c85..04f0aae5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 77 ; base exp - INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwag.pic", 0, 1 ; sprite dimensions dw PoliwagPicFront, PoliwagPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index 8055d5ff..54673b74 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -7,18 +7,18 @@ db 120 ; catch rate db 131 ; base exp - INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic", 0, 1 ; sprite dimensions dw PoliwhirlPicFront, PoliwhirlPicBack db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index cd89c1ed..2c3b6bc5 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 185 ; base exp - INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwrath.pic", 0, 1 ; sprite dimensions dw PoliwrathPicFront, PoliwrathPicBack db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 71d51956..ee8e3389 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 152 ; base exp - INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ponyta.pic", 0, 1 ; sprite dimensions dw PonytaPicFront, PonytaPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index bfec59ef..8be8923e 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 130 ; base exp - INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/porygon.pic", 0, 1 ; sprite dimensions dw PorygonPicFront, PorygonPicBack db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 12f8bb01..57f6e901 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 149 ; base exp - INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/primeape.pic", 0, 1 ; sprite dimensions dw PrimeapePicFront, PrimeapePicBack - db SCRATCH, LEER, KARATE_CHOP, FURY_SWIPES ; level 1 learnset + db SCRATCH, LEER, LOW_KICK, KARATE_CHOP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index b3fb9f41..1f6c4437 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 80 ; base exp - INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/psyduck.pic", 0, 1 ; sprite dimensions dw PsyduckPicFront, PsyduckPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index a5c5acea..9ac93813 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 122 ; base exp - INCBIN "gfx/pokemon/front/raichu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/raichu.pic", 0, 1 ; sprite dimensions dw RaichuPicFront, RaichuPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index dbe16ab0..8a093859 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 192 ; base exp - INCBIN "gfx/pokemon/front/rapidash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rapidash.pic", 0, 1 ; sprite dimensions dw RapidashPicFront, RapidashPicBack db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index b33adf4d..9dc46afb 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 116 ; base exp - INCBIN "gfx/pokemon/front/raticate.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/raticate.pic", 0, 1 ; sprite dimensions dw RaticatePicFront, RaticatePicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \ BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index d6e263a1..9cace629 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 57 ; base exp - INCBIN "gfx/pokemon/front/rattata.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rattata.pic", 0, 1 ; sprite dimensions dw RattataPicFront, RattataPicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index c6b17500..f08f7255 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -7,19 +7,19 @@ db 60 ; catch rate db 204 ; base exp - INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rhydon.pic", 0, 1 ; sprite dimensions dw RhydonPicFront, RhydonPicBack db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index 6f4bb31b..3b8b1eb4 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 135 ; base exp - INCBIN "gfx/pokemon/front/rhyhorn.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic", 0, 1 ; sprite dimensions dw RhyhornPicFront, RhyhornPicBack db HORN_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index a05f516f..aa107190 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 93 ; base exp - INCBIN "gfx/pokemon/front/sandshrew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/sandshrew.pic", 0, 1 ; sprite dimensions dw SandshrewPicFront, SandshrewPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ - SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ + SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 5a50dd25..9c51bbba 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 163 ; base exp - INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/sandslash.pic", 0, 1 ; sprite dimensions dw SandslashPicFront, SandslashPicBack db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index 044a2baf..de73eea4 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 187 ; base exp - INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/scyther.pic", 0, 1 ; sprite dimensions dw ScytherPicFront, ScytherPicBack db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 6e3fb7ef..89ab670f 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 155 ; base exp - INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seadra.pic", 0, 1 ; sprite dimensions dw SeadraPicFront, SeadraPicBack db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 532a4c70..bcb0dd64 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 170 ; base exp - INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seaking.pic", 0, 1 ; sprite dimensions dw SeakingPicFront, SeakingPicBack db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index e2fe02ec..eba3d34d 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 100 ; base exp - INCBIN "gfx/pokemon/front/seel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seel.pic", 0, 1 ; sprite dimensions dw SeelPicFront, SeelPicBack db HEADBUTT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index b52f7cb4..ed8cc154 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 97 ; base exp - INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/shellder.pic", 0, 1 ; sprite dimensions dw ShellderPicFront, ShellderPicBack db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index 77483e91..33f02f22 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -7,20 +7,20 @@ db 75 ; catch rate db 164 ; base exp - INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/slowbro.pic", 0, 1 ; sprite dimensions dw SlowbroPicFront, SlowbroPicBack db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ - PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 0ae2ef0a..32eb6aa9 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -7,18 +7,18 @@ db 190 ; catch rate db 99 ; base exp - INCBIN "gfx/pokemon/front/slowpoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/slowpoke.pic", 0, 1 ; sprite dimensions dw SlowpokePicFront, SlowpokePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9b6ccd3e..f835a4b9 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -7,20 +7,20 @@ db 25 ; catch rate db 154 ; base exp - INCBIN "gfx/pokemon/front/snorlax.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/snorlax.pic", 0, 1 ; sprite dimensions dw SnorlaxPicFront, SnorlaxPicBack db HEADBUTT, AMNESIA, REST, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ - REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ + REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 161f4100..c353fc89 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 58 ; base exp - INCBIN "gfx/pokemon/front/spearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/spearow.pic", 0, 1 ; sprite dimensions dw SpearowPicFront, SpearowPicBack db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index e844ac6e..11db64ac 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 66 ; base exp - INCBIN "gfx/pokemon/front/squirtle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/squirtle.pic", 0, 1 ; sprite dimensions dw SquirtlePicFront, SquirtlePicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 1ec43ca8..6f9681a2 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -7,18 +7,18 @@ db 60 ; catch rate db 207 ; base exp - INCBIN "gfx/pokemon/front/starmie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/starmie.pic", 0, 1 ; sprite dimensions dw StarmiePicFront, StarmiePicBack db TACKLE, WATER_GUN, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ THUNDER, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ FLASH ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 198f552f..08b1250b 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -7,17 +7,17 @@ db 225 ; catch rate db 106 ; base exp - INCBIN "gfx/pokemon/front/staryu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/staryu.pic", 0, 1 ; sprite dimensions dw StaryuPicFront, StaryuPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 5380a4a7..bb0bafd1 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 166 ; base exp - INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions dw TangelaPicFront, TangelaPicBack - db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 9aba3e22..311eecad 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 211 ; base exp - INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tauros.pic", 0, 1 ; sprite dimensions dw TaurosPicFront, TaurosPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -17,7 +17,7 @@ tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index e8296d61..7f128c3f 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 105 ; base exp - INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tentacool.pic", 0, 1 ; sprite dimensions dw TentacoolPicFront, TentacoolPicBack db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index ad8f773e..eeea2d0f 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 205 ; base exp - INCBIN "gfx/pokemon/front/tentacruel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tentacruel.pic", 0, 1 ; sprite dimensions dw TentacruelPicFront, TentacruelPicBack db ACID, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index ec5c01d2..bc800fea 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vaporeon.pic", 0, 1 ; sprite dimensions dw VaporeonPicFront, VaporeonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, WATER_GUN ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c01ee263..85c1de76 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 138 ; base exp - INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions dw VenomothPicFront, VenomothPicBack - db TACKLE, DISABLE, POISONPOWDER, LEECH_LIFE ; level 1 learnset + db TACKLE, DISABLE, SUPERSONIC, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, REST, PSYWAVE, SUBSTITUTE + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 9c9ff071..47590f61 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 75 ; base exp - INCBIN "gfx/pokemon/front/venonat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venonat.pic", 0, 1 ; sprite dimensions dw VenonatPicFront, VenonatPicBack db TACKLE, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ - SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, REST, PSYWAVE, SUBSTITUTE + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ + SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 414590d8..d97b9c64 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 208 ; base exp - INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venusaur.pic", 0, 1 ; sprite dimensions dw VenusaurPicFront, VenusaurPicBack db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 5b958297..8fd9c2f9 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 191 ; base exp - INCBIN "gfx/pokemon/front/victreebel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/victreebel.pic", 0, 1 ; sprite dimensions dw VictreebelPicFront, VictreebelPicBack db SLEEP_POWDER, STUN_SPORE, ACID, RAZOR_LEAF ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 10ae05da..d6baddb9 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 184 ; base exp - INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vileplume.pic", 0, 1 ; sprite dimensions dw VileplumePicFront, VileplumePicBack db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 4ad65701..6234d3a4 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 103 ; base exp - INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/voltorb.pic", 0, 1 ; sprite dimensions dw VoltorbPicFront, VoltorbPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index c112b97d..7aba033e 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 63 ; base exp - INCBIN "gfx/pokemon/front/vulpix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vulpix.pic", 0, 1 ; sprite dimensions dw VulpixPicFront, VulpixPicBack db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index d430bcdc..df4c7314 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 143 ; base exp - INCBIN "gfx/pokemon/front/wartortle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/wartortle.pic", 0, 1 ; sprite dimensions dw WartortlePicFront, WartortlePicBack db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index f6aba236..67769f3b 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 52 ; base exp - INCBIN "gfx/pokemon/front/weedle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weedle.pic", 0, 1 ; sprite dimensions dw WeedlePicFront, WeedlePicBack db POISON_STING, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 513de8f8..90a3dc49 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 151 ; base exp - INCBIN "gfx/pokemon/front/weepinbell.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weepinbell.pic", 0, 1 ; sprite dimensions dw WeepinbellPicFront, WeepinbellPicBack db VINE_WHIP, GROWTH, WRAP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index d605f15a..f5618bb0 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -7,15 +7,15 @@ db 60 ; catch rate db 173 ; base exp - INCBIN "gfx/pokemon/front/weezing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weezing.pic", 0, 1 ; sprite dimensions dw WeezingPicFront, WeezingPicBack db TACKLE, SMOG, SLUDGE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ + tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 7249badf..2a6876b2 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -7,19 +7,19 @@ db 50 ; catch rate db 109 ; base exp - INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic", 0, 1 ; sprite dimensions dw WigglytuffPicFront, WigglytuffPicBack db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 6571d286..68b6396a 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 216 ; base exp - INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/zapdos.pic", 0, 1 ; sprite dimensions dw ZapdosPicFront, ZapdosPicBack db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index ddae33cb..9e4fa80f 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 54 ; base exp - INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/zubat.pic", 0, 1 ; sprite dimensions dw ZubatPicFront, ZubatPicBack db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, REST, SUBSTITUTE ; end diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 931793df..5b9acf27 100755 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -195,60 +195,11 @@ PokedexEntryPointers: ; weight in pounds ; text entry -RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 - text_far _RhydonDexEntry - text_end - -KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 - text_far _KangaskhanDexEntry - text_end - -NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 - text_far _NidoranMDexEntry - text_end - -ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 - text_far _ClefairyDexEntry - text_end - -SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _SpearowDexEntry - text_end - -VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 - text_far _VoltorbDexEntry - text_end - -NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 - text_far _NidokingDexEntry - text_end - -SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 - text_far _SlowbroDexEntry +BulbasaurDexEntry: + db "SEED@" + db 2,4 + dw 150 + text_far _BulbasaurDexEntry text_end IvysaurDexEntry: @@ -258,165 +209,137 @@ IvysaurDexEntry: text_far _IvysaurDexEntry text_end -ExeggutorDexEntry: - db "COCONUT@" +VenusaurDexEntry: + db "SEED@" db 6,7 - dw 2650 - text_far _ExeggutorDexEntry - text_end - -LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 - text_far _LickitungDexEntry - text_end - -ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 - text_far _ExeggcuteDexEntry - text_end - -GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 - text_far _GrimerDexEntry + dw 2210 + text_far _VenusaurDexEntry text_end -GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 - text_far _GengarDexEntry +CharmanderDexEntry: + db "LIZARD@" + db 2,0 + dw 190 + text_far _CharmanderDexEntry text_end -NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 - text_far _NidoranFDexEntry +CharmeleonDexEntry: + db "FLAME@" + db 3,7 + dw 420 + text_far _CharmeleonDexEntry text_end -NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 - text_far _NidoqueenDexEntry +CharizardDexEntry: + db "FLAME@" + db 5,7 + dw 2000 + text_far _CharizardDexEntry text_end -CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 - text_far _CuboneDexEntry +SquirtleDexEntry: + db "TINYTURTLE@" + db 1,8 + dw 200 + text_far _SquirtleDexEntry text_end -RhyhornDexEntry: - db "SPIKES@" +WartortleDexEntry: + db "TURTLE@" db 3,3 - dw 2540 - text_far _RhyhornDexEntry + dw 500 + text_far _WartortleDexEntry text_end -LaprasDexEntry: - db "TRANSPORT@" - db 8,2 - dw 4850 - text_far _LaprasDexEntry +BlastoiseDexEntry: + db "SHELLFISH@" + db 5,3 + dw 1890 + text_far _BlastoiseDexEntry text_end -ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 - text_far _ArcanineDexEntry +CaterpieDexEntry: + db "WORM@" + db 1,0 + dw 60 + text_far _CaterpieDexEntry text_end -MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 - text_far _MewDexEntry +MetapodDexEntry: + db "COCOON@" + db 2,4 + dw 220 + text_far _MetapodDexEntry text_end -GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 - text_far _GyaradosDexEntry +ButterfreeDexEntry: + db "BUTTERFLY@" + db 3,7 + dw 710 + text_far _ButterfreeDexEntry text_end -ShellderDexEntry: - db "BIVALVE@" +WeedleDexEntry: + db "HAIRY BUG@" db 1,0 - dw 90 - text_far _ShellderDexEntry - text_end - -TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 - text_far _TentacoolDexEntry + dw 70 + text_far _WeedleDexEntry text_end -GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 - text_far _GastlyDexEntry +KakunaDexEntry: + db "COCOON@" + db 2,0 + dw 220 + text_far _KakunaDexEntry text_end -ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 - text_far _ScytherDexEntry +BeedrillDexEntry: + db "POISON BEE@" + db 3,3 + dw 650 + text_far _BeedrillDexEntry text_end -StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 - text_far _StaryuDexEntry +PidgeyDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _PidgeyDexEntry text_end -BlastoiseDexEntry: - db "SHELLFISH@" - db 5,3 - dw 1890 - text_far _BlastoiseDexEntry +PidgeottoDexEntry: + db "BIRD@" + db 3,7 + dw 660 + text_far _PidgeottoDexEntry text_end -PinsirDexEntry: - db "STAGBEETLE@" +PidgeotDexEntry: + db "BIRD@" db 4,11 - dw 1210 - text_far _PinsirDexEntry + dw 870 + text_far _PidgeotDexEntry text_end -TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 - text_far _TangelaDexEntry +RattataDexEntry: + db "RAT@" + db 1,0 + dw 80 + text_far _RattataDexEntry text_end -GrowlitheDexEntry: - db "PUPPY@" +RaticateDexEntry: + db "RAT@" db 2,4 - dw 420 - text_far _GrowlitheDexEntry + dw 410 + text_far _RaticateDexEntry text_end -OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 - text_far _OnixDexEntry +SpearowDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _SpearowDexEntry text_end FearowDexEntry: @@ -426,165 +349,179 @@ FearowDexEntry: text_far _FearowDexEntry text_end -PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _PidgeyDexEntry - text_end - -SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 - text_far _SlowpokeDexEntry +EkansDexEntry: + db "SNAKE@" + db 6,7 + dw 150 + text_far _EkansDexEntry text_end -KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 - text_far _KadabraDexEntry +ArbokDexEntry: + db "COBRA@" + db 11,6 + dw 1430 + text_far _ArbokDexEntry text_end -GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 - text_far _GravelerDexEntry +PikachuDexEntry: + db "MOUSE@" + db 1,4 + dw 130 + text_far _PikachuDexEntry text_end -ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 - text_far _ChanseyDexEntry +RaichuDexEntry: + db "MOUSE@" + db 2,7 + dw 660 + text_far _RaichuDexEntry text_end -MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 - text_far _MachokeDexEntry +SandshrewDexEntry: + db "MOUSE@" + db 2,0 + dw 260 + text_far _SandshrewDexEntry text_end -MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 - text_far _MrMimeDexEntry +SandslashDexEntry: + db "MOUSE@" + db 3,3 + dw 650 + text_far _SandslashDexEntry text_end -HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 - text_far _HitmonleeDexEntry +NidoranFDexEntry: + db "POISON PIN@" + db 1,4 + dw 150 + text_far _NidoranFDexEntry text_end -HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 - text_far _HitmonchanDexEntry +NidorinaDexEntry: + db "POISON PIN@" + db 2,7 + dw 440 + text_far _NidorinaDexEntry text_end -ArbokDexEntry: - db "COBRA@" - db 11,6 - dw 1430 - text_far _ArbokDexEntry +NidoqueenDexEntry: + db "DRILL@" + db 4,3 + dw 1320 + text_far _NidoqueenDexEntry text_end -ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 - text_far _ParasectDexEntry +NidoranMDexEntry: + db "POISON PIN@" + db 1,8 + dw 200 + text_far _NidoranMDexEntry text_end -PsyduckDexEntry: - db "DUCK@" - db 2,7 +NidorinoDexEntry: + db "POISON PIN@" + db 2,11 dw 430 - text_far _PsyduckDexEntry + text_far _NidorinoDexEntry text_end -DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 - text_far _DrowzeeDexEntry +NidokingDexEntry: + db "DRILL@" + db 4,7 + dw 1370 + text_far _NidokingDexEntry text_end -GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 - text_far _GolemDexEntry +ClefairyDexEntry: + db "FAIRY@" + db 2,0 + dw 170 + text_far _ClefairyDexEntry text_end -MagmarDexEntry: - db "SPITFIRE@" +ClefableDexEntry: + db "FAIRY@" db 4,3 - dw 980 - text_far _MagmarDexEntry + dw 880 + text_far _ClefableDexEntry text_end -ElectabuzzDexEntry: - db "ELECTRIC@" +VulpixDexEntry: + db "FOX@" + db 2,0 + dw 220 + text_far _VulpixDexEntry + text_end + +NinetalesDexEntry: + db "FOX@" db 3,7 - dw 660 - text_far _ElectabuzzDexEntry + dw 440 + text_far _NinetalesDexEntry text_end -MagnetonDexEntry: - db "MAGNET@" +JigglypuffDexEntry: + db "BALLOON@" + db 1,8 + dw 120 + text_far _JigglypuffDexEntry + text_end + +WigglytuffDexEntry: + db "BALLOON@" db 3,3 - dw 1320 - text_far _MagnetonDexEntry + dw 260 + text_far _WigglytuffDexEntry text_end -KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 - text_far _KoffingDexEntry +ZubatDexEntry: + db "BAT@" + db 2,7 + dw 170 + text_far _ZubatDexEntry text_end -MankeyDexEntry: - db "PIG MONKEY@" +GolbatDexEntry: + db "BAT@" + db 5,3 + dw 1210 + text_far _GolbatDexEntry + text_end + +OddishDexEntry: + db "WEED@" db 1,8 - dw 620 - text_far _MankeyDexEntry + dw 120 + text_far _OddishDexEntry text_end -SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 - text_far _SeelDexEntry +GloomDexEntry: + db "WEED@" + db 2,7 + dw 190 + text_far _GloomDexEntry text_end -DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 - text_far _DiglettDexEntry +VileplumeDexEntry: + db "FLOWER@" + db 3,11 + dw 410 + text_far _VileplumeDexEntry text_end -TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 - text_far _TaurosDexEntry +ParasDexEntry: + db "MUSHROOM@" + db 1,0 + dw 120 + text_far _ParasDexEntry text_end -FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 - text_far _FarfetchdDexEntry +ParasectDexEntry: + db "MUSHROOM@" + db 3,3 + dw 650 + text_far _ParasectDexEntry text_end VenonatDexEntry: @@ -594,60 +531,25 @@ VenonatDexEntry: text_far _VenonatDexEntry text_end -DragoniteDexEntry: - db "DRAGON@" - db 7,3 - dw 4630 - text_far _DragoniteDexEntry - text_end - -DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 - text_far _DoduoDexEntry - text_end - -PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 - text_far _PoliwagDexEntry - text_end - -JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 - text_far _JynxDexEntry - text_end - -MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 - text_far _MoltresDexEntry - text_end - -ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 - text_far _ArticunoDexEntry +VenomothDexEntry: + db "POISONMOTH@" + db 4,11 + dw 280 + text_far _VenomothDexEntry text_end -ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 - text_far _ZapdosDexEntry +DiglettDexEntry: + db "MOLE@" + db 0,8 + dw 20 + text_far _DiglettDexEntry text_end -DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 - text_far _DittoDexEntry +DugtrioDexEntry: + db "MOLE@" + db 2,4 + dw 730 + text_far _DugtrioDexEntry text_end MeowthDexEntry: @@ -657,214 +559,228 @@ MeowthDexEntry: text_far _MeowthDexEntry text_end -KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 - text_far _KrabbyDexEntry +PersianDexEntry: + db "CLASSY CAT@" + db 3,3 + dw 710 + text_far _PersianDexEntry text_end -VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 - text_far _VulpixDexEntry +PsyduckDexEntry: + db "DUCK@" + db 2,7 + dw 430 + text_far _PsyduckDexEntry text_end -NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 - text_far _NinetalesDexEntry +GolduckDexEntry: + db "DUCK@" + db 5,7 + dw 1690 + text_far _GolduckDexEntry text_end -PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 - text_far _PikachuDexEntry +MankeyDexEntry: + db "PIG MONKEY@" + db 1,8 + dw 620 + text_far _MankeyDexEntry text_end -RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 - text_far _RaichuDexEntry +PrimeapeDexEntry: + db "PIG MONKEY@" + db 3,3 + dw 710 + text_far _PrimeapeDexEntry text_end -DratiniDexEntry: - db "DRAGON@" - db 5,11 - dw 70 - text_far _DratiniDexEntry +GrowlitheDexEntry: + db "PUPPY@" + db 2,4 + dw 420 + text_far _GrowlitheDexEntry text_end -DragonairDexEntry: - db "DRAGON@" - db 13,1 - dw 360 - text_far _DragonairDexEntry +ArcanineDexEntry: + db "LEGENDARY@" + db 6,3 + dw 3420 + text_far _ArcanineDexEntry text_end -KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 - text_far _KabutoDexEntry +PoliwagDexEntry: + db "TADPOLE@" + db 2,0 + dw 270 + text_far _PoliwagDexEntry text_end -KabutopsDexEntry: - db "SHELLFISH@" +PoliwhirlDexEntry: + db "TADPOLE@" + db 3,3 + dw 440 + text_far _PoliwhirlDexEntry + text_end + +PoliwrathDexEntry: + db "TADPOLE@" db 4,3 - dw 890 - text_far _KabutopsDexEntry + dw 1190 + text_far _PoliwrathDexEntry text_end -HorseaDexEntry: - db "DRAGON@" - db 1,4 - dw 180 - text_far _HorseaDexEntry +AbraDexEntry: + db "PSI@" + db 2,11 + dw 430 + text_far _AbraDexEntry text_end -SeadraDexEntry: - db "DRAGON@" - db 3,11 - dw 550 - text_far _SeadraDexEntry +KadabraDexEntry: + db "PSI@" + db 4,3 + dw 1250 + text_far _KadabraDexEntry text_end -SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 - text_far _SandshrewDexEntry +AlakazamDexEntry: + db "PSI@" + db 4,11 + dw 1060 + text_far _AlakazamDexEntry text_end -SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 - text_far _SandslashDexEntry +MachopDexEntry: + db "SUPERPOWER@" + db 2,7 + dw 430 + text_far _MachopDexEntry text_end -OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 - text_far _OmanyteDexEntry +MachokeDexEntry: + db "SUPERPOWER@" + db 4,11 + dw 1550 + text_far _MachokeDexEntry text_end -OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 - text_far _OmastarDexEntry +MachampDexEntry: + db "SUPERPOWER@" + db 5,3 + dw 2870 + text_far _MachampDexEntry text_end -JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 - text_far _JigglypuffDexEntry +BellsproutDexEntry: + db "FLOWER@" + db 2,4 + dw 90 + text_far _BellsproutDexEntry text_end -WigglytuffDexEntry: - db "BALLOON@" +WeepinbellDexEntry: + db "FLYCATCHER@" db 3,3 - dw 260 - text_far _WigglytuffDexEntry + dw 140 + text_far _WeepinbellDexEntry text_end -EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 - text_far _EeveeDexEntry +VictreebelDexEntry: + db "FLYCATCHER@" + db 5,7 + dw 340 + text_far _VictreebelDexEntry text_end -FlareonDexEntry: - db "FLAME@" +TentacoolDexEntry: + db "JELLYFISH@" db 2,11 - dw 550 - text_far _FlareonDexEntry + dw 1000 + text_far _TentacoolDexEntry text_end -JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 - text_far _JolteonDexEntry +TentacruelDexEntry: + db "JELLYFISH@" + db 5,3 + dw 1210 + text_far _TentacruelDexEntry text_end -VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 - text_far _VaporeonDexEntry +GeodudeDexEntry: + db "ROCK@" + db 1,4 + dw 440 + text_far _GeodudeDexEntry text_end -MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 - text_far _MachopDexEntry +GravelerDexEntry: + db "ROCK@" + db 3,3 + dw 2320 + text_far _GravelerDexEntry text_end -ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 - text_far _ZubatDexEntry +GolemDexEntry: + db "MEGATON@" + db 4,7 + dw 6620 + text_far _GolemDexEntry text_end -EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 - text_far _EkansDexEntry +PonytaDexEntry: + db "FIRE HORSE@" + db 3,3 + dw 660 + text_far _PonytaDexEntry text_end -ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 - text_far _ParasDexEntry +RapidashDexEntry: + db "FIRE HORSE@" + db 5,7 + dw 2090 + text_far _RapidashDexEntry text_end -PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 - text_far _PoliwhirlDexEntry +SlowpokeDexEntry: + db "DOPEY@" + db 3,11 + dw 790 + text_far _SlowpokeDexEntry text_end -PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 - text_far _PoliwrathDexEntry +SlowbroDexEntry: + db "HERMITCRAB@" + db 5,3 + dw 1730 + text_far _SlowbroDexEntry text_end -WeedleDexEntry: - db "HAIRY BUG@" +MagnemiteDexEntry: + db "MAGNET@" db 1,0 - dw 70 - text_far _WeedleDexEntry + dw 130 + text_far _MagnemiteDexEntry text_end -KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 - text_far _KakunaDexEntry +MagnetonDexEntry: + db "MAGNET@" + db 3,3 + dw 1320 + text_far _MagnetonDexEntry text_end -BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 - text_far _BeedrillDexEntry +FarfetchdDexEntry: + db "WILD DUCK@" + db 2,7 + dw 330 + text_far _FarfetchdDexEntry + text_end + +DoduoDexEntry: + db "TWIN BIRD@" + db 4,7 + dw 860 + text_far _DoduoDexEntry text_end DodrioDexEntry: @@ -874,25 +790,11 @@ DodrioDexEntry: text_far _DodrioDexEntry text_end -PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 - text_far _PrimeapeDexEntry - text_end - -DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 - text_far _DugtrioDexEntry - text_end - -VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 - text_far _VenomothDexEntry +SeelDexEntry: + db "SEA LION@" + db 3,7 + dw 1980 + text_far _SeelDexEntry text_end DewgongDexEntry: @@ -902,81 +804,81 @@ DewgongDexEntry: text_far _DewgongDexEntry text_end -CaterpieDexEntry: - db "WORM@" - db 1,0 - dw 60 - text_far _CaterpieDexEntry +GrimerDexEntry: + db "SLUDGE@" + db 2,11 + dw 660 + text_far _GrimerDexEntry text_end -MetapodDexEntry: - db "COCOON@" - db 2,4 - dw 220 - text_far _MetapodDexEntry +MukDexEntry: + db "SLUDGE@" + db 3,11 + dw 660 + text_far _MukDexEntry text_end -ButterfreeDexEntry: - db "BUTTERFLY@" - db 3,7 - dw 710 - text_far _ButterfreeDexEntry +ShellderDexEntry: + db "BIVALVE@" + db 1,0 + dw 90 + text_far _ShellderDexEntry text_end -MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 - text_far _MachampDexEntry +CloysterDexEntry: + db "BIVALVE@" + db 4,11 + dw 2920 + text_far _CloysterDexEntry text_end -GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 - text_far _GolduckDexEntry +GastlyDexEntry: + db "GAS@" + db 4,3 + dw 2 + text_far _GastlyDexEntry text_end -HypnoDexEntry: - db "HYPNOSIS@" +HaunterDexEntry: + db "GAS@" db 5,3 - dw 1670 - text_far _HypnoDexEntry + dw 2 + text_far _HaunterDexEntry text_end -GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 - text_far _GolbatDexEntry +GengarDexEntry: + db "SHADOW@" + db 4,11 + dw 890 + text_far _GengarDexEntry text_end -MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 - text_far _MewtwoDexEntry +OnixDexEntry: + db "ROCK SNAKE@" + db 28,10 + dw 4630 + text_far _OnixDexEntry text_end -SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 - text_far _SnorlaxDexEntry +DrowzeeDexEntry: + db "HYPNOSIS@" + db 3,3 + dw 710 + text_far _DrowzeeDexEntry text_end -MagikarpDexEntry: - db "FISH@" - db 2,11 - dw 220 - text_far _MagikarpDexEntry +HypnoDexEntry: + db "HYPNOSIS@" + db 5,3 + dw 1670 + text_far _HypnoDexEntry text_end -MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 - text_far _MukDexEntry +KrabbyDexEntry: + db "RIVER CRAB@" + db 1,4 + dw 140 + text_far _KrabbyDexEntry text_end KinglerDexEntry: @@ -986,11 +888,11 @@ KinglerDexEntry: text_far _KinglerDexEntry text_end -CloysterDexEntry: - db "BIVALVE@" - db 4,11 - dw 2920 - text_far _CloysterDexEntry +VoltorbDexEntry: + db "BALL@" + db 1,8 + dw 230 + text_far _VoltorbDexEntry text_end ElectrodeDexEntry: @@ -1000,25 +902,25 @@ ElectrodeDexEntry: text_far _ElectrodeDexEntry text_end -ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 - text_far _ClefableDexEntry +ExeggcuteDexEntry: + db "EGG@" + db 1,4 + dw 60 + text_far _ExeggcuteDexEntry text_end -WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 - text_far _WeezingDexEntry +ExeggutorDexEntry: + db "COCONUT@" + db 6,7 + dw 2650 + text_far _ExeggutorDexEntry text_end -PersianDexEntry: - db "CLASSY CAT@" - db 3,3 - dw 710 - text_far _PersianDexEntry +CuboneDexEntry: + db "LONELY@" + db 1,4 + dw 140 + text_far _CuboneDexEntry text_end MarowakDexEntry: @@ -1028,67 +930,88 @@ MarowakDexEntry: text_far _MarowakDexEntry text_end -HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 - text_far _HaunterDexEntry +HitmonleeDexEntry: + db "KICKING@" + db 4,11 + dw 1100 + text_far _HitmonleeDexEntry text_end -AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 - text_far _AbraDexEntry +HitmonchanDexEntry: + db "PUNCHING@" + db 4,7 + dw 1110 + text_far _HitmonchanDexEntry text_end -AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 - text_far _AlakazamDexEntry +LickitungDexEntry: + db "LICKING@" + db 3,11 + dw 1440 + text_far _LickitungDexEntry text_end -PidgeottoDexEntry: - db "BIRD@" - db 3,7 - dw 660 - text_far _PidgeottoDexEntry +KoffingDexEntry: + db "POISON GAS@" + db 2,0 + dw 20 + text_far _KoffingDexEntry text_end -PidgeotDexEntry: - db "BIRD@" - db 4,11 - dw 870 - text_far _PidgeotDexEntry +WeezingDexEntry: + db "POISON GAS@" + db 3,11 + dw 210 + text_far _WeezingDexEntry text_end -StarmieDexEntry: - db "MYSTERIOUS@" +RhyhornDexEntry: + db "SPIKES@" + db 3,3 + dw 2540 + text_far _RhyhornDexEntry + text_end + +RhydonDexEntry: + db "DRILL@" + db 6,3 + dw 2650 + text_far _RhydonDexEntry + text_end + +ChanseyDexEntry: + db "EGG@" db 3,7 - dw 1760 - text_far _StarmieDexEntry + dw 760 + text_far _ChanseyDexEntry text_end -BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 - text_far _BulbasaurDexEntry +TangelaDexEntry: + db "VINE@" + db 3,3 + dw 770 + text_far _TangelaDexEntry text_end -VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 - text_far _VenusaurDexEntry +KangaskhanDexEntry: + db "PARENT@" + db 7,3 + dw 1760 + text_far _KangaskhanDexEntry text_end -TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 - text_far _TentacruelDexEntry +HorseaDexEntry: + db "DRAGON@" + db 1,4 + dw 180 + text_far _HorseaDexEntry + text_end + +SeadraDexEntry: + db "DRAGON@" + db 3,11 + dw 550 + text_far _SeadraDexEntry text_end GoldeenDexEntry: @@ -1105,53 +1028,123 @@ SeakingDexEntry: text_far _SeakingDexEntry text_end -PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 +StaryuDexEntry: + db "STARSHAPE@" + db 2,7 + dw 760 + text_far _StaryuDexEntry + text_end + +StarmieDexEntry: + db "MYSTERIOUS@" + db 3,7 + dw 1760 + text_far _StarmieDexEntry + text_end + +MrMimeDexEntry: + db "BARRIER@" + db 4,3 + dw 1200 + text_far _MrMimeDexEntry + text_end + +ScytherDexEntry: + db "MANTIS@" + db 4,11 + dw 1230 + text_far _ScytherDexEntry + text_end + +JynxDexEntry: + db "HUMANSHAPE@" + db 4,7 + dw 900 + text_far _JynxDexEntry + text_end + +ElectabuzzDexEntry: + db "ELECTRIC@" + db 3,7 dw 660 - text_far _PonytaDexEntry + text_far _ElectabuzzDexEntry text_end -RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 - text_far _RapidashDexEntry +MagmarDexEntry: + db "SPITFIRE@" + db 4,3 + dw 980 + text_far _MagmarDexEntry text_end -RattataDexEntry: - db "RAT@" - db 1,0 - dw 80 - text_far _RattataDexEntry +PinsirDexEntry: + db "STAGBEETLE@" + db 4,11 + dw 1210 + text_far _PinsirDexEntry text_end -RaticateDexEntry: - db "RAT@" - db 2,4 - dw 410 - text_far _RaticateDexEntry +TaurosDexEntry: + db "WILD BULL@" + db 4,7 + dw 1950 + text_far _TaurosDexEntry text_end -NidorinoDexEntry: - db "POISON PIN@" +MagikarpDexEntry: + db "FISH@" db 2,11 - dw 430 - text_far _NidorinoDexEntry + dw 220 + text_far _MagikarpDexEntry text_end -NidorinaDexEntry: - db "POISON PIN@" +GyaradosDexEntry: + db "ATROCIOUS@" + db 21,4 + dw 5180 + text_far _GyaradosDexEntry + text_end + +LaprasDexEntry: + db "TRANSPORT@" + db 8,2 + dw 4850 + text_far _LaprasDexEntry + text_end + +DittoDexEntry: + db "TRANSFORM@" + db 1,0 + dw 90 + text_far _DittoDexEntry + text_end + +EeveeDexEntry: + db "EVOLUTION@" + db 1,0 + dw 140 + text_far _EeveeDexEntry + text_end + +VaporeonDexEntry: + db "BUBBLE JET@" + db 3,3 + dw 640 + text_far _VaporeonDexEntry + text_end + +JolteonDexEntry: + db "LIGHTNING@" db 2,7 - dw 440 - text_far _NidorinaDexEntry + dw 540 + text_far _JolteonDexEntry text_end -GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 - text_far _GeodudeDexEntry +FlareonDexEntry: + db "FLAME@" + db 2,11 + dw 550 + text_far _FlareonDexEntry text_end PorygonDexEntry: @@ -1161,95 +1154,102 @@ PorygonDexEntry: text_far _PorygonDexEntry text_end -AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 - text_far _AerodactylDexEntry +OmanyteDexEntry: + db "SPIRAL@" + db 1,4 + dw 170 + text_far _OmanyteDexEntry text_end -MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 - text_far _MagnemiteDexEntry +OmastarDexEntry: + db "SPIRAL@" + db 3,3 + dw 770 + text_far _OmastarDexEntry text_end -CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 - text_far _CharmanderDexEntry +KabutoDexEntry: + db "SHELLFISH@" + db 1,8 + dw 250 + text_far _KabutoDexEntry text_end -SquirtleDexEntry: - db "TINYTURTLE@" - db 1,8 - dw 200 - text_far _SquirtleDexEntry +KabutopsDexEntry: + db "SHELLFISH@" + db 4,3 + dw 890 + text_far _KabutopsDexEntry text_end -CharmeleonDexEntry: - db "FLAME@" - db 3,7 - dw 420 - text_far _CharmeleonDexEntry +AerodactylDexEntry: + db "FOSSIL@" + db 5,11 + dw 1300 + text_far _AerodactylDexEntry text_end -WartortleDexEntry: - db "TURTLE@" - db 3,3 - dw 500 - text_far _WartortleDexEntry +SnorlaxDexEntry: + db "SLEEPING@" + db 6,11 + dw 10140 + text_far _SnorlaxDexEntry text_end -CharizardDexEntry: - db "FLAME@" +ArticunoDexEntry: + db "FREEZE@" db 5,7 - dw 2000 - text_far _CharizardDexEntry + dw 1220 + text_far _ArticunoDexEntry text_end -OddishDexEntry: - db "WEED@" - db 1,8 - dw 120 - text_far _OddishDexEntry +ZapdosDexEntry: + db "ELECTRIC@" + db 5,3 + dw 1160 + text_far _ZapdosDexEntry text_end -GloomDexEntry: - db "WEED@" - db 2,7 - dw 190 - text_far _GloomDexEntry +MoltresDexEntry: + db "FLAME@" + db 6,7 + dw 1320 + text_far _MoltresDexEntry text_end -VileplumeDexEntry: - db "FLOWER@" - db 3,11 - dw 410 - text_far _VileplumeDexEntry +DratiniDexEntry: + db "DRAGON@" + db 5,11 + dw 70 + text_far _DratiniDexEntry text_end -BellsproutDexEntry: - db "FLOWER@" - db 2,4 - dw 90 - text_far _BellsproutDexEntry +DragonairDexEntry: + db "DRAGON@" + db 13,1 + dw 360 + text_far _DragonairDexEntry text_end -WeepinbellDexEntry: - db "FLYCATCHER@" - db 3,3 - dw 140 - text_far _WeepinbellDexEntry +DragoniteDexEntry: + db "DRAGON@" + db 7,3 + dw 4630 + text_far _DragoniteDexEntry text_end -VictreebelDexEntry: - db "FLYCATCHER@" - db 5,7 - dw 340 - text_far _VictreebelDexEntry +MewtwoDexEntry: + db "GENETIC@" + db 6,7 + dw 2690 + text_far _MewtwoDexEntry + text_end + +MewDexEntry: + db "NEW SPECIE@" + db 1,4 + dw 90 + text_far _MewDexEntry text_end MissingNoDexEntry: diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index cdb7e179..7e84a83d 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -1,1509 +1,1508 @@ -_RhydonDexEntry:: - text "Protected by an" - next "armor-like hide," - next "it is capable of" +_BulbasaurDexEntry:: + text "It can go for days" + next "without eating a" + next "single morsel." - page "living in molten" - next "lava of 3,600" - next "degrees" + page "In the bulb on" + next "its back, it" + next "stores energy" dex -_KangaskhanDexEntry:: - text "The infant rarely" - next "ventures out of" - next "its mother's" +_IvysaurDexEntry:: + text "The bulb on its" + next "back grows by" + next "drawing energy." - page "protective pouch" - next "until it is 3" - next "years old" + page "It gives off an" + next "aroma when it is" + next "ready to bloom" dex -_NidoranMDexEntry:: - text "Stiffens its ears" - next "to sense danger." - next "The larger its" +_VenusaurDexEntry:: + text "The flower on its" + next "back catches the" + next "sun's rays." - page "horns, the more" - next "powerful its" - next "secreted venom" + page "The sunlight is" + next "then absorbed and" + next "used for energy" dex -_ClefairyDexEntry:: - text "Its magical and" - next "cute appeal has" - next "many admirers." +_CharmanderDexEntry:: + text "The flame at the" + next "tip of its tail" + next "makes a sound as" - page "It is rare and" - next "found only in" - next "certain areas" + page "it burns. You can" + next "only hear it in" + next "quiet places" dex -_SpearowDexEntry:: - text "Eats bugs in" - next "grassy areas. It" - next "has to flap its" +_CharmeleonDexEntry:: + text "Tough fights could" + next "excite this" + next "#MON. When" - page "short wings at" - next "high speed to" - next "stay airborne" + page "excited, it may" + next "blow out bluish-" + next "white flames" dex -_VoltorbDexEntry:: - text "Usually found in" - next "power plants." - next "Easily mistaken" +_CharizardDexEntry:: + text "When expelling a" + next "blast of super" + next "hot fire, the red" - page "for a # BALL," - next "they have zapped" - next "many people" + page "flame at the tip" + next "of its tail burns" + next "more intensely" dex -_NidokingDexEntry:: - text "It uses its" - next "powerful tail in" - next "battle to smash," +_SquirtleDexEntry:: + text "Shoots water at" + next "prey while in the" + next "water." - page "constrict, then" - next "break the prey's" - next "bones" + page "Withdraws into" + next "its shell when in" + next "danger" dex -_SlowbroDexEntry:: - text "The SHELLDER that" - next "is latched onto" - next "SLOWPOKE's tail" +_WartortleDexEntry:: + text "When tapped, this" + next "#MON will pull" + next "in its head, but" - page "is said to feed" - next "on the host's left" - next "over scraps" + page "its tail will" + next "still stick out a" + next "little bit" dex -_IvysaurDexEntry:: - text "When the bulb on" - next "its back grows" - next "large, it appears" +_BlastoiseDexEntry:: + text "Once it takes aim" + next "at its enemy, it" + next "blasts out water" - page "to lose the" - next "ability to stand" - next "on its hind legs" + page "with even more" + next "force than a fire" + next "hose" dex -_ExeggutorDexEntry:: - text "Legend has it that" - next "on rare occasions," - next "one of its heads" +_CaterpieDexEntry:: + text "If you touch the" + next "feeler on top of" + next "its head, it will" - page "will drop off and" - next "continue on as an" - next "EXEGGCUTE" + page "release a horrible" + next "stink to protect" + next "itself" dex -_LickitungDexEntry:: - text "Its tongue can be" - next "extended like a" - next "chameleon's. It" +_MetapodDexEntry:: + text "Hardens its shell" + next "to protect itself." + next "However, a large" - page "leaves a tingling" - next "sensation when it" - next "licks enemies" + page "impact may cause" + next "it to pop out of" + next "its shell" dex -_ExeggcuteDexEntry:: - text "Often mistaken" - next "for eggs." - next "When disturbed," +_ButterfreeDexEntry:: + text "Its wings, covered" + next "with poisonous" + next "powders, repel" - page "they quickly" - next "gather and attack" - next "in swarms" + page "water. This" + next "allows it to fly" + next "in the rain" dex -_GrimerDexEntry:: - text "Appears in filthy" - next "areas. Thrives by" - next "sucking up" +_WeedleDexEntry:: + text "Beware of the" + next "sharp stinger on" + next "its head. It" - page "polluted sludge" - next "that is pumped" - next "out of factories" + page "hides in grass" + next "and bushes where" + next "it eats leaves" dex -_GengarDexEntry:: - text "Under a full moon," - next "this #MON" - next "likes to mimic" +_KakunaDexEntry:: + text "Able to move only" + next "slightly. When" + next "endangered, it" - page "the shadows of" - next "people and laugh" - next "at their fright" + page "may stick out its" + next "stinger and poison" + next "its enemy" dex -_NidoranFDexEntry:: - text "Although small," - next "its venomous" - next "barbs render this" +_BeedrillDexEntry:: + text "It has 3 poisonous" + next "stingers on its" + next "forelegs and its" - page "#MON dangerous." - next "The female has" - next "smaller horns" + page "tail. They are" + next "used to jab its" + next "enemy repeatedly" dex -_NidoqueenDexEntry:: - text "Its hard scales" - next "provide strong" - next "protection. It" +_PidgeyDexEntry:: + text "Very docile. If" + next "attacked, it will" + next "often kick up" - page "uses its hefty" - next "bulk to execute" - next "powerful moves" + page "sand to protect" + next "itself rather" + next "than fight back" dex -_CuboneDexEntry:: - text "Because it never" - next "removes its skull" - next "helmet, no one" +_PidgeottoDexEntry:: + text "This #MON is" + next "full of vitality." + next "It constantly" - page "has ever seen" - next "this #MON's" - next "real face" + page "flies around its" + next "large territory in" + next "search of prey" dex -_RhyhornDexEntry:: - text "Its massive bones" - next "are 1000 times" - next "harder than human" +_PidgeotDexEntry:: + text "This #MON flies" + next "at Mach 2 speed," + next "seeking prey." - page "bones. It can" - next "easily knock a" - next "trailer flying" + page "Its large talons" + next "are feared as" + next "wicked weapons" dex -_LaprasDexEntry:: - text "A #MON that" - next "has been over-" - next "hunted almost to" +_RattataDexEntry:: + text "Will chew on any-" + next "thing with its" + next "fangs. If you see" - page "extinction. It" - next "can ferry people" - next "across the water" + page "one, it is certain" + next "that 40 more live" + next "in the area" dex -_ArcanineDexEntry:: - text "A #MON that" - next "has been admired" - next "since the past" +_RaticateDexEntry:: + text "Its hind feet are" + next "webbed. They act" + next "as flippers, so" - page "for its beauty." - next "It runs agilely" - next "as if on wings" + page "it can swim in" + next "rivers and hunt" + next "for prey" dex -_MewDexEntry:: - text "So rare that it" - next "is still said to" - next "be a mirage by" +_SpearowDexEntry:: + text "Inept at flying" + next "high. However, it" + next "can fly around" - page "many experts. Only" - next "a few people have" - next "seen it worldwide" + page "very fast to" + next "protect its ter-" + next "ritory" dex -_GyaradosDexEntry:: - text "Rarely seen in" - next "the wild. Huge" - next "and vicious, it" +_FearowDexEntry:: + text "A #MON that" + next "dates back many" + next "years. If it" - page "is capable of" - next "destroying entire" - next "cities in a rage" + page "senses danger, it" + next "flies high and" + next "away, instantly" dex -_ShellderDexEntry:: - text "Its hard shell" - next "repels any kind" - next "of attack." +_EkansDexEntry:: + text "The older it gets," + next "the longer it" + next "grows. At night," - page "It is vulnerable" - next "only when its" - next "shell is open" + page "it wraps its long" + next "body around tree" + next "branches to rest" dex -_TentacoolDexEntry:: - text "Drifts in shallow" - next "seas. Anglers who" - next "hook them by" +_ArbokDexEntry:: + text "The frightening" + next "patterns on its" + next "belly have been" - page "accident are" - next "often punished by" - next "its stinging acid" + page "studied. Six" + next "variations have" + next "been confirmed" dex -_GastlyDexEntry:: - text "Almost invisible," - next "this gaseous" - next "#MON cloaks" +_PikachuDexEntry:: + text "It keeps its tail" + next "raised to monitor" + next "its surroundings." - page "the target and" - next "puts it to sleep" - next "without notice" + page "If you yank its" + next "tail, it will try" + next "to bite you" dex -_ScytherDexEntry:: - text "With ninja-like" - next "agility and speed," - next "it can create the" +_RaichuDexEntry:: + text "When electricity" + next "builds up inside" + next "its body, it" - page "illusion that" - next "there is more" - next "than one" + page "becomes feisty." + next "It also glows in" + next "the dark" dex -_StaryuDexEntry:: - text "An enigmatic" - next "#MON that can" - next "effortlessly" +_SandshrewDexEntry:: + text "Its body is dry." + next "When it gets cold" + next "at night, its" - page "regenerate any" - next "appendage it" - next "loses in battle" + page "hide is said to" + next "become coated with" + next "a fine dew" dex -_BlastoiseDexEntry:: - text "A brutal #MON" - next "with pressurized" - next "water jets on its" +_SandslashDexEntry:: + text "It is skilled at" + next "slashing enemies" + next "with its claws." - page "shell. They are" - next "used for high" - next "speed tackles" + page "If broken, they" + next "start to grow back" + next "in a day" dex -_PinsirDexEntry:: - text "If it fails to" - next "crush the victim" - next "in its pincers," +_NidoranFDexEntry:: + text "A mild-mannered" + next "#MON that does" + next "not like to" - page "it will swing it" - next "around and toss" - next "it hard" + page "fight. Beware, its" + next "small horns" + next "secrete venom" dex -_TangelaDexEntry:: - text "The whole body is" - next "swathed with wide" - next "vines that are" +_NidorinaDexEntry:: + text "When resting deep" + next "in its burrow, its" + next "thorns always" - page "similar to sea-" - next "weed. Its vines" - next "shake as it walks" + page "retract." + next "This is proof that" + next "it is relaxed" dex -_GrowlitheDexEntry:: - text "Very protective" - next "of its territory." - next "It will bark and" +_NidoqueenDexEntry:: + text "Tough scales cover" + next "the sturdy body" + next "of this #MON." - page "bite to repel" - next "intruders from" - next "its space" + page "It appears that" + next "the scales grow" + next "in cycles" dex -_OnixDexEntry:: - text "As it grows, the" - next "stone portions of" - next "its body harden" +_NidoranMDexEntry:: + text "Its large ears" + next "are always kept" + next "upright. If it" - page "to become similar" - next "to a diamond, but" - next "colored black" + page "senses danger, it" + next "will attack with a" + next "poisonous sting" dex -_FearowDexEntry:: - text "With its huge and" - next "magnificent wings," - next "it can keep aloft" +_NidorinoDexEntry:: + text "Its horns contain" + next "venom. If they" + next "are stabbed into" - page "without ever" - next "having to land" - next "for rest" + page "an enemy, the" + next "impact makes the" + next "poison leak out" dex -_PidgeyDexEntry:: - text "A common sight in" - next "forests and woods." - next "It flaps its" +_NidokingDexEntry:: + text "Its steel-like" + next "hide adds to its" + next "powerful tackle." - page "wings at ground" - next "level to kick up" - next "blinding sand" + page "Its horns are so" + next "hard, they can" + next "pierce a diamond" dex -_SlowpokeDexEntry:: - text "Incredibly slow" - next "and dopey. It" - next "takes 5 seconds" +_ClefairyDexEntry:: + text "Adored for their" + next "cute looks and" + next "playfulness. They" - page "for it to feel" - next "pain when under" - next "attack" + page "are thought to be" + next "rare, as they do" + next "not appear often" dex -_KadabraDexEntry:: - text "It emits special" - next "alpha waves from" - next "its body that" +_ClefableDexEntry:: + text "They appear to be" + next "very protective of" + next "their own world." - page "induce headaches" - next "just by being" - next "close by" + page "It is a kind of" + next "fairy, rarely seen" + next "by people" dex -_GravelerDexEntry:: - text "Rolls down slopes" - next "to move. It rolls" - next "over any obstacle" +_VulpixDexEntry:: + text "Both its fur and" + next "its tails are" + next "beautiful. As it" - page "without slowing" - next "or changing its" - next "direction" + page "grows, the tails" + next "split and form" + next "more tails" dex -_ChanseyDexEntry:: - text "A rare and elusive" - next "#MON that is" - next "said to bring" +_NinetalesDexEntry:: + text "According to an" + next "enduring legend," + next "9 noble saints" - page "happiness to those" - next "who manage to get" - next "it" + page "were united and" + next "reincarnated as" + next "this #MON" dex -_MachokeDexEntry:: - text "Its muscular body" - next "is so powerful, it" - next "must wear a power" +_JigglypuffDexEntry:: + text "Uses its alluring" + next "eyes to enrapture" + next "its foe. It then" - page "save belt to be" - next "able to regulate" - next "its motions" + page "sings a pleasing" + next "melody that lulls" + next "the foe to sleep" dex -_MrMimeDexEntry:: - text "If interrupted" - next "while it is" - next "miming, it will" +_WigglytuffDexEntry:: + text "Its body is full" + next "of elasticity. By" + next "inhaling deeply," - page "slap around the" - next "offender with its" - next "broad hands" + page "it can continue" + next "to inflate itself" + next "without limit" dex -_HitmonleeDexEntry:: - text "When in a hurry," - next "its legs lengthen" - next "progressively." +_ZubatDexEntry:: + text "Emits ultrasonic" + next "cries while it" + next "flies. They act" - page "It runs smoothly" - next "with extra long," - next "loping strides" + page "as a sonar used" + next "to check for ob-" + next "jects in its way" dex -_HitmonchanDexEntry:: - text "While apparently" - next "doing nothing, it" - next "fires punches in" +_GolbatDexEntry:: + text "It attacks in a" + next "stealthy manner," + next "without warning." - page "lightning fast" - next "volleys that are" - next "impossible to see" + page "Its sharp fangs" + next "are used to bite" + next "and suck blood" dex -_ArbokDexEntry:: - text "It is rumored that" - next "the ferocious" - next "warning markings" +_OddishDexEntry:: + text "It may be mistaken" + next "for a clump of" + next "weeds. If you try" - page "on its belly" - next "differ from area" - next "to area" + page "to yank it out of" + next "the ground, it" + next "shrieks horribly" dex -_ParasectDexEntry:: - text "A host-parasite" - next "pair in which the" - next "parasite mushroom" +_GloomDexEntry:: + text "Smells incredibly" + next "foul! However," + next "around 1 out of" - page "has taken over the" - next "host bug. Prefers" - next "damp places" + page "1,000 people enjoy" + next "sniffing its nose-" + next "bending stink" dex -_PsyduckDexEntry:: - text "While lulling its" - next "enemies with its" - next "vacant look, this" +_VileplumeDexEntry:: + text "Flaps its broad" + next "flower petals to" + next "scatter its" - page "wily #MON will" - next "use psychokinetic" - next "powers" + page "poisonous pollen." + next "The flapping sound" + next "is very loud" dex -_DrowzeeDexEntry:: - text "Puts enemies to" - next "sleep then eats" - next "their dreams." +_ParasDexEntry:: + text "Burrows under the" + next "ground to gnaw on" + next "tree roots. The" - page "Occasionally gets" - next "sick from eating" - next "bad dreams" + page "mushrooms on its" + next "back absorb most" + next "of the nutrition" dex -_GolemDexEntry:: - text "Its boulder-like" - next "body is extremely" - next "hard. It can" +_ParasectDexEntry:: + text "The bug host is" + next "drained of energy" + next "by the mushrooms" - page "easily withstand" - next "dynamite blasts" - next "without damage" + page "on its back. They" + next "appear to do all" + next "the thinking" dex -_MagmarDexEntry:: - text "Its body always" - next "burns with an" - next "orange glow that" +_VenonatDexEntry:: + text "Its large eyes act" + next "as radars. In a" + next "bright place, you" - page "enables it to" - next "hide perfectly" - next "among flames" + page "can see that they" + next "are clusters of" + next "many tiny eyes" dex -_ElectabuzzDexEntry:: - text "Normally found" - next "near power plants," - next "they can wander" +_VenomothDexEntry:: + text "The powdery scales" + next "on its wings are" + next "hard to remove." - page "away and cause" - next "major blackouts" - next "in cities" + page "They also contain" + next "poison that leaks" + next "out on contact" dex -_MagnetonDexEntry:: - text "Formed by several" - next "MAGNEMITEs linked" - next "together. They" +_DiglettDexEntry:: + text "It prefers dark" + next "places. It spends" + next "most of its time" - page "frequently appear" - next "when sunspots" - next "flare up" + page "underground," + next "though it may pop" + next "up in caves" dex -_KoffingDexEntry:: - text "Because it stores" - next "several kinds of" - next "toxic gases in" +_DugtrioDexEntry:: + text "A team of triplets" + next "that can burrow" + next "over 60 MPH." - page "its body, it is" - next "prone to exploding" - next "without warning" + page "Due to this, some" + next "people think it's" + next "an earthquake" dex -_MankeyDexEntry:: - text "Extremely quick to" - next "anger. It could" - next "be docile one" +_MeowthDexEntry:: + text "Appears to be more" + next "active at night." + next "It loves round" - page "moment then" - next "thrashing away" - next "the next instant" + page "and shiny things." + next "It can't stop from" + next "picking them up" dex -_SeelDexEntry:: - text "The protruding" - next "horn on its head" - next "is very hard." +_PersianDexEntry:: + text "The gem in its" + next "forehead glows on" + next "its own! It walks" - page "It is used for" - next "bashing through" - next "thick ice" + page "with all the grace" + next "and elegance of a" + next "proud queen" dex -_DiglettDexEntry:: - text "Lives about one" - next "yard underground" - next "where it feeds on" +_PsyduckDexEntry:: + text "Always tormented" + next "by headaches." + next "It uses psychic" - page "plant roots. It" - next "sometimes appears" - next "above ground" + page "powers, but it is" + next "not known if it" + next "intends to do so" dex -_TaurosDexEntry:: - text "When it targets" - next "an enemy, it" - next "charges furiously" +_GolduckDexEntry:: + text "Its slim and long" + next "limbs end in broad" + next "flippers. They" - page "while whipping its" - next "body with its" - next "long tails" + page "are used for swim-" + next "ming gracefully" + next "in lakes" dex -_FarfetchdDexEntry:: - text "The sprig of" - next "green onions it" - next "holds is its" +_MankeyDexEntry:: + text "An agile #MON" + next "that lives in" + next "trees. It angers" - page "weapon. It is" - next "used much like a" - next "metal sword" + page "easily and will" + next "not hesitate to" + next "attack anything" dex -_VenonatDexEntry:: - text "Lives in the" - next "shadows of tall" - next "trees where it" +_PrimeapeDexEntry:: + text "It stops being" + next "angry only when" + next "nobody else is" - page "eats insects. It" - next "is attracted by" - next "light at night" + page "around. To view" + next "this moment is" + next "very difficult" dex -_DragoniteDexEntry:: - text "An extremely" - next "rarely seen" - next "marine #MON." +_GrowlitheDexEntry:: + text "A #MON with a" + next "friendly nature." + next "However, it will" - page "Its intelligence" - next "is said to match" - next "that of humans" + page "bark fiercely at" + next "anything invading" + next "its territory" dex -_DoduoDexEntry:: - text "A bird that makes" - next "up for its poor" - next "flying with its" +_ArcanineDexEntry:: + text "A legendary #-" + next "MON in China." + next "Many people are" - page "fast foot speed." - next "Leaves giant" - next "footprints" + page "charmed by its" + next "grace and beauty" + next "while running" dex _PoliwagDexEntry:: - text "Its newly grown" - next "legs prevent it" - next "from running. It" + text "The direction of" + next "the spiral on the" + next "belly differs by" - page "appears to prefer" - next "swimming than" - next "trying to stand" + page "area. It is more" + next "adept at swimming" + next "than walking" dex -_JynxDexEntry:: - text "It seductively" - next "wiggles its hips" - next "as it walks. It" +_PoliwhirlDexEntry:: + text "Under attack, it" + next "uses its belly " + next "spiral to put the" - page "can cause people" - next "to dance in" - next "unison with it" + page "foe to sleep. It" + next "then makes its" + next "escape" dex -_MoltresDexEntry:: - text "Known as the" - next "legendary bird of" - next "fire. Every flap" +_PoliwrathDexEntry:: + text "Swims powerfully" + next "using all the" + next "muscles in its" - page "of its wings" - next "creates a dazzling" - next "flash of flames" + page "body. It can even" + next "overtake champion" + next "swimmers" dex -_ArticunoDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear to" +_AbraDexEntry:: + text "Sleeps 18 hours a" + next "day. If it senses" + next "danger, it will" - page "doomed people who" - next "are lost in icy" - next "mountains" + page "teleport itself to" + next "safety even as it" + next "sleeps" dex -_ZapdosDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear" +_KadabraDexEntry:: + text "Many odd things" + next "happen if this" + next "#MON is close" - page "from clouds while" - next "dropping enormous" - next "lightning bolts" + page "by. For example," + next "it makes clocks" + next "run backwards" dex -_DittoDexEntry:: - text "Capable of copying" - next "an enemy's genetic" - next "code to instantly" +_AlakazamDexEntry:: + text "A #MON that can" + next "memorize anything." + next "It never forgets" - page "transform itself" - next "into a duplicate" - next "of the enemy" + page "what it learns--" + next "that's why this" + next "#MON is smart" dex -_MeowthDexEntry:: - text "Adores circular" - next "objects. Wanders" - next "the streets on a" +_MachopDexEntry:: + text "Very powerful in" + next "spite of its small" + next "size. Its mastery" - page "nightly basis to" - next "look for dropped" - next "loose change" + page "of many types of" + next "martial arts makes" + next "it very tough" dex -_KrabbyDexEntry:: - text "Its pincers are" - next "not only powerful" - next "weapons, they are" +_MachokeDexEntry:: + text "The belt around" + next "its waist holds" + next "back its energy." - page "used for balance" - next "when walking" - next "sideways" + page "Without it, this" + next "#MON would be" + next "unstoppable" dex -_VulpixDexEntry:: - text "At the time of" - next "birth, it has" - next "just one tail." +_MachampDexEntry:: + text "One arm alone can" + next "move mountains." + next "Using all four" - page "The tail splits" - next "from its tip as" - next "it grows older" + page "arms, this #MON" + next "fires off awesome" + next "punches" dex -_NinetalesDexEntry:: - text "Very smart and" - next "very vengeful." - next "Grabbing one of" +_BellsproutDexEntry:: + text "Prefers hot and" + next "humid places." + next "It ensnares tiny" - page "its many tails" - next "could result in a" - next "1000-year curse" + page "insects with its" + next "vines and devours" + next "them" dex -_PikachuDexEntry:: - text "When several of" - next "these #MON" - next "gather, their" +_WeepinbellDexEntry:: + text "When hungry, it" + next "swallows anything" + next "that moves. Its" - page "electricity could" - next "build and cause" - next "lightning storms" + page "hapless prey is" + next "melted inside by" + next "strong acids" dex -_RaichuDexEntry:: - text "Its long tail" - next "serves as a" - next "ground to protect" +_VictreebelDexEntry:: + text "Lures prey with" + next "the sweet aroma of" + next "honey. Swallowed" - page "itself from its" - next "own high voltage" - next "power" + page "whole, the prey is" + next "melted in a day," + next "bones and all" dex -_DratiniDexEntry:: - text "Long considered a" - next "mythical #MON" - next "until recently" +_TentacoolDexEntry:: + text "It can sometimes" + next "be found all dry" + next "and shriveled up" - page "when a small" - next "colony was found" - next "living underwater" + page "on a beach. Toss" + next "it back into the" + next "sea to revive it" dex -_DragonairDexEntry:: - text "A mystical #MON" - next "that exudes a" - next "gentle aura." +_TentacruelDexEntry:: + text "Its 80 tentacles" + next "can stretch and" + next "contract freely." - page "Has the ability" - next "to change climate" - next "conditions" + page "They wrap around" + next "prey and weaken" + next "it with poison" dex -_KabutoDexEntry:: - text "A #MON that" - next "was resurrected" - next "from a fossil" +_GeodudeDexEntry:: + text "Commonly found" + next "near mountain" + next "trails, etc." - page "found in what was" - next "once the ocean" - next "floor eons ago" + page "If you step on" + next "one by accident," + next "it gets angry" dex -_KabutopsDexEntry:: - text "Its sleek shape is" - next "perfect for swim-" - next "ming. It slashes" +_GravelerDexEntry:: + text "Often seen rolling" + next "down mountain" + next "trails. Obstacles" - page "prey with its" - next "claws and drains" - next "the body fluids" + page "are just things to" + next "roll straight" + next "over, not avoid" dex -_HorseaDexEntry:: - text "Known to shoot" - next "down flying bugs" - next "with precision" +_GolemDexEntry:: + text "Once it sheds its" + next "skin, its body" + next "turns tender and" - page "blasts of ink" - next "from the surface" - next "of the water" + page "whitish. Its hide" + next "hardens when it's" + next "exposed to air" dex -_SeadraDexEntry:: - text "Capable of swim-" - next "ming backwards by" - next "rapidly flapping" +_PonytaDexEntry:: + text "Capable of jumping" + next "incredibly high." + next "Its hooves and" - page "its wing-like" - next "pectoral fins and" - next "stout tail" + page "sturdy legs absorb" + next "the impact of a" + next "hard landing" dex -_SandshrewDexEntry:: - text "Burrows deep" - next "underground in" - next "arid locations" +_RapidashDexEntry:: + text "Just loves to run." + next "If it sees some-" + next "thing faster than" - page "far from water." - next "It only emerges" - next "to hunt for food" + page "itself, it will" + next "give chase at top" + next "speed" dex -_SandslashDexEntry:: - text "Curls up into a" - next "spiny ball when" - next "threatened. It" +_SlowpokeDexEntry:: + text "Incredibly slow" + next "and sluggish. It" + next "is quite content" - page "can roll while" - next "curled up to" - next "attack or escape" + page "to loll about" + next "without worrying" + next "about the time" dex -_OmanyteDexEntry:: - text "Although long" - next "extinct, in rare" - next "cases, it can be" +_SlowbroDexEntry:: + text "Lives lazily by" + next "the sea. If the" + next "SHELLDER on its" - page "genetically" - next "resurrected from" - next "fossils" + page "tail comes off," + next "it becomes a" + next "SLOWPOKE again" dex -_OmastarDexEntry:: - text "A prehistoric" - next "#MON that died" - next "out when its" +_MagnemiteDexEntry:: + text "It is born with" + next "the ability to" + next "defy gravity. It" - page "heavy shell made" - next "it impossible to" - next "catch prey" + page "floats in air on" + next "powerful electro-" + next "magnetic waves" dex -_JigglypuffDexEntry:: - text "When its huge eyes" - next "light up, it sings" - next "a mysteriously" +_MagnetonDexEntry:: + text "Generates strange" + next "radio signals. It" + next "raises the tem-" - page "soothing melody" - next "that lulls its" - next "enemies to sleep" + page "perature by 3.6F" + next "degrees within" + next "3,300 feet" dex -_WigglytuffDexEntry:: - text "The body is soft" - next "and rubbery. When" - next "angered, it will" +_FarfetchdDexEntry:: + text "Lives where reedy" + next "plants grow. They" + next "are rarely seen," - page "suck in air and" - next "inflate itself to" - next "an enormous size" + page "so it's thought" + next "their numbers are" + next "decreasing" dex -_EeveeDexEntry:: - text "Its genetic code" - next "is irregular." - next "It may mutate if" +_DoduoDexEntry:: + text "Its short wings" + next "make flying dif-" + next "ficult. Instead," - page "it is exposed to" - next "radiation from" - next "element STONEs" + page "this #MON runs" + next "at high speed on" + next "developed legs" dex -_FlareonDexEntry:: - text "When storing" - next "thermal energy in" - next "its body, its" +_DodrioDexEntry:: + text "One of DODUO's 2" + next "heads splits to" + next "form a unique" - page "temperature could" - next "soar to over 1600" - next "degrees" + page "species. It runs" + next "close to 40 MPH" + next "in prairies" dex -_JolteonDexEntry:: - text "It accumulates" - next "negative ions in" - next "the atmosphere to" +_SeelDexEntry:: + text "Loves freezing" + next "cold conditions." + next "Relishes swimming" - page "blast out 10000-" - next "volt lightning" - next "bolts" + page "in a frigid cli-" + next "mate of around 14F" + next "degrees" dex -_VaporeonDexEntry:: - text "Lives close to" - next "water. Its long" - next "tail is ridged" +_DewgongDexEntry:: + text "Its entire body is" + next "a snowy-white." + next "Unharmed by even" - page "with a fin which" - next "is often mistaken" - next "for a mermaid's" + page "intense cold, it" + next "swims powerfully" + next "in icy waters" dex -_MachopDexEntry:: - text "Loves to build" - next "its muscles." - next "It trains in all" +_GrimerDexEntry:: + text "Made of hardened" + next "sludge. It smells" + next "too putrid to" - page "styles of martial" - next "arts to become" - next "even stronger" + page "touch." + next "Even weeds won't" + next "grow in its path" dex -_ZubatDexEntry:: - text "Forms colonies in" - next "perpetually dark" - next "places. Uses" +_MukDexEntry:: + text "Smells so awful," + next "it can cause" + next "fainting. Through" - page "ultrasonic waves" - next "to identify and" - next "approach targets" + page "degeneration, it" + next "lost its sense of" + next "smell" dex -_EkansDexEntry:: - text "Moves silently" - next "and stealthily." - next "Eats the eggs of" +_ShellderDexEntry:: + text "The shell can" + next "withstand any" + next "attack. However," - page "birds, such as" - next "PIDGEY and" - next "SPEAROW, whole" + page "when it is open," + next "the tender body" + next "is exposed" dex -_ParasDexEntry:: - text "Burrows to suck" - next "tree roots. The" - next "mushrooms on its" +_CloysterDexEntry:: + text "For protection, it" + next "uses its harder-" + next "than-diamonds" - page "back grow by draw-" - next "ing nutrients from" - next "the bug host" + page "shell. It also" + next "shoots spikes from" + next "the shell" dex -_PoliwhirlDexEntry:: - text "Capable of living" - next "in or out of" - next "water. When out" +_GastlyDexEntry:: + text "Said to appear in" + next "decrepit, deserted" + next "buildings. It has" - page "of water, it" - next "sweats to keep" - next "its body slimy" + page "no real shape as" + next "it appears to be" + next "made of a gas" dex -_PoliwrathDexEntry:: - text "An adept swimmer" - next "at both the front" - next "crawl and breast" +_HaunterDexEntry:: + text "By licking, it" + next "saps the victim's" + next "life. It causes" - page "stroke. Easily" - next "overtakes the best" - next "human swimmers" + page "shaking that won't" + next "stop until the" + next "victim's demise" dex -_WeedleDexEntry:: - text "Often found in" - next "forests, eating" - next "leaves." +_GengarDexEntry:: + text "A GENGAR is close" + next "by if you feel a" + next "sudden chill." - page "It has a sharp" - next "venomous stinger" - next "on its head" + page "It may be trying" + next "to lay a curse" + next "on you" dex -_KakunaDexEntry:: - text "Almost incapable" - next "of moving, this" - next "#MON can only" +_OnixDexEntry:: + text "Burrows at high" + next "speed in search" + next "of food. The" - page "harden its shell" - next "to protect itself" - next "from predators" + page "tunnels it leaves" + next "are used as homes" + next "by DIGLETTs" dex -_BeedrillDexEntry:: - text "Flies at high" - next "speed and attacks" - next "using its large" +_DrowzeeDexEntry:: + text "If you sleep by" + next "it all the time," + next "it will sometimes" - page "venomous stingers" - next "on its forelegs" - next "and tail" + page "show you dreams" + next "it has eaten in" + next "the past" dex -_DodrioDexEntry:: - text "Uses its three" - next "brains to execute" - next "complex plans." +_HypnoDexEntry:: + text "Avoid eye contact" + next "if you come across" + next "one. It will try" - page "While two heads" - next "sleep, one head" - next "stays awake" + page "to put you to" + next "sleep by using" + next "its pendulum" dex -_PrimeapeDexEntry:: - text "Always furious" - next "and tenacious to" - next "boot. It will not" +_KrabbyDexEntry:: + text "Its pincers are" + next "superb weapons." + next "They sometimes" - page "abandon chasing" - next "its quarry until" - next "it is caught" + page "break off during" + next "battle, but they" + next "grow back fast" dex -_DugtrioDexEntry:: - text "A team of DIGLETT" - next "triplets." - next "It triggers huge" +_KinglerDexEntry:: + text "One claw grew" + next "massively and as" + next "hard as steel." - page "earthquakes by" - next "burrowing 60 miles" - next "underground" + page "It has 10,000-HP" + next "strength. However," + next "it is too heavy" dex -_VenomothDexEntry:: - text "The dust-like" - next "scales covering" - next "its wings are" +_VoltorbDexEntry:: + text "It is said to" + next "camouflage itself" + next "as a # BALL. It" - page "color coded to" - next "indicate the kinds" - next "of poison it has" + page "will self-destruct" + next "with very little" + next "stimulus" dex -_DewgongDexEntry:: - text "Stores thermal" - next "energy in its" - next "body. Swims at a" +_ElectrodeDexEntry:: + text "Stores electrical" + next "energy inside its" + next "body. Even the" - page "steady 8 knots" - next "even in intensely" - next "cold waters" + page "slightest shock" + next "could trigger a" + next "huge explosion" dex -_CaterpieDexEntry:: - text "Its short feet" - next "are tipped with" - next "suction pads that" +_ExeggcuteDexEntry:: + text "The heads attract" + next "each other and" + next "spin around." - page "enable it to" - next "tirelessly climb" - next "slopes and walls" + page "There must be 6" + next "heads for it to" + next "maintain balance" dex -_MetapodDexEntry:: - text "This #MON is" - next "vulnerable to" - next "attack while its" +_ExeggutorDexEntry:: + text "Its cries are very" + next "noisy. This is" + next "because each of" - page "shell is soft," - next "exposing its weak" - next "and tender body" + page "the 3 heads thinks" + next "about whatever it" + next "likes" dex -_ButterfreeDexEntry:: - text "In battle, it" - next "flaps its wings" - next "at high speed to" +_CuboneDexEntry:: + text "Wears the skull" + next "of its deceased" + next "mother. Its cries" - page "release highly" - next "toxic dust into" - next "the air" + page "echo inside the" + next "skull and come out" + next "as a sad melody" dex -_MachampDexEntry:: - text "Using its heavy" - next "muscles, it throws" - next "powerful punches" +_MarowakDexEntry:: + text "Small and weak," + next "this #MON is" + next "adept with its" - page "that can send the" - next "victim clear over" - next "the horizon" + page "bone club. It has" + next "grown more vicious" + next "over the ages" dex -_GolduckDexEntry:: - text "Often seen swim-" - next "ming elegantly by" - next "lake shores. It" +_HitmonleeDexEntry:: + text "When kicking, the" + next "sole of its foot" + next "turns as hard as" - page "is often mistaken" - next "for the Japanese" - next "monster, Kappa" + page "a diamond on im-" + next "pact and destroys" + next "its enemy" dex -_HypnoDexEntry:: - text "When it locks eyes" - next "with an enemy, it" - next "will use a mix of" +_HitmonchanDexEntry:: + text "Punches in cork-" + next "screw fashion. It" + next "can punch its way" - page "PSI moves such as" - next "HYPNOSIS and" - next "CONFUSION" + page "through a concrete" + next "wall in the same" + next "way as a drill" dex -_GolbatDexEntry:: - text "Once it strikes," - next "it will not stop" - next "draining energy" +_LickitungDexEntry:: + text "Its tongue spans" + next "almost 7 feet and" + next "moves more freely" - page "from the victim" - next "even if it gets" - next "too heavy to fly" + page "than its forelegs." + next "Its licks can" + next "cause paralysis" dex -_MewtwoDexEntry:: - text "It was created by" - next "a scientist after" - next "years of horrific" +_KoffingDexEntry:: + text "In hot places, its" + next "internal gases" + next "could expand and" - page "gene splicing and" - next "DNA engineering" - next "experiments" - dex + page "explode without" + next "any warning. Be" + next "very careful!@@" -_SnorlaxDexEntry:: - text "Very lazy. Just" - next "eats and sleeps." - next "As its rotund" +_WeezingDexEntry:: + text "It lives and grows" + next "by absorbing dust," + next "germs and poison" - page "bulk builds, it" - next "becomes steadily" - next "more slothful" + page "gases that are" + next "contained in toxic" + next "waste and garbage" dex -_MagikarpDexEntry:: - text "In the distant" - next "past, it was" - next "somewhat stronger" +_RhyhornDexEntry:: + text "A #MON with a" + next "one-track mind." + next "Once it charges, " - page "than the horribly" - next "weak descendants" - next "that exist today" + page "it won't stop" + next "running until it" + next "falls asleep" dex -_MukDexEntry:: - text "Thickly covered" - next "with a filthy," - next "vile sludge. It" +_RhydonDexEntry:: + text "Walks on its hind" + next "legs. Shows signs" + next "of intelligence." - page "is so toxic, even" - next "its footprints" - next "contain poison" + page "Its armor-like" + next "hide even repels" + next "molten lava" dex -_KinglerDexEntry:: - text "The large pincer" - next "has 10000 hp of" - next "crushing power." +_ChanseyDexEntry:: + text "A gentle and kind-" + next "hearted #MON" + next "that shares its" - page "However, its huge" - next "size makes it" - next "unwieldy to use" + page "nutritious eggs" + next "if it sees an" + next "injured #MON" dex -_CloysterDexEntry:: - text "When attacked, it" - next "launches its" - next "horns in quick" +_TangelaDexEntry:: + text "Its identity is" + next "obscured by masses" + next "of thick, blue" - page "volleys. Its" - next "innards have" - next "never been seen" + page "vines. The vines" + next "are said to never" + next "stop growing" dex -_ElectrodeDexEntry:: - text "It stores electric" - next "energy under very" - next "high pressure." +_KangaskhanDexEntry:: + text "Raises its young" + next "in its belly" + next "pouch. Won't run" - page "It often explodes" - next "with little or no" - next "provocation" + page "from any fight" + next "to keep its young" + next "protected" dex -_ClefableDexEntry:: - text "A timid fairy" - next "#MON that is" - next "rarely seen. It" +_HorseaDexEntry:: + text "If it senses any" + next "danger, it will" + next "vigorously spray" - page "will run and hide" - next "the moment it" - next "senses people" + page "water or a special" + next "type of ink from" + next "its mouth" dex -_WeezingDexEntry:: - text "Where two kinds" - next "of poison gases" - next "meet, 2 KOFFINGs" +_SeadraDexEntry:: + text "Touching the back" + next "fin causes numb-" + next "ness. It hooks" - page "can fuse into a" - next "WEEZING over many" - next "years" + page "its tail to coral" + next "to stay in place" + next "while sleeping" dex -_PersianDexEntry:: - text "Although its fur" - next "has many admirers," - next "it is tough to" +_GoldeenDexEntry:: + text "When it is time" + next "for them to lay" + next "eggs, they can be" - page "raise as a pet" - next "because of its" - next "fickle meanness" + page "seen swimming up" + next "rivers and falls" + next "in large groups" dex -_MarowakDexEntry:: - text "The bone it holds" - next "is its key weapon." - next "It throws the" +_SeakingDexEntry:: + text "It is the male's" + next "job to make a" + next "nest by carving" - page "bone skillfully" - next "like a boomerang" - next "to KO targets" + page "out boulders in a" + next "stream using the" + next "horn on its head" dex -_HaunterDexEntry:: - text "Because of its" - next "ability to slip" - next "through block" +_StaryuDexEntry:: + text "As long as the" + next "center section is" + next "unharmed, it can" - page "walls, it is said" - next "to be from an-" - next "other dimension" + page "grow back fully" + next "even if it is" + next "chopped to bits" dex -_AbraDexEntry:: - text "Using its ability" - next "to read minds, it" - next "will identify" +_StarmieDexEntry:: + text "The center section" + next "is named the core." + next "People think it" - page "impending danger" - next "and TELEPORT to" - next "safety" + page "is communicating" + next "when it glows in" + next "7 colors" dex -_AlakazamDexEntry:: - text "Its brain can out-" - next "perform a super-" - next "computer." +_MrMimeDexEntry:: + text "Always practices" + next "its pantomime act." + next "It makes enemies" - page "Its intelligence" - next "quotient is said" - next "to be 5,000" + page "believe something" + next "exists that" + next "really doesn't" dex -_PidgeottoDexEntry:: - text "Very protective" - next "of its sprawling" - next "territorial area," +_ScytherDexEntry:: + text "Leaps out of tall" + next "grass and slices" + next "prey with its" - page "this #MON will" - next "fiercely peck at" - next "any intruder" + page "scythes. The move-" + next "ment looks like" + next "that of a ninja" dex -_PidgeotDexEntry:: - text "When hunting, it" - next "skims the surface" - next "of water at high" +_JynxDexEntry:: + text "Appears to move" + next "to a rhythm of" + next "its own, as if it" - page "speed to pick off" - next "unwary prey such" - next "as MAGIKARP" + page "were dancing. It" + next "wiggles its hips" + next "as it walks" dex -_StarmieDexEntry:: - text "Its central core" - next "glows with the" - next "seven colors of" +_ElectabuzzDexEntry:: + text "If a major power" + next "outage occurs, it" + next "is certain that" - page "the rainbow. Some" - next "people value the" - next "core as a gem" + page "this #MON has" + next "eaten electricity" + next "at a power plant" dex -_BulbasaurDexEntry:: - text "A strange seed was" - next "planted on its" - next "back at birth." +_MagmarDexEntry:: + text "Born in an active" + next "volcano. Its body" + next "is always cloaked" - page "The plant sprouts" - next "and grows with" - next "this #MON" + page "in flames, so it" + next "looks like a big" + next "ball of fire" dex -_VenusaurDexEntry:: - text "The plant blooms" - next "when it is" - next "absorbing solar" +_PinsirDexEntry:: + text "Grips its prey in" + next "its pincers and" + next "squeezes hard! It" - page "energy. It stays" - next "on the move to" - next "seek sunlight" + page "can't move if it's" + next "cold, so it lives" + next "in warm places" dex -_TentacruelDexEntry:: - text "The tentacles are" - next "normally kept" - next "short. On hunts," +_TaurosDexEntry:: + text "A rowdy #MON" + next "with a lot of" + next "stamina. Once" - page "they are extended" - next "to ensnare and" - next "immobilize prey" + page "running, it won't" + next "stop until it hits" + next "something" dex -_GoldeenDexEntry:: - text "Its tail fin" - next "billows like an" - next "elegant ballroom" +_MagikarpDexEntry:: + text "Famous for being" + next "very unreliable." + next "It can be found" - page "dress, giving it" - next "the nickname of" - next "the Water Queen" + page "swimming in seas," + next "lakes, rivers and" + next "shallow puddles" dex -_SeakingDexEntry:: - text "In the autumn" - next "spawning season," - next "they can be seen" +_GyaradosDexEntry:: + text "Brutally vicious" + next "and enormously" + next "destructive." - page "swimming power-" - next "fully up rivers" - next "and creeks" + page "Known for totally" + next "destroying cities" + next "in ancient times" dex -_PonytaDexEntry:: - text "Its hooves are 10" - next "times harder than" - next "diamonds. It can" +_LaprasDexEntry:: + text "A gentle soul that" + next "can read the minds" + next "of people. It can" - page "trample anything" - next "completely flat" - next "in little time" + page "ferry people" + next "across the sea on" + next "its back" dex -_RapidashDexEntry:: - text "Very competitive," - next "this #MON will" - next "chase anything" +_DittoDexEntry:: + text "When it spots an" + next "enemy, its body" + next "transfigures into" - page "that moves fast" - next "in the hopes of" - next "racing it" + page "an almost perfect" + next "copy of its oppo-" + next "nent" dex -_RattataDexEntry:: - text "Bites anything" - next "when it attacks." - next "Small and very" +_EeveeDexEntry:: + text "Its genetic code" + next "is unstable, so it" + next "could evolve in" - page "quick, it is a" - next "common sight in" - next "many places" + page "a variety of ways." + next "There are only a" + next "few alive" dex -_RaticateDexEntry:: - text "It uses its whis-" - next "kers to maintain" - next "its balance." +_VaporeonDexEntry:: + text "Its cell structure" + next "is similar to" + next "water molecules." - page "It apparently" - next "slows down if" - next "they are cut off" + page "It will melt away" + next "and become invis-" + next "ible in water" dex -_NidorinoDexEntry:: - text "An aggressive" - next "#MON that is" - next "quick to attack." +_JolteonDexEntry:: + text "A sensitive #-" + next "MON that easily" + next "becomes sad or" - page "The horn on its" - next "head secretes a" - next "powerful venom" + page "angry. Every time" + next "its mood changes," + next "it charges power" dex -_NidorinaDexEntry:: - text "The female's horn" - next "develops slowly." - next "Prefers physical" +_FlareonDexEntry:: + text "It has a flame" + next "chamber inside its" + next "body. It inhales," - page "attacks such as" - next "clawing and" - next "biting" + page "then blows out" + next "fire that is over" + next "3,000F degrees" dex -_GeodudeDexEntry:: - text "Found in fields" - next "and mountains." - next "Mistaking them" +_PorygonDexEntry:: + text "The only #MON" + next "people anticipate" + next "can fly into" - page "for boulders," - next "people often step" - next "or trip on them" + page "space. None has" + next "managed the feat" + next "yet, however" dex -_PorygonDexEntry:: - text "A #MON that" - next "consists entirely" - next "of programming" +_OmanyteDexEntry:: + text "An ancient #MON" + next "that was recovered" + next "from a fossil. It" - page "code. Capable of" - next "moving freely in" - next "cyberspace" + page "swims by cleverly" + next "twisting its 10" + next "tentacles about" dex -_AerodactylDexEntry:: - text "A ferocious, pre-" - next "historic #MON" - next "that goes for the" +_OmastarDexEntry:: + text "Sharp beaks ring" + next "its mouth. Its" + next "shell was too big" - page "enemy's throat" - next "with its serrated" - next "saw-like fangs" + page "for it to move" + next "freely, so it" + next "became extinct" dex -_MagnemiteDexEntry:: - text "Uses anti-gravity" - next "to stay suspended." - next "Appears without" +_KabutoDexEntry:: + text "A #MON that was" + next "recovered from a" + next "fossil. It uses" - page "warning and uses" - next "THUNDER WAVE and" - next "similar moves" + page "the eyes on its" + next "back while hiding" + next "on the sea floor" dex -_CharmanderDexEntry:: - text "Obviously prefers" - next "hot places. When" - next "it rains, steam" +_KabutopsDexEntry:: + text "A slim and fast" + next "swimmer. It slices" + next "its prey with its" - page "is said to spout" - next "from the tip of" - next "its tail" + page "sharp sickles and" + next "drinks the body" + next "fluids" dex -_SquirtleDexEntry:: - text "After birth, its" - next "back swells and" - next "hardens into a" +_AerodactylDexEntry:: + text "A savage #MON" + next "that died out in" + next "ancient times. It" - page "shell. Powerfully" - next "sprays foam from" - next "its mouth" + page "was resurrected" + next "using DNA taken" + next "from amber" dex -_CharmeleonDexEntry:: - text "When it swings" - next "its burning tail," - next "it elevates the" +_SnorlaxDexEntry:: + text "Will eat anything," + next "even if the food" + next "happens to be a" - page "temperature to" - next "unbearably high" - next "levels" + page "little moldy. It" + next "never gets an" + next "upset stomach" dex -_WartortleDexEntry:: - text "Often hides in" - next "water to stalk" - next "unwary prey. For" +_ArticunoDexEntry:: + text "A legendary bird" + next "#MON. It" + next "freezes water" - page "swimming fast, it" - next "moves its ears to" - next "maintain balance" + page "that is contained" + next "in winter air and" + next "makes it snow" dex -_CharizardDexEntry:: - text "Spits fire that" - next "is hot enough to" - next "melt boulders." +_ZapdosDexEntry:: + text "This legendary" + next "bird #MON is" + next "said to appear" - page "Known to cause" - next "forest fires" - next "unintentionally" + page "when the sky turns" + next "dark and lightning" + next "showers down" dex -_OddishDexEntry:: - text "During the day," - next "it keeps its face" - next "buried in the" +_MoltresDexEntry:: + text "A legendary bird" + next "#MON. As it" + next "flaps its flaming" - page "ground. At night," - next "it wanders around" - next "sowing its seeds" + page "wings, even the" + next "night sky will" + next "turn red" dex -_GloomDexEntry:: - text "The fluid that" - next "oozes from its" - next "mouth isn't drool." +_DratiniDexEntry:: + text "The existence of" + next "this mythical" + next "#MON was only" - page "It is a nectar" - next "that is used to" - next "attract prey" + page "recently confirmed" + next "by a fisherman" + next "who caught one" dex -_VileplumeDexEntry:: - text "The larger its" - next "petals, the more" - next "toxic pollen it" +_DragonairDexEntry:: + text "According to a" + next "witness, its body" + next "was surrounded by" - page "contains. Its big" - next "head is heavy and" - next "hard to hold up" + page "a strange aura" + next "that gave it a" + next "mystical look" dex -_BellsproutDexEntry:: - text "A carnivorous" - next "#MON that traps" - next "and eats bugs." +_DragoniteDexEntry:: + text "It is said that" + next "this #MON lives" + next "somewhere in the" - page "It uses its root" - next "feet to soak up" - next "needed moisture" + page "sea and that it" + next "flies. However, it" + next "is only a rumor" dex -_WeepinbellDexEntry:: - text "It spits out" - next "POISONPOWDER to" - next "immobilize the" +_MewtwoDexEntry:: + text "Its DNA is almost" + next "the same as MEW's." + next "However, its size" - page "enemy and then" - next "finishes it with" - next "a spray of ACID" + page "and disposition" + next "are vastly dif-" + next "ferent" dex -_VictreebelDexEntry:: - text "Said to live in" - next "huge colonies" - next "deep in jungles," +_MewDexEntry:: + text "When viewed" + next "through a micro-" + next "scope, this" - page "although no one" - next "has ever returned" - next "from there" + page "#MON's short," + next "fine, delicate" + next "hair can be seen" dex diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 51f6b244..19016d14 100755 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -222,11 +222,11 @@ NidoranMEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 21, FOCUS_ENERGY - db 29, FURY_ATTACK - db 36, HORN_DRILL - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, FOCUS_ENERGY + db 30, FURY_ATTACK + db 38, HORN_DRILL db 0 ClefairyEvosMoves: @@ -271,7 +271,7 @@ NidokingEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING + db 12, DOUBLE_KICK db 23, THRASH db 0 @@ -360,11 +360,11 @@ NidoranFEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 21, TAIL_WHIP - db 29, BITE - db 36, FURY_SWIPES - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, TAIL_WHIP + db 30, BITE + db 38, FURY_SWIPES db 0 NidoqueenEvosMoves: @@ -372,7 +372,7 @@ NidoqueenEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING + db 12, DOUBLE_KICK db 23, BODY_SLAM db 0 @@ -381,6 +381,9 @@ CuboneEvosMoves: db EV_LEVEL, 28, MAROWAK db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 31, FOCUS_ENERGY db 38, THRASH @@ -486,6 +489,7 @@ ScytherEvosMoves: db 29, SLASH db 35, SWORDS_DANCE db 42, AGILITY + db 50, WING_ATTACK db 0 StaryuEvosMoves: @@ -518,6 +522,7 @@ PinsirEvosMoves: ; Evolutions db 0 ; Learnset + db 21, BIND db 25, SEISMIC_TOSS db 30, GUILLOTINE db 36, FOCUS_ENERGY @@ -530,12 +535,14 @@ TangelaEvosMoves: ; Evolutions db 0 ; Learnset - db 29, ABSORB + db 24, BIND + db 27, ABSORB + db 29, VINE_WHIP db 32, POISONPOWDER db 36, STUN_SPORE db 39, SLEEP_POWDER db 45, SLAM - db 49, GROWTH + db 48, GROWTH db 0 MissingNo1FEvosMoves: @@ -640,6 +647,7 @@ ChanseyEvosMoves: ; Evolutions db 0 ; Learnset + db 12, DOUBLESLAP db 24, SING db 30, GROWL db 38, MINIMIZE @@ -822,11 +830,13 @@ MankeyEvosMoves: db EV_LEVEL, 28, PRIMEAPE db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY db 33, SEISMIC_TOSS db 39, THRASH + db 45, SCREECH db 0 SeelEvosMoves: @@ -898,7 +908,9 @@ VenonatEvosMoves: db EV_LEVEL, 31, VENOMOTH db 0 ; Learnset - db 24, POISONPOWDER + db 11, SUPERSONIC + db 19, CONFUSION + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 35, PSYBEAM @@ -1071,11 +1083,15 @@ PikachuEvosMoves: db EV_ITEM, THUNDER_STONE, 1, RAICHU db 0 ; Learnset - db 9, THUNDER_WAVE - db 16, QUICK_ATTACK - db 26, SWIFT + db 6, TAIL_WHIP + db 8, THUNDER_WAVE + db 11, QUICK_ATTACK + db 15, DOUBLE_TEAM + db 20, SLAM + db 26, THUNDERBOLT db 33, AGILITY - db 43, THUNDER + db 41, THUNDER + db 50, LIGHT_SCREEN db 0 RaichuEvosMoves: @@ -1247,52 +1263,55 @@ EeveeEvosMoves: db EV_ITEM, WATER_STONE, 1, VAPOREON db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, TAIL_WHIP - db 37, BITE - db 45, TAKE_DOWN + db 8, SAND_ATTACK + db 16, GROWL + db 23, QUICK_ATTACK + db 30, BITE + db 36, FOCUS_ENERGY + db 42, TAKE_DOWN db 0 FlareonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, EMBER - db 37, TAIL_WHIP - db 40, BITE - db 42, LEER - db 44, FIRE_SPIN - db 48, RAGE - db 54, FLAMETHROWER + db 8, SAND_ATTACK + db 16, EMBER + db 23, QUICK_ATTACK + db 30, BITE + db 36, FIRE_SPIN + db 42, SMOG + db 47, LEER + db 52, FLAMETHROWER db 0 JolteonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, THUNDERSHOCK - db 37, TAIL_WHIP - db 40, THUNDER_WAVE - db 42, DOUBLE_KICK - db 44, AGILITY - db 48, PIN_MISSILE - db 54, THUNDER + db 8, SAND_ATTACK + db 16, THUNDERSHOCK + db 23, QUICK_ATTACK + db 30, DOUBLE_KICK + db 36, PIN_MISSILE + db 42, THUNDER_WAVE + db 47, AGILITY + db 52, THUNDER db 0 VaporeonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, WATER_GUN - db 37, TAIL_WHIP - db 40, BITE - db 42, ACID_ARMOR - db 44, HAZE - db 48, MIST - db 54, HYDRO_PUMP + db 8, SAND_ATTACK + db 16, WATER_GUN + db 23, QUICK_ATTACK + db 30, BITE + db 36, AURORA_BEAM + db 42, HAZE + db 42, MIST + db 47, ACID_ARMOR + db 52, HYDRO_PUMP db 0 MachopEvosMoves: @@ -1412,11 +1431,14 @@ PrimeapeEvosMoves: ; Evolutions db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY + db 28, RAGE db 37, SEISMIC_TOSS db 46, THRASH + db 45, SCREECH db 0 DugtrioEvosMoves: @@ -1434,7 +1456,7 @@ VenomothEvosMoves: ; Evolutions db 0 ; Learnset - db 24, POISONPOWDER + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 38, PSYBEAM @@ -1477,19 +1499,21 @@ MetapodEvosMoves: db EV_LEVEL, 10, BUTTERFREE db 0 ; Learnset + db 7, HARDEN db 0 ButterfreeEvosMoves: ; Evolutions db 0 ; Learnset - db 12, CONFUSION - db 15, POISONPOWDER - db 16, STUN_SPORE - db 17, SLEEP_POWDER - db 21, SUPERSONIC - db 26, WHIRLWIND - db 32, PSYBEAM + db 10, CONFUSION + db 13, POISONPOWDER + db 14, STUN_SPORE + db 15, SLEEP_POWDER + db 18, SUPERSONIC + db 23, WHIRLWIND + db 28, GUST + db 34, PSYBEAM db 0 MachampEvosMoves: @@ -1669,6 +1693,9 @@ MarowakEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 33, FOCUS_ENERGY db 41, THRASH @@ -1889,11 +1916,11 @@ NidorinoEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 23, FOCUS_ENERGY - db 32, FURY_ATTACK - db 41, HORN_DRILL - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, FOCUS_ENERGY + db 36, FURY_ATTACK + db 46, HORN_DRILL db 0 NidorinaEvosMoves: @@ -1902,11 +1929,11 @@ NidorinaEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 23, TAIL_WHIP - db 32, BITE - db 41, FURY_SWIPES - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, TAIL_WHIP + db 36, BITE + db 46, FURY_SWIPES db 0 GeodudeEvosMoves: diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 471ee846..0fbc9260 100755 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -11,7 +11,7 @@ MonPartyData: dn ICON_QUADRUPED, ICON_QUADRUPED ; Rattata / Raticate dn ICON_BIRD, ICON_BIRD ; Spearow / Fearow dn ICON_SNAKE, ICON_SNAKE ; Ekans / Arbok - dn ICON_FAIRY, ICON_FAIRY ; Pikachu / Raichu + dn ICON_PIKACHU, ICON_PIKACHU ; Pikachu / Raichu dn ICON_MON, ICON_MON ; Sandshrew / Sandslash dn ICON_MON, ICON_MON ; NidoranF / Nidorina dn ICON_MON, ICON_MON ; Nidoqueen / NidoranM diff --git a/data/pokemon/mew.asm b/data/pokemon/mew.asm deleted file mode 100644 index c68867ee..00000000 --- a/data/pokemon/mew.asm +++ /dev/null @@ -1,15 +0,0 @@ -; Mew's pics and base data are not grouped with the other Pokémon -; because it was a last-minute addition "as a kind of prank". -; Shigeki Morimoto explained in an Iwata Asks interview: -; "We put Mew in right at the very end. The cartridge was really full and -; there wasn't room for much more on there. Then the debug features which -; weren't going to be included in the final version of the game were removed, -; creating a miniscule 300 bytes of free space. So we thought that we could -; slot Mew in there. What we did would be unthinkable nowadays!" -; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0 - -MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" -MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" - -MewBaseStats:: -INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm deleted file mode 100755 index c0acd13a..00000000 --- a/data/pokemon/title_mons.asm +++ /dev/null @@ -1,56 +0,0 @@ -TitleMons: -; mons on the title screen are randomly chosen from here -IF DEF(_RED) - db STARTER1 - db STARTER2 - db STARTER3 - db WEEDLE - db NIDORAN_M - db SCYTHER - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP -ENDC -IF DEF(_GREEN) - db STARTER3 - db STARTER1 - db STARTER2 - db CATERPIE - db NIDORAN_F - db PINSIR - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP -ENDC -IF DEF(_BLUE) - db STARTER2 - db STARTER1 - db STARTER3 - db MANKEY - db HITMONLEE - db VULPIX - db CHANSEY - db AERODACTYL - db JOLTEON - db SNORLAX - db GLOOM - db POLIWAG - db DODUO - db PORYGON - db GENGAR - db RAICHU -ENDC diff --git a/data/sgb/sgb_border.asm b/data/sgb/sgb_border.asm index aa11a326..9955acda 100755 --- a/data/sgb/sgb_border.asm +++ b/data/sgb/sgb_border.asm @@ -1,62 +1,87 @@ BorderPalettes: -IF DEF(_RED) - INCBIN "gfx/sgb/red_border.tilemap" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/sgb/blue_border.tilemap" -ENDC + INCBIN "gfx/sgb/border.tilemap" ds $100 -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB1 - RGB 25,22,25 - RGB 25,17,21 - RGB 24,14,12 -ENDC -IF DEF(_BLUE) - RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O) - RGB 10,17,26 - RGB 5,9,20 - RGB 16,20,27 -ENDC - - ds $18 - -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB2 - RGB 22,31,16 - RGB 27,20,6 - RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB2 - RGB 27,11,6 - RGB 5,9,20 - RGB 28,25,15 -ENDC - - ds $18 - -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB3 - RGB 31,31,17 - RGB 18,21,29 - RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB3 - RGB 12,15,11 - RGB 5,9,20 - RGB 14,22,17 -ENDC - - ds $18 + RGB 24, 6, 6 + RGB 31, 25, 9 + RGB 25, 10, 10 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 24, 18 + RGB 25, 10, 10 + RGB 15, 25, 15 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 6, 31 + RGB 31, 25, 9 + RGB 15, 25, 15 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 6 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 SGBBorderGraphics: -IF DEF(_RED) - INCBIN "gfx/sgb/red_border.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/sgb/blue_border.2bpp" -ENDC + INCBIN "gfx/sgb/border.2bpp" diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index 0b6219e1..a0582416 100755 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -58,10 +58,6 @@ BlkPacket_WholeScreen: ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 ds 8, 0 -; unused - db $03, 00,00, 19,17, $00 - db $00 - BlkPacket_Battle: ATTR_BLK 5 ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 @@ -70,40 +66,16 @@ BlkPacket_Battle: ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2 ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 ; enemy mon : pal 3 -; unused - db $03, 00,00, 19,11, $00 - db $03, 00,12, 19,17, $02 - db $03, 01,00, 10,03, $01 - db $03, 10,08, 19,10, $00 - db $03, 00,04, 08,11, $02 - db $03, 11,00, 19,07, $03 - db $00 - BlkPacket_StatusScreen: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0 ds 8, 0 -; unused - db $02, 00,00, 17,00 - db $03, 01,00, 07,06, $01 - db $03, 01,07, 19,17, $00 - db $03, 08,00, 19,06, $00 - db $00 - BlkPacket_Pokedex: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0 ds 8, 0 -; unused - db $02, 00,00, 17,00 - db $01, 00,01, 19,00 - db $03, 01,01, 08,08, $01 - db $03, 01,09, 08,17, $00 - db $03, 09,01, 19,17, $00 - db $00 - BlkPacket_Slots: ATTR_BLK 5 ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 @@ -112,27 +84,13 @@ BlkPacket_Slots: ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 ; message box: pal 0 -; unused - db $03, 00,00, 19,11, $01 - db $03, 00,04, 19,09, $02 - db $03, 00,06, 19,07, $03 - db $03, 04,04, 15,09, $00 - db $03, 00,12, 19,17, $00 - db $00 - BlkPacket_Titlescreen: ATTR_BLK 3 - ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 - ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 - ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 ; player, mon, copyright text: pal 2 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 + ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17 + ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 ds 12, 0 -; unused - db $03, 00,00, 19,07, $00 - db $03, 00,08, 19,09, $01 - db $03, 00,10, 19,17, $02 - db $00 - BlkPacket_NidorinoIntro: ATTR_BLK 3 ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 @@ -140,12 +98,6 @@ BlkPacket_NidorinoIntro: ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 ds 12, 0 -; unused - db $03, 00,00, 19,03, $01 - db $03, 00,04, 19,13, $00 - db $03, 00,14, 19,17, $01 - db $00 - BlkPacket_PartyMenu: ATTR_BLK 7 ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 @@ -157,46 +109,20 @@ BlkPacket_PartyMenu: ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically ds 4, 0 -; unused - db $02, 00,00, 17,01 - db $03, 01,00, 02,12, $00 - db $03, 01,13, 02,17, $01 - db $03, 03,00, 19,17, $01 - db $03, 12,00, 18,01, $00 - db $03, 12,02, 18,03, $00 - db $03, 12,04, 18,05, $00 - db $03, 12,06, 18,07, $00 - db $03, 12,08, 18,09, $00 - db $03, 12,10, 18,11, $00 - db $00 - BlkPacket_TrainerCard: ATTR_BLK 10 - ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge - ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge - ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 ; Thunder Badge - ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 ; Rainbow Badge - ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 ; Rainbow Badge - ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 ; Rainbow Badge - ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 ; Soul Badge - ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge - ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge - ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge + ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 + ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 + ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 + ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 + ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13 + ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13 + ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 + ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 + ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 + ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ds 2, 0 -; unused - db $03, 03,12, 04,13, $00 - db $03, 07,12, 08,13, $01 - db $03, 11,12, 12,13, $03 - db $03, 16,11, 17,12, $02 - db $03, 14,13, 15,14, $01 - db $03, 16,13, 17,14, $03 - db $03, 03,15, 04,16, $02 - db $03, 07,15, 08,16, $03 - db $03, 11,15, 12,16, $02 - db $03, 15,15, 16,16, $01 - db $00 - BlkPacket_GameFreakIntro: ATTR_BLK 3 ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0 @@ -204,15 +130,10 @@ BlkPacket_GameFreakIntro: ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 ds 12, 0 -; unused - db $03, 00,00, 19,10, $00 - db $03, 00,11, 04,13, $00 - db $03, 05,11, 07,13, $01 - db $03, 08,11, 19,13, $00 - db $03, 00,14, 19,17, $00 - db $03, 08,11, 09,13, $02 - db $03, 12,11, 14,13, $03 - db $00 +UnknownPacket_72751: + ATTR_BLK 1 + ATTR_BLK_DATA %111, 1,1,0, 04,00, 15,05 + ds 8 PalPacket_Empty: PAL_SET 0, 0, 0, 0 @@ -226,6 +147,8 @@ PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWM PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON +UnknownPalPacket_72811: PAL_SET PAL_25, PAL_25, PAL_25, PAL_25 +UnknownPalPacket_72821: PAL_SET PAL_25, PAL_27, PAL_25, PAL_25 PalTrnPacket: PAL_TRN MltReq1Packet: MLT_REQ 1 @@ -236,19 +159,18 @@ PctTrnPacket: PCT_TRN MaskEnFreezePacket: MASK_EN 1 MaskEnCancelPacket: MASK_EN 0 - ; These are DATA_SND packets containing SNES code. ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. -DataSnd_72548: +DataSnd_728a1: DATA_SND $85d, $0, 11 db $8C ; cpx #$8c (2) db $D0, $F4 ; bne -$0c db $60 ; rts ds 7, 0 -DataSnd_72558: +DataSnd_728b1: DATA_SND $852, $0, 11 db $A9, $E7 ; lda #$e7 db $9F, $01, $C0, $7E ; sta $7ec001, x @@ -258,8 +180,8 @@ DataSnd_72558: db $E8 ; inx db $E0 ; cpx #$8c (1) -DataSnd_72568: - DATA_SND $847, $0, 11 +DataSnd_728c1: + DATA_SND $847, $0, 11 ; 728c1 (1c:68c1) db $C4 ; cmp #$c4 (2) db $D0, $16 ; bne +$16 db $A5 ; lda dp @@ -268,8 +190,8 @@ DataSnd_72568: db $D0, $10 ; bne +$10 db $A2, $28 ; ldx #$28 -DataSnd_72578: - DATA_SND $83c, $0, 11 +DataSnd_728d1: + DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) db $F0, $12 ; beq +$12 db $A5 ; lda dp db $C9, $C9 ; cmp #$c9 @@ -279,7 +201,7 @@ DataSnd_72578: db $CA ; dex db $C9 ; cmp #$c4 (1) -DataSnd_72588: +DataSnd_728e1: DATA_SND $831, $0, 11 dbw $0C, $CAA5 ; tsb $caa5 db $C9, $7E ; cmp #$7e @@ -288,7 +210,7 @@ DataSnd_72588: db $CB ; wai db $C9, $7E ; cmp #$7e -DataSnd_72598: +DataSnd_728f1: DATA_SND $826, $0, 11 db $39 ; bne +$39 (2) dbw $CD, $C48 ; cmp $c48 @@ -297,7 +219,7 @@ DataSnd_72598: db $C9, $C9 ; cmp #$c9 db $80, $D0 ; bra -$30 -DataSnd_725a8: +DataSnd_72901: DATA_SND $81b, $0, 11 db $EA ; nop db $EA ; nop @@ -309,7 +231,7 @@ DataSnd_725a8: dbw $CD,$C4F ; cmp $c4f db $D0 ; bne +$39 (1) -DataSnd_725b8: +DataSnd_72911: DATA_SND $810, $0, 11 dbw $4C, $820 ; jmp $820 db $EA ; nop diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 7029b4e8..5ddca002 100755 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -1,51 +1,84 @@ SuperPalettes: ; entries correspond to PAL_* constants - RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE - RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET - RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN - RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER - RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN - RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER - RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION - RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON - RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA - RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR - RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO - RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON - RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP -IF DEF(_RED) - RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1 -ENDC -IF DEF(_BLUE) - RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1 -ENDC - RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2 - RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F - RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON - RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON - RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON - RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON - RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON - RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON - RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON - RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON - RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON - RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON - RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1 -IF DEF(_RED) - RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2 - RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3 - RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4 -ENDC -IF DEF(_BLUE) - RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2 - RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3 - RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4 -ENDC - RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK - RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR - RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR - RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR - RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE - RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE - RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK + RGB 31,31,30, 23,26,19, 23,27,31, 06,06,06 ; PAL_ROUTE + RGB 31,31,30, 28,27,31, 23,27,31, 06,06,06 ; PAL_PALLET + RGB 31,31,30, 26,31,21, 23,27,31, 06,06,06 ; PAL_VIRIDIAN + RGB 31,31,30, 23,23,22, 23,27,31, 06,06,06 ; PAL_PEWTER + RGB 31,31,30, 22,23,31, 23,27,31, 06,06,06 ; PAL_CERULEAN + RGB 31,31,30, 27,23,29, 23,27,31, 06,06,06 ; PAL_LAVENDER + RGB 31,31,30, 31,25,16, 23,27,31, 06,06,06 ; PAL_VERMILION + RGB 31,31,30, 22,31,22, 23,27,31, 06,06,06 ; PAL_CELADON + RGB 31,31,30, 31,26,26, 23,27,31, 06,06,06 ; PAL_FUCHSIA + RGB 31,31,30, 31,15,14, 23,27,31, 06,06,06 ; PAL_CINNABAR + RGB 31,31,30, 17,17,25, 23,27,31, 06,06,06 ; PAL_INDIGO + RGB 31,31,30, 31,31,19, 23,27,31, 06,06,06 ; PAL_SAFFRON + RGB 31,31,30, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP + RGB 31,31,30, 30,30,17, 21,00,04, 21,00,04 ; PAL_LOGO1 + RGB 31,31,30, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2 + RGB 31,31,30, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F + RGB 31,31,30, 31,30,22, 27,16,16, 06,06,06 ; PAL_MEWMON + RGB 31,31,30, 21,22,31, 09,10,20, 06,06,06 ; PAL_BLUEMON + RGB 31,31,30, 31,24,11, 26,09,06, 06,06,06 ; PAL_REDMON + RGB 31,31,30, 26,28,31, 07,24,28, 06,06,06 ; PAL_CYANMON + RGB 31,31,30, 27,22,30, 22,15,23, 06,06,06 ; PAL_PURPLEMON + RGB 31,31,30, 26,23,18, 18,14,10, 06,06,06 ; PAL_BROWNMON + RGB 31,31,30, 24,28,18, 13,21,15, 06,06,06 ; PAL_GREENMON + RGB 31,31,30, 31,24,26, 31,18,21, 06,06,06 ; PAL_PINKMON + RGB 31,31,30, 31,31,19, 28,23,09, 06,06,06 ; PAL_YELLOWMON + RGB 31,31,30, 25,25,18, 16,16,14, 06,06,06 ; PAL_GREYMON + RGB 31,31,30, 27,22,30, 26,09,06, 06,06,06 ; PAL_SLOTS1 + RGB 31,31,30, 31,23,26, 29,29,08, 06,06,06 ; PAL_SLOTS2 + RGB 31,31,30, 23,31,20, 29,29,08, 06,06,06 ; PAL_SLOTS3 + RGB 31,31,30, 23,29,31, 29,29,08, 06,06,06 ; PAL_SLOTS4 + RGB 31,31,30, 06,06,06, 06,06,06, 06,06,06 ; PAL_BLACK + RGB 31,31,30, 31,31,19, 00,21,00, 06,06,06 ; PAL_GREENBAR + RGB 31,31,30, 31,31,19, 28,23,09, 06,06,06 ; PAL_YELLOWBAR + RGB 31,31,30, 31,31,19, 26,09,06, 06,06,06 ; PAL_REDBAR + RGB 31,31,30, 20,15,11, 22,21,20, 06,06,06 ; PAL_BADGE + RGB 31,31,30, 20,15,11, 22,21,20, 06,06,06 ; PAL_CAVE + RGB 31,31,30, 28,24,14, 20,20,11, 06,06,06 ; PAL_GAMEFREAK + RGB 31,31,30, 31,30,22, 23,27,31, 06,06,06 ; PAL_25 + RGB 31,31,30, 28,23,09, 18,14,10, 06,06,06 ; PAL_26 + RGB 31,31,30, 16,16,16, 31,25,09, 06,06,06 ; PAL_27 + +GBCBasePalettes: + RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE + RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET + RGB 31,31,31, 19,31,00, 11,23,31, 03,03,03 ; PAL_VIRIDIAN + RGB 31,31,31, 18,18,15, 11,23,31, 03,03,03 ; PAL_PEWTER + RGB 31,31,31, 05,08,31, 11,23,31, 03,03,03 ; PAL_CERULEAN + RGB 31,31,31, 25,04,31, 11,23,31, 03,03,03 ; PAL_LAVENDER + RGB 31,31,31, 31,19,00, 11,23,31, 03,03,03 ; PAL_VERMILION + RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADON + RGB 31,31,31, 31,15,15, 11,23,31, 03,03,03 ; PAL_FUCHSIA + RGB 31,31,31, 31,08,08, 11,23,31, 03,03,03 ; PAL_CINNABAR + RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO + RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON + RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP + RGB 31,31,31, 31,31,00, 31,00,00, 31,00,00 ; PAL_LOGO1 + RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2 + RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F + RGB 31,31,31, 31,31,00, 31,01,01, 03,03,03 ; PAL_MEWMON + RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON + RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON + RGB 31,31,31, 16,26,31, 00,17,31, 03,03,03 ; PAL_CYANMON + RGB 31,31,31, 25,15,31, 19,00,22, 03,03,03 ; PAL_PURPLEMON + RGB 31,31,31, 29,18,10, 17,09,05, 03,03,03 ; PAL_BROWNMON + RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON + RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON + RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON + RGB 31,31,31, 20,23,10, 11,11,05, 03,03,03 ; PAL_GREYMON + RGB 31,31,31, 25,01,31, 31,00,00, 03,03,03 ; PAL_SLOTS1 + RGB 31,31,31, 31,04,19, 31,31,00, 03,03,03 ; PAL_SLOTS2 + RGB 31,31,31, 08,31,00, 31,31,00, 03,03,03 ; PAL_SLOTS3 + RGB 31,31,31, 00,31,31, 31,31,00, 03,03,03 ; PAL_SLOTS4 + RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK + RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR + RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR + RGB 31,31,31, 31,31,00, 31,00,00, 03,03,03 ; PAL_REDBAR + RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_BADGE + RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE + RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK + RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_25 + RGB 31,31,31, 31,18,00, 19,07,01, 03,03,03 ; PAL_26 + RGB 31,31,31, 09,09,09, 31,21,00, 03,03,03 ; PAL_27 diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index eb583d53..e87a9627 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -1,59 +1,131 @@ SpriteFacingAndAnimationTable: -; This table is used for overworld sprites $1-$9. - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0 - dw .WalkingDown, .NormalOAM ; facing down, walk animation frame 1 - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2 - dw .WalkingDown, .FlippedOAM ; facing down, walk animation frame 3 - dw .StandingUp, .NormalOAM ; facing up, walk animation frame 0 - dw .WalkingUp, .NormalOAM ; facing up, walk animation frame 1 - dw .StandingUp, .NormalOAM ; facing up, walk animation frame 2 - dw .WalkingUp, .FlippedOAM ; facing up, walk animation frame 3 - dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 0 - dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 1 - dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 2 - dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 3 - dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 0 - dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 1 - dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 2 - dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 3 + dw .StandingDown ; facing down, walk animation frame 0 + dw .WalkingDown ; facing down, walk animation frame 1 + dw .StandingDown ; facing down, walk animation frame 2 + dw .WalkingDown2 ; facing down, walk animation frame 3 + dw .StandingUp ; facing up, walk animation frame 0 + dw .WalkingUp ; facing up, walk animation frame 1 + dw .StandingUp ; facing up, walk animation frame 2 + dw .WalkingUp2 ; facing up, walk animation frame 3 + dw .StandingLeft ; facing left, walk animation frame 0 + dw .WalkingLeft ; facing left, walk animation frame 1 + dw .StandingLeft ; facing left, walk animation frame 2 + dw .WalkingLeft ; facing left, walk animation frame 3 + dw .StandingRight ; facing right, walk animation frame 0 + dw .WalkingRight ; facing right, walk animation frame 1 + dw .StandingRight ; facing right, walk animation frame 2 + dw .WalkingRight ; facing right, walk animation frame 3 ; The rest of this table is used for sprites $a and $b. ; All orientation and animation parameters lead to the same result. ; Used for immobile sprites like items on the ground. - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0 - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 1 - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2 - dw .StandingDown, .NormalOAM ; facing down, walk animation frame 3 - dw .StandingDown, .NormalOAM ; facing up, walk animation frame 0 - dw .StandingDown, .NormalOAM ; facing up, walk animation frame 1 - dw .StandingDown, .NormalOAM ; facing up, walk animation frame 2 - dw .StandingDown, .NormalOAM ; facing up, walk animation frame 3 - dw .StandingDown, .NormalOAM ; facing left, walk animation frame 0 - dw .StandingDown, .NormalOAM ; facing left, walk animation frame 1 - dw .StandingDown, .NormalOAM ; facing left, walk animation frame 2 - dw .StandingDown, .NormalOAM ; facing left, walk animation frame 3 - dw .StandingDown, .NormalOAM ; facing right, walk animation frame 0 - dw .StandingDown, .NormalOAM ; facing right, walk animation frame 1 - dw .StandingDown, .NormalOAM ; facing right, walk animation frame 2 - dw .StandingDown, .NormalOAM ; facing right, walk animation frame 3 - -; four tile ids compose an overworld sprite -.StandingDown: db $00, $01, $02, $03 -.WalkingDown: db $80, $81, $82, $83 -.StandingUp: db $04, $05, $06, $07 -.WalkingUp: db $84, $85, $86, $87 -.StandingLeft: db $08, $09, $0a, $0b -.WalkingLeft: db $88, $89, $8a, $8b - -.NormalOAM: - ; y, x, attributes - db 0, 0, $00 ; top left - db 0, 8, $00 ; top right - db 8, 0, OAMFLAG_CANBEMASKED ; bottom left - db 8, 8, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - -.FlippedOAM: - ; y, x, attributes - db 0, 8, OAM_HFLIP ; top left - db 0, 0, OAM_HFLIP ; top right - db 8, 8, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left - db 8, 0, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown + dw .StandingDown +; special case + dw SpriteSpecialCase ; pikachu maybe? + +.StandingDown: + db $04 +; Sprite OAM Parameters + db $00, $00, $00, $00 ; top left + db $00, $08, $01, $00 ; top right + db $08, $00, $02, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $03, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingDown: + db $04 +; Sprite OAM Parameters + db $00, $00, $80, $00 ; top left + db $00, $08, $81, $00 ; top right + db $08, $00, $82, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $83, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingDown2: + db $04 +; Sprite OAM Parameters + db $00, $08, $80, OAM_HFLIP ; top left + db $00, $00, $81, OAM_HFLIP ; top right + db $08, $08, $82, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left + db $08, $00, $83, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.StandingUp: + db $04 +; Sprite OAM Parameters + db $00, $00, $04, $00 ; top left + db $00, $08, $05, $00 ; top right + db $08, $00, $06, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $07, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingUp: + db $04 +; Sprite OAM Parameters + db $00, $00, $84, $00 ; top left + db $00, $08, $85, $00 ; top right + db $08, $00, $86, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $87, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingUp2: + db $04 +; Sprite OAM Parameters + db $00, $08, $84, OAM_HFLIP ; top left + db $00, $00, $85, OAM_HFLIP ; top right + db $08, $08, $86, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left + db $08, $00, $87, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.StandingLeft: + db $04 +; Sprite OAM Parameters + db $00, $00, $08, $00 ; top left + db $00, $08, $09, $00 ; top right + db $08, $00, $0a, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $0b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingLeft: + db $04 +; Sprite OAM Parameters + db $00, $00, $88, $00 ; top left + db $00, $08, $89, $00 ; top right + db $08, $00, $8a, OAMFLAG_CANBEMASKED ; bottom left + db $08, $08, $8b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.StandingRight: + db $04 +; Sprite OAM Parameters + db $00, $08, $08, OAM_HFLIP ; top left + db $00, $00, $09, OAM_HFLIP ; top right + db $08, $08, $0a, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left + db $08, $00, $0b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.WalkingRight: + db $04 +; Sprite OAM Parameters + db $00, $08, $88, OAM_HFLIP ; top left + db $00, $00, $89, OAM_HFLIP ; top right + db $08, $08, $8a, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left + db $08, $00, $8b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +SpriteSpecialCase: + db $09 +; Sprite OAM Parameters + db -$4, -$4, $00, $00 + db -$4, $04, $01, $00 + db -$4, $0c, $00, OAM_HFLIP + db $04, -$4, $01, $00 + db $04, $04, $02, $00 + db $04, $0c, $01, $00 + db $0c, -$4, $00, OAM_VFLIP | OAMFLAG_CANBEMASKED + db $0c, $04, $01, OAMFLAG_CANBEMASKED + db $0c, $0c, $00, OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 6b4f2ba0..b7bee609 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -36,7 +36,7 @@ SpriteSheetPointerTable: overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL overworld_sprite LanceSprite, 12 ; SPRITE_LANCE - overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_SCIENTIST overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER @@ -55,17 +55,27 @@ SpriteSheetPointerTable: overworld_sprite FisherSprite, 12 ; SPRITE_FISHER overworld_sprite KogaSprite, 12 ; SPRITE_KOGA overworld_sprite GuardSprite, 12 ; SPRITE_GUARD - overworld_sprite GuardSprite, 12 ; SPRITE_UNUSED_GUARD + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_GUARD overworld_sprite MomSprite, 12 ; SPRITE_MOM overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY - overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID overworld_sprite FairySprite, 12 ; SPRITE_FAIRY overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI overworld_sprite SeelSprite, 12 ; SPRITE_SEEL + overworld_sprite PikachuSprite, 12 ; SPRITE_PIKACHU + overworld_sprite OfficerJennySprite, 12 ; SPRITE_OFFICER_JENNY + overworld_sprite SandshrewSprite, 12 ; SPRITE_SANDSHREW + overworld_sprite OddishSprite, 12 ; SPRITE_ODDISH + overworld_sprite BulbasaurSprite, 12 ; SPRITE_BULBASAUR + overworld_sprite JigglypuffSprite, 12 ; SPRITE_JIGGLYPUFF + overworld_sprite ClefairySprite, 12 ; SPRITE_CLEFAIRY + overworld_sprite ChanseySprite, 12 ; SPRITE_CHANSEY + overworld_sprite JessieSprite, 12 ; SPRITE_JESSIE + overworld_sprite JamesSprite, 12 ; SPRITE_JAMES overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER diff --git a/data/text/text_1.asm b/data/text/text_1.asm index af1d3827..eb394afe 100644 --- a/data/text/text_1.asm +++ b/data/text/text_1.asm @@ -147,3 +147,8 @@ _OaksAideNoRoomText:: text_ram wOaksAideRewardItemName text "." done + +_NurseChanseyText:: + text "CHANSEY: Chaaan" + line "sey!" + done diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 5e620fbb..f1e5b68d 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -17,6 +17,15 @@ _AIBattleUseItemText:: text "!" prompt +_BoxFullTest:: + text "The BOX is full!" + done + +_BoxWillBeClearedText:: + text "The BOX will be" + line "cleared." + done + _TradeWentToText:: text_ram wcf4b text " went" @@ -318,7 +327,7 @@ _GameOverText:: line "GAME is over!" done -_CinnabarGymQuizIntroText:: +_CinnabarGymQuizDummyIntroText:: text "#MON Quiz!" para "Get it right and" @@ -337,6 +346,34 @@ _CinnabarGymQuizIntroText:: line "Here we go!" prompt +_CinnabarGymQuizIntroText:: + text "#MON Quiz!" + + para "Get it right and" + line "the door opens to" + cont "the next room!" + + para "Get it wrong and" + line "face the trainer" + cont "blocking the way!" + + para "If you want to" + line "conserve your" + cont "#MON for the" + cont "GYM LEADER..." + + para "Then get it right!" + line "Here we go!" + para "" + done + +_CinnabarGymQuizShortIntroText:: + text "#MON Quiz!" + + line "Test your skill!" + para "" + done + _CinnabarQuizQuestionsText1:: text "CATERPIE evolves" line "into BUTTERFREE?" @@ -602,6 +639,14 @@ _KabutopsFossilText:: cont "rare #MON." done +_FanClubPicture1Text:: + text "My cute RAPIDASH." + done + +_FanClubPicture2Text:: + text "My beloved FEAROW." + done + _LinkCableHelpText1:: text "TRAINER TIPS" @@ -947,6 +992,10 @@ _GotAwayText:: text "Got away safely!" prompt +_RunAwayText:: + text "Hurry, get away!" + prompt + _ItemsCantBeUsedHereText:: text "Items can't be" line "used here." @@ -977,7 +1026,7 @@ _NoMovesLeftText:: _MultiHitText:: text "Hit the enemy" line "@" - text_decimal wPlayerNumHits, 1, 1 + text_decimal wPlayerNumHits,1,1 text " times!" prompt @@ -1233,88 +1282,6 @@ _GrewLevelText:: text "!@" text_end -_WildMonAppearedText:: - text "Wild @" - text_ram wEnemyMonNick - text_start - line "appeared!" - prompt - -_HookedMonAttackedText:: - text "The hooked" - line "@" - text_ram wEnemyMonNick - text_start - cont "attacked!" - prompt - -_EnemyAppearedText:: - text_ram wEnemyMonNick - text_start - line "appeared!" - prompt - -_TrainerWantsToFightText:: - text_ram wTrainerName - text " wants" - line "to fight!" - prompt - -_UnveiledGhostText:: - text "SILPH SCOPE" - line "unveiled the" - cont "GHOST's identity!" - prompt - -_GhostCantBeIDdText:: - text "Darn! The GHOST" - line "can't be ID'd!" - prompt - -_GoText:: - text "Go! @" - text_end - -_DoItText:: - text "Do it! @" - text_end - -_GetmText:: - text "Get'm! @" - text_end - -_EnemysWeakText:: - text "The enemy's weak!" - line "Get'm! @" - text_end - -_PlayerMon1Text:: - text_ram wBattleMonNick - text "!" - done - -_PlayerMon2Text:: - text_ram wBattleMonNick - text " @" - text_end - -_EnoughText:: - text "enough!@" - text_end - -_OKExclamationText:: - text "OK!@" - text_end - -_GoodText:: - text "good!@" - text_end - -_ComeBackText:: - text_start - line "Come back!" - done - _SuperEffectiveText:: text "It's super" line "effective!" @@ -1339,454 +1306,17 @@ _SafariZoneAngryText:: line "is angry!" prompt -; money related -_PickUpPayDayMoneyText:: - text "<PLAYER> picked up" - line "¥@" - text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text "!" - prompt - -_ClearSaveDataText:: - text "Clear all saved" - line "data?" - done - -_WhichFloorText:: - text "Which floor do" - line "you want? " - done - -_PartyMenuNormalText:: - text "Choose a #MON." - done - -_PartyMenuItemUseText:: - text "Use item on which" - line "#MON?" - done - -_PartyMenuBattleText:: - text "Bring out which" - line "#MON?" - done - -_PartyMenuUseTMText:: - text "Use TM on which" - line "#MON?" - done - -_PartyMenuSwapMonText:: - text "Move #MON" - line "where?" - done - -_PotionText:: - text_ram wcd6d - text_start - line "recovered by @" - text_decimal wHPBarHPDifference, 2, 3 - text "!" - done - -_AntidoteText:: - text_ram wcd6d - text " was" - line "cured of poison!" - done - -_ParlyzHealText:: - text_ram wcd6d - text "'s" - line "rid of paralysis!" - done - -_BurnHealText:: - text_ram wcd6d - text "'s" - line "burn was healed!" - done - -_IceHealText:: - text_ram wcd6d - text " was" - line "defrosted!" - done - -_AwakeningText:: - text_ram wcd6d - text_start - line "woke up!" - done - -_FullHealText:: - text_ram wcd6d - text "'s" - line "health returned!" - done - -_ReviveText:: - text_ram wcd6d +_WildMonAppearedText:: + text "Wild @" + text_ram wEnemyMonNick text_start - line "is revitalized!" - done - -_RareCandyText:: - text_ram wcd6d - text " grew" - line "to level @" - text_decimal wCurEnemyLVL, 1, 3 - text "!@" - text_end - -_TurnedOnPC1Text:: - text "<PLAYER> turned on" - line "the PC." - prompt - -_AccessedBillsPCText:: - text "Accessed BILL's" - line "PC." - - para "Accessed #MON" - line "Storage System." - prompt - -_AccessedSomeonesPCText:: - text "Accessed someone's" - line "PC." - - para "Accessed #MON" - line "Storage System." - prompt - -_AccessedMyPCText:: - text "Accessed my PC." - - para "Accessed Item" - line "Storage System." - prompt - -_TurnedOnPC2Text:: - text "<PLAYER> turned on" - line "the PC." - prompt - -_WhatDoYouWantText:: - text "What do you want" - line "to do?" - done - -_WhatToDepositText:: - text "What do you want" - line "to deposit?" - done - -_DepositHowManyText:: - text "How many?" - done - -_ItemWasStoredText:: - text_ram wcd6d - text " was" - line "stored via PC." - prompt - -_NothingToDepositText:: - text "You have nothing" - line "to deposit." - prompt - -_NoRoomToStoreText:: - text "No room left to" - line "store items." - prompt - -_WhatToWithdrawText:: - text "What do you want" - line "to withdraw?" - done - -_WithdrawHowManyText:: - text "How many?" - done - -_WithdrewItemText:: - text "Withdrew" - line "@" - text_ram wcd6d - text "." - prompt - -_NothingStoredText:: - text "There is nothing" - line "stored." - prompt - -_CantCarryMoreText:: - text "You can't carry" - line "any more items." - prompt - -_WhatToTossText:: - text "What do you want" - line "to toss away?" - done - -_TossHowManyText:: - text "How many?" - done - -_AccessedHoFPCText:: - text "Accessed #MON" - line "LEAGUE's site." - - para "Accessed the HALL" - line "OF FAME List." - prompt - -_SwitchOnText:: - text "Switch on!" - prompt - -_WhatText:: - text "What?" - done - -_DepositWhichMonText:: - text "Deposit which" - line "#MON?" - done - -_MonWasStoredText:: - text_ram wcf4b - text " was" - line "stored in Box @" - text_ram wBoxNumString - text "." - prompt - -_CantDepositLastMonText:: - text "You can't deposit" - line "the last #MON!" - prompt - -_BoxFullText:: - text "Oops! This Box is" - line "full of #MON." - prompt - -_MonIsTakenOutText:: - text_ram wcf4b - text " is" - line "taken out." - cont "Got @" - text_ram wcf4b - text "." - prompt - -_NoMonText:: - text "What? There are" - line "no #MON here!" - prompt - -_CantTakeMonText:: - text "You can't take" - line "any more #MON." - - para "Deposit #MON" - line "first." - prompt - -_ReleaseWhichMonText:: - text "Release which" - line "#MON?" - done - -_OnceReleasedText:: - text "Once released," - line "@" - text_ram wcf4b - text " is" - cont "gone forever. OK?" - done - -_MonWasReleasedText:: - text_ram wcf4b - text " was" - line "released outside." - cont "Bye @" - -_CF4BExclamationText:: - text_ram wcf4b - text "!" - prompt - -_RequireCoinCaseText:: - text "A COIN CASE is" - line "required!@" - text_end - -_ExchangeCoinsForPrizesText:: - text "We exchange your" - line "coins for prizes." + line "appeared!" prompt -_WhichPrizeText:: - text "Which prize do" - line "you want?" - done - -_HereYouGoText:: - text "Here you go!@" - text_end - -_SoYouWantPrizeText:: - text "So, you want" +_HookedMonAttackedText:: + text "The hooked" line "@" - text_ram wcd6d - text "?" - done - -_SorryNeedMoreCoinsText:: - text "Sorry, you need" - line "more coins.@" - text_end - -_OopsYouDontHaveEnoughRoomText:: - text "Oops! You don't" - line "have enough room.@" - text_end - -_OhFineThenText:: - text "Oh, fine then.@" - text_end - -_GetDexRatedText:: - text "Want to get your" - line "#DEX rated?" - done - -_ClosedOaksPCText:: - text "Closed link to" - line "PROF.OAK's PC.@" - text_end - -_AccessedOaksPCText:: - text "Accessed PROF." - line "OAK's PC." - - para "Accessed #DEX" - line "Rating System." - prompt - -_WhereWouldYouLikeText:: - text "Where would you" - line "like to go?" - done - -_PleaseWaitText:: - text "OK, please wait" - line "just a moment." - done - -_LinkCanceledText:: - text "The link was" - line "canceled." - done - -_OakSpeechText1:: - text "Hello there!" - line "Welcome to the" - cont "world of #MON!" - - para "My name is OAK!" - line "People call me" - cont "the #MON PROF!" - prompt - -_OakSpeechText2A:: - text "This world is" - line "inhabited by" - cont "creatures called" - cont "#MON!@" - text_end - -_OakSpeechText2B:: + text_ram wEnemyMonNick text_start - - para "For some people," - line "#MON are" - cont "pets. Others use" - cont "them for fights." - - para "Myself..." - - para "I study #MON" - line "as a profession." - prompt - -_IntroducePlayerText:: - text "First, what is" - line "your name?" - prompt - -_IntroduceRivalText:: - text "This is my grand-" - line "son. He's been" - cont "your rival since" - cont "you were a baby." - - para "...Erm, what is" - line "his name again?" - prompt - -_OakSpeechText3:: - text "<PLAYER>!" - - para "Your very own" - line "#MON legend is" - cont "about to unfold!" - - para "A world of dreams" - line "and adventures" - cont "with #MON" - cont "awaits! Let's go!" - done - -_DoYouWantToNicknameText:: - text "Do you want to" - line "give a nickname" - cont "to @" - text_ram wcd6d - text "?" - done - -_YourNameIsText:: - text "Right! So your" - line "name is <PLAYER>!" - prompt - -_HisNameIsText:: - text "That's right! I" - line "remember now! His" - cont "name is <RIVAL>!" + cont "attacked!" prompt - -_WillBeTradedText:: - text_ram wNameOfPlayerMonToBeTraded - text " and" - line "@" - text_ram wcd6d - text " will" - cont "be traded." - done - -_TextIDErrorText:: - text_decimal hSpriteIndexOrTextID, 1, 2 - text " ERROR." - done - -_ContCharText:: - text "<_CONT>@" - text_end diff --git a/data/text/text_3.asm b/data/text/text_3.asm index 6407dce7..bd418402 100644 --- a/data/text/text_3.asm +++ b/data/text/text_3.asm @@ -1,330 +1,637 @@ -_FileDataDestroyedText:: - text "The file data is" - line "destroyed!" +_EnemyAppearedText:: + text_ram wEnemyMonNick + text_start + line "appeared!" + prompt + +_TrainerWantsToFightText:: + text_ram wTrainerName + text " wants" + line "to fight!" + prompt + +_UnveiledGhostText:: + text "SILPH SCOPE" + line "unveiled the" + cont "GHOST's identity!" + prompt + +_GhostCantBeIDdText:: + text "Darn! The GHOST" + line "can't be ID'd!" + prompt + +_GoText:: + text "Go! @" + text_end + +_DoItText:: + text "Do it! @" + text_end + +_GetmText:: + text "Get'm! @" + text_end + +_EnemysWeakText:: + text "The enemy's weak!" + line "Get'm! @" + text_end + +_PlayerMon1Text:: + text_ram wBattleMonNick + text "!" + done + +_PlayerMon2Text:: + text_ram wBattleMonNick + text " @" + text_end + +_EnoughText:: + text "enough!@" + text_end + +_OKExclamationText:: + text "OK!@" + text_end + +_GoodText:: + text "good!@" + text_end + +_ComeBackText:: + text_start + line "Come back!" + done + +; money related +_PickUpPayDayMoneyText:: + text "<PLAYER> picked up" + line "¥@" + text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text "!" prompt -_WouldYouLikeToSaveText:: - text "Would you like to" - line "SAVE the game?" +_ClearSaveDataText:: + text "Clear all saved" + line "data?" done -_GameSavedText:: - text "<PLAYER> saved" - line "the game!" +_WhichFloorText:: + text "Which floor do" + line "you want? " done -_OlderFileWillBeErasedText:: - text "The older file" - line "will be erased to" - cont "save. Okay?" +_SleepingPikachuText1:: + text "There isn't any" + line "response..." + prompt + +_PartyMenuNormalText:: + text "Choose a #MON." done -_WhenYouChangeBoxText:: - text "When you change a" - line "#MON BOX, data" - cont "will be saved." +_PartyMenuItemUseText:: + text "Use item on which" + line "#MON?" + done - para "Is that okay?" +_PartyMenuBattleText:: + text "Bring out which" + line "#MON?" done -_ChooseABoxText:: - text "Choose a" - line "<PKMN> BOX.@" - text_end +_PartyMenuUseTMText:: + text "Teach to which" + line "#MON?" + done -_EvolvedText:: - text_ram wcf4b - text " evolved" +_PartyMenuSwapMonText:: + text "Move #MON" + line "where?" done -_IntoText:: - text_start - line "into @" +_PotionText:: text_ram wcd6d + text_start + line "recovered by @" + text_decimal wHPBarHPDifference, 2, 3 text "!" done -_StoppedEvolvingText:: - text "Huh? @" - text_ram wcf4b +_AntidoteText:: + text_ram wcd6d + text " was" + line "cured of poison!" + done + +_ParlyzHealText:: + text_ram wcd6d + text "'s" + line "rid of paralysis!" + done + +_BurnHealText:: + text_ram wcd6d + text "'s" + line "burn was healed!" + done + +_IceHealText:: + text_ram wcd6d + text " was" + line "defrosted!" + done + +_AwakeningText:: + text_ram wcd6d text_start - line "stopped evolving!" - prompt + line "woke up!" + done -_IsEvolvingText:: - text "What? @" - text_ram wcf4b +_FullHealText:: + text_ram wcd6d + text "'s" + line "health returned!" + done + +_ReviveText:: + text_ram wcd6d text_start - line "is evolving!" + line "is revitalized!" done -_FellAsleepText:: - text "<TARGET>" - line "fell asleep!" +_RareCandyText:: + text_ram wcd6d + text " grew" + line "to level @" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end + +_TurnedOnPC1Text:: + text "<PLAYER> turned on" + line "the PC." prompt -_AlreadyAsleepText:: - text "<TARGET>'s" - line "already asleep!" +_AccessedBillsPCText:: + text "Accessed BILL's" + line "PC." + + para "Accessed #MON" + line "Storage System." prompt -_PoisonedText:: - text "<TARGET>" - line "was poisoned!" +_AccessedSomeonesPCText:: + text "Accessed someone's" + line "PC." + + para "Accessed #MON" + line "Storage System." prompt -_BadlyPoisonedText:: - text "<TARGET>'s" - line "badly poisoned!" +_AccessedMyPCText:: + text "Accessed my PC." + + para "Accessed Item" + line "Storage System." prompt -_BurnedText:: - text "<TARGET>" - line "was burned!" +_TurnedOnPC2Text:: + text "<PLAYER> turned on" + line "the PC." prompt -_FrozenText:: - text "<TARGET>" - line "was frozen solid!" +_WhatDoYouWantText:: + text "What do you want" + line "to do?" + done + +_WhatToDepositText:: + text "What do you want" + line "to deposit?" + done + +_DepositHowManyText:: + text "How many?" + done + +_ItemWasStoredText:: + text_ram wcd6d + text " was" + line "stored via PC." prompt -_FireDefrostedText:: - text "Fire defrosted" - line "<TARGET>!" +_NothingToDepositText:: + text "You have nothing" + line "to deposit." prompt -_MonsStatsRoseText:: - text "<USER>'s" - line "@" - text_ram wcf4b - text "@" - text_end +_NoRoomToStoreText:: + text "No room left to" + line "store items." + prompt -_GreatlyRoseText:: - text "<SCROLL>greatly@" - text_end +_WhatToWithdrawText:: + text "What do you want" + line "to withdraw?" + done -_RoseText:: - text " rose!" - prompt +_WithdrawHowManyText:: + text "How many?" + done -_MonsStatsFellText:: - text "<TARGET>'s" +_WithdrewItemText:: + text "Withdrew" line "@" - text_ram wcf4b - text "@" - text_end + text_ram wcd6d + text "." + prompt -_GreatlyFellText:: - text "<SCROLL>greatly@" - text_end +_NothingStoredText:: + text "There is nothing" + line "stored." + prompt -_FellText:: - text " fell!" +_CantCarryMoreText:: + text "You can't carry" + line "any more items." prompt -_RanFromBattleText:: - text "<USER>" - line "ran from battle!" +_WhatToTossText:: + text "What do you want" + line "to toss away?" + done + +_TossHowManyText:: + text "How many?" + done + +_AccessedHoFPCText:: + text "Accessed #MON" + line "LEAGUE's site." + + para "Accessed the HALL" + line "OF FAME List." prompt -_RanAwayScaredText:: - text "<TARGET>" - line "ran away scared!" +_SleepingPikachuText2:: + text "There isn't any" + line "response..." prompt -_WasBlownAwayText:: - text "<TARGET>" - line "was blown away!" +_SwitchOnText:: + text "Switch on!" prompt -_ChargeMoveEffectText:: - text "<USER>@" - text_end +_WhatText:: + text "What?" + done -_MadeWhirlwindText:: - text_start - line "made a whirlwind!" - prompt +_DepositWhichMonText:: + text "Deposit which" + line "#MON?" + done -_TookInSunlightText:: - text_start - line "took in sunlight!" +_MonWasStoredText:: + text_ram wcf4b + text " was" + line "stored in Box @" + text_ram wBoxNumString + text "." prompt -_LoweredItsHeadText:: - text_start - line "lowered its head!" +_CantDepositLastMonText:: + text "You can't deposit" + line "the last #MON!" prompt -_SkyAttackGlowingText:: - text_start - line "is glowing!" +_BoxFullText:: + text "Oops! This Box is" + line "full of #MON." prompt -_FlewUpHighText:: - text_start - line "flew up high!" +_MonIsTakenOutText:: + text_ram wcf4b + text " is" + line "taken out." + cont "Got @" + text_ram wcf4b + text "." prompt -_DugAHoleText:: - text_start - line "dug a hole!" +_NoMonText:: + text "What? There are" + line "no #MON here!" prompt -_BecameConfusedText:: - text "<TARGET>" - line "became confused!" +_CantTakeMonText:: + text "You can't take" + line "any more #MON." + + para "Deposit #MON" + line "first." prompt -_MimicLearnedMoveText:: - text "<USER>" - line "learned" - cont "@" +_PikachuUnhappyText:: text_ram wcd6d - text "!" + text " looks" + line "unhappy about it!" prompt -_MoveWasDisabledText:: - text "<TARGET>'s" +_ReleaseWhichMonText:: + text "Release which" + line "#MON?" + done + +_OnceReleasedText:: + text "Once released," line "@" - text_ram wcd6d + text_ram wcf4b + text " is" + cont "gone forever. OK?" + done + +_MonWasReleasedText:: + text_ram wcf4b text " was" - cont "disabled!" + line "released outside." + cont "Bye @" + +_CF4BExclamationText:: + text_ram wcf4b + text "!" prompt -_NothingHappenedText:: - text "Nothing happened!" +_RequireCoinCaseText:: + text "A COIN CASE is" + line "required!@" + text_end + +_ExchangeCoinsForPrizesText:: + text "We exchange your" + line "coins for prizes." prompt -_NoEffectText:: - text "No effect!" +_WhichPrizeText:: + text "Which prize do" + line "you want?" + done + +_HereYouGoText:: + text "Here you go!@" + text_end + +_SoYouWantPrizeText:: + text "So, you want" + line "@" + text_ram wcd6d + text "?" + done + +_SorryNeedMoreCoinsText:: + text "Sorry, you need" + line "more coins.@" + text_end + +_OopsYouDontHaveEnoughRoomText:: + text "Oops! You don't" + line "have enough room.@" + text_end + +_OhFineThenText:: + text "Oh, fine then.@" + text_end + +_GetDexRatedText:: + text "Want to get your" + line "#DEX rated?" + done + +_ClosedOaksPCText:: + text "Closed link to" + line "PROF.OAK's PC.@" + text_end + +_AccessedOaksPCText:: + text "Accessed PROF." + line "OAK's PC." + + para "Accessed #DEX" + line "Rating System." prompt -_ButItFailedText:: - text "But, it failed! " +_ExpressionText:: + text "This expression is" + line "No. @" + text_decimal wExpressionNumber, 1, 2 + text "." prompt -_DidntAffectText:: - text "It didn't affect" - line "<TARGET>!" +_NotEnoughMemoryText:: + text "Not enough Yellow" + line "Version memory." + done + +_OakSpeechText1:: + text "Hello there!" + line "Welcome to the" + cont "world of #MON!" + + para "My name is OAK!" + line "People call me" + cont "the #MON PROF!" prompt -_IsUnaffectedText:: - text "<TARGET>" - line "is unaffected!" +_OakSpeechText2A:: + text "This world is" + line "inhabited by" + cont "creatures called" + cont "#MON!@" + text_end + +_OakSpeechText2B:: + text $51,"For some people," + line "#MON are" + cont "pets. Others use" + cont "them for fights." + + para "Myself..." + + para "I study #MON" + line "as a profession." prompt -_ParalyzedMayNotAttackText:: - text "<TARGET>'s" - line "paralyzed! It may" - cont "not attack!" +_IntroducePlayerText:: + text "First, what is" + line "your name?" prompt -_SubstituteText:: - text "It created a" - line "SUBSTITUTE!" +_IntroduceRivalText:: + text "This is my grand-" + line "son. He's been" + cont "your rival since" + cont "you were a baby." + + para "...Erm, what is" + line "his name again?" prompt -_HasSubstituteText:: - text "<USER>" - line "has a SUBSTITUTE!" +_OakSpeechText3:: + text "<PLAYER>!" + + para "Your very own" + line "#MON legend is" + cont "about to unfold!" + + para "A world of dreams" + line "and adventures" + cont "with #MON" + cont "awaits! Let's go!" + done + +_DoYouWantToNicknameText:: + text "Do you want to" + line "give a nickname" + cont "to @" + text_ram wcd6d + text "?" + done + +_YourNameIsText:: + text "Right! So your" + line "name is <PLAYER>!" prompt -_TooWeakSubstituteText:: - text "Too weak to make" - line "a SUBSTITUTE!" +_HisNameIsText:: + text "That's right! I" + line "remember now! His" + cont "name is <RIVAL>!" prompt -_CoinsScatteredText:: - text "Coins scattered" - line "everywhere!" +_WillBeTradedText:: + text_ram wNameOfPlayerMonToBeTraded + text " and" + line "@" + text_ram wcd6d + text " will" + cont "be traded." + done + +_Colosseum3MonsText:: + text "You need 3 #MON" + line "to fight!" prompt -_GettingPumpedText:: - text "<USER>'s" - line "getting pumped!" +_ColosseumMewText:: + text "Sorry, MEW can't" + line "attend!" prompt -_WasSeededText:: - text "<TARGET>" - line "was seeded!" +_ColosseumDifferentMonsText:: + text "Your #MON must" + line "all be different!" prompt -_EvadedAttackText:: - text "<TARGET>" - line "evaded attack!" +_ColosseumMaxL55Text:: + text "No #MON can" + line "exceed L55!" prompt -_HitWithRecoilText:: - text "<USER>'s" - line "hit with recoil!" +_ColosseumMinL50Text:: + text "All #MON must" + line "be at least L50!" prompt -_ConvertedTypeText:: - text "Converted type to" - line "<TARGET>'s!" +_ColosseumTotalL155Text:: + text "Your total levels" + line "exceed 155!" prompt -_StatusChangesEliminatedText:: - text "All STATUS changes" - line "are eliminated!" +_ColosseumMaxL30Text:: + text "No #MON can" + line "exceed L30!" prompt -_StartedSleepingEffect:: - text "<USER>" - line "started sleeping!" - done +_ColosseumMinL25Text:: + text "All #MON must" + line "be at least L25!" + prompt -_FellAsleepBecameHealthyText:: - text "<USER>" - line "fell asleep and" - cont "became healthy!" - done +_ColosseumTotalL80Text:: + text "Your total levels" + line "exceed 80!" + prompt -_RegainedHealthText:: - text "<USER>" - line "regained health!" +_ColosseumMaxL20Text:: + text "No #MON can" + line "exceed L20!" prompt -_TransformedText:: - text "<USER>" - line "transformed into" - cont "@" - text_ram wcd6d - text "!" +_ColosseumMinL15Text:: + text "All #MON must" + line "be at least L15!" prompt -_LightScreenProtectedText:: - text "<USER>'s" - line "protected against" - cont "special attacks!" +_ColosseumTotalL50Text:: + text "Your total levels" + line "exceed 50!" prompt -_ReflectGainedArmorText:: - text "<USER>" - line "gained armor!" +_ColosseumHeightText:: + text_ram wcd6d + text " is over" + line "6’8” tall!" prompt -_ShroudedInMistText:: - text "<USER>'s" - line "shrouded in mist!" +_ColosseumWeightText:: + text_ram wcd6d + text " weighs" + line "over 44 pounds!" prompt -_SuckedHealthText:: - text "Sucked health from" - line "<TARGET>!" +_ColosseumEvolvedText:: + text_ram wcd6d + text " is an" + line "evolved #MON!" prompt -_DreamWasEatenText:: - text "<TARGET>'s" - line "dream was eaten!" +_ColosseumIneligibleText:: + text "Your opponent is" + line "ineligible." prompt -_TradeCenterText1:: - text "!" +_ColosseumWhereToText:: + text "Where would you" + line "like to go?" done -_ColosseumText1:: - text "!" +_ColosseumPleaseWaitText:: + text "OK, please wait" + line "just a moment." + done + +_ColosseumCanceledText:: + text "The link was" + line "canceled." done + +_ColosseumVersionText:: + text "The game versions" + line "don't match." + prompt + +_TextIDErrorText:: + text_decimal hSpriteIndexOrTextID, 1, 2 + text " error." + done + +_ContCharText:: + text "<_CONT>@" + text_end + +_NoPokemonText:: + text "There are no" + line "#MON here!" + prompt diff --git a/data/text/text_4.asm b/data/text/text_4.asm index 4c01b5f4..4c3d6a9c 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -1,221 +1,56 @@ -_PokemartGreetingText:: - text "Hi there!" - next "May I help you?" - done - -_PokemonFaintedText:: - text_ram wcd6d - text_start - line "fainted!" - done - -_PlayerBlackedOutText:: - text "<PLAYER> is out of" - line "useable #MON!" - - para "<PLAYER> blacked" - line "out!" +_FileDataDestroyedText:: + text "The file data is" + line "destroyed!" prompt -_RepelWoreOffText:: - text "REPEL's effect" - line "wore off." +_WouldYouLikeToSaveText:: + text "Would you like to" + line "SAVE the game?" done -_PokemartBuyingGreetingText:: - text "Take your time." +_SavingText:: + text "Saving..." done -_PokemartTellBuyPriceText:: - text_ram wcf4b - text "?" - line "That will be" - cont "¥@" - text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text ". OK?" +_GameSavedText:: + text "<PLAYER> saved" + line "the game!" done -_PokemartBoughtItemText:: - text "Here you are!" - line "Thank you!" - prompt - -_PokemartNotEnoughMoneyText:: - text "You don't have" - line "enough money." - prompt - -_PokemartItemBagFullText:: - text "You can't carry" - line "any more items." - prompt - -_PokemonSellingGreetingText:: - text "What would you" - line "like to sell?" - done - -_PokemartTellSellPriceText:: - text "I can pay you" - line "¥@" - text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text " for that." +_OlderFileWillBeErasedText:: + text "The older file" + line "will be erased to" + cont "save. Okay?" done -_PokemartItemBagEmptyText:: - text "You don't have" - line "anything to sell." - prompt - -_PokemartUnsellableItemText:: - text "I can't put a" - line "price on that." - prompt +_WhenYouChangeBoxText:: + text "When you change a" + line "#MON BOX, data" + cont "will be saved." -_PokemartThankYouText:: - text "Thank you!" + para "Is that okay?" done -_PokemartAnythingElseText:: - text "Is there anything" - line "else I can do?" - done - -_LearnedMove1Text:: - text_ram wLearnMoveMonName - text " learned" - line "@" - text_ram wcf4b - text "!@" +_ChooseABoxText:: + text "Choose a" + line "<PKMN> BOX.@" text_end -_WhichMoveToForgetText:: - text "Which move should" - next "be forgotten?" - done - -_AbandonLearningText:: - text "Abandon learning" - line "@" +_EvolvedText:: text_ram wcf4b - text "?" + text " evolved" done -_DidNotLearnText:: - text_ram wLearnMoveMonName +_IntoText:: text_start - line "did not learn" - cont "@" - text_ram wcf4b - text "!" - prompt - -_TryingToLearnText:: - text_ram wLearnMoveMonName - text " is" - line "trying to learn" - cont "@" - text_ram wcf4b - text "!" - - para "But, @" - text_ram wLearnMoveMonName - text_start - line "can't learn more" - cont "than 4 moves!" - - para "Delete an older" - line "move to make room" - cont "for @" - text_ram wcf4b - text "?" - done - -_OneTwoAndText:: - text "1, 2 and...@" - text_end - -_PoofText:: - text " Poof!@" - text_end - -_ForgotAndText:: - text_start - para "@" - text_ram wLearnMoveMonName - text " forgot" - line "@" + line "into @" text_ram wcd6d text "!" - - para "And..." - prompt - -_HMCantDeleteText:: - text "HM techniques" - line "can't be deleted!" - prompt - -_PokemonCenterWelcomeText:: - text "Welcome to our" - line "#MON CENTER!" - - para "We heal your" - line "#MON back to" - cont "perfect health!" - prompt - -_ShallWeHealYourPokemonText:: - text "Shall we heal your" - line "#MON?" - done - -_NeedYourPokemonText:: - text "OK. We'll need" - line "your #MON." done -_PokemonFightingFitText:: - text "Thank you!" - line "Your #MON are" - cont "fighting fit!" +_StoppedEvolvingText:: + text "Huh? @" + text_ram wcf4b + text_start + line "stopped evolving!" prompt - -_PokemonCenterFarewellText:: - text "We hope to see" - line "you again!" - done - -_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: - text "This area is" - line "reserved for 2" - cont "friends who are" - cont "linked by cable." - done - -_CableClubNPCWelcomeText:: - text "Welcome to the" - line "Cable Club!" - done - -_CableClubNPCPleaseApplyHereHaveToSaveText:: - text "Please apply here." - - para "Before opening" - line "the link, we have" - cont "to save the game." - done - -_CableClubNPCPleaseWaitText:: - text "Please wait.@" - text_end - -_CableClubNPCLinkClosedBecauseOfInactivityText:: - text "The link has been" - line "closed because of" - cont "inactivity." - - para "Please contact" - line "your friend and" - cont "come again!" - done diff --git a/data/text/text_5.asm b/data/text/text_5.asm index ae7151cc..fc758be9 100644 --- a/data/text/text_5.asm +++ b/data/text/text_5.asm @@ -1,104 +1,277 @@ -_CableClubNPCPleaseComeAgainText:: - text "Please come again!" +_IsEvolvingText:: + text "What? @" + text_ram wcf4b + text_start + line "is evolving!" done -_CableClubNPCMakingPreparationsText:: - text "We're making" - line "preparations." - cont "Please wait." - done +_FellAsleepText:: + text "<TARGET>" + line "fell asleep!" + prompt -_UsedStrengthText:: - text_ram wcd6d - text " used" - line "STRENGTH.@" +_AlreadyAsleepText:: + text "<TARGET>'s" + line "already asleep!" + prompt + +_PoisonedText:: + text "<TARGET>" + line "was poisoned!" + prompt + +_BadlyPoisonedText:: + text "<TARGET>'s" + line "badly poisoned!" + prompt + +_BurnedText:: + text "<TARGET>" + line "was burned!" + prompt + +_FrozenText:: + text "<TARGET>" + line "was frozen solid!" + prompt + +_FireDefrostedText:: + text "Fire defrosted" + line "<TARGET>!" + prompt + +_MonsStatsRoseText:: + text "<USER>'s" + line "@" + text_ram wcf4b + text "@" text_end -_CanMoveBouldersText:: - text_ram wcd6d - text " can" - line "move boulders." +_GreatlyRoseText:: + text "<SCROLL>greatly@" + text_end + +_RoseText:: + text " rose!" + prompt + +_MonsStatsFellText:: + text "<TARGET>'s" + line "@" + text_ram wcf4b + text "@" + text_end + +_GreatlyFellText:: + text "<SCROLL>greatly@" + text_end + +_FellText:: + text " fell!" prompt -_CurrentTooFastText:: - text "The current is" - line "much too fast!" +_RanFromBattleText:: + text "<USER>" + line "ran from battle!" prompt -_CyclingIsFunText:: - text "Cycling is fun!" - line "Forget SURFing!" +_RanAwayScaredText:: + text "<TARGET>" + line "ran away scared!" prompt -_FlashLightsAreaText:: - text "A blinding FLASH" - line "lights the area!" +_WasBlownAwayText:: + text "<TARGET>" + line "was blown away!" prompt -_WarpToLastPokemonCenterText:: - text "Warp to the last" - line "#MON CENTER." - done +_ChargeMoveEffectText:: + text "<USER>@" + text_end -_CannotUseTeleportNowText:: - text_ram wcd6d - text " can't" - line "use TELEPORT now." +_MadeWhirlwindText:: + text_start + line "made a whirlwind!" prompt -_CannotFlyHereText:: - text_ram wcd6d - text " can't" - line "FLY here." +_TookInSunlightText:: + text_start + line "took in sunlight!" prompt -_NotHealthyEnoughText:: - text "Not healthy" - line "enough." +_LoweredItsHeadText:: + text_start + line "lowered its head!" prompt -_NewBadgeRequiredText:: - text "No! A new BADGE" - line "is required." +_SkyAttackGlowingText:: + text_start + line "is glowing!" prompt -_CannotUseItemsHereText:: - text "You can't use items" - line "here." +_FlewUpHighText:: + text_start + line "flew up high!" prompt -_CannotGetOffHereText:: - text "You can't get off" - line "here." +_DugAHoleText:: + text_start + line "dug a hole!" prompt -_GotMonText:: - text "<PLAYER> got" - line "@" - text_ram wcd6d - text "!@" - text_end +_BecameConfusedText:: + text "<TARGET>" + line "became confused!" + prompt -_SentToBoxText:: - text "There's no more" - line "room for #MON!" +_MimicLearnedMoveText:: + text "<USER>" + line "learned" cont "@" - text_ram wBoxMonNicks + text_ram wcd6d + text "!" + prompt + +_MoveWasDisabledText:: + text "<TARGET>'s" + line "@" + text_ram wcd6d text " was" - cont "sent to #MON" - cont "BOX @" - text_ram wcf4b - text " on PC!" + cont "disabled!" + prompt + +_NothingHappenedText:: + text "Nothing happened!" + prompt + +_NoEffectText:: + text "No effect!" + prompt + +_ButItFailedText:: + text "But, it failed! " + prompt + +_DidntAffectText:: + text "It didn't affect" + line "<TARGET>!" + prompt + +_IsUnaffectedText:: + text "<TARGET>" + line "is unaffected!" + prompt + +_ParalyzedMayNotAttackText:: + text "<TARGET>'s" + line "paralyzed! It may" + cont "not attack!" + prompt + +_SubstituteText:: + text "It created a" + line "SUBSTITUTE!" + prompt + +_HasSubstituteText:: + text "<USER>" + line "has a SUBSTITUTE!" + prompt + +_TooWeakSubstituteText:: + text "Too weak to make" + line "a SUBSTITUTE!" + prompt + +_WasSeededText:: + text "<TARGET>" + line "was seeded!" + prompt + +_EvadedAttackText:: + text "<TARGET>" + line "evaded attack!" + prompt + +_HitWithRecoilText:: + text "<USER>'s" + line "hit with recoil!" + prompt + +_ConvertedTypeText:: + text "Converted type to" + line "<TARGET>'s!" + prompt + +_StatusChangesEliminatedText:: + text "All STATUS changes" + line "are eliminated!" + prompt + +_GettingPumpedText:: + text "<USER>'s" + line "getting pumped!" + prompt + +_StartedSleepingEffect:: + text "<USER>" + line "started sleeping!" done -_BoxIsFullText:: - text "There's no more" - line "room for #MON!" +_FellAsleepBecameHealthyText:: + text "<USER>" + line "fell asleep and" + cont "became healthy!" + done + +_RegainedHealthText:: + text "<USER>" + line "regained health!" + prompt + +_TransformedText:: + text "<USER>" + line "transformed into" + cont "@" + text_ram wcd6d + text "!" + prompt + +_LightScreenProtectedText:: + text "<USER>'s" + line "protected against" + cont "special attacks!" + prompt - para "The #MON BOX" - line "is full and can't" - cont "accept any more!" +_ReflectGainedArmorText:: + text "<USER>" + line "gained armor!" + prompt + +_ShroudedInMistText:: + text "<USER>'s" + line "shrouded in mist!" + prompt + +_CoinsScatteredText:: + text "Coins scattered" + line "everywhere!" + prompt + +_SuckedHealthText:: + text "Sucked health from" + line "<TARGET>!" + prompt + +_DreamWasEatenText:: + text "<TARGET>'s" + line "dream was eaten!" + prompt + +_TradeCenterText1:: + text "!" + done - para "Change the BOX at" - line "a #MON CENTER!" +_ColosseumText1:: + text "!" done diff --git a/data/text/text_6.asm b/data/text/text_6.asm index 39eb22ea..bcdc75a3 100644 --- a/data/text/text_6.asm +++ b/data/text/text_6.asm @@ -1,231 +1,10 @@ -_ItemUseBallText00:: - text "It dodged the" - line "thrown BALL!" +TeachingHMsText:: + text "Once a #MON" + line "learns an HM, the" + cont "technique can't" + cont "be replaced." - para "This #MON" - line "can't be caught!" - prompt - -_ItemUseBallText01:: - text "You missed the" - line "#MON!" - prompt - -_ItemUseBallText02:: - text "Darn! The #MON" - line "broke free!" - prompt - -_ItemUseBallText03:: - text "Aww! It appeared" - line "to be caught! " - prompt - -_ItemUseBallText04:: - text "Shoot! It was so" - line "close too!" - prompt - -_ItemUseBallText05:: - text "All right!" - line "@" - text_ram wEnemyMonNick - text " was" - cont "caught!@" - text_end - -_ItemUseBallText07:: - text_ram wBoxMonNicks - text " was" - line "transferred to" - cont "BILL's PC!" - prompt - -_ItemUseBallText08:: - text_ram wBoxMonNicks - text " was" - line "transferred to" - cont "someone's PC!" - prompt - -_ItemUseBallText06:: - text "New #DEX data" - line "will be added for" - cont "@" - text_ram wEnemyMonNick - text "!@" - text_end - -_SurfingGotOnText:: - text "<PLAYER> got on" - line "@" - text_ram wcd6d - text "!" - prompt - -_SurfingNoPlaceToGetOffText:: - text "There's no place" - line "to get off!" - prompt - -_VitaminStatRoseText:: - text_ram wcd6d - text "'s" - line "@" - text_ram wcf4b - text " rose." - prompt - -_VitaminNoEffectText:: - text "It won't have any" - line "effect." - prompt - -_ThrewBaitText:: - text "<PLAYER> threw" - line "some BAIT." - done - -_ThrewRockText:: - text "<PLAYER> threw a" - line "ROCK." - done - -_PlayedFluteNoEffectText:: - text "Played the #" - line "FLUTE." - - para "Now, that's a" - line "catchy tune!" - prompt - -_FluteWokeUpText:: - text "All sleeping" - line "#MON woke up." - prompt - -_PlayedFluteHadEffectText:: - text "<PLAYER> played the" - line "# FLUTE.@" - text_end - -_CoinCaseNumCoinsText:: - text "Coins" - line "@" - text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " " - prompt - -_ItemfinderFoundItemText:: - text "Yes! ITEMFINDER" - line "indicates there's" - cont "an item nearby." - prompt - -_ItemfinderFoundNothingText:: - text "Nope! ITEMFINDER" - line "isn't responding." - prompt - -_RaisePPWhichTechniqueText:: - text "Raise PP of which" - line "technique?" - done - -_RestorePPWhichTechniqueText:: - text "Restore PP of" - line "which technique?" - done - -_PPMaxedOutText:: - text_ram wcf4b - text "'s PP" - line "is maxed out." - prompt - -_PPIncreasedText:: - text_ram wcf4b - text "'s PP" - line "increased." - prompt - -_PPRestoredText:: - text "PP was restored." - prompt - -_BootedUpTMText:: - text "Booted up a TM!" - prompt - -_BootedUpHMText:: - text "Booted up an HM!" - prompt - -_TeachMachineMoveText:: - text "It contained" - line "@" - text_ram wcf4b - text "!" - - para "Teach @" - text_ram wcf4b - text_start - line "to a #MON?" + para "Better think care-" + line "fully before you" + cont "teach HM moves." done - -_MonCannotLearnMachineMoveText:: - text_ram wcd6d - text " is not" - line "compatible with" - cont "@" - text_ram wcf4b - text "." - - para "It can't learn" - line "@" - text_ram wcf4b - text "." - prompt - -_ItemUseNotTimeText:: - text "OAK: <PLAYER>!" - line "This isn't the" - cont "time to use that! " - prompt - -_ItemUseNotYoursToUseText:: - text "This isn't yours" - line "to use!" - prompt - -_ItemUseNoEffectText:: - text "It won't have any" - line "effect." - prompt - -_ThrowBallAtTrainerMonText1:: - text "The trainer" - line "blocked the BALL!" - prompt - -_ThrowBallAtTrainerMonText2:: - text "Don't be a thief!" - prompt - -_NoCyclingAllowedHereText:: - text "No cycling" - next "allowed here." - prompt - -_NoSurfingHereText:: - text "No SURFing on" - line "@" - text_ram wcd6d - text " here!" - prompt - -_BoxFullCannotThrowBallText:: - text "The #MON BOX" - line "is full! Can't" - cont "use that item!" - prompt diff --git a/data/text/text_7.asm b/data/text/text_7.asm index 34f070bd..88c7d884 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -1,200 +1,216 @@ -_ItemUseText001:: - text "<PLAYER> used@" - text_end - -_ItemUseText002:: - text_ram wcf4b - text "!" +_PokemonText:: + text "#MON!" done -_GotOnBicycleText1:: - text "<PLAYER> got on the@" - text_end +_PokemartGreetingText:: + text "Hi there!" + next "May I help you?" + done -_GotOnBicycleText2:: - text_ram wcf4b - text "!" - prompt +_PokemonFaintedText:: + text_ram wcd6d + text_start + line "fainted!" + done -_GotOffBicycleText1:: - text "<PLAYER> got off@" - text_end +_PlayerBlackedOutText:: + text "<PLAYER> is out of" + line "useable #MON!" -_GotOffBicycleText2:: - text "the @" - text_ram wcf4b - text "." + para "<PLAYER> blacked" + line "out!" prompt -_ThrewAwayItemText:: - text "Threw away" - line "@" - text_ram wcd6d - text "." - prompt +_RepelWoreOffText:: + text "REPEL's effect" + line "wore off." + done -_IsItOKToTossItemText:: - text "Is it OK to toss" - line "@" +_PokemartBuyingGreetingText:: + text "Take your time." + done + +_PokemartTellBuyPriceText:: text_ram wcf4b text "?" - prompt + line "That will be" + cont "¥@" + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text ". OK?" + done -_TooImportantToTossText:: - text "That's too impor-" - line "tant to toss!" +_PokemartBoughtItemText:: + text "Here you are!" + line "Thank you!" prompt -_AlreadyKnowsText:: - text_ram wcd6d - text " knows" - line "@" - text_ram wcf4b - text "!" +_PokemartNotEnoughMoneyText:: + text "You don't have" + line "enough money." prompt -_ConnectCableText:: - text "Okay, connect the" - line "cable like so!" +_PokemartItemBagFullText:: + text "You can't carry" + line "any more items." prompt -_TradedForText:: - text "<PLAYER> traded" - line "@" - text_ram wInGameTradeGiveMonName - text " for" - cont "@" - text_ram wInGameTradeReceiveMonName - text "!@" - text_end +_PokemonSellingGreetingText:: + text "What would you" + line "like to sell?" + done -_WannaTrade1Text:: - text "I'm looking for" - line "@" - text_ram wInGameTradeGiveMonName - text "! Wanna" +_PokemartTellSellPriceText:: + text "I can pay you" + line "¥@" + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text " for that." + done - para "trade one for" - line "@" - text_ram wInGameTradeReceiveMonName - text "? " +_PokemartItemBagEmptyText:: + text "You don't have" + line "anything to sell." + prompt + +_PokemartUnsellableItemText:: + text "I can't put a" + line "price on that." + prompt + +_PokemartThankYouText:: + text "Thank you!" done -_NoTrade1Text:: - text "Awww!" - line "Oh well..." +_PokemartAnythingElseText:: + text "Is there anything" + line "else I can do?" done -_WrongMon1Text:: - text "What? That's not" +_LearnedMove1Text:: + text_ram wLearnMoveMonName + text " learned" line "@" - text_ram wInGameTradeGiveMonName - text "!" - - para "If you get one," - line "come back here!" - done + text_ram wcf4b + text "!@" + text_end -_Thanks1Text:: - text "Hey thanks!" +_WhichMoveToForgetText:: + text "Which move should" + next "be forgotten?" done -_AfterTrade1Text:: - text "Isn't my old" +_AbandonLearningText:: + text "Abandon learning" line "@" - text_ram wInGameTradeReceiveMonName - text " great?" + text_ram wcf4b + text "?" done -_WannaTrade2Text:: - text "Hello there! Do" - line "you want to trade" +_DidNotLearnText:: + text_ram wLearnMoveMonName + text_start + line "did not learn" + cont "@" + text_ram wcf4b + text "!" + prompt + +_TryingToLearnText:: + text_ram wLearnMoveMonName + text " is" + line "trying to learn" + cont "@" + text_ram wcf4b + text "!" - para "your @" - text_ram wInGameTradeGiveMonName + para "But, @" + text_ram wLearnMoveMonName text_start - line "for @" - text_ram wInGameTradeReceiveMonName + line "can't learn more" + cont "than 4 moves!" + + para "Delete an older" + line "move to make room" + cont "for @" + text_ram wcf4b text "?" done -_NoTrade2Text:: - text "Well, if you" - line "don't want to..." - done +_OneTwoAndText:: + text "1, 2 and...@" + text_end -_WrongMon2Text:: - text "Hmmm? This isn't" - line "@" - text_ram wInGameTradeGiveMonName - text "." +_PoofText:: + text " Poof!@" + text_end - para "Think of me when" - line "you get one." - done +_ForgotAndText:: + text_start + para "@" + text_ram wLearnMoveMonName + text " forgot" + line "@" + text_ram wcd6d + text "!" -_Thanks2Text:: - text "Thanks!" - done + para "And..." + prompt -_AfterTrade2Text:: - text "The @" - text_ram wInGameTradeGiveMonName - text " you" - line "traded to me" +_HMCantDeleteText:: + text "HM techniques" + line "can't be deleted!" + prompt - para "went and evolved!" - done +_PokemonCenterWelcomeText:: + text "Welcome to our" + line "#MON CENTER!" -_WannaTrade3Text:: - text "Hi! Do you have" - line "@" - text_ram wInGameTradeGiveMonName - text "?" + para "We heal your" + line "#MON back to" + cont "perfect health!" + prompt - para "Want to trade it" - line "for @" - text_ram wInGameTradeReceiveMonName - text "?" +_ShallWeHealYourPokemonText:: + text "Shall we heal your" + line "#MON?" done -_NoTrade3Text:: - text "That's too bad." +_NeedYourPokemonText:: + text "OK. We'll need" + line "your #MON." done -_WrongMon3Text:: - text "...This is no" - line "@" - text_ram wInGameTradeGiveMonName - text "." +_PokemonFightingFitText:: + text "Thank you!" + line "Your #MON are" + cont "fighting fit!" + prompt - para "If you get one," - line "trade it with me!" +_PokemonCenterFarewellText:: + text "We hope to see" + line "you again!" done -_Thanks3Text:: - text "Thanks pal!" +_LooksContentText:: + text "It looks very" + line "content asleep." done -_AfterTrade3Text:: - text "How is my old" - line "@" - text_ram wInGameTradeReceiveMonName - text "?" +_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: + text "This area is" + line "reserved for 2" + cont "friends who are" + cont "linked by cable." + done - para "My @" - text_ram wInGameTradeGiveMonName - text " is" - line "doing great!" +_CableClubNPCWelcomeText:: + text "Welcome to the" + line "Cable Club!" done -_NothingToCutText:: - text "There isn't" - line "anything to CUT!" - prompt +_CableClubNPCPleaseApplyHereHaveToSaveText:: + text "Please apply here." -_UsedCutText:: - text_ram wcd6d - text " hacked" - line "away with CUT!" - prompt + para "Before opening" + line "the link, we have" + cont "to save the game." + done diff --git a/data/text/text_8.asm b/data/text/text_8.asm new file mode 100644 index 00000000..d8d11d50 --- /dev/null +++ b/data/text/text_8.asm @@ -0,0 +1,118 @@ +_CableClubNPCPleaseWaitText:: + text "Please wait.@" + text_end + +_CableClubNPCLinkClosedBecauseOfInactivityText:: + text "The link has been" + line "closed because of" + cont "inactivity." + + para "Please contact" + line "your friend and" + cont "come again!" + done + +_CableClubNPCPleaseComeAgainText:: + text "Please come again!" + done + +_CableClubNPCMakingPreparationsText:: + text "We're making" + line "preparations." + cont "Please wait." + done + +_FlashLightsAreaText:: + text "A blinding FLASH" + line "lights the area!" + prompt + +_WarpToLastPokemonCenterText:: + text "Warp to the last" + line "#MON CENTER." + done + +_CannotUseTeleportNowText:: + text_ram wcd6d + text " can't" + line "use TELEPORT now." + prompt + +_CannotFlyHereText:: + text_ram wcd6d + text " can't" + line "FLY here." + prompt + +_NotHealthyEnoughText:: + text "Not healthy" + line "enough." + prompt + +_NewBadgeRequiredText:: + text "No! A new BADGE" + line "is required." + prompt + +_CannotUseItemsHereText:: + text "You can't use items" + line "here." + prompt + +_CannotGetOffHereText:: + text "You can't get off" + line "here." + prompt + +_UsedStrengthText:: + text_ram wcd6d + text " used" + line "STRENGTH.@" + text_end + +_CanMoveBouldersText:: + text_ram wcd6d + text " can" + line "move boulders." + prompt + +_CurrentTooFastText:: + text "The current is" + line "much too fast!" + prompt + +_CyclingIsFunText:: + text "Cycling is fun!" + line "Forget SURFing!" + prompt + +_GotMonText:: + text "<PLAYER> got" + line "@" + text_ram wcd6d + text "!@" + text_end + +_SentToBoxText:: + text "There's no more" + line "room for #MON!" + cont "@" + text_ram wBoxMonNicks + text " was" + cont "sent to #MON" + cont "BOX @" + text_ram wcf4b + text " on PC!" + done + +_BoxIsFullText:: + text "There's no more" + line "room for #MON!" + + para "The #MON BOX" + line "is full and can't" + cont "accept any more!" + + para "Change the BOX at" + line "a #MON CENTER!" + done diff --git a/data/text/text_9.asm b/data/text/text_9.asm new file mode 100644 index 00000000..a5aff49c --- /dev/null +++ b/data/text/text_9.asm @@ -0,0 +1,442 @@ +_ItemUseBallText00:: + text "It dodged the" + line "thrown BALL!" + + para "This #MON" + line "can't be caught!" + prompt + +_ItemUseBallText01:: + text "You missed the" + line "#MON!" + prompt + +_ItemUseBallText02:: + text "Darn! The #MON" + line "broke free!" + prompt + +_ItemUseBallText03:: + text "Aww! It appeared" + line "to be caught! " + prompt + +_ItemUseBallText04:: + text "Shoot! It was so" + line "close too!" + prompt + +_ItemUseBallText05:: + text "All right!" + line "@" + text_ram wEnemyMonNick + text " was" + cont "caught!@" + text_end + +_ItemUseBallText07:: + text_ram wBoxMonNicks + text " was" + line "transferred to" + cont "BILL's PC!" + prompt + +_ItemUseBallText08:: + text_ram wBoxMonNicks + text " was" + line "transferred to" + cont "someone's PC!" + prompt + +_ItemUseBallText06:: + text "New #DEX data" + line "will be added for" + cont "@" + text_ram wEnemyMonNick + text "!@" + text_end + +_SurfingGotOnText:: + text "<PLAYER> got on" + line "@" + text_ram wcd6d + text "!" + prompt + +_SurfingNoPlaceToGetOffText:: + text "There's no place" + line "to get off!" + prompt + +_RefusingText:: + text_ram wcd6d + text_start + line "is refusing!" + prompt + +_VitaminStatRoseText:: + text_ram wcd6d + text "'s" + line "@" + text_ram wcf4b + text " rose." + prompt + +_VitaminNoEffectText:: + text "It won't have any" + line "effect." + prompt + +_ThrewBaitText:: + text "<PLAYER> threw" + line "some BAIT." + done + +_ThrewRockText:: + text "<PLAYER> threw a" + line "ROCK." + done + +_PlayedFluteNoEffectText:: + text "Played the #" + line "FLUTE." + + para "Now, that's a" + line "catchy tune!" + prompt + +_FluteWokeUpText:: + text "All sleeping" + line "#MON woke up." + prompt + +_PlayedFluteHadEffectText:: + text "<PLAYER> played the" + line "# FLUTE.@" + text_end + +_CoinCaseNumCoinsText:: + text "Coins" + line "@" + text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " " + prompt + +_ItemfinderFoundItemText:: + text "Yes! ITEMFINDER" + line "indicates there's" + cont "an item nearby." + prompt + +_ItemfinderFoundNothingText:: + text "Nope! ITEMFINDER" + line "isn't responding." + prompt + +_RaisePPWhichTechniqueText:: + text "Raise PP of which" + line "technique?" + done + +_RestorePPWhichTechniqueText:: + text "Restore PP of" + line "which technique?" + done + +_PPMaxedOutText:: + text_ram wcf4b + text "'s PP" + line "is maxed out." + prompt + +_PPIncreasedText:: + text_ram wcf4b + text "'s PP" + line "increased." + prompt + +_PPRestoredText:: + text "PP was restored." + prompt + +_BootedUpTMText:: + text "Booted up a TM!" + prompt + +_BootedUpHMText:: + text "Booted up an HM!" + prompt + +_TeachMachineMoveText:: + text "It contained" + line "@" + text_ram wcf4b + text "!" + + para "Teach @" + text_ram wcf4b + text_start + line "to a #MON?" + done + +_MonCannotLearnMachineMoveText:: + text_ram wcd6d + text " is not" + line "compatible with" + cont "@" + text_ram wcf4b + text "." + + para "It can't learn" + line "@" + text_ram wcf4b + text "." + prompt + +_ItemUseNotTimeText:: + text "OAK: <PLAYER>!" + line "This isn't the" + cont "time to use that! " + prompt + +_ItemUseNotYoursToUseText:: + text "This isn't yours" + line "to use!" + prompt + +_ItemUseNoEffectText:: + text "It won't have any" + line "effect." + prompt + +_ThrowBallAtTrainerMonText1:: + text "The trainer" + line "blocked the BALL!" + prompt + +_ThrowBallAtTrainerMonText2:: + text "Don't be a thief!" + prompt + +_NoCyclingAllowedHereText:: + text "No cycling" + next "allowed here." + prompt + +_NoSurfingHereText:: + text "No SURFing on" + line "@" + text_ram wcd6d + text " here!" + prompt + +_BoxFullCannotThrowBallText:: + text "The #MON BOX" + line "is full! Can't" + cont "use that item!" + prompt + +_DontHavePokemonText:: + text "You don't have a " + line "#MON!" + prompt + +_ItemUseText001:: + text "<PLAYER> used@" + text_end + +_ItemUseText002:: + text_ram wcf4b + text "!" + done + +_GotOnBicycleText1:: + text "<PLAYER> got on the@" + text_end + +_GotOnBicycleText2:: + text_ram wcf4b + text "!" + prompt + +_GotOffBicycleText1:: + text "<PLAYER> got off@" + text_end + +_GotOffBicycleText2:: + text "the @" + text_ram wcf4b + text "." + prompt + +_ThrewAwayItemText:: + text "Threw away" + line "@" + text_ram wcd6d + text "." + prompt + +_IsItOKToTossItemText:: + text "Is it OK to toss" + line "@" + text_ram wcf4b + text "?" + prompt + +_TooImportantToTossText:: + text "That's too impor-" + line "tant to toss!" + prompt + +_AlreadyKnowsText:: + text_ram wcd6d + text " knows" + line "@" + text_ram wcf4b + text "!" + prompt + +_ConnectCableText:: + text "Okay, connect the" + line "cable like so!" + prompt + +_TradedForText:: + text "<PLAYER> traded" + line "@" + text_ram wInGameTradeGiveMonName + text " for" + cont "@" + text_ram wInGameTradeReceiveMonName + text "!@" + text_end + +_WannaTrade1Text:: + text "I'm looking for" + line "@" + text_ram wInGameTradeGiveMonName + text "! Wanna" + + para "trade one for" + line "@" + text_ram wInGameTradeReceiveMonName + text "? " + done + +_NoTrade1Text:: + text "Awww!" + line "Oh well..." + done + +_WrongMon1Text:: + text "What? That's not" + line "@" + text_ram wInGameTradeGiveMonName + text "!" + + para "If you get one," + line "come back here!" + done + +_Thanks1Text:: + text "Hey thanks!" + done + +_AfterTrade1Text:: + text "Isn't my old" + line "@" + text_ram wInGameTradeReceiveMonName + text " great?" + done + +_WannaTrade2Text:: + text "Hello there! Do" + line "you want to trade" + + para "your @" + text_ram wInGameTradeGiveMonName + text_start + line "for @" + text_ram wInGameTradeReceiveMonName + text "?" + done + +_NoTrade2Text:: + text "Well, if you" + line "don't want to..." + done + +_WrongMon2Text:: + text "Hmmm? This isn't" + line "@" + text_ram wInGameTradeGiveMonName + text "." + + para "Think of me when" + line "you get one." + done + +_Thanks2Text:: + text "Thanks!" + done + +_AfterTrade2Text:: + text "Hello there! Your" + line "old @" + text_ram wInGameTradeGiveMonName + text " is" + cont "magnificent!" + done + +_WannaTrade3Text:: + text "Hi! Do you have" + line "@" + text_ram wInGameTradeGiveMonName + text "?" + + para "Want to trade it" + line "for @" + text_ram wInGameTradeReceiveMonName + text "?" + done + +_NoTrade3Text:: + text "That's too bad." + done + +_WrongMon3Text:: + text "...This is no" + line "@" + text_ram wInGameTradeGiveMonName + text "." + + para "If you get one," + line "trade it with me!" + done + +_Thanks3Text:: + text "Thanks, pal!" + done + +_AfterTrade3Text:: + text "How is my old" + line "@" + text_ram wInGameTradeReceiveMonName + text "?" + + para "My @" + text_ram wInGameTradeGiveMonName + text " is" + line "doing great!" + done + +_NothingToCutText:: + text "There isn't" + line "anything to CUT!" + prompt + +_UsedCutText:: + text_ram wcd6d + text " hacked" + line "away with CUT!" + prompt diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm index 8c125fa0..df882ebd 100644 --- a/data/text_predef_pointers.asm +++ b/data/text_predef_pointers.asm @@ -15,58 +15,60 @@ TextPredefs:: add_tx_pre AerodactylFossilText ; 09 add_tx_pre Route15UpstairsBinocularsText ; 0A add_tx_pre KabutopsFossilText ; 0B - add_tx_pre GymStatueText1 ; 0C - add_tx_pre GymStatueText2 ; 0D - add_tx_pre BookcaseText ; 0E - add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F - add_tx_pre PewterCityPokecenterBenchGuyText ; 10 - add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 - add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 - add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 - add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 - add_tx_pre CeladonCityHotelText ; 15 - add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 - add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 - add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 - add_tx_pre MtMoonPokecenterBenchGuyText ; 19 - add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A - add_tx_pre UnusedBenchGuyText1 ; 1B XXX unused - add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused - add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused - add_tx_pre UnusedPredefText ; 1E XXX unused - add_tx_pre PokemonCenterPCText ; 1F - add_tx_pre ViridianSchoolNotebook ; 20 - add_tx_pre ViridianSchoolBlackboard ; 21 - add_tx_pre JustAMomentText ; 22 - add_tx_pre OpenBillsPCText ; 23 - add_tx_pre FoundHiddenItemText ; 24 - add_tx_pre HiddenItemBagFullText ; 25 XXX unused - add_tx_pre VermilionGymTrashText ; 26 - add_tx_pre IndigoPlateauHQText ; 27 - add_tx_pre GameCornerOutOfOrderText ; 28 - add_tx_pre GameCornerOutToLunchText ; 29 - add_tx_pre GameCornerSomeonesKeysText ; 2A - add_tx_pre FoundHiddenCoinsText ; 2B - add_tx_pre DroppedHiddenCoinsText ; 2C - add_tx_pre BillsHouseMonitorText ; 2D - add_tx_pre BillsHouseInitiatedText ; 2E - add_tx_pre BillsHousePokemonList ; 2F - add_tx_pre MagazinesText ; 30 - add_tx_pre CinnabarGymQuiz ; 31 - add_tx_pre GameCornerNoCoinsText ; 32 - add_tx_pre GameCornerCoinCaseText ; 33 - add_tx_pre LinkCableHelp ; 34 - add_tx_pre TMNotebook ; 35 - add_tx_pre FightingDojoText ; 36 - add_tx_pre EnemiesOnEverySideText ; 37 - add_tx_pre WhatGoesAroundComesAroundText ; 38 - add_tx_pre NewBicycleText ; 39 - add_tx_pre IndigoPlateauStatues ; 3A - add_tx_pre VermilionGymTrashSuccessText1 ; 3B - add_tx_pre VermilionGymTrashSuccessText2 ; 3C XXX unused - add_tx_pre VermilionGymTrashSuccessText3 ; 3D - add_tx_pre VermilionGymTrashFailText ; 3E - add_tx_pre TownMapText ; 3F - add_tx_pre BookOrSculptureText ; 40 - add_tx_pre ElevatorText ; 41 - add_tx_pre PokemonStuffText ; 42 + add_tx_pre FanClubPicture1Text ; 0C + add_tx_pre FanClubPicture2Text ; 0D + add_tx_pre GymStatueText1 ; 0E + add_tx_pre GymStatueText2 ; 0F + add_tx_pre BookcaseText ; 10 + add_tx_pre ViridianCityPokecenterBenchGuyText ; 11 + add_tx_pre PewterCityPokecenterBenchGuyText ; 12 + add_tx_pre CeruleanCityPokecenterBenchGuyText ; 13 + add_tx_pre LavenderCityPokecenterBenchGuyText ; 14 + add_tx_pre VermilionCityPokecenterBenchGuyText ; 15 + add_tx_pre CeladonCityPokecenterBenchGuyText ; 16 + add_tx_pre CeladonCityHotelText ; 17 + add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 18 + add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 19 + add_tx_pre SaffronCityPokecenterBenchGuyText ; 1A + add_tx_pre MtMoonPokecenterBenchGuyText ; 1B + add_tx_pre RockTunnelPokecenterBenchGuyText ; 1C + add_tx_pre UnusedBenchGuyText1 ; 1D XXX unused + add_tx_pre UnusedBenchGuyText2 ; 1E XXX unused + add_tx_pre UnusedBenchGuyText3 ; 1F XXX unused + add_tx_pre UnusedPredefText ; 20 XXX unused + add_tx_pre PokemonCenterPCText ; 21 + add_tx_pre ViridianSchoolNotebook ; 22 + add_tx_pre ViridianSchoolBlackboard ; 23 + add_tx_pre JustAMomentText ; 24 + add_tx_pre OpenBillsPCText ; 25 + add_tx_pre FoundHiddenItemText ; 26 + add_tx_pre HiddenItemBagFullText ; 27 XXX unused + add_tx_pre VermilionGymTrashText ; 28 + add_tx_pre IndigoPlateauHQText ; 29 + add_tx_pre GameCornerOutOfOrderText ; 2A + add_tx_pre GameCornerOutToLunchText ; 2B + add_tx_pre GameCornerSomeonesKeysText ; 2C + add_tx_pre FoundHiddenCoinsText ; 2D + add_tx_pre DroppedHiddenCoinsText ; 2E + add_tx_pre BillsHouseMonitorText ; 2F + add_tx_pre BillsHouseInitiatedText ; 30 + add_tx_pre BillsHousePokemonList ; 31 + add_tx_pre MagazinesText ; 32 + add_tx_pre CinnabarGymQuiz ; 33 + add_tx_pre GameCornerNoCoinsText ; 34 + add_tx_pre GameCornerCoinCaseText ; 35 + add_tx_pre LinkCableHelp ; 36 + add_tx_pre TMNotebook ; 37 + add_tx_pre FightingDojoText ; 38 + add_tx_pre EnemiesOnEverySideText ; 39 + add_tx_pre WhatGoesAroundComesAroundText ; 3A + add_tx_pre NewBicycleText ; 3B + add_tx_pre IndigoPlateauStatues ; 3C + add_tx_pre VermilionGymTrashSuccessText1 ; 3D + add_tx_pre VermilionGymTrashSuccessText2 ; 3E XXX unused + add_tx_pre VermilionGymTrashSuccessText3 ; 3F + add_tx_pre VermilionGymTrashFailText ; 40 + add_tx_pre TownMapText ; 41 + add_tx_pre BookOrSculptureText ; 42 + add_tx_pre ElevatorText ; 43 + add_tx_pre PokemonStuffText ; 44 diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index d348d5d5..058a815c 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -69,3 +69,6 @@ Facility_Coll:: Plateau_Coll:: coll_tiles $1b, $23, $2c, $2d, $3b, $45 + +BeachHouse_Coll:: + coll_tiles $01, $11, $12, $14 diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index c371e92b..5fca7114 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -12,6 +12,7 @@ DoorTileIDPointers: dbw LAB, .LabDoorTileIDs dbw FACILITY, .FacilityDoorTileIDs dbw PLATEAU, .PlateauDoorTileIDs + dbw INTERIOR, .InteriorDoorTileIDs db -1 ; end door_tiles: MACRO @@ -54,3 +55,6 @@ ENDM .PlateauDoorTileIDs: door_tiles $3b, $1b + +.InteriorDoorTileIDs: + door_tiles $04, $15 diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 998c6cb1..4e055591 100755 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -32,3 +32,4 @@ Tilesets: tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE + tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index db005dcf..7c207e27 100755 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -23,6 +23,7 @@ WarpTileIDPointers: dw .ClubWarpTileIDs dw .FacilityWarpTileIDs dw .PlateauWarpTileIDs + dw .BeachHouseWarpTileIDs warp_tiles: MACRO REPT _NARG @@ -90,4 +91,7 @@ ENDM ; fallthrough .ShipPortWarpTileIDs: .ClubWarpTileIDs: + warp_tiles + +.BeachHouseWarpTileIDs: warp_tiles ; end diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 6e6df63c..dd8277dc 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -27,7 +27,7 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; GAMBLER move_choices 1, 3 ; BEAUTY move_choices 1, 2 ; PSYCHIC_TR - move_choices 1, 3 ; ROCKER + move_choices 1 ; ROCKER move_choices 1 ; JUGGLER move_choices 1 ; TAMER move_choices 1 ; BIRD_KEEPER @@ -43,11 +43,11 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; BRUNO move_choices 1 ; BROCK move_choices 1, 3 ; MISTY - move_choices 1, 3 ; LT_SURGE + move_choices 1 ; LT_SURGE move_choices 1, 3 ; ERIKA move_choices 1, 3 ; KOGA - move_choices 1, 3 ; BLAINE - move_choices 1, 3 ; SABRINA + move_choices 1 ; BLAINE + move_choices 1 ; SABRINA move_choices 1, 2 ; GENTLEMAN move_choices 1, 3 ; RIVAL2 move_choices 1, 3 ; RIVAL3 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 005cb1dd..af33a273 100755 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -77,12 +77,13 @@ YoungsterData: db 18, NIDORAN_M, NIDORINO, 0 ; Unused db 17, SPEAROW, RATTATA, RATTATA, SPEAROW, 0 + db 24, SANDSHREW, 0 BugCatcherData: ; Viridian Forest - db 6, WEEDLE, CATERPIE, 0 - db 7, WEEDLE, KAKUNA, WEEDLE, 0 - db 9, WEEDLE, 0 + db 7, CATERPIE, CATERPIE, 0 + db 6, METAPOD, CATERPIE, METAPOD, 0 + db 10, CATERPIE, 0 ; Route 3 db 10, CATERPIE, WEEDLE, CATERPIE, 0 db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0 @@ -100,6 +101,7 @@ BugCatcherData: ; Route 9 db 19, BEEDRILL, BEEDRILL, 0 db 20, CATERPIE, WEEDLE, VENONAT, 0 + db 8, CATERPIE, METAPOD, 0 LassData: ; Route 3 @@ -120,15 +122,16 @@ LassData: ; SS Anne 1F Rooms db 18, PIDGEY, NIDORAN_F, 0 ; SS Anne 2F Rooms - db 18, RATTATA, PIKACHU, 0 + db 20, JIGGLYPUFF, 0 ; Route 8 db 23, NIDORAN_F, NIDORINA, 0 db 24, MEOWTH, MEOWTH, MEOWTH, 0 - db 19, PIDGEY, RATTATA, NIDORAN_M, MEOWTH, PIKACHU, 0 + db 19, PIDGEY, RATTATA, NIDORAN_F, MEOWTH, NIDORAN_M, 0 db 22, CLEFAIRY, CLEFAIRY, 0 ; Celadon Gym db 23, BELLSPROUT, WEEPINBELL, 0 db 23, ODDISH, GLOOM, 0 + db 6, NIDORAN_F, NIDORAN_M, 0 SailorData: ; SS Anne Stern @@ -141,11 +144,11 @@ SailorData: db 17, HORSEA, HORSEA, HORSEA, 0 db 20, MACHOP, 0 ; Vermilion Gym - db 21, PIKACHU, PIKACHU, 0 + db 24, MAGNEMITE, 0 JrTrainerMData: ; Pewter Gym - db 11, DIGLETT, SANDSHREW, 0 + db 9, DIGLETT, SANDSHREW, 0 ; Route 24/Route 25 db 14, RATTATA, EKANS, 0 ; Route 24 @@ -160,12 +163,13 @@ JrTrainerMData: db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0 ; Route 12 db 29, NIDORAN_M, NIDORINO, 0 + db 16, WEEPINBELL, 0 JrTrainerFData: ; Cerulean Gym db 19, GOLDEEN, 0 ; Route 6 - db 16, RATTATA, PIKACHU, 0 + db 16, ODDISH, BELLSPROUT, 0 db 16, PIDGEY, PIDGEY, PIDGEY, 0 ; Unused db 22, BULBASAUR, 0 @@ -173,7 +177,7 @@ JrTrainerFData: db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 db 23, MEOWTH, 0 ; Route 10 - db 20, PIKACHU, CLEFAIRY, 0 + db 20, JIGGLYPUFF, CLEFAIRY, 0 db 21, PIDGEY, PIDGEOTTO, 0 ; Rock Tunnel B1F db 21, JIGGLYPUFF, PIDGEY, MEOWTH, 0 @@ -181,7 +185,7 @@ JrTrainerFData: ; Celadon Gym db 24, BULBASAUR, IVYSAUR, 0 ; Route 13 - db 24, PIDGEY, MEOWTH, RATTATA, PIKACHU, MEOWTH, 0 + db 24, PIDGEY, MEOWTH, RATTATA, PIDGEY, MEOWTH, 0 db 30, POLIWAG, POLIWAG, 0 db 27, PIDGEY, MEOWTH, PIDGEY, PIDGEOTTO, 0 db 28, GOLDEEN, POLIWAG, HORSEA, 0 @@ -193,11 +197,12 @@ JrTrainerFData: db 19, PIDGEY, RATTATA, RATTATA, BELLSPROUT, 0 ; Route 15 db 28, GLOOM, ODDISH, ODDISH, 0 - db 29, PIKACHU, RAICHU, 0 + db 29, PIDGEY, PIDGEOTTO, 0 db 33, CLEFAIRY, 0 db 29, BELLSPROUT, ODDISH, TANGELA, 0 ; Route 20 db 30, TENTACOOL, HORSEA, SEEL, 0 + db 20, CUBONE, 0 PokemaniacData: ; Route 10 @@ -383,7 +388,7 @@ BeautyData: db 24, BELLSPROUT, BELLSPROUT, 0 db 26, EXEGGCUTE, 0 ; Route 13 - db 27, RATTATA, PIKACHU, RATTATA, 0 + db 27, RATTATA, VULPIX, RATTATA, 0 db 29, CLEFAIRY, MEOWTH, 0 ; Route 20 db 35, SEAKING, 0 @@ -410,7 +415,7 @@ PsychicData: RockerData: ; Vermilion Gym - db 20, VOLTORB, MAGNEMITE, VOLTORB, 0 + db 20, VOLTORB, VOLTORB, VOLTORB, 0 ; Route 12 db 29, VOLTORB, ELECTRODE, 0 @@ -483,17 +488,11 @@ BlackbeltData: db 43, MACHOKE, MACHOP, MACHOKE, 0 Green1Data: - db 5, SQUIRTLE, 0 - db 5, BULBASAUR, 0 - db 5, CHARMANDER, 0 + db 5, EEVEE, 0 ; Route 22 - db $FF, 9, PIDGEY, 8, SQUIRTLE, 0 - db $FF, 9, PIDGEY, 8, BULBASAUR, 0 - db $FF, 9, PIDGEY, 8, CHARMANDER, 0 + db $FF, 9, SPEAROW, 8, EEVEE, 0 ; Cerulean City - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, SQUIRTLE, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, BULBASAUR, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMANDER, 0 + db $FF, 18, SPEAROW, 15, SANDSHREW, 15, RATTATA, 17, EEVEE, 0 ProfOakData: ; Unused @@ -533,11 +532,11 @@ ScientistData: GiovanniData: ; Rocket Hideout B4F - db $FF, 25, ONIX, 24, RHYHORN, 29, KANGASKHAN, 0 + db $FF, 25, ONIX, 24, RHYHORN, 29, PERSIAN, 0 ; Silph Co. 11F - db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0 + db $FF, 37, NIDORINO, 35, PERSIAN, 37, RHYHORN, 41, NIDOQUEEN, 0 ; Viridian Gym - db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0 + db $FF, 50, DUGTRIO, 53, PERSIAN, 53, NIDOQUEEN, 55, NIDOKING, 55, RHYDON, 0 RocketData: ; Mt. Moon B2F @@ -601,6 +600,16 @@ RocketData: ; Silph Co. 11F db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0 db 32, CUBONE, DROWZEE, MAROWAK, 0 +;JessieJamesData: + db 14, EKANS, MEOWTH, KOFFING, 0 + db 25, KOFFING, MEOWTH, EKANS, 0 + db 27, MEOWTH, ARBOK, WEEZING, 0 + db 31, WEEZING, ARBOK, MEOWTH, 0 +; unused JessieJames trainers + db 16, KOFFING, 0 + db 27, KOFFING, 0 + db 29, WEEZING, 0 + db 33, WEEZING, 0 CooltrainerMData: ; Viridian Gym @@ -639,32 +648,32 @@ BrunoData: db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0 BrockData: - db $FF, 12, GEODUDE, 14, ONIX, 0 + db $FF, 10, GEODUDE, 12, ONIX, 0 MistyData: db $FF, 18, STARYU, 21, STARMIE, 0 LtSurgeData: - db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0 + db $FF, 28, RAICHU, 0 ErikaData: - db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0 + db $FF, 30, TANGELA, 32, WEEPINBELL, 32, GLOOM, 0 KogaData: - db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0 + db $FF, 44, VENONAT, 46, VENONAT, 48, VENONAT, 50, VENOMOTH, 0 BlaineData: - db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0 + db $FF, 48, NINETALES, 50, RAPIDASH, 54, ARCANINE, 0 SabrinaData: - db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0 + db $FF, 50, ABRA, 50, KADABRA, 50, ALAKAZAM, 0 GentlemanData: ; SS Anne 1F Rooms db 18, GROWLITHE, GROWLITHE, 0 db 19, NIDORAN_M, NIDORAN_F, 0 ; SS Anne 2F Rooms/Vermilion Gym - db 23, PIKACHU, 0 + db 22, VOLTORB, MAGNEMITE, 0 ; Unused db 48, PRIMEAPE, 0 ; SS Anne 2F Rooms @@ -672,26 +681,24 @@ GentlemanData: Green2Data: ; SS Anne 2F - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0 - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0 - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0 + db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, EEVEE, 0 ; Pokémon Tower 2F - db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0 - db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0 - db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0 + db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, EEVEE, 0 + db $FF, 25, FEAROW, 23, MAGNEMITE, 22, SHELLDER, 20, SANDSHREW, 25, EEVEE, 0 + db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNEMITE, 20, SANDSHREW, 25, EEVEE, 0 ; Silph Co. 7F - db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0 - db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 - db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 + db $FF, 38, SANDSLASH, 35, NINETALES, 37, CLOYSTER, 35, KADABRA, 40, JOLTEON, 0 + db $FF, 38, SANDSLASH, 35, CLOYSTER, 37, MAGNETON, 35, KADABRA, 40, FLAREON, 0 + db $FF, 38, SANDSLASH, 35, MAGNETON, 37, NINETALES, 35, KADABRA, 40, VAPOREON, 0 ; Route 22 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, NINETALES, 47, CLOYSTER, 50, KADABRA, 53, JOLTEON, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, CLOYSTER, 47, MAGNETON, 50, KADABRA, 53, FLAREON, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, MAGNETON, 47, NINETALES, 50, KADABRA, 53, VAPOREON, 0 Green3Data: - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0 - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, JOLTEON, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNETON, 63, CLOYSTER, 65, FLAREON, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNETON, 65, VAPOREON, 0 LoreleiData: db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index da19f587..f858fa57 100755 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1,25 +1,160 @@ -; unique moves for gym leaders -; this is not automatic! you have to write the index you want to [wLoneAttackNo] -; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, -; the fourth entry in the list. -LoneMoves: - ; pokemon index, move to give nth pokemon - db 1, BIDE - db 1, BUBBLEBEAM - db 2, THUNDERBOLT - db 2, MEGA_DRAIN - db 3, TOXIC - db 3, PSYWAVE - db 3, FIRE_BLAST - db 4, FISSURE - -; unique moves for elite 4 -; all trainers in this class are given this move automatically -; (unrelated to LoneMoves) -TeamMoves: - ; trainer, move - db LORELEI, BLIZZARD - db BRUNO, FISSURE - db AGATHA, TOXIC - db LANCE, BARRIER +; yellow has its own format. + +; entry = trainerclass, trainerid, moveset+, 0 +; moveset = partymon location, partymon's move, moveid + +SpecialTrainerMoves: + db BUG_CATCHER, 15 + db 2, 2, TACKLE + db 2, 3, STRING_SHOT + db 0 + + db YOUNGSTER, 14 + db 1, 4, FISSURE + db 0 + + db BROCK, 1 + db 2, 3, BIND + db 2, 4, BIDE + db 0 + + db MISTY, 1 + db 2, 4, BUBBLEBEAM + db 0 + + db LT_SURGE, 1 + db 1, 1, THUNDERBOLT + db 1, 2, MEGA_PUNCH + db 1, 3, MEGA_KICK + db 1, 4, GROWL + db 0 + + db ERIKA, 1 + db 1, 3, MEGA_DRAIN + db 2, 1, RAZOR_LEAF + db 3, 1, PETAL_DANCE + db 0 + + db KOGA, 1 + db 1, 1, TOXIC + db 1, 2, TACKLE + db 2, 1, TOXIC + db 2, 3, SUPERSONIC + db 3, 1, TOXIC + db 3, 2, DOUBLE_EDGE + db 4, 1, LEECH_LIFE + db 4, 2, DOUBLE_TEAM + db 4, 3, PSYCHIC_M + db 4, 4, TOXIC + db 0 + + db BLAINE, 1 + db 1, 1, FLAMETHROWER + db 1, 4, CONFUSE_RAY + db 3, 1, FLAMETHROWER + db 3, 2, FIRE_BLAST + db 3, 3, REFLECT + db 0 + + db SABRINA, 1 + db 1, 1, FLASH + db 2, 1, KINESIS + db 2, 4, PSYWAVE + db 3, 1, PSYWAVE + db 0 + + db GIOVANNI, 3 + db 1, 3, FISSURE + db 2, 2, DOUBLE_TEAM + db 3, 1, EARTHQUAKE + db 3, 3, THUNDER + db 4, 1, EARTHQUAKE + db 4, 2, LEER + db 4, 3, THUNDER + db 5, 1, ROCK_SLIDE + db 5, 4, EARTHQUAKE + db 0 + + db LORELEI, 1 + db 1, 1, BUBBLEBEAM + db 2, 3, ICE_BEAM + db 3, 1, PSYCHIC_M + db 3, 2, SURF + db 4, 3, LOVELY_KISS + db 5, 3, BLIZZARD + db 0 + + db BRUNO, 1 + db 1, 1, ROCK_SLIDE + db 1, 2, SCREECH + db 1, 4, DIG + db 2, 3, FIRE_PUNCH + db 2, 4, DOUBLE_TEAM + db 3, 1, DOUBLE_KICK + db 3, 2, MEGA_KICK + db 3, 4, DOUBLE_TEAM + db 4, 1, ROCK_SLIDE + db 4, 2, SCREECH + db 4, 4, EARTHQUAKE + db 5, 2, KARATE_CHOP + db 5, 3, STRENGTH + db 0 + + db AGATHA, 1 + db 1, 2, SUBSTITUTE + db 1, 3, LICK + db 1, 4, MEGA_DRAIN + db 2, 2, TOXIC + db 2, 4, LEECH_LIFE + db 3, 2, LICK + db 4, 1, WRAP + db 5, 2, PSYCHIC_M + db 0 + + db LANCE, 1 + db 1, 1, DRAGON_RAGE + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BUBBLEBEAM + db 3, 2, WRAP + db 3, 3, ICE_BEAM + db 4, 1, WING_ATTACK + db 4, 2, SWIFT + db 4, 3, FLY + db 5, 1, BLIZZARD + db 5, 2, FIRE_BLAST + db 5, 3, THUNDER + db 0 + + db RIVAL3, 1 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, ICE_BEAM + db 5, 1, CONFUSE_RAY + db 5, 4, FIRE_SPIN + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL3, 2 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, THUNDERBOLT + db 5, 1, ICE_BEAM + db 6, 2, REFLECT + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL3, 3 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, CONFUSE_RAY + db 4, 4, FIRE_SPIN + db 5, 1, THUNDERBOLT + db 6, 1, AURORA_BEAM + db 6, 3, QUICK_ATTACK + db 0 + db -1 ; end diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 56ef25c4..a991e9ae 100755 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -29,8 +29,8 @@ WildDataPointers: dw Route16Mons ; ROUTE_16 dw Route17Mons ; ROUTE_17 dw Route18Mons ; ROUTE_18 - dw WaterMons ; ROUTE_19 - dw WaterMons ; ROUTE_20 + dw Route19Mons ; ROUTE_19 + dw Route20Mons ; ROUTE_20 dw Route21Mons ; ROUTE_21 dw Route22Mons ; ROUTE_22 dw Route23Mons ; ROUTE_23 @@ -247,6 +247,7 @@ WildDataPointers: dw NoMons dw NoMons dw NoMons + dw NoMons dw -1 ; end ; wild pokemon data is divided into two parts. @@ -299,7 +300,8 @@ INCLUDE "data/wild/maps/SafariZoneCenter.asm" INCLUDE "data/wild/maps/SafariZoneEast.asm" INCLUDE "data/wild/maps/SafariZoneNorth.asm" INCLUDE "data/wild/maps/SafariZoneWest.asm" -INCLUDE "data/wild/maps/SeaRoutes.asm" +INCLUDE "data/wild/maps/Route19.asm" +INCLUDE "data/wild/maps/Route20.asm" INCLUDE "data/wild/maps/SeafoamIslands1F.asm" INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm" INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm" diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm index eb39c525..24a24f60 100644 --- a/data/wild/maps/CeruleanCave1F.asm +++ b/data/wild/maps/CeruleanCave1F.asm @@ -1,19 +1,14 @@ DungeonMons1: db 10 ; grass encounter rate - db 46, GOLBAT - db 46, HYPNO - db 46, MAGNETON - db 49, DODRIO - db 49, VENOMOTH -IF DEF(_RED) - db 52, ARBOK -ENDC -IF DEF(_BLUE) + db 50, GOLBAT + db 55, GOLBAT + db 45, GRAVELER + db 55, GLOOM + db 55, WEEPINBELL db 52, SANDSLASH -ENDC - db 49, KADABRA - db 52, PARASECT - db 53, RAICHU - db 53, DITTO + db 54, VENOMOTH + db 54, PARASECT + db 55, DITTO + db 60, DITTO db 0 ; water encounter rate diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm index cbdb2eaf..07b34527 100644 --- a/data/wild/maps/CeruleanCave2F.asm +++ b/data/wild/maps/CeruleanCave2F.asm @@ -1,14 +1,14 @@ DungeonMons2: db 15 ; grass encounter rate - db 51, DODRIO - db 51, VENOMOTH - db 51, KADABRA - db 52, RHYDON - db 52, MAROWAK - db 52, ELECTRODE - db 56, CHANSEY - db 54, WIGGLYTUFF - db 55, DITTO + db 52, GOLBAT + db 57, GOLBAT + db 50, GRAVELER + db 56, SANDSLASH + db 50, RHYHORN db 60, DITTO + db 58, GLOOM + db 58, WEEPINBELL + db 60, RHYDON + db 58, RHYDON db 0 ; water encounter rate diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm index 86e8fba2..969ab18f 100644 --- a/data/wild/maps/CeruleanCaveB1F.asm +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -1,19 +1,14 @@ DungeonMonsB1: db 25 ; grass encounter rate - db 55, RHYDON - db 55, MAROWAK - db 55, ELECTRODE - db 64, CHANSEY - db 64, PARASECT - db 64, RAICHU -IF DEF(_RED) - db 57, ARBOK -ENDC -IF DEF(_BLUE) - db 57, SANDSLASH -ENDC + db 54, GOLBAT + db 59, GOLBAT + db 55, GRAVELER + db 52, RHYHORN + db 62, RHYDON + db 60, DITTO + db 56, CHANSEY db 65, DITTO - db 63, DITTO - db 67, DITTO + db 55, LICKITUNG + db 50, LICKITUNG db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index d8c9ba1b..2e426655 100755 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -1,14 +1,14 @@ MoonMons1: db 10 ; grass encounter rate db 8, ZUBAT - db 7, ZUBAT db 9, ZUBAT - db 8, GEODUDE + db 10, GEODUDE db 6, ZUBAT + db 7, ZUBAT db 10, ZUBAT db 10, GEODUDE - db 8, PARAS db 11, ZUBAT - db 8, CLEFAIRY + db 12, SANDSHREW + db 11, CLEFAIRY db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 875a7256..1eee34ce 100755 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -1,14 +1,14 @@ MoonMonsB1: db 10 ; grass encounter rate db 8, ZUBAT - db 7, ZUBAT - db 7, GEODUDE - db 8, GEODUDE db 9, ZUBAT - db 10, PARAS db 10, ZUBAT + db 10, GEODUDE + db 11, GEODUDE db 11, ZUBAT - db 9, CLEFAIRY - db 9, GEODUDE + db 9, PARAS + db 11, PARAS + db 10, CLEFAIRY + db 12, CLEFAIRY db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index ae90ed1e..d49ec585 100755 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -1,14 +1,14 @@ MoonMonsB2: db 10 ; grass encounter rate - db 9, ZUBAT - db 9, GEODUDE db 10, ZUBAT - db 10, GEODUDE + db 11, GEODUDE + db 13, PARAS + db 11, ZUBAT db 11, ZUBAT - db 10, PARAS - db 12, PARAS - db 10, CLEFAIRY db 12, ZUBAT - db 12, CLEFAIRY + db 13, ZUBAT + db 9, CLEFAIRY + db 11, CLEFAIRY + db 13, CLEFAIRY db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index 3be7fb18..75fcadfe 100755 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm @@ -1,28 +1,14 @@ MansionMons1: db 10 ; grass encounter rate -IF DEF(_RED) - db 32, KOFFING - db 30, KOFFING - db 34, PONYTA - db 30, PONYTA + db 34, RATTATA + db 34, RATICATE + db 23, GRIMER + db 26, GROWLITHE + db 37, RATTATA + db 37, RATICATE + db 30, GROWLITHE + db 26, GRIMER db 34, GROWLITHE - db 32, PONYTA - db 30, GRIMER - db 28, PONYTA - db 37, WEEZING - db 39, MUK -ENDC -IF DEF(_BLUE) - db 32, GRIMER - db 30, GRIMER - db 34, PONYTA - db 30, PONYTA - db 34, VULPIX - db 32, PONYTA - db 30, KOFFING - db 28, PONYTA - db 37, MUK - db 39, WEEZING -ENDC + db 38, GROWLITHE db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 494973b2..2143532f 100755 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm @@ -1,28 +1,14 @@ MansionMons2: db 10 ; grass encounter rate -IF DEF(_RED) - db 32, GROWLITHE - db 34, KOFFING - db 34, KOFFING - db 30, PONYTA - db 30, KOFFING - db 32, PONYTA - db 30, GRIMER - db 28, PONYTA - db 39, WEEZING - db 37, MUK -ENDC -IF DEF(_BLUE) - db 32, VULPIX - db 34, GRIMER - db 34, GRIMER - db 30, PONYTA - db 30, GRIMER - db 32, PONYTA - db 30, KOFFING - db 28, PONYTA - db 39, MUK - db 37, WEEZING -ENDC + db 37, RATTATA + db 37, RATICATE + db 26, GRIMER + db 29, GRIMER + db 40, RATTATA + db 40, RATICATE + db 32, GRIMER + db 35, GRIMER + db 35, MUK + db 38, MUK db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index bbb14213..f0c77977 100755 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,28 +1,14 @@ MansionMons3: db 10 ; grass encounter rate -IF DEF(_RED) - db 31, KOFFING - db 33, GROWLITHE - db 35, KOFFING - db 32, PONYTA - db 34, PONYTA - db 40, WEEZING - db 34, GRIMER - db 38, WEEZING - db 36, PONYTA - db 42, MUK -ENDC -IF DEF(_BLUE) - db 31, GRIMER - db 33, VULPIX + db 40, RATTATA + db 40, RATICATE + db 32, GRIMER db 35, GRIMER - db 32, PONYTA - db 34, MAGMAR - db 40, MUK - db 34, KOFFING + db 43, RATTATA + db 43, RATICATE + db 38, GRIMER + db 38, GRIMER db 38, MUK - db 36, PONYTA - db 42, WEEZING -ENDC + db 41, MUK db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 77f989b2..c0ad432b 100755 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -1,28 +1,14 @@ MansionMonsB1: db 10 ; grass encounter rate -IF DEF(_RED) - db 33, KOFFING - db 31, KOFFING - db 35, GROWLITHE - db 32, PONYTA - db 31, KOFFING - db 40, WEEZING - db 34, PONYTA db 35, GRIMER - db 42, WEEZING - db 42, MUK -ENDC -IF DEF(_BLUE) - db 33, GRIMER - db 31, GRIMER - db 35, VULPIX - db 32, PONYTA - db 31, GRIMER - db 40, MUK - db 34, PONYTA - db 35, KOFFING - db 38, MAGMAR - db 42, WEEZING -ENDC + db 38, GRIMER + db 37, RATICATE + db 40, RATICATE + db 41, MUK + db 43, RATICATE + db 24, DITTO + db 46, RATICATE + db 18, DITTO + db 12, DITTO db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index 177497e9..b608ea15 100755 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -4,11 +4,11 @@ TowerMons3: db 21, GASTLY db 22, GASTLY db 23, GASTLY + db 24, GASTLY db 19, GASTLY db 18, GASTLY - db 24, GASTLY - db 20, CUBONE - db 22, CUBONE + db 25, GASTLY + db 20, HAUNTER db 25, HAUNTER db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index b6e82d14..425b200c 100755 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -4,11 +4,11 @@ TowerMons4: db 21, GASTLY db 22, GASTLY db 23, GASTLY + db 24, GASTLY db 19, GASTLY db 18, GASTLY + db 25, GASTLY + db 20, HAUNTER db 25, HAUNTER - db 20, CUBONE - db 22, CUBONE - db 24, GASTLY db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 03c41eba..5a0c96e1 100755 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -1,14 +1,14 @@ TowerMons5: - db 10 ; grass encounter rate - db 20, GASTLY - db 21, GASTLY + db 15 ; grass encounter rate db 22, GASTLY db 23, GASTLY - db 19, GASTLY - db 18, GASTLY - db 25, HAUNTER - db 20, CUBONE - db 22, CUBONE db 24, GASTLY + db 25, GASTLY + db 26, GASTLY + db 21, GASTLY + db 20, CUBONE + db 27, GASTLY + db 22, HAUNTER + db 27, HAUNTER db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 38898de1..5e9d23f4 100755 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -1,14 +1,14 @@ TowerMons6: db 15 ; grass encounter rate - db 21, GASTLY db 22, GASTLY db 23, GASTLY db 24, GASTLY - db 20, GASTLY - db 19, GASTLY - db 26, HAUNTER + db 25, GASTLY + db 26, GASTLY + db 21, GASTLY db 22, CUBONE - db 24, CUBONE - db 28, HAUNTER + db 27, GASTLY + db 22, HAUNTER + db 27, HAUNTER db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index b2faa100..8a3467ff 100755 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -1,14 +1,14 @@ TowerMons7: - db 15 ; grass encounter rate - db 21, GASTLY - db 22, GASTLY - db 23, GASTLY + db 20 ; grass encounter rate db 24, GASTLY - db 20, GASTLY - db 28, HAUNTER - db 22, CUBONE + db 25, GASTLY + db 26, GASTLY + db 27, GASTLY + db 28, GASTLY + db 23, GASTLY db 24, CUBONE - db 28, HAUNTER - db 30, HAUNTER + db 29, GASTLY + db 24, HAUNTER + db 29, HAUNTER db 0 ; water encounter rate diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index f70dfbcb..a910420e 100755 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,20 +1,14 @@ PowerPlantMons: db 10 ; grass encounter rate - db 21, VOLTORB - db 21, MAGNEMITE - db 20, PIKACHU - db 24, PIKACHU - db 23, MAGNEMITE - db 23, VOLTORB - db 32, MAGNETON - db 35, MAGNETON -IF DEF(_RED) - db 33, ELECTABUZZ - db 36, ELECTABUZZ -ENDC -IF DEF(_BLUE) - db 33, RAICHU - db 36, RAICHU -ENDC + db 30, MAGNEMITE + db 35, MAGNEMITE + db 33, MAGNETON + db 33, VOLTORB + db 37, VOLTORB + db 33, GRIMER + db 37, GRIMER + db 38, MAGNETON + db 33, MUK + db 37, MUK db 0 ; water encounter rate diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 42a6d58b..5c64bac4 100755 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -1,14 +1,14 @@ TunnelMonsB1: db 15 ; grass encounter rate - db 16, ZUBAT - db 17, ZUBAT - db 17, GEODUDE - db 15, MACHOP - db 16, GEODUDE - db 18, ZUBAT db 15, ZUBAT + db 16, GEODUDE + db 17, ZUBAT + db 19, ZUBAT + db 18, GEODUDE + db 20, GEODUDE + db 21, ZUBAT db 17, MACHOP - db 13, ONIX - db 15, ONIX + db 19, MACHOP + db 21, MACHOP db 0 ; water encounter rate diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 2f970332..3f034958 100755 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -1,14 +1,14 @@ TunnelMonsB2: db 15 ; grass encounter rate - db 16, ZUBAT - db 17, ZUBAT + db 20, ZUBAT db 17, GEODUDE - db 15, MACHOP - db 16, GEODUDE - db 18, ZUBAT - db 17, MACHOP - db 17, ONIX - db 13, ONIX - db 18, GEODUDE + db 18, MACHOP + db 21, ZUBAT + db 22, ZUBAT + db 21, GEODUDE + db 20, MACHOP + db 14, ONIX + db 18, ONIX + db 22, ONIX db 0 ; water encounter rate diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index e75ded3b..df599383 100755 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -1,14 +1,14 @@ Route1Mons: db 25 ; grass encounter rate db 3, PIDGEY - db 3, RATTATA - db 3, RATTATA + db 4, PIDGEY db 2, RATTATA + db 3, RATTATA db 2, PIDGEY db 3, PIDGEY - db 3, PIDGEY - db 4, RATTATA - db 4, PIDGEY db 5, PIDGEY + db 4, RATTATA + db 6, PIDGEY + db 7, PIDGEY db 0 ; water encounter rate diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 603dc389..b7ca364c 100755 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,25 +1,14 @@ Route10Mons: db 15 ; grass encounter rate - db 16, VOLTORB - db 16, SPEAROW - db 14, VOLTORB -IF DEF(_RED) - db 11, EKANS - db 13, SPEAROW - db 15, EKANS - db 17, VOLTORB - db 17, SPEAROW - db 13, EKANS - db 17, EKANS -ENDC -IF DEF(_BLUE) - db 11, SANDSHREW - db 13, SPEAROW - db 15, SANDSHREW - db 17, VOLTORB - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW -ENDC + db 16, MAGNEMITE + db 18, RATTATA + db 18, MAGNEMITE + db 20, MAGNEMITE + db 17, NIDORAN_M + db 17, NIDORAN_F + db 22, MAGNEMITE + db 20, RATICATE + db 16, MACHOP + db 18, MACHOP db 0 ; water encounter rate diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index ea053c07..eb00aa7e 100755 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -1,25 +1,14 @@ Route11Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 14, EKANS - db 15, SPEAROW - db 12, EKANS - db 9, DROWZEE - db 13, SPEAROW - db 13, DROWZEE - db 15, EKANS -ENDC -IF DEF(_BLUE) - db 14, SANDSHREW - db 15, SPEAROW - db 12, SANDSHREW - db 9, DROWZEE - db 13, SPEAROW - db 13, DROWZEE - db 15, SANDSHREW -ENDC - db 17, SPEAROW - db 11, DROWZEE + db 16, PIDGEY + db 15, RATTATA + db 18, PIDGEY db 15, DROWZEE + db 17, RATTATA + db 17, DROWZEE + db 18, PIDGEOTTO + db 20, PIDGEOTTO + db 19, DROWZEE + db 17, RATICATE db 0 ; water encounter rate diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index acdfe6b6..46c4106e 100755 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -1,28 +1,24 @@ Route12Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 24, ODDISH - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT - db 26, ODDISH - db 27, PIDGEY - db 28, GLOOM - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT - db 27, PIDGEY - db 28, WEEPINBELL - db 30, WEEPINBELL -ENDC + db 25, ODDISH + db 25, BELLSPROUT + db 28, PIDGEY + db 28, PIDGEOTTO + db 27, ODDISH + db 27, BELLSPROUT + db 29, GLOOM + db 29, WEEPINBELL + db 26, FARFETCHD + db 31, FARFETCHD - db 0 ; water encounter rate + db 3 ; water encounter rate + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWBRO + db 20, SLOWBRO diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index 4d0c0a46..d19e0d83 100755 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,28 +1,24 @@ Route13Mons: - db 20 ; grass encounter rate -IF DEF(_RED) - db 24, ODDISH - db 25, PIDGEY - db 27, PIDGEY - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT - db 26, ODDISH - db 25, DITTO - db 28, GLOOM - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 25, PIDGEY - db 27, PIDGEY - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT - db 25, DITTO - db 28, WEEPINBELL - db 30, WEEPINBELL -ENDC + db 15 ; grass encounter rate + db 25, ODDISH + db 25, BELLSPROUT + db 28, PIDGEOTTO + db 28, PIDGEY + db 27, ODDISH + db 27, BELLSPROUT + db 29, GLOOM + db 29, WEEPINBELL + db 26, FARFETCHD + db 31, FARFETCHD - db 0 ; water encounter rate + db 3 ; water encounter rate + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWPOKE + db 15, SLOWBRO + db 20, SLOWBRO diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index a91631a8..fe600bed 100755 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,26 +1,14 @@ Route14Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 24, ODDISH - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT db 26, ODDISH - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT db 26, BELLSPROUT - db 30, WEEPINBELL -ENDC - db 28, PIDGEOTTO + db 24, VENONAT db 30, PIDGEOTTO + db 28, ODDISH + db 28, BELLSPROUT + db 30, GLOOM + db 30, WEEPINBELL + db 27, VENONAT + db 30, VENOMOTH db 0 ; water encounter rate diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 13bd7f32..4374acfb 100755 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,26 +1,14 @@ Route15Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 24, ODDISH - db 26, DITTO - db 23, PIDGEY - db 26, VENONAT - db 22, ODDISH - db 28, VENONAT db 26, ODDISH - db 30, GLOOM -ENDC -IF DEF(_BLUE) - db 24, BELLSPROUT - db 26, DITTO - db 23, PIDGEY - db 26, VENONAT - db 22, BELLSPROUT - db 28, VENONAT db 26, BELLSPROUT + db 24, VENONAT + db 32, PIDGEOTTO + db 28, ODDISH + db 28, BELLSPROUT + db 30, GLOOM db 30, WEEPINBELL -ENDC - db 28, PIDGEOTTO - db 30, PIDGEOTTO + db 27, VENONAT + db 30, VENOMOTH db 0 ; water encounter rate diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index ecab87c1..f858dcdb 100755 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -1,14 +1,14 @@ Route16Mons: db 25 ; grass encounter rate - db 20, SPEAROW db 22, SPEAROW - db 18, RATTATA - db 20, DODUO - db 20, RATTATA - db 18, DODUO db 22, DODUO - db 22, RATTATA - db 23, RATICATE + db 23, RATTATA + db 24, DODUO + db 24, RATTATA + db 26, DODUO + db 23, SPEAROW + db 24, FEAROW db 25, RATICATE + db 26, RATICATE db 0 ; water encounter rate diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index 762b5449..3f6316f3 100755 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,14 +1,14 @@ Route17Mons: db 25 ; grass encounter rate - db 20, SPEAROW - db 22, SPEAROW - db 25, RATICATE - db 24, DODUO - db 27, RATICATE db 26, DODUO - db 28, DODUO - db 29, RATICATE - db 25, FEAROW db 27, FEAROW + db 27, DODUO + db 28, DODUO + db 28, PONYTA + db 30, PONYTA + db 29, FEAROW + db 28, DODUO + db 32, PONYTA + db 29, DODRIO db 0 ; water encounter rate diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index d8123c5e..b76cef02 100755 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm @@ -1,14 +1,14 @@ Route18Mons: db 25 ; grass encounter rate - db 20, SPEAROW db 22, SPEAROW - db 25, RATICATE + db 22, DODUO + db 23, RATTATA db 24, DODUO - db 25, FEAROW + db 24, RATTATA db 26, DODUO - db 28, DODUO - db 29, RATICATE - db 27, FEAROW - db 29, FEAROW + db 23, SPEAROW + db 24, FEAROW + db 25, RATICATE + db 26, RATICATE db 0 ; water encounter rate diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/Route19.asm index 72ea781d..70b06ac8 100755..100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/Route19.asm @@ -1,4 +1,4 @@ -WaterMons: +Route19Mons: db 0 ; grass encounter rate db 5 ; water encounter rate diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 035e5b28..40093712 100755 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -2,22 +2,13 @@ Route2Mons: db 25 ; grass encounter rate db 3, RATTATA db 3, PIDGEY - db 4, PIDGEY db 4, RATTATA + db 4, NIDORAN_M + db 4, NIDORAN_F db 5, PIDGEY -IF DEF(_RED) - db 3, WEEDLE - db 2, RATTATA - db 5, RATTATA - db 4, WEEDLE - db 5, WEEDLE -ENDC -IF DEF(_BLUE) - db 3, CATERPIE - db 2, RATTATA - db 5, RATTATA - db 4, CATERPIE - db 5, CATERPIE -ENDC + db 6, NIDORAN_M + db 6, NIDORAN_F + db 7, PIDGEY + db 7, PIDGEY db 0 ; water encounter rate diff --git a/data/wild/maps/Route20.asm b/data/wild/maps/Route20.asm new file mode 100644 index 00000000..b955c330 --- /dev/null +++ b/data/wild/maps/Route20.asm @@ -0,0 +1,15 @@ +Route20Mons: + db $00 + + db $05 + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 5,TENTACOOL + db 10,TENTACOOL + db 15,TENTACOOL + db 20,TENTACOOL + db 30,TENTACOOL + db 35,TENTACOOL + db 40,TENTACOOL + diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 13ffe445..e934e079 100755 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,15 +1,15 @@ Route21Mons: db 25 ; grass encounter rate - db 21, RATTATA - db 23, PIDGEY - db 30, RATICATE - db 23, RATTATA - db 21, PIDGEY - db 30, PIDGEOTTO - db 32, PIDGEOTTO - db 28, TANGELA - db 30, TANGELA - db 32, TANGELA + db 15, PIDGEY + db 13, RATTATA + db 13, PIDGEY + db 11, PIDGEY + db 17, PIDGEY + db 15, RATTATA + db 15, RATICATE + db 17, PIDGEOTTO + db 19, PIDGEOTTO + db 15, PIDGEOTTO db 5 ; water encounter rate db 5, TENTACOOL diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index c8f72608..1b50ded0 100755 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,27 +1,14 @@ Route22Mons: db 25 ; grass encounter rate - db 3, RATTATA -IF DEF(_RED) - db 3, NIDORAN_M - db 4, RATTATA - db 4, NIDORAN_M - db 2, RATTATA db 2, NIDORAN_M - db 3, SPEAROW - db 5, SPEAROW - db 3, NIDORAN_F - db 4, NIDORAN_F -ENDC -IF DEF(_BLUE) - db 3, NIDORAN_F - db 4, RATTATA - db 4, NIDORAN_F - db 2, RATTATA db 2, NIDORAN_F - db 3, SPEAROW - db 5, SPEAROW - db 3, NIDORAN_M + db 3, MANKEY + db 3, RATTATA db 4, NIDORAN_M -ENDC + db 4, NIDORAN_F + db 5, MANKEY + db 2, SPEAROW + db 4, SPEAROW + db 6, SPEAROW db 0 ; water encounter rate diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 77f019a3..cc1642e8 100755 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -1,24 +1,14 @@ Route23Mons: db 10 ; grass encounter rate -IF DEF(_RED) - db 26, EKANS -ENDC -IF DEF(_BLUE) - db 26, SANDSHREW -ENDC - db 33, DITTO - db 26, SPEAROW - db 38, FEAROW - db 38, DITTO - db 38, FEAROW -IF DEF(_RED) - db 41, ARBOK -ENDC -IF DEF(_BLUE) - db 41, SANDSLASH -ENDC - db 43, DITTO - db 41, FEAROW - db 43, FEAROW + db 41, NIDORINO + db 41, NIDORINA + db 36, MANKEY + db 44, NIDORINO + db 44, NIDORINA + db 40, FEAROW + db 41, MANKEY + db 45, FEAROW + db 41, PRIMEAPE + db 46, PRIMEAPE db 0 ; water encounter rate diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index 8ba7d232..e493dfbf 100755 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm @@ -1,25 +1,14 @@ Route24Mons: db 25 ; grass encounter rate -IF DEF(_RED) - db 7, WEEDLE - db 8, KAKUNA - db 12, PIDGEY db 12, ODDISH - db 13, ODDISH - db 10, ABRA - db 14, ODDISH -ENDC -IF DEF(_BLUE) - db 7, CATERPIE - db 8, METAPOD - db 12, PIDGEY db 12, BELLSPROUT - db 13, BELLSPROUT - db 10, ABRA - db 14, BELLSPROUT -ENDC db 13, PIDGEY - db 8, ABRA - db 12, ABRA + db 14, ODDISH + db 14, BELLSPROUT + db 15, PIDGEY + db 13, VENONAT + db 16, VENONAT + db 17, PIDGEY + db 17, PIDGEOTTO db 0 ; water encounter rate diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 7e0ded65..2daa060c 100755 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm @@ -1,28 +1,14 @@ Route25Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 8, WEEDLE - db 9, KAKUNA - db 13, PIDGEY db 12, ODDISH - db 13, ODDISH - db 12, ABRA - db 14, ODDISH - db 10, ABRA - db 7, METAPOD - db 8, CATERPIE -ENDC -IF DEF(_BLUE) - db 8, CATERPIE - db 9, METAPOD - db 13, PIDGEY db 12, BELLSPROUT - db 13, BELLSPROUT - db 12, ABRA + db 13, PIDGEY + db 14, ODDISH db 14, BELLSPROUT - db 10, ABRA - db 7, KAKUNA - db 8, WEEDLE -ENDC + db 15, PIDGEY + db 13, VENONAT + db 16, VENONAT + db 17, PIDGEY + db 17, PIDGEOTTO db 0 ; water encounter rate diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index b397b1d1..be7afe95 100755 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm @@ -1,14 +1,14 @@ Route3Mons: db 20 ; grass encounter rate - db 6, PIDGEY - db 5, SPEAROW - db 7, PIDGEY - db 6, SPEAROW - db 7, SPEAROW - db 8, PIDGEY db 8, SPEAROW - db 3, JIGGLYPUFF - db 5, JIGGLYPUFF - db 7, JIGGLYPUFF + db 9, SPEAROW + db 9, MANKEY + db 10, SPEAROW + db 8, SANDSHREW + db 10, RATTATA + db 10, SANDSHREW + db 12, RATTATA + db 11, SPEAROW + db 12, SPEAROW db 0 ; water encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index d4f4763b..29f0aec4 100755 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,24 +1,14 @@ Route4Mons: db 20 ; grass encounter rate - db 10, RATTATA - db 10, SPEAROW - db 8, RATTATA -IF DEF(_RED) - db 6, EKANS - db 8, SPEAROW - db 10, EKANS - db 12, RATTATA - db 12, SPEAROW - db 8, EKANS - db 12, EKANS -ENDC -IF DEF(_BLUE) - db 6, SANDSHREW db 8, SPEAROW + db 9, SPEAROW + db 9, MANKEY + db 10, SPEAROW + db 8, SANDSHREW + db 10, RATTATA db 10, SANDSHREW db 12, RATTATA + db 11, SPEAROW db 12, SPEAROW - db 8, SANDSHREW - db 12, SANDSHREW -ENDC + db 0 ; water encounter rate diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index dd200378..7517bcb9 100755 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -1,28 +1,14 @@ Route5Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 13, ODDISH - db 13, PIDGEY db 15, PIDGEY - db 10, MANKEY - db 12, MANKEY - db 15, ODDISH - db 16, ODDISH + db 14, RATTATA + db 7, ABRA db 16, PIDGEY - db 14, MANKEY - db 16, MANKEY -ENDC -IF DEF(_BLUE) - db 13, BELLSPROUT - db 13, PIDGEY - db 15, PIDGEY - db 10, MEOWTH - db 12, MEOWTH - db 15, BELLSPROUT - db 16, BELLSPROUT - db 16, PIDGEY - db 14, MEOWTH - db 16, MEOWTH -ENDC + db 16, RATTATA + db 17, PIDGEY + db 17, PIDGEOTTO + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF db 0 ; water encounter rate diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 15585ea4..067d2694 100755 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -1,28 +1,24 @@ Route6Mons: db 15 ; grass encounter rate -IF DEF(_RED) - db 13, ODDISH - db 13, PIDGEY db 15, PIDGEY - db 10, MANKEY - db 12, MANKEY - db 15, ODDISH - db 16, ODDISH + db 14, RATTATA + db 7, ABRA db 16, PIDGEY - db 14, MANKEY - db 16, MANKEY -ENDC -IF DEF(_BLUE) - db 13, BELLSPROUT - db 13, PIDGEY - db 15, PIDGEY - db 10, MEOWTH - db 12, MEOWTH - db 15, BELLSPROUT - db 16, BELLSPROUT - db 16, PIDGEY - db 14, MEOWTH - db 16, MEOWTH -ENDC + db 16, RATTATA + db 17, PIDGEY + db 17, PIDGEOTTO + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF - db 0 ; water encounter rate + db 3 ; water encounter rate + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, PSYDUCK + db 15, GOLDUCK + db 20, GOLDUCK diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 39508bf0..1ebb1ce9 100755 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,27 +1,14 @@ Route7Mons: db 15 ; grass encounter rate - db 19, PIDGEY -IF DEF(_RED) - db 19, ODDISH - db 17, MANKEY - db 22, ODDISH + db 20, PIDGEY db 22, PIDGEY - db 18, MANKEY - db 18, GROWLITHE - db 20, GROWLITHE - db 19, MANKEY - db 20, MANKEY -ENDC -IF DEF(_BLUE) - db 19, BELLSPROUT - db 17, MEOWTH - db 22, BELLSPROUT - db 22, PIDGEY - db 18, MEOWTH - db 18, VULPIX - db 20, VULPIX - db 19, MEOWTH - db 20, MEOWTH -ENDC + db 20, RATTATA + db 15, ABRA + db 19, ABRA + db 24, PIDGEOTTO + db 26, ABRA + db 19, JIGGLYPUFF + db 24, JIGGLYPUFF + db 24, JIGGLYPUFF db 0 ; water encounter rate diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 005ee677..db07dbba 100755 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -1,27 +1,14 @@ Route8Mons: db 15 ; grass encounter rate - db 18, PIDGEY -IF DEF(_RED) - db 18, MANKEY - db 17, EKANS - db 16, GROWLITHE db 20, PIDGEY - db 20, MANKEY - db 19, EKANS - db 17, GROWLITHE - db 15, GROWLITHE - db 18, GROWLITHE -ENDC -IF DEF(_BLUE) - db 18, MEOWTH - db 17, SANDSHREW - db 16, VULPIX - db 20, PIDGEY - db 20, MEOWTH - db 19, SANDSHREW - db 17, VULPIX - db 15, VULPIX - db 18, VULPIX -ENDC + db 22, PIDGEY + db 20, RATTATA + db 15, ABRA + db 19, ABRA + db 24, PIDGEOTTO + db 19, JIGGLYPUFF + db 24, JIGGLYPUFF + db 20, KADABRA + db 27, KADABRA db 0 ; water encounter rate diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index a38fc35f..78512402 100755 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -1,25 +1,14 @@ Route9Mons: db 15 ; grass encounter rate - db 16, RATTATA - db 16, SPEAROW - db 14, RATTATA -IF DEF(_RED) - db 11, EKANS - db 13, SPEAROW - db 15, EKANS - db 17, RATTATA + db 16, NIDORAN_M + db 16, NIDORAN_F + db 18, RATTATA + db 18, NIDORAN_M + db 18, NIDORAN_F db 17, SPEAROW - db 13, EKANS - db 17, EKANS -ENDC -IF DEF(_BLUE) - db 11, SANDSHREW - db 13, SPEAROW - db 15, SANDSHREW - db 17, RATTATA - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW -ENDC + db 18, NIDORINO + db 18, NIDORINA + db 20, RATICATE + db 19, FEAROW db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 4661b927..125fbc6a 100755 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -1,27 +1,14 @@ ZoneMonsCenter: db 30 ; grass encounter rate -IF DEF(_RED) - db 22, NIDORAN_M - db 25, RHYHORN - db 22, VENONAT + db 14, NIDORAN_M + db 36, NIDORAN_F db 24, EXEGGCUTE - db 31, NIDORINO - db 25, EXEGGCUTE - db 31, NIDORINA - db 30, PARASECT - db 23, SCYTHER -ENDC -IF DEF(_BLUE) - db 22, NIDORAN_F - db 25, RHYHORN - db 22, VENONAT - db 24, EXEGGCUTE - db 31, NIDORINA - db 25, EXEGGCUTE - db 31, NIDORINO - db 30, PARASECT - db 23, PINSIR -ENDC - db 23, CHANSEY + db 20, RHYHORN + db 23, NIDORINO + db 27, PARASECT + db 27, PARAS + db 32, PARASECT + db 22, TANGELA + db 7, CHANSEY db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index 9910bf12..ba0a1954 100755 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm @@ -1,28 +1,14 @@ ZoneMons1: db 30 ; grass encounter rate -IF DEF(_RED) - db 24, NIDORAN_M - db 26, DODUO - db 22, PARAS - db 25, EXEGGCUTE - db 33, NIDORINO - db 23, EXEGGCUTE - db 24, NIDORAN_F - db 25, PARASECT - db 25, KANGASKHAN - db 28, SCYTHER -ENDC -IF DEF(_BLUE) - db 24, NIDORAN_F - db 26, DODUO - db 22, PARAS - db 25, EXEGGCUTE - db 33, NIDORINA - db 23, EXEGGCUTE - db 24, NIDORAN_M - db 25, PARASECT - db 25, KANGASKHAN - db 28, PINSIR -ENDC + db 21, NIDORAN_M + db 29, NIDORAN_F + db 22, EXEGGCUTE + db 21, TAUROS + db 32, NIDORINA + db 19, CUBONE + db 26, EXEGGCUTE + db 24, MAROWAK + db 21, CHANSEY + db 15, SCYTHER db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 4482571b..fa6dd3b4 100755 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -1,25 +1,14 @@ ZoneMons2: db 30 ; grass encounter rate -IF DEF(_RED) - db 22, NIDORAN_M - db 26, RHYHORN - db 23, PARAS - db 25, EXEGGCUTE - db 30, NIDORINO - db 27, EXEGGCUTE - db 30, NIDORINA -ENDC -IF DEF(_BLUE) - db 22, NIDORAN_F - db 26, RHYHORN - db 23, PARAS - db 25, EXEGGCUTE - db 30, NIDORINA - db 27, EXEGGCUTE - db 30, NIDORINO -ENDC - db 32, VENOMOTH - db 26, CHANSEY - db 28, TAUROS + db 36, NIDORAN_M + db 14, NIDORAN_F + db 20, EXEGGCUTE + db 25, RHYHORN + db 23, NIDORINA + db 28, KANGASKHAN + db 16, CUBONE + db 33, KANGASKHAN + db 25, SCYTHER + db 15, PINSIR db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index c9989cc9..b1e2fe3a 100755 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -1,25 +1,14 @@ ZoneMons3: db 30 ; grass encounter rate -IF DEF(_RED) - db 25, NIDORAN_M - db 26, DODUO - db 23, VENONAT - db 24, EXEGGCUTE - db 33, NIDORINO + db 29, NIDORAN_M + db 21, NIDORAN_F + db 22, EXEGGCUTE + db 21, TAUROS + db 32, NIDORINO + db 19, CUBONE db 26, EXEGGCUTE - db 25, NIDORAN_F -ENDC -IF DEF(_BLUE) - db 25, NIDORAN_F - db 26, DODUO - db 23, VENONAT - db 24, EXEGGCUTE - db 33, NIDORINA - db 26, EXEGGCUTE - db 25, NIDORAN_M -ENDC - db 31, VENOMOTH - db 26, TAUROS - db 28, KANGASKHAN + db 24, MAROWAK + db 25, PINSIR + db 27, TANGELA db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index b191de13..e37005b2 100755 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,27 +1,14 @@ IslandMons1: db 15 ; grass encounter rate - db 30, SEEL -IF DEF(_RED) - db 30, SLOWPOKE - db 30, SHELLDER - db 30, HORSEA - db 28, HORSEA - db 21, ZUBAT - db 29, GOLBAT - db 28, PSYDUCK - db 28, SHELLDER - db 38, GOLDUCK -ENDC -IF DEF(_BLUE) - db 30, PSYDUCK - db 30, STARYU - db 30, KRABBY - db 28, KRABBY - db 21, ZUBAT - db 29, GOLBAT + db 18, ZUBAT + db 25, KRABBY + db 27, KRABBY + db 27, ZUBAT + db 36, ZUBAT db 28, SLOWPOKE - db 28, STARYU - db 38, SLOWBRO -ENDC + db 30, SLOWPOKE + db 9, ZUBAT + db 27, GOLBAT + db 36, GOLBAT db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index 79762821..fd9ab09a 100755 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,28 +1,14 @@ IslandMonsB1: db 10 ; grass encounter rate -IF DEF(_RED) - db 30, STARYU - db 30, HORSEA - db 32, SHELLDER - db 32, HORSEA - db 28, SLOWPOKE - db 30, SEEL - db 30, SLOWPOKE - db 28, SEEL - db 38, DEWGONG - db 37, SEADRA -ENDC -IF DEF(_BLUE) - db 30, SHELLDER - db 30, KRABBY - db 32, STARYU - db 32, KRABBY - db 28, PSYDUCK - db 30, SEEL - db 30, PSYDUCK - db 28, SEEL - db 38, DEWGONG - db 37, KINGLER -ENDC + db 27, ZUBAT + db 26, KRABBY + db 36, ZUBAT + db 28, KRABBY + db 27, GOLBAT + db 29, SLOWPOKE + db 18, ZUBAT + db 28, KINGLER + db 22, SEEL + db 26, SEEL db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index e68d71cc..53961534 100755 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -1,27 +1,14 @@ IslandMonsB2: db 10 ; grass encounter rate - db 30, SEEL -IF DEF(_RED) - db 30, SLOWPOKE - db 32, SEEL - db 32, SLOWPOKE - db 28, HORSEA - db 30, STARYU - db 30, HORSEA - db 28, SHELLDER - db 30, GOLBAT - db 37, SLOWBRO -ENDC -IF DEF(_BLUE) - db 30, PSYDUCK - db 32, SEEL - db 32, PSYDUCK - db 28, KRABBY - db 30, SHELLDER - db 30, KRABBY - db 28, STARYU - db 30, GOLBAT - db 37, GOLDUCK -ENDC + db 27, ZUBAT + db 27, KRABBY + db 36, ZUBAT + db 27, GOLBAT + db 28, KINGLER + db 24, SEEL + db 29, KRABBY + db 36, GOLBAT + db 31, SLOWPOKE + db 31, SLOWBRO db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 35319df9..5435d1e6 100755 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -1,27 +1,24 @@ IslandMonsB3: db 10 ; grass encounter rate -IF DEF(_RED) - db 31, SLOWPOKE - db 31, SEEL - db 33, SLOWPOKE - db 33, SEEL - db 29, HORSEA - db 31, SHELLDER - db 31, HORSEA - db 29, SHELLDER - db 39, SEADRA -ENDC -IF DEF(_BLUE) - db 31, PSYDUCK - db 31, SEEL - db 33, PSYDUCK - db 33, SEEL + db 27, GOLBAT + db 36, ZUBAT db 29, KRABBY - db 31, STARYU + db 27, ZUBAT + db 30, KINGLER + db 26, SEEL db 31, KRABBY - db 29, STARYU - db 39, KINGLER -ENDC - db 37, DEWGONG + db 30, SEEL + db 28, DEWGONG + db 32, DEWGONG - db 0 ; water encounter rate + db 5 ; water encounter rate + db 25, TENTACOOL + db 30, TENTACOOL + db 20, TENTACOOL + db 30, STARYU + db 35, TENTACOOL + db 30, STARYU + db 40, TENTACOOL + db 30, STARYU + db 30, STARYU + db 30, STARYU diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index c5e3766b..bfeb6821 100755 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,27 +1,24 @@ IslandMonsB4: db 10 ; grass encounter rate -IF DEF(_RED) - db 31, HORSEA - db 31, SHELLDER - db 33, HORSEA - db 33, SHELLDER - db 29, SLOWPOKE - db 31, SEEL - db 31, SLOWPOKE - db 29, SEEL - db 39, SLOWBRO -ENDC -IF DEF(_BLUE) - db 31, KRABBY - db 31, STARYU - db 33, KRABBY - db 33, STARYU - db 29, PSYDUCK - db 31, SEEL - db 31, PSYDUCK - db 29, SEEL - db 39, GOLDUCK -ENDC - db 32, GOLBAT + db 36, GOLBAT + db 36, ZUBAT + db 30, KRABBY + db 32, KINGLER + db 28, SEEL + db 32, SEEL + db 27, GOLBAT + db 45, ZUBAT + db 30, DEWGONG + db 34, DEWGONG - db 0 ; water encounter rate + db 5 ; water encounter rate + db 25, TENTACOOL + db 30, TENTACOOL + db 20, TENTACOOL + db 30, STARYU + db 35, TENTACOOL + db 30, STARYU + db 40, TENTACOOL + db 30, STARYU + db 30, STARYU + db 30, STARYU diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 71adde2e..bcb16dc8 100755 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -1,14 +1,14 @@ PlateauMons1: db 15 ; grass encounter rate - db 24, MACHOP db 26, GEODUDE - db 22, ZUBAT - db 36, ONIX - db 39, ONIX - db 42, ONIX + db 31, GEODUDE + db 36, GEODUDE + db 39, ZUBAT + db 44, ZUBAT + db 41, GEODUDE + db 43, ONIX + db 45, ONIX db 41, GRAVELER - db 41, GOLBAT - db 42, MACHOKE - db 43, MAROWAK + db 47, GRAVELER db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index ee660e3a..89b736cd 100755 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -1,14 +1,14 @@ PlateauMons2: db 10 ; grass encounter rate - db 22, MACHOP - db 24, GEODUDE - db 26, ZUBAT - db 36, ONIX - db 39, ONIX - db 42, ONIX - db 41, MACHOKE - db 40, GOLBAT - db 40, MAROWAK - db 43, GRAVELER + db 31, GEODUDE + db 36, GEODUDE + db 41, GEODUDE + db 44, ZUBAT + db 39, GOLBAT + db 44, GRAVELER + db 45, ONIX + db 47, ONIX + db 39, MACHOKE + db 42, MACHOKE db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 754557bf..aec2d097 100755 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -1,14 +1,14 @@ PlateauMons3: db 15 ; grass encounter rate - db 24, MACHOP - db 26, GEODUDE - db 22, ZUBAT - db 42, ONIX - db 40, VENOMOTH - db 45, ONIX - db 43, GRAVELER - db 41, GOLBAT + db 36, GEODUDE + db 44, GOLBAT + db 41, GEODUDE + db 49, ONIX + db 46, GEODUDE + db 41, GRAVELER db 42, MACHOKE db 45, MACHOKE + db 47, GRAVELER + db 47, GRAVELER db 0 ; water encounter rate diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index d11fc34e..e7b1288f 100755 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,26 +1,14 @@ ForestMons: - db 8 ; grass encounter rate -IF DEF(_RED) - db 4, WEEDLE - db 5, KAKUNA - db 3, WEEDLE - db 5, WEEDLE - db 4, KAKUNA - db 6, KAKUNA - db 4, METAPOD + db 25 ; grass encounter rate db 3, CATERPIE -ENDC -IF DEF(_BLUE) + db 4, METAPOD db 4, CATERPIE - db 5, METAPOD - db 3, CATERPIE db 5, CATERPIE - db 4, METAPOD + db 4, PIDGEY + db 6, PIDGEY + db 6, CATERPIE db 6, METAPOD - db 4, KAKUNA - db 3, WEEDLE -ENDC - db 3, PIKACHU - db 5, PIKACHU + db 8, PIDGEY + db 9, PIDGEOTTO db 0 ; water encounter rate diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 20a52a6c..154980cc 100755 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -1,101 +1,33 @@ -; super rod encounters -SuperRodData: - ; map, fishing group - dbw PALLET_TOWN, .Group1 - dbw VIRIDIAN_CITY, .Group1 - dbw CERULEAN_CITY, .Group3 - dbw VERMILION_CITY, .Group4 - dbw CELADON_CITY, .Group5 - dbw FUCHSIA_CITY, .Group10 - dbw CINNABAR_ISLAND, .Group8 - dbw ROUTE_4, .Group3 - dbw ROUTE_6, .Group4 - dbw ROUTE_10, .Group5 - dbw ROUTE_11, .Group4 - dbw ROUTE_12, .Group7 - dbw ROUTE_13, .Group7 - dbw ROUTE_17, .Group7 - dbw ROUTE_18, .Group7 - dbw ROUTE_19, .Group8 - dbw ROUTE_20, .Group8 - dbw ROUTE_21, .Group8 - dbw ROUTE_22, .Group2 - dbw ROUTE_23, .Group9 - dbw ROUTE_24, .Group3 - dbw ROUTE_25, .Group3 - dbw CERULEAN_GYM, .Group3 - dbw VERMILION_DOCK, .Group4 - dbw SEAFOAM_ISLANDS_B3F, .Group8 - dbw SEAFOAM_ISLANDS_B4F, .Group8 - dbw SAFARI_ZONE_EAST, .Group6 - dbw SAFARI_ZONE_NORTH, .Group6 - dbw SAFARI_ZONE_WEST, .Group6 - dbw SAFARI_ZONE_CENTER, .Group6 - dbw CERULEAN_CAVE_2F, .Group9 - dbw CERULEAN_CAVE_B1F, .Group9 - dbw CERULEAN_CAVE_1F, .Group9 +FishingSlots:: + db PALLET_TOWN, STARYU, 10, TENTACOOL, 10, STARYU, 5, TENTACOOL, 20 + db VIRIDIAN_CITY, POLIWAG, 5, POLIWAG, 10, POLIWAG, 15, POLIWAG, 10 + db CERULEAN_CITY, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30, SEAKING, 40 + db VERMILION_CITY, TENTACOOL, 15, TENTACOOL, 20, TENTACOOL, 10, HORSEA, 5 + db CELADON_CITY, GOLDEEN, 5, GOLDEEN, 10, GOLDEEN, 15, GOLDEEN, 20 + db FUCHSIA_CITY, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, GYARADOS, 15 + db CINNABAR_ISLAND, STARYU, 15, TENTACOOL, 15, STARYU, 10, TENTACOOL, 30 + db ROUTE_4, GOLDEEN, 20, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30 + db ROUTE_6, GOLDEEN, 5, GOLDEEN, 10, GOLDEEN, 15, GOLDEEN, 20 + db ROUTE_24, GOLDEEN, 20, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30 + db ROUTE_25, KRABBY, 10, KRABBY, 15, KINGLER, 15, KINGLER, 25 + db ROUTE_10, KRABBY, 15, KRABBY, 20, HORSEA, 10, KINGLER, 25 + db ROUTE_11, TENTACOOL, 15, TENTACOOL, 20, TENTACOOL, 10, HORSEA, 5 + db ROUTE_12, HORSEA, 20, HORSEA, 25, SEADRA, 25, SEADRA, 35 + db ROUTE_13, HORSEA, 15, HORSEA, 20, TENTACOOL, 10, SEADRA, 20 + db ROUTE_17, TENTACOOL, 5, TENTACOOL, 15, SHELLDER, 25, SHELLDER, 35 + db ROUTE_18, TENTACOOL, 15, SHELLDER, 20, SHELLDER, 30, SHELLDER, 40 + db ROUTE_19, TENTACOOL, 15, STARYU, 20, TENTACOOL, 30, TENTACRUEL, 30 + db ROUTE_20, TENTACOOL, 20, TENTACRUEL, 20, STARYU, 30, TENTACRUEL, 40 + db ROUTE_21, TENTACOOL, 15, STARYU, 20, TENTACOOL, 30, TENTACRUEL, 30 + db ROUTE_22, POLIWAG, 5, POLIWAG, 10, POLIWAG, 15, POLIWHIRL, 15 + db ROUTE_23, POLIWAG, 25, POLIWAG, 30, POLIWHIRL, 30, POLIWHIRL, 40 + db VERMILION_DOCK, TENTACOOL, 10, TENTACOOL, 15, STARYU, 15, SHELLDER, 10 + db SAFARI_ZONE_CENTER, MAGIKARP, 5, MAGIKARP, 10, DRATINI, 10, DRAGONAIR, 15 + db SAFARI_ZONE_EAST, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SAFARI_ZONE_NORTH, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SAFARI_ZONE_WEST, MAGIKARP, 5, MAGIKARP, 10, MAGIKARP, 15, DRATINI, 15 + db SEAFOAM_ISLANDS_B3F, KRABBY, 25, STARYU, 20, KINGLER, 35, STARYU, 40 + db SEAFOAM_ISLANDS_B4F, KRABBY, 25, STARYU, 20, KINGLER, 35, STARYU, 40 + db CERULEAN_CAVE_1F, GOLDEEN, 25, SEAKING, 35, SEAKING, 45, SEAKING, 55 + db CERULEAN_CAVE_B1F, GOLDEEN, 30, SEAKING, 40, SEAKING, 50, SEAKING, 60 db -1 ; end - -; fishing groups -; number of monsters, followed by level/monster pairs - -.Group1: - db 2 - db 15, TENTACOOL - db 15, POLIWAG - -.Group2: - db 2 - db 15, GOLDEEN - db 15, POLIWAG - -.Group3: - db 3 - db 15, PSYDUCK - db 15, GOLDEEN - db 15, KRABBY - -.Group4: - db 2 - db 15, KRABBY - db 15, SHELLDER - -.Group5: - db 2 - db 23, POLIWHIRL - db 15, SLOWPOKE - -.Group6: - db 4 - db 15, DRATINI - db 15, KRABBY - db 15, PSYDUCK - db 15, SLOWPOKE - -.Group7: - db 4 - db 5, TENTACOOL - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP - -.Group8: - db 4 - db 15, STARYU - db 15, HORSEA - db 15, SHELLDER - db 15, GOLDEEN - -.Group9: - db 4 - db 23, SLOWBRO - db 23, SEAKING - db 23, KINGLER - db 23, SEADRA - -.Group10: - db 4 - db 23, SEAKING - db 15, KRABBY - db 15, GOLDEEN - db 15, MAGIKARP |