diff options
Diffstat (limited to 'data')
1481 files changed, 29115 insertions, 24903 deletions
diff --git a/data/animations.asm b/data/animations.asm deleted file mode 100755 index de2487d7..00000000 --- a/data/animations.asm +++ /dev/null @@ -1,3623 +0,0 @@ -AttackAnimationPointers: - dw PoundAnim - dw KarateChopAnim - dw DoubleSlapAnim - dw CometPunchAnim - dw MegaPunchAnim - dw PayDayAnim - dw FirePunchAnim - dw IcePunchAnim - dw ThunderPunchAnim - dw ScratchAnim - dw VicegripAnim - dw GuillotineAnim - dw RazorWindAnim - dw SwordsDanceAnim - dw CutAnim - dw GustAnim - dw WingAttackAnim - dw WhirlwindAnim - dw FlyAnim - dw BindAnim - dw SlamAnim - dw VineWhipAnim - dw StompAnim - dw DoubleKickAnim - dw MegaKickAnim - dw JumpKickAnim - dw RollingKickAnim - dw SandAttackAnim - dw HeatButtAnim - dw HornAttackAnim - dw FuryAttackAnim - dw HornDrillAnim - dw TackleAnim - dw BodySlamAnim - dw WrapAnim - dw TakeDownAnim - dw ThrashAnim - dw DoubleEdgeAnim - dw TailWhipAnim - dw PoisonStingAnim - dw TwineedleAnim - dw PinMissileAnim - dw LeerAnim - dw BiteAnim - dw GrowlAnim - dw RoarAnim - dw SingAnim - dw SupersonicAnim - dw SonicBoomAnim - dw DisableAnim - dw AcidAnim - dw EmberAnim - dw FlamethrowerAnim - dw MistAnim - dw WaterGunAnim - dw HydroPumpAnim - dw SurfAnim - dw IceBeamAnim - dw BlizzardAnim - dw PsyBeamAnim - dw BubbleBeamAnim - dw AuroraBeamAnim - dw HyperBeamAnim - dw PeckAnim - dw DrillPeckAnim - dw SubmissionAnim - dw LowKickAnim - dw CounterAnim - dw SeismicTossAnim - dw StrengthAnim - dw AbsorbAnim - dw MegaDrainAnim - dw LeechSeedAnim - dw GrowthAnim - dw RazorLeafAnim - dw SolarBeamAnim - dw PoisonPowderAnim - dw StunSporeAnim - dw SleepPowderAnim - dw PedalDanceAnim - dw StringShotAnim - dw DragonRageAnim - dw FireSpinAnim - dw ThunderShockAnim - dw ThunderBoltAnim - dw ThunderWaveAnim - dw ThunderAnim - dw RockThrowAnim - dw EarthquakeAnim - dw FissureAnim - dw DigAnim - dw ToxicAnim - dw ConfusionAnim - dw PsychicAnim - dw HypnosisAnim - dw MeditateAnim - dw AgilityAnim - dw QuickAttackAnim - dw RageAnim - dw TeleportAnim - dw NightShadeAnim - dw MimicAnim - dw ScreechAnim - dw DoubleTeamAnim - dw RecoverAnim - dw HardenAnim - dw MinimizeAnim - dw SmokeScreenAnim - dw ConfuseRayAnim - dw WithdrawAnim - dw DefenseCurlAnim - dw BarrierAnim - dw LightScreenAnim - dw HazeAnim - dw ReflectAnim - dw FocusEnergyAnim - dw BideAnim - dw MetronomeAnim - dw MirrorMoveAnim - dw SelfdestructAnim - dw EggBombAnim - dw LickAnim - dw SmogAnim - dw SludgeAnim - dw BoneClubAnim - dw FireBlastAnim - dw WaterfallAnim - dw ClampAnim - dw SwiftAnim - dw SkullBashAnim - dw SpikeCannonAnim - dw ConstrictAnim - dw AmnesiaAnim - dw KinesisAnim - dw SoftboiledAnim - dw HiJumpKickAnim - dw GlareAnim - dw DreamEaterAnim - dw PoisonGasAnim - dw BarrageAnim - dw LeechLifeAnim - dw LovelyKissAnim - dw SkyAttackAnim - dw TransformAnim - dw BubbleAnim - dw DizzyPunchAnim - dw SporeAnim - dw FlashAnim - dw PsywaveAnim - dw SplashAnim - dw AcidArmorAnim - dw CrabHammerAnim - dw ExplosionAnim - dw FurySwipesAnim - dw BonemerangAnim - dw RestAnim - dw RockSlideAnim - dw HyperFangAnim - dw SharpenAnim - dw ConversionAnim - dw TriAttackAnim - dw SuperFangAnim - dw SlashAnim - dw SubstituteAnim - dw StruggleAnim - dw ShowPicAnim - dw EnemyFlashAnim - dw PlayerFlashAnim - dw EnemyHUDShakeAnim - dw TradeBallDropAnim - dw TradeBallAppear1Anim - dw TradeBallAppear2Anim - dw TradeBallPoofAnim - dw XStatItemAnim - dw XStatItemAnim - dw ShrinkingSquareAnim - dw ShrinkingSquareAnim - dw XStatItemBlackAnim - dw XStatItemBlackAnim - dw ShrinkingSquareBlackAnim - dw ShrinkingSquareBlackAnim - dw UnusedAnim - dw UnusedAnim - dw ParalyzeAnim - dw ParalyzeAnim - dw PoisonAnim - dw PoisonAnim - dw SleepPlayerAnim - dw SleepEnemyAnim - dw ConfusedPlayerAnim - dw ConfusedEnemyAnim - dw FaintAnim - dw BallTossAnim - dw BallShakeAnim - dw BallPoofAnim - dw BallBlockAnim - dw GreatTossAnim - dw UltraTossAnim - dw ShakeScreenAnim - dw HidePicAnim - dw ThrowRockAnim - dw ThrowBaitAnim - -; each animation is a list of subanimations and special effects -; if first byte < $56 -; db tileset_and_delay, sound_id, subanimation_id -; if first byte >= $D8 -; db special_effect_id, sound_id -; $FF terminated -PoundAnim: -StruggleAnim: - db $08,$00,$01 - db $FF - -KarateChopAnim: - db $08,$01,$03 - db $FF - -DoubleSlapAnim: - db $05,$02,$01 - db $05,$02,$01 - db $FF - -CometPunchAnim: - db $04,$03,$02 - db $04,$03,$02 - db $FF - -MegaPunchAnim: - db $46,$04,$04 - db $FF - -PayDayAnim: - db $08,$00,$01 - db $04,$05,$52 - db $FF - -FirePunchAnim: - db $06,$06,$02 - db $46,$FF,$11 - db $FF - -IcePunchAnim: - db $06,$07,$02 - db $10,$FF,$2F - db $FF - -ThunderPunchAnim: - db $06,$08,$02 - db SE_DARK_SCREEN_PALETTE, $FF - db $46,$FF,$2B - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ScratchAnim: - db $06,$09,$0F - db $FF - -VicegripAnim: - db $08,$0A,$2A - db $FF - -GuillotineAnim: - db $06,$0B,$2A - db $FF - -RazorWindAnim: - db $04,$0C,$16 - db $FF - -SwordsDanceAnim: - db $46,$0D,$18 - db $46,$0D,$18 - db $46,$0D,$18 - db $FF - -CutAnim: - db SE_DARK_SCREEN_FLASH, $0E - db $04,$FF,$16 - db $FF - -GustAnim: - db $46,$0F,$10 - db $06,$FF,$02 - db $FF - -WingAttackAnim: - db $46,$10,$04 - db $FF - -WhirlwindAnim: - db $46,$11,$10 - db SE_SLIDE_ENEMY_MON_OFF, $FF - db $FF - -FlyAnim: - db $46,$12,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -BindAnim: - db $04,$13,$23 - db $04,$13,$23 - db $FF - -SlamAnim: - db $06,$14,$02 - db $FF - -VineWhipAnim: - db $01,$15,$16 - db $08,$FF,$01 - db $FF - -StompAnim: - db $48,$16,$05 - db $FF - -DoubleKickAnim: - db $08,$17,$01 - db $08,$17,$01 - db $FF - -MegaKickAnim: - db $46,$18,$04 - db $FF - -JumpKickAnim: - db $46,$19,$04 - db $FF - -RollingKickAnim: - db SE_DARK_SCREEN_FLASH, $1A - db $46,$FF,$04 - db $FF - -SandAttackAnim: - db $46,$1B,$28 - db $FF - -HeatButtAnim: - db $46,$1C,$05 - db $FF - -HornAttackAnim: - db $06,$1D,$45 - db $46,$FF,$05 - db $FF - -FuryAttackAnim: - db $02,$1E,$46 - db $02,$FF,$46 - db $FF - -HornDrillAnim: - db $42,$1F,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $FF - -TackleAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $FF - -BodySlamAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_MON_POSITION, $FF - db $FF - -WrapAnim: - db $04,$22,$23 - db $04,$22,$23 - db $04,$22,$23 - db $FF - -TakeDownAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $23 - db SE_RESET_MON_POSITION, $FF - db $FF - -ThrashAnim: - db $46,$24,$04 - db $FF - -DoubleEdgeAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db $06,$FF,$2D - db SE_RESET_SCREEN_PALETTE, $FF - db SE_MOVE_MON_HORIZONTALLY, $FF - db SE_DARK_SCREEN_FLASH, $25 - db SE_RESET_MON_POSITION, $FF - db $FF - -TailWhipAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF - -PoisonStingAnim: - db $06,$27,$00 - db $FF - -TwineedleAnim: - db $05,$28,$01 - db $05,$28,$01 - db $FF - -PinMissileAnim: - db $03,$29,$01 - db $FF - -LeerAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -BiteAnim: - db $08,$2B,$02 - db $FF - -GrowlAnim: - db $46,$2C,$12 - db $FF - -RoarAnim: - db $46,$2D,$15 - db $46,$2D,$15 - db $46,$2D,$15 - db $FF - -SingAnim: - db $46,$2E,$12 - db $50,$FF,$40 - db $50,$FF,$40 - db $FF - -SupersonicAnim: - db $06,$2F,$31 - db $FF - -SonicBoomAnim: - db $46,$2D,$15 - db $46,$2D,$15 - db $46,$0F,$10 - db $46,$FF,$05 - db $FF - -DisableAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -AcidAnim: - db $46,$32,$13 - db $46,$32,$14 - db $FF - -EmberAnim: - db $46,$33,$11 - db $FF - -FlamethrowerAnim: - db $46,$34,$1F - db $46,$34,$0C - db $46,$34,$0D - db $FF - -MistAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -WaterGunAnim: - db $06,$36,$2C - db $FF - -HydroPumpAnim: - db $06,$37,$1A - db $06,$37,$1A - db $FF - -SurfAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $06,$37,$1A - db $FF - -IceBeamAnim: - db $03,$39,$2E - db $10,$FF,$2F - db $FF - -BlizzardAnim: - db $04,$3A,$38 - db $04,$37,$38 - db $FF - -PsyBeamAnim: - db $03,$3B,$2E - db SE_FLASH_SCREEN_LONG, $FF - db $FF - -BubbleBeamAnim: - db $12,$3C,$35 - db $FF - -AuroraBeamAnim: - db $03,$3D,$2E - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db $FF - -HyperBeamAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_SPIRAL_BALLS_INWARD, $FF - db $02,$3E,$2E - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db $46,$04,$04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PeckAnim: - db $08,$3F,$01 - db $FF - -DrillPeckAnim: - db $46,$40,$04 - db $FF - -SubmissionAnim: - db SE_SLIDE_MON_OFF, $41 - db $06,$FF,$01 - db SE_SHOW_MON_PIC, $FF - db $FF - -LowKickAnim: - db SE_SLIDE_MON_OFF, $42 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -CounterAnim: - db SE_SLIDE_MON_OFF, $43 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -SeismicTossAnim: - db SE_BLINK_ENEMY_MON, $FF - db $41,$8B,$4E - db SE_HIDE_ENEMY_MON_PIC, $FF - db SE_SLIDE_MON_OFF, $FF - db $42,$44,$4F - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_SHOW_MON_PIC, $FF - db $41,$44,$50 - db SE_SHOW_ENEMY_MON_PIC, $FF - db SE_SHAKE_SCREEN, $FF - db $FF - -StrengthAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $46,$06,$04 - db $FF - -AbsorbAnim: - db SE_LIGHT_SCREEN_PALETTE, $46 - db $06,$FF,$21 - db $06,$FF,$22 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -MegaDrainAnim: - db SE_LIGHT_SCREEN_PALETTE, $47 - db SE_DARK_SCREEN_FLASH, $FF - db $06,$FF,$21 - db $06,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -LeechSeedAnim: - db $46,$48,$1B - db $55,$4D,$1C - db $FF - -GrowthAnim: - db SE_LIGHT_SCREEN_PALETTE, $49 - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -RazorLeafAnim: - db SE_LEAVES_FALLING, $4A - db $41,$80,$44 - db $01,$0C,$16 - db $FF - -SolarBeamAnim: - db $06,$4B,$2E - db $06,$FF,$01 - db $FF - -PoisonPowderAnim: - db $06,$4C,$36 - db $FF - -StunSporeAnim: - db $06,$4D,$36 - db $FF - -SleepPowderAnim: - db $06,$4E,$36 - db $FF - -PedalDanceAnim: - db SE_LIGHT_SCREEN_PALETTE, $4F - db SE_PETALS_FALLING, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -StringShotAnim: - db $08,$50,$37 - db $FF - -DragonRageAnim: - db $46,$51,$1F - db $46,$FF,$0C - db $46,$FF,$0D - db $46,$FF,$0E - db $FF - -FireSpinAnim: - db $46,$52,$0C - db $46,$FF,$0D - db $46,$FF,$0E - db $FF - -ThunderShockAnim: - db $42,$53,$29 - db $FF - -ThunderBoltAnim: - db $41,$54,$29 - db $41,$54,$29 - db $FF - -ThunderWaveAnim: - db $42,$55,$29 - db $02,$FF,$23 - db $04,$FF,$23 - db $FF - -ThunderAnim: - db SE_DARK_SCREEN_PALETTE, $56 - db SE_DARK_SCREEN_FLASH, $FF - db $46,$FF,$2B - db SE_DARK_SCREEN_FLASH, $FF - db $42,$54,$29 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -RockThrowAnim: - db $04,$57,$30 - db $FF - -EarthquakeAnim: - db SE_SHAKE_SCREEN, $58 - db SE_SHAKE_SCREEN, $58 - db $FF - -FissureAnim: - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db $FF - -DigAnim: - db $46,$5A,$04 - db SE_SLIDE_MON_UP, $FF - db $FF - -ToxicAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $46,$5B,$14 - db $FF - -ConfusionAnim: - db SE_FLASH_SCREEN_LONG, $5C - db $FF - -PsychicAnim: - db SE_FLASH_SCREEN_LONG, $5D - db SE_WAVY_SCREEN, $FF - db $FF - -HypnosisAnim: - db SE_FLASH_SCREEN_LONG, $5E - db $FF - -MeditateAnim: - db SE_LIGHT_SCREEN_PALETTE, $5F - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -AgilityAnim: - db SE_LIGHT_SCREEN_PALETTE, $60 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -QuickAttackAnim: - db SE_SLIDE_MON_OFF, $61 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -RageAnim: - db $06,$62,$01 - db $FF - -TeleportAnim: - db SE_SQUISH_MON_PIC, $63 - db SE_SHOOT_BALLS_UPWARD, $FF - db $FF - -NightShadeAnim: - db SE_FLASH_SCREEN_LONG, $5C - db SE_WAVY_SCREEN, $FF - db $FF - -MimicAnim: - db $46,$65,$21 - db $46,$65,$22 - db $FF - -ScreechAnim: - db $46,$66,$12 - db $FF - -DoubleTeamAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHAKE_BACK_AND_FORTH, $67 - db SE_SHOW_MON_PIC, $FF - db $46,$6F,$33 - db $FF - -RecoverAnim: - db SE_BLINK_MON, $68 - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -HardenAnim: - db SE_LIGHT_SCREEN_PALETTE, $69 - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -MinimizeAnim: - db SE_LIGHT_SCREEN_PALETTE, $6A - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_MINIMIZE_MON, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SmokeScreenAnim: - db $46,$6B,$28 - db $04,$FF,$0A - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ConfuseRayAnim: - db SE_DARK_SCREEN_PALETTE, $6C - db $46,$FF,$3E - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -WithdrawAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db SE_SLIDE_MON_DOWN, $FF - db $06,$FF,$51 - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF - -DefenseCurlAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db $06,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -BarrierAnim: - db $46,$6F,$33 - db $46,$6F,$33 - db $FF - -LightScreenAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46,$70,$33 - db $46,$70,$33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -HazeAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ReflectAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db $46,$72,$33 - db $46,$72,$33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -FocusEnergyAnim: - db SE_SPIRAL_BALLS_INWARD, $73 - db $FF - -BideAnim: - db $46,$74,$04 - db $FF - -MetronomeAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF - -MirrorMoveAnim: - db $08,$76,$01 - db $FF - -SelfdestructAnim: - db $43,$77,$34 - db $FF - -EggBombAnim: - db $44,$78,$41 - db $44,$78,$42 - db $FF - -LickAnim: - db $46,$7B,$14 - db $FF - -SmogAnim: - db SE_DARKEN_MON_PALETTE, $48 - db $46,$7A,$19 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SludgeAnim: - db $46,$7B,$13 - db $46,$7B,$14 - db $FF - -BoneClubAnim: - db $08,$7C,$02 - db $FF - -FireBlastAnim: - db $46,$7D,$1F - db $46,$FF,$20 - db $46,$FF,$20 - db $46,$FF,$0C - db $46,$FF,$0D - db $FF - -WaterfallAnim: - db SE_SLIDE_MON_DOWN, $48 - db $06,$37,$1A - db $08,$FF,$02 - db SE_SLIDE_MON_UP, $FF - db $FF - -ClampAnim: - db $08,$7F,$2A - db $06,$83,$23 - db $06,$83,$23 - db $FF - -SwiftAnim: - db $43,$80,$3F - db $FF - -SkullBashAnim: - db $46,$81,$05 - db $FF - -SpikeCannonAnim: - db $44,$82,$04 - db $FF - -ConstrictAnim: - db $06,$83,$23 - db $06,$83,$23 - db $06,$83,$23 - db $FF - -AmnesiaAnim: - db $08,$84,$25 - db $08,$84,$25 - db $FF - -KinesisAnim: - db $08,$85,$01 - db $FF - -SoftboiledAnim: - db SE_SLIDE_MON_HALF_OFF, $48 - db $08,$86,$4C - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF - -HiJumpKickAnim: - db $46,$87,$04 - db $FF - -GlareAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -DreamEaterAnim: - db SE_FLASH_SCREEN_LONG, $89 - db SE_DARK_SCREEN_PALETTE, $89 - db $08,$89,$02 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PoisonGasAnim: - db $46,$8A,$19 - db $FF - -BarrageAnim: - db $43,$8B,$41 - db $05,$FF,$55 - db $FF - -LeechLifeAnim: - db $08,$8C,$02 - db SE_DARK_SCREEN_FLASH, $FF - db $06,$FF,$21 - db $06,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -LovelyKissAnim: - db $06,$8D,$12 - db $FF - -SkyAttackAnim: - db SE_SQUISH_MON_PIC, $8E - db SE_SHOOT_BALLS_UPWARD, $FF - db $46,$87,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -TransformAnim: - db $46,$8F,$21 - db $44,$8F,$22 - db $08,$FF,$47 - db SE_TRANSFORM_MON, $FF - db $FF - -BubbleAnim: - db $16,$90,$35 - db $FF - -DizzyPunchAnim: - db $06,$91,$17 - db $06,$91,$17 - db $06,$91,$17 - db $06,$02,$02 - db $FF - -SporeAnim: - db $06,$92,$36 - db $FF - -FlashAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PsywaveAnim: - db $06,$2F,$31 - db SE_WAVY_SCREEN, $5C - db $FF - -SplashAnim: - db SE_BOUNCE_UP_AND_DOWN, $95 - db $FF - -AcidArmorAnim: - db SE_SLIDE_MON_DOWN_AND_HIDE, $96 - db $FF - -CrabHammerAnim: - db $46,$97,$05 - db $06,$FF,$2A - db $FF - -ExplosionAnim: - db $43,$98,$34 - db $FF - -FurySwipesAnim: - db $04,$99,$0F - db $FF - -BonemerangAnim: - db $06,$9A,$02 - db $FF - -RestAnim: - db $10,$9B,$3A - db $10,$9B,$3A - db $FF - -RockSlideAnim: - db $04,$9C,$1D - db $03,$9C,$1E - db $46,$9D,$04 - db $FF - -HyperFangAnim: - db $06,$9D,$02 - db $FF - -SharpenAnim: - db SE_LIGHT_SCREEN_PALETTE, $9E - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ConversionAnim: - db SE_DARK_SCREEN_FLASH, $9F - db $46,$FF,$21 - db $46,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -TriAttackAnim: - db SE_DARK_SCREEN_FLASH, $A0 - db $46,$FF,$4D - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -SuperFangAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db $46,$A1,$04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SlashAnim: - db $06,$A2,$0F - db $FF - -SubstituteAnim: - db SE_SLIDE_MON_OFF, $A3 - db $08,$FF,$47 - db SE_SUBSTITUTE_MON, $FF - db $FF - -BallTossAnim: - db $03,$FF,$06 - db $FF - -GreatTossAnim: - db $03,$FF,$07 - db $FF - -UltraTossAnim: - db $02,$FF,$08 - db $FF - -BallShakeAnim: - db $04,$FF,$09 - db $FF - -BallPoofAnim: - db $04,$FF,$0A - db $FF - -ShowPicAnim: - db SE_SHOW_ENEMY_MON_PIC, $FF - db $FF - -HidePicAnim: - db SE_HIDE_ENEMY_MON_PIC, $FF - db $FF - -EnemyFlashAnim: - db SE_SHOW_MON_PIC, $FF - db $FF - -PlayerFlashAnim: - db SE_FLASH_MON_PIC, $FF - db $FF - -EnemyHUDShakeAnim: - db SE_SHAKE_ENEMY_HUD, $FF - db $FF - -TradeBallDropAnim: - db $86,$FF,$48 - db $FF - -TradeBallAppear1Anim: - db $84,$FF,$49 - db $FF - -TradeBallAppear2Anim: - db $86,$FF,$4A - db $FF - -TradeBallPoofAnim: - db $86,$FF,$4B - db $FF - -XStatItemAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ShrinkingSquareAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46,$FF,$43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -XStatItemBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ShrinkingSquareBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db $46,$FF,$43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -UnusedAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SHOOT_MANY_BALLS_UPWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ParalyzeAnim: - db $04,$13,$24 - db $04,$13,$24 - db $FF - -PoisonAnim: - db $08,$13,$27 - db $08,$13,$27 - db $FF - -SleepPlayerAnim: - db $10,$9B,$3A - db $10,$9B,$3A - db $FF - -SleepEnemyAnim: - db $10,$9B,$3B - db $10,$9B,$3B - db $FF - -ConfusedPlayerAnim: - db $08,$84,$25 - db $08,$84,$25 - db $FF - -ConfusedEnemyAnim: - db $08,$84,$26 - db $08,$84,$26 - db $FF - -BallBlockAnim: - db $03,$FF,$0B - db $FF - -FaintAnim: - db SE_SLIDE_MON_DOWN, $5A - db $FF - -ShakeScreenAnim: - db SE_SHAKE_SCREEN, $FF - db $FF - -ThrowRockAnim: - db $03,$8B,$53 - db $FF - -ThrowBaitAnim: - db $03,$8B,$54 - db $FF - -SubanimationPointers: - dw Subanimation00 - dw Subanimation01 - dw Subanimation02 - dw Subanimation03 - dw Subanimation04 - dw Subanimation05 - dw Subanimation06 - dw Subanimation07 - dw Subanimation08 - dw Subanimation09 - dw Subanimation0a - dw Subanimation0b - dw Subanimation0c - dw Subanimation0d - dw Subanimation0e - dw Subanimation0f - dw Subanimation10 - dw Subanimation11 - dw Subanimation12 - dw Subanimation13 - dw Subanimation14 - dw Subanimation15 - dw Subanimation16 - dw Subanimation17 - dw Subanimation18 - dw Subanimation19 - dw Subanimation1a - dw Subanimation1b - dw Subanimation1c - dw Subanimation1d - dw Subanimation1e - dw Subanimation1f - dw Subanimation20 - dw Subanimation21 - dw Subanimation22 - dw Subanimation23 - dw Subanimation24 - dw Subanimation25 - dw Subanimation26 - dw Subanimation27 - dw Subanimation28 - dw Subanimation29 - dw Subanimation2a - dw Subanimation2b - dw Subanimation2c - dw Subanimation2d - dw Subanimation2e - dw Subanimation2f - dw Subanimation30 - dw Subanimation31 - dw Subanimation32 - dw Subanimation33 - dw Subanimation34 - dw Subanimation35 - dw Subanimation36 - dw Subanimation37 - dw Subanimation38 - dw Subanimation39 - dw Subanimation3a - dw Subanimation3b - dw Subanimation3c - dw Subanimation3d - dw Subanimation3e - dw Subanimation3f - dw Subanimation40 - dw Subanimation41 - dw Subanimation42 - dw Subanimation43 - dw Subanimation44 - dw Subanimation45 - dw Subanimation46 - dw Subanimation47 - dw Subanimation48 - dw Subanimation49 - dw Subanimation4a - dw Subanimation4b - dw Subanimation4c - dw Subanimation4d - dw Subanimation4e - dw Subanimation4f - dw Subanimation50 - dw Subanimation51 - dw Subanimation52 - dw Subanimation53 - dw Subanimation54 - dw Subanimation55 - -Subanimation04: - db $43 - db $02,$1a,$00 - db $02,$10,$00 - db $02,$03,$00 - -Subanimation05: - db $41 - db $02,$10,$00 - -Subanimation08: - db $0b - db $03,$30,$00 - db $03,$44,$00 - db $03,$94,$00 - db $03,$60,$00 - db $03,$76,$00 - db $03,$9f,$00 - db $03,$8d,$00 - db $03,$a0,$00 - db $03,$1a,$00 - db $03,$a1,$00 - db $03,$34,$00 - -Subanimation07: - db $0b - db $03,$30,$00 - db $03,$a2,$00 - db $03,$31,$00 - db $03,$a3,$00 - db $03,$32,$00 - db $03,$a4,$00 - db $03,$92,$00 - db $03,$a5,$00 - db $03,$15,$00 - db $03,$a6,$00 - db $03,$34,$00 - -Subanimation06: - db $0b - db $03,$30,$00 - db $03,$a2,$00 - db $03,$93,$00 - db $03,$61,$00 - db $03,$73,$00 - db $03,$a7,$00 - db $03,$33,$00 - db $03,$a8,$00 - db $03,$0e,$00 - db $03,$a9,$00 - db $03,$34,$00 - -Subanimation09: - db $04 - db $03,$21,$04 - db $04,$21,$04 - db $03,$21,$04 - db $05,$21,$04 - -Subanimation0a: - db $46 - db $06,$1b,$00 - db $07,$1b,$00 - db $08,$36,$00 - db $09,$36,$00 - db $0a,$15,$00 - db $0a,$15,$00 - -Subanimation0b: - db $04 - db $01,$2d,$00 - db $03,$2f,$00 - db $03,$35,$00 - db $03,$4d,$00 - -Subanimation55: - db $41 - db $01,$9d,$00 - -Subanimation11: - db $4c - db $0b,$26,$00 - db $0c,$26,$00 - db $0b,$26,$00 - db $0c,$26,$00 - db $0b,$28,$00 - db $0c,$28,$00 - db $0b,$28,$00 - db $0c,$28,$00 - db $0b,$27,$00 - db $0c,$27,$00 - db $0b,$27,$00 - db $0c,$27,$00 - -Subanimation2b: - db $4b - db $0d,$03,$03 - db $0e,$03,$03 - db $0f,$03,$00 - db $0d,$11,$00 - db $0d,$11,$00 - db $0d,$37,$00 - db $0d,$37,$00 - db $10,$21,$00 - db $10,$21,$00 - db $11,$1b,$00 - db $11,$1b,$00 - -Subanimation2c: - db $4c - db $12,$01,$00 - db $12,$0f,$00 - db $12,$1b,$00 - db $12,$25,$00 - db $13,$38,$00 - db $13,$38,$02 - db $14,$38,$00 - db $14,$38,$02 - db $15,$38,$00 - db $15,$38,$00 - db $16,$38,$00 - db $16,$38,$00 - -Subanimation12: - db $69 - db $17,$30,$00 - db $17,$39,$00 - db $17,$3a,$00 - db $17,$3b,$00 - db $17,$3c,$00 - db $17,$3d,$00 - db $17,$3e,$00 - db $17,$3f,$00 - db $17,$1f,$00 - -Subanimation00: - db $41 - db $01,$17,$00 - -Subanimation01: - db $42 - db $01,$0f,$00 - db $01,$1d,$00 - -Subanimation02: - db $43 - db $01,$12,$00 - db $01,$15,$00 - db $01,$1c,$00 - -Subanimation03: - db $44 - db $01,$0b,$00 - db $01,$11,$00 - db $01,$18,$00 - db $01,$1d,$00 - -Subanimation0c: - db $43 - db $0c,$20,$00 - db $0c,$21,$00 - db $0c,$23,$00 - -Subanimation0d: - db $46 - db $0c,$20,$02 - db $0c,$15,$00 - db $0c,$21,$02 - db $0c,$17,$00 - db $0c,$23,$02 - db $0c,$19,$00 - -Subanimation0e: - db $49 - db $0c,$20,$02 - db $0c,$15,$02 - db $0c,$07,$00 - db $0c,$21,$02 - db $0c,$17,$02 - db $0c,$09,$00 - db $0c,$23,$02 - db $0c,$19,$02 - db $0c,$0c,$00 - -Subanimation1f: - db $85 - db $0c,$30,$03 - db $0c,$40,$03 - db $0c,$41,$03 - db $0c,$42,$03 - db $0c,$21,$00 - -Subanimation2e: - db $2e - db $18,$43,$02 - db $75,$52,$04 - db $19,$43,$02 - db $75,$63,$04 - db $1a,$43,$02 - db $75,$4d,$04 - db $1b,$43,$02 - db $75,$97,$04 - db $1c,$43,$02 - db $75,$98,$04 - db $1d,$43,$02 - db $75,$58,$04 - db $1e,$43,$02 - db $75,$1b,$00 - -Subanimation2f: - db $44 - db $1f,$24,$00 - db $20,$20,$00 - db $21,$1a,$00 - db $22,$15,$00 - -Subanimation30: - db $52 - db $23,$00,$02 - db $23,$02,$02 - db $23,$04,$00 - db $23,$07,$02 - db $23,$02,$02 - db $23,$04,$00 - db $23,$0e,$02 - db $23,$02,$02 - db $23,$0c,$00 - db $25,$07,$00 - db $25,$0e,$00 - db $25,$15,$00 - db $24,$24,$02 - db $23,$1c,$02 - db $23,$23,$00 - db $23,$21,$02 - db $24,$28,$00 - db $24,$28,$00 - -Subanimation0f: - db $4c - db $26,$0e,$02 - db $26,$16,$02 - db $26,$1c,$00 - db $27,$0e,$02 - db $27,$16,$02 - db $27,$1c,$00 - db $28,$0e,$02 - db $28,$16,$02 - db $28,$1c,$00 - db $29,$0e,$02 - db $29,$16,$02 - db $29,$1c,$00 - -Subanimation16: - db $4c - db $2a,$05,$00 - db $2b,$05,$02 - db $2b,$0c,$02 - db $2a,$11,$04 - db $2b,$11,$02 - db $2b,$17,$02 - db $2a,$1b,$04 - db $2b,$1b,$02 - db $2b,$20,$02 - db $2a,$2f,$04 - db $2c,$00,$02 - db $2c,$00,$00 - -Subanimation10: - db $88 - db $2d,$44,$00 - db $2e,$45,$00 - db $2d,$46,$00 - db $2e,$47,$00 - db $2d,$48,$00 - db $2e,$49,$00 - db $2d,$2f,$00 - db $2e,$1a,$00 - -Subanimation31: - db $2a - db $2f,$46,$00 - db $2f,$4a,$00 - db $2f,$4b,$00 - db $2f,$4c,$00 - db $2f,$4d,$00 - db $2f,$4e,$00 - db $2f,$4f,$00 - db $2f,$50,$00 - db $2f,$2e,$00 - db $2f,$51,$00 - -Subanimation13: - db $86 - db $30,$31,$00 - db $30,$32,$00 - db $30,$92,$00 - db $30,$0e,$00 - db $30,$0f,$00 - db $30,$10,$00 - -Subanimation14: - db $49 - db $30,$10,$00 - db $30,$10,$03 - db $31,$1c,$04 - db $31,$21,$04 - db $31,$26,$00 - db $30,$10,$02 - db $31,$1d,$04 - db $31,$22,$04 - db $31,$27,$00 - -Subanimation41: - db $85 - db $03,$31,$00 - db $03,$32,$00 - db $03,$92,$00 - db $03,$0e,$00 - db $03,$10,$00 - -Subanimation42: - db $43 - db $48,$08,$00 - db $49,$08,$00 - db $5a,$08,$00 - -Subanimation15: - db $22 - db $35,$52,$00 - db $35,$53,$00 - -Subanimation17: - db $44 - db $36,$54,$00 - db $36,$55,$00 - db $37,$56,$00 - db $37,$57,$00 - -Subanimation18: - db $a4 - db $36,$54,$00 - db $36,$55,$00 - db $37,$56,$00 - db $37,$57,$00 - -Subanimation40: - db $46 - db $17,$54,$00 - db $17,$55,$00 - db $17,$0e,$00 - db $17,$56,$00 - db $17,$57,$00 - db $17,$13,$00 - -Subanimation19: - db $8c - db $38,$31,$00 - db $39,$31,$00 - db $38,$32,$00 - db $39,$32,$00 - db $38,$92,$00 - db $39,$92,$00 - db $38,$0e,$00 - db $39,$0e,$00 - db $38,$0f,$00 - db $39,$0f,$00 - db $38,$10,$00 - db $39,$10,$00 - -Subanimation1a: - db $50 - db $3a,$08,$00 - db $3b,$08,$00 - db $3c,$08,$00 - db $3d,$08,$00 - db $3e,$08,$00 - db $3f,$08,$00 - db $3e,$08,$00 - db $3f,$08,$00 - db $3a,$0b,$00 - db $3b,$0b,$00 - db $3c,$0b,$00 - db $3d,$0b,$00 - db $3e,$0b,$00 - db $3f,$0b,$00 - db $3e,$0b,$00 - db $3f,$0b,$00 - -Subanimation1b: - db $84 - db $40,$31,$00 - db $40,$32,$00 - db $40,$92,$00 - db $40,$15,$00 - -Subanimation1c: - db $43 - db $41,$58,$00 - db $41,$59,$00 - db $41,$21,$00 - -Subanimation1d: - db $af - db $24,$9a,$00 - db $23,$1b,$02 - db $24,$22,$00 - db $23,$16,$02 - db $23,$1d,$02 - db $24,$98,$00 - db $25,$2c,$04 - db $25,$2a,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$03 - -Subanimation1e: - db $01 - db $25,$75,$00 - -Subanimation20: - db $42 - db $42,$07,$00 - db $43,$07,$00 - -Subanimation21: - db $43 - db $44,$00,$00 - db $45,$08,$00 - db $46,$10,$02 - -Subanimation22: - db $8b - db $47,$10,$00 - db $47,$56,$00 - db $47,$07,$00 - db $47,$aa,$00 - db $47,$ab,$00 - db $47,$ac,$00 - db $47,$ad,$00 - db $47,$ae,$00 - db $47,$af,$00 - db $47,$89,$00 - db $47,$b0,$00 - -Subanimation2d: - db $66 - db $44,$64,$00 - db $45,$65,$00 - db $46,$66,$00 - db $47,$66,$00 - db $47,$66,$00 - db $47,$66,$00 - -Subanimation39: - db $61 - db $47,$67,$00 - -Subanimation4e: - db $41 - db $71,$0f,$03 - -Subanimation4f: - db $47 - db $71,$0f,$00 - db $71,$08,$00 - db $71,$01,$00 - db $71,$95,$00 - db $72,$95,$00 - db $73,$95,$00 - db $74,$95,$00 - -Subanimation50: - db $48 - db $74,$95,$00 - db $73,$95,$00 - db $72,$95,$00 - db $71,$95,$00 - db $71,$01,$00 - db $71,$08,$00 - db $71,$0f,$00 - db $71,$16,$00 - -Subanimation29: - db $5d - db $48,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$69,$03 - db $49,$6b,$00 - db $4c,$6a,$03 - db $4d,$69,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$6c,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$69,$03 - db $49,$6d,$00 - db $4c,$6a,$03 - db $4d,$2a,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$2a,$03 - db $49,$6b,$00 - -Subanimation2a: - db $44 - db $4e,$2b,$00 - db $4f,$2b,$00 - db $50,$2b,$00 - db $50,$2b,$00 - -Subanimation23: - db $42 - db $51,$2d,$00 - db $51,$6e,$00 - -Subanimation24: - db $a2 - db $51,$2d,$00 - db $51,$6e,$00 - -Subanimation25: - db $62 - db $52,$71,$00 - db $52,$72,$00 - -Subanimation26: - db $02 - db $52,$01,$00 - db $52,$2c,$00 - -Subanimation3a: - db $63 - db $53,$71,$00 - db $53,$7f,$00 - db $53,$81,$00 - -Subanimation3b: - db $03 - db $53,$01,$00 - db $53,$15,$00 - db $53,$2c,$00 - -Subanimation27: - db $a2 - db $54,$01,$00 - db $54,$2c,$00 - -Subanimation28: - db $23 - db $55,$73,$03 - db $56,$73,$03 - db $57,$73,$00 - -Subanimation32: - db $63 - db $47,$74,$00 - db $47,$43,$00 - db $47,$75,$00 - -Subanimation33: - db $26 - db $58,$76,$00 - db $34,$76,$00 - db $58,$76,$00 - db $34,$76,$00 - db $58,$76,$00 - db $34,$76,$00 - -Subanimation3c: - db $67 - db $59,$79,$03 - db $59,$7b,$03 - db $59,$77,$03 - db $59,$7a,$03 - db $59,$78,$03 - db $59,$7c,$03 - db $59,$76,$00 - -Subanimation3d: - db $08 - db $3a,$4d,$00 - db $3b,$4d,$00 - db $3c,$4d,$00 - db $3d,$4d,$00 - db $3e,$4d,$00 - db $3f,$4d,$00 - db $3e,$4d,$00 - db $3f,$4d,$00 - -Subanimation34: - db $35 - db $48,$7d,$00 - db $49,$7d,$00 - db $5a,$7d,$00 - db $48,$30,$00 - db $49,$30,$00 - db $5a,$30,$00 - db $48,$7e,$00 - db $49,$7e,$00 - db $5a,$7e,$00 - db $48,$7f,$00 - db $49,$7f,$00 - db $5a,$7f,$00 - db $48,$80,$00 - db $49,$80,$00 - db $5a,$80,$00 - db $48,$81,$00 - db $49,$81,$00 - db $5a,$81,$00 - db $48,$82,$00 - db $49,$82,$00 - db $5a,$82,$00 - -Subanimation35: - db $24 - db $5b,$83,$03 - db $5c,$84,$03 - db $5d,$85,$03 - db $5e,$09,$00 - -Subanimation36: - db $48 - db $5f,$2a,$00 - db $5f,$00,$00 - db $60,$2a,$00 - db $60,$00,$00 - db $61,$2a,$00 - db $61,$00,$00 - db $62,$2a,$00 - db $62,$00,$00 - -Subanimation37: - db $2a - db $63,$89,$00 - db $64,$75,$00 - db $63,$76,$00 - db $65,$0d,$00 - db $65,$86,$00 - db $65,$12,$00 - db $65,$87,$00 - db $65,$17,$00 - db $65,$88,$00 - db $65,$1a,$00 - -Subanimation38: - db $50 - db $66,$8a,$00 - db $66,$33,$00 - db $66,$2e,$00 - db $67,$24,$03 - db $66,$01,$04 - db $66,$10,$04 - db $66,$1d,$04 - db $67,$28,$03 - db $66,$2a,$04 - db $66,$0e,$04 - db $66,$1b,$04 - db $67,$26,$03 - db $66,$03,$04 - db $66,$12,$04 - db $66,$1e,$04 - db $67,$29,$00 - -Subanimation3e: - db $92 - db $02,$31,$00 - db $34,$31,$00 - db $02,$31,$00 - db $02,$32,$00 - db $34,$32,$00 - db $02,$32,$00 - db $02,$92,$00 - db $34,$92,$00 - db $02,$92,$00 - db $02,$0e,$00 - db $34,$0e,$00 - db $02,$0e,$00 - db $02,$0f,$00 - db $34,$0f,$00 - db $02,$0f,$00 - db $02,$10,$00 - db $34,$10,$00 - db $02,$10,$00 - -Subanimation3f: - db $72 - db $68,$4b,$00 - db $68,$8c,$00 - db $68,$20,$00 - db $68,$1c,$00 - db $68,$19,$00 - db $68,$14,$00 - db $68,$76,$00 - db $68,$8d,$00 - db $68,$15,$00 - db $68,$10,$00 - db $68,$0c,$00 - db $68,$06,$00 - db $68,$8e,$00 - db $68,$8f,$00 - db $68,$90,$00 - db $68,$26,$00 - db $68,$23,$00 - db $68,$1f,$00 - -Subanimation44: - db $2c - db $69,$4b,$00 - db $69,$8c,$00 - db $69,$20,$00 - db $69,$1c,$00 - db $69,$19,$00 - db $69,$14,$00 - db $69,$76,$00 - db $69,$8d,$00 - db $69,$15,$00 - db $69,$10,$00 - db $69,$0c,$00 - db $69,$06,$00 - -Subanimation43: - db $a3 - db $6a,$07,$00 - db $6b,$0f,$00 - db $6c,$17,$00 - -Subanimation45: - db $24 - db $6d,$8b,$00 - db $6d,$84,$00 - db $6d,$63,$00 - db $6d,$8c,$00 - -Subanimation46: - db $26 - db $6d,$8b,$00 - db $6d,$84,$00 - db $6d,$63,$00 - db $6d,$8c,$00 - db $6d,$0a,$00 - db $6d,$89,$00 - -Subanimation47: - db $23 - db $06,$82,$00 - db $07,$82,$00 - db $08,$96,$00 - -Subanimation48: - db $06 - db $03,$41,$04 - db $03,$48,$04 - db $04,$48,$04 - db $03,$48,$04 - db $05,$48,$04 - db $03,$48,$03 - -Subanimation49: - db $04 - db $04,$48,$04 - db $03,$48,$04 - db $05,$48,$04 - db $03,$48,$03 - -Subanimation4a: - db $01 - db $04,$84,$03 - -Subanimation4b: - db $03 - db $06,$72,$00 - db $07,$72,$00 - db $08,$72,$00 - -Subanimation4c: - db $68 - db $6f,$30,$00 - db $6e,$30,$00 - db $70,$30,$00 - db $6e,$30,$00 - db $6f,$30,$00 - db $6e,$30,$00 - db $70,$30,$00 - db $6e,$30,$00 - -Subanimation4d: - db $26 - db $32,$4b,$00 - db $33,$4f,$00 - db $32,$20,$00 - db $33,$16,$00 - db $32,$19,$00 - db $33,$0d,$00 - -Subanimation51: - db $a6 - db $76,$1b,$00 - db $34,$1b,$00 - db $76,$1b,$00 - db $34,$1b,$00 - db $76,$1b,$00 - db $34,$1b,$00 - -Subanimation52: - db $47 - db $77,$25,$00 - db $77,$9b,$00 - db $77,$1a,$00 - db $77,$9c,$00 - db $77,$2f,$00 - db $77,$50,$00 - db $77,$8c,$00 - -Subanimation53: - db $0c - db $78,$30,$00 - db $78,$a2,$00 - db $78,$93,$00 - db $78,$61,$00 - db $78,$73,$00 - db $78,$a7,$00 - db $78,$33,$00 - db $78,$a8,$00 - db $78,$0e,$00 - db $78,$a9,$00 - db $78,$34,$00 - db $01,$9e,$00 - -Subanimation54: - db $0b - db $79,$30,$00 - db $79,$a2,$00 - db $79,$93,$00 - db $79,$61,$00 - db $79,$73,$00 - db $79,$a7,$00 - db $79,$33,$00 - db $79,$a8,$00 - db $79,$0e,$00 - db $79,$a9,$00 - db $79,$34,$00 - -FrameBlockPointers: - dw FrameBlock00 - dw FrameBlock01 - dw FrameBlock02 - dw FrameBlock03 - dw FrameBlock04 - dw FrameBlock05 - dw FrameBlock06 - dw FrameBlock07 - dw FrameBlock08 - dw FrameBlock09 - dw FrameBlock0a - dw FrameBlock0b - dw FrameBlock0c - dw FrameBlock0d - dw FrameBlock0e - dw FrameBlock0f - dw FrameBlock10 - dw FrameBlock11 - dw FrameBlock12 - dw FrameBlock13 - dw FrameBlock14 - dw FrameBlock15 - dw FrameBlock16 - dw FrameBlock17 - dw FrameBlock18 - dw FrameBlock19 - dw FrameBlock1a - dw FrameBlock1b - dw FrameBlock1c - dw FrameBlock1d - dw FrameBlock1e - dw FrameBlock1f - dw FrameBlock20 - dw FrameBlock21 - dw FrameBlock22 - dw FrameBlock23 - dw FrameBlock24 - dw FrameBlock25 - dw FrameBlock26 - dw FrameBlock27 - dw FrameBlock28 - dw FrameBlock29 - dw FrameBlock2a - dw FrameBlock2b - dw FrameBlock2c - dw FrameBlock2d - dw FrameBlock2e - dw FrameBlock2f - dw FrameBlock30 - dw FrameBlock31 - dw FrameBlock32 - dw FrameBlock33 - dw FrameBlock34 - dw FrameBlock35 - dw FrameBlock36 - dw FrameBlock37 - dw FrameBlock38 - dw FrameBlock39 - dw FrameBlock3a - dw FrameBlock3b - dw FrameBlock3c - dw FrameBlock3d - dw FrameBlock3e - dw FrameBlock3f - dw FrameBlock40 - dw FrameBlock41 - dw FrameBlock42 - dw FrameBlock43 - dw FrameBlock44 - dw FrameBlock45 - dw FrameBlock46 - dw FrameBlock47 - dw SmallBlackCircleFrameBlock - dw LargeBlockCircleFrameBlock - dw FrameBlock4a - dw FrameBlock4b - dw FrameBlock4c - dw FrameBlock4d - dw FrameBlock4e - dw FrameBlock4f - dw FrameBlock50 - dw FrameBlock51 - dw FrameBlock52 - dw FrameBlock53 - dw FrameBlock54 - dw FrameBlock55 - dw FrameBlock56 - dw FrameBlock57 - dw FrameBlock58 - dw FrameBlock59 - dw FrameBlock5a - dw FrameBlock5b - dw FrameBlock5c - dw FrameBlock5d - dw FrameBlock5e - dw FrameBlock5f - dw FrameBlock60 - dw FrameBlock61 - dw FrameBlock62 - dw FrameBlock63 - dw FrameBlock64 - dw FrameBlock65 - dw FrameBlock66 - dw FrameBlock67 - dw FrameBlock68 - dw FrameBlock69 - dw FrameBlock6a - dw FrameBlock6b - dw FrameBlock6c - dw FrameBlock6d - dw FrameBlock6e - dw FrameBlock6f - dw FrameBlock70 - dw FrameBlock71 - dw FrameBlock72 - dw FrameBlock73 - dw FrameBlock74 - dw FrameBlock75 - dw FrameBlock76 - dw FrameBlock77 - dw FrameBlock78 - dw FrameBlock79 - -; FrameBlock format is as follows: -; first byte = number of tiles in FrameBlock -; -; Next, each group of 4 bytes describes a tile in the FrameBlock -; first byte = y offset -; second byte = x offset -; third byte = tile id (it's actually tile id - $31) -; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: - db $09 - db $00,$00,$2c,$00 - db $00,$08,$2d,$00 - db $00,$10,$2c,$20 - db $08,$00,$3c,$00 - db $08,$08,$3d,$00 - db $08,$10,$3c,$20 - db $10,$00,$2c,$40 - db $10,$08,$2d,$40 - db $10,$10,$2c,$60 - -FrameBlock02: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $00,$10,$21,$20 - db $00,$18,$20,$20 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $08,$10,$31,$20 - db $08,$18,$30,$20 - db $10,$00,$30,$40 - db $10,$08,$31,$40 - db $10,$10,$31,$60 - db $10,$18,$30,$60 - db $18,$00,$20,$40 - db $18,$08,$21,$40 - db $18,$10,$21,$60 - db $18,$18,$20,$60 - -FrameBlock03: - db $04 - db $00,$00,$02,$00 - db $00,$08,$02,$20 - db $08,$00,$12,$00 - db $08,$08,$12,$20 - -FrameBlock04: - db $04 - db $00,$00,$06,$00 - db $00,$08,$07,$00 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock05: - db $04 - db $00,$00,$07,$20 - db $00,$08,$06,$20 - db $08,$00,$17,$20 - db $08,$08,$16,$20 - -FrameBlock06: - db $0c - db $00,$08,$23,$00 - db $08,$00,$32,$00 - db $08,$08,$33,$00 - db $00,$10,$23,$20 - db $08,$10,$33,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$33,$40 - db $18,$08,$23,$40 - db $10,$10,$33,$60 - db $10,$18,$32,$60 - db $18,$10,$23,$60 - -FrameBlock07: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $00,$10,$21,$20 - db $00,$18,$20,$20 - db $08,$10,$31,$20 - db $08,$18,$30,$20 - db $10,$00,$30,$40 - db $10,$08,$31,$40 - db $18,$00,$20,$40 - db $18,$08,$21,$40 - db $10,$10,$31,$60 - db $10,$18,$30,$60 - db $18,$10,$21,$60 - db $18,$18,$20,$60 - -FrameBlock08: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $00,$18,$21,$20 - db $00,$20,$20,$20 - db $08,$18,$31,$20 - db $08,$20,$30,$20 - db $18,$00,$30,$40 - db $18,$08,$31,$40 - db $20,$00,$20,$40 - db $20,$08,$21,$40 - db $18,$18,$31,$60 - db $18,$20,$30,$60 - db $20,$18,$21,$60 - db $20,$20,$20,$60 - -FrameBlock09: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$18,$25,$20 - db $00,$20,$24,$20 - db $08,$20,$34,$20 - db $18,$00,$34,$40 - db $20,$00,$24,$40 - db $20,$08,$25,$40 - db $18,$20,$34,$60 - db $20,$18,$25,$60 - db $20,$20,$24,$60 - -FrameBlock0a: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$20,$25,$20 - db $00,$28,$24,$20 - db $08,$28,$34,$20 - db $20,$00,$34,$40 - db $28,$00,$24,$40 - db $28,$08,$25,$40 - db $20,$28,$34,$60 - db $28,$20,$25,$60 - db $28,$28,$24,$60 - -FrameBlock0b: - db $04 - db $00,$00,$05,$00 - db $00,$08,$05,$20 - db $08,$00,$15,$00 - db $08,$08,$15,$20 - -FrameBlock0c: - db $04 - db $00,$00,$04,$00 - db $00,$08,$04,$20 - db $08,$00,$14,$00 - db $08,$08,$14,$20 - -FrameBlock0d: - db $08 - db $00,$00,$0c,$00 - db $00,$08,$0d,$00 - db $08,$00,$1c,$00 - db $08,$08,$1d,$00 - db $10,$00,$1d,$60 - db $10,$08,$1c,$60 - db $18,$00,$0d,$60 - db $18,$08,$0c,$60 - -FrameBlock0e: - db $04 - db $20,$00,$0c,$00 - db $20,$08,$0d,$00 - db $28,$00,$1c,$00 - db $28,$08,$1d,$00 - -FrameBlock0f: - db $04 - db $30,$00,$1d,$60 - db $30,$08,$1c,$60 - db $38,$00,$0d,$60 - db $38,$08,$0c,$60 - -FrameBlock10: - db $08 - db $00,$00,$0e,$00 - db $00,$08,$0f,$00 - db $08,$00,$1e,$00 - db $08,$08,$1f,$00 - db $00,$10,$0f,$20 - db $00,$18,$0e,$20 - db $08,$10,$1f,$20 - db $08,$18,$1e,$20 - -FrameBlock11: - db $08 - db $00,$00,$0e,$00 - db $00,$08,$0f,$00 - db $08,$00,$1e,$00 - db $08,$08,$1f,$00 - db $00,$20,$0f,$20 - db $00,$28,$0e,$20 - db $08,$20,$1f,$20 - db $08,$28,$1e,$20 - -FrameBlock12: - db $03 - db $00,$00,$37,$00 - db $08,$10,$37,$00 - db $00,$20,$37,$00 - -FrameBlock13: - db $04 - db $00,$00,$36,$00 - db $00,$08,$36,$20 - db $08,$00,$36,$40 - db $08,$08,$36,$60 - -FrameBlock14: - db $08 - db $00,$10,$28,$00 - db $00,$18,$28,$20 - db $08,$10,$38,$00 - db $08,$18,$38,$20 - db $00,$20,$36,$00 - db $00,$28,$36,$20 - db $08,$20,$36,$40 - db $08,$28,$36,$60 - -FrameBlock15: - db $0c - db $00,$00,$28,$00 - db $00,$08,$28,$20 - db $08,$00,$38,$00 - db $08,$08,$38,$20 - db $00,$10,$29,$00 - db $00,$18,$29,$20 - db $08,$10,$39,$00 - db $08,$18,$39,$20 - db $00,$20,$28,$00 - db $00,$28,$28,$20 - db $08,$20,$38,$00 - db $08,$28,$38,$20 - -FrameBlock16: - db $08 - db $00,$00,$29,$00 - db $00,$08,$29,$20 - db $08,$00,$39,$00 - db $08,$08,$39,$20 - db $00,$20,$29,$00 - db $00,$28,$29,$20 - db $08,$20,$39,$00 - db $08,$28,$39,$20 - -FrameBlock17: - db $04 - db $00,$00,$08,$00 - db $00,$08,$09,$00 - db $08,$00,$18,$00 - db $08,$08,$19,$00 - -FrameBlock18: - db $01 - db $18,$00,$45,$60 - -FrameBlock19: - db $02 - db $18,$08,$45,$00 - db $10,$08,$46,$60 - -FrameBlock1a: - db $02 - db $10,$10,$45,$60 - db $18,$10,$46,$00 - -FrameBlock1b: - db $02 - db $10,$18,$45,$00 - db $08,$18,$46,$60 - -FrameBlock1c: - db $02 - db $08,$20,$45,$60 - db $10,$20,$46,$00 - -FrameBlock1d: - db $02 - db $08,$28,$45,$00 - db $00,$28,$46,$60 - -FrameBlock1e: - db $02 - db $00,$30,$45,$60 - db $08,$30,$46,$00 - -FrameBlock75: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$22,$00 - db $08,$08,$43,$60 - -FrameBlock1f: - db $02 - db $00,$00,$03,$00 - db $00,$30,$03,$20 - -FrameBlock20: - db $06 - db $00,$00,$03,$00 - db $00,$30,$03,$20 - db $08,$08,$03,$00 - db $08,$28,$03,$20 - db $08,$00,$13,$00 - db $08,$30,$13,$20 - -FrameBlock21: - db $0c - db $00,$00,$03,$00 - db $00,$30,$03,$20 - db $08,$08,$03,$00 - db $08,$28,$03,$20 - db $08,$00,$13,$00 - db $08,$30,$13,$20 - db $10,$10,$03,$00 - db $10,$20,$03,$20 - db $10,$08,$13,$00 - db $10,$28,$13,$20 - db $10,$00,$03,$00 - db $10,$30,$03,$20 - -FrameBlock22: - db $13 - db $00,$00,$03,$00 - db $08,$00,$13,$00 - db $10,$00,$03,$00 - db $18,$00,$13,$00 - db $08,$08,$03,$00 - db $10,$08,$13,$00 - db $18,$08,$03,$00 - db $10,$10,$03,$00 - db $18,$10,$13,$00 - db $18,$18,$03,$00 - db $10,$20,$03,$20 - db $18,$20,$13,$20 - db $08,$28,$03,$20 - db $10,$28,$13,$20 - db $18,$28,$03,$20 - db $00,$30,$03,$20 - db $08,$30,$13,$20 - db $10,$30,$03,$20 - db $18,$30,$13,$20 - -FrameBlock23: - db $04 - db $00,$00,$0a,$00 - db $00,$08,$0b,$00 - db $08,$00,$1a,$00 - db $08,$08,$1b,$00 - -FrameBlock24: - db $02 - db $08,$00,$0a,$00 - db $08,$08,$0b,$00 - -FrameBlock25: - db $0c - db $10,$00,$0a,$00 - db $10,$08,$0b,$00 - db $18,$00,$1a,$00 - db $18,$08,$1b,$00 - db $00,$10,$0a,$00 - db $00,$18,$0b,$00 - db $08,$10,$1a,$00 - db $08,$18,$1b,$00 - db $08,$20,$0a,$00 - db $08,$28,$0b,$00 - db $10,$20,$1a,$00 - db $10,$28,$1b,$00 - -FrameBlock26: - db $04 - db $00,$10,$44,$00 - db $00,$18,$44,$20 - db $08,$10,$44,$40 - db $08,$18,$44,$60 - -FrameBlock27: - db $05 - db $08,$08,$44,$00 - db $08,$10,$44,$20 - db $10,$08,$44,$40 - db $10,$10,$44,$60 - db $00,$18,$47,$00 - -FrameBlock28: - db $06 - db $10,$00,$44,$00 - db $10,$08,$44,$20 - db $18,$00,$44,$40 - db $18,$08,$44,$60 - db $08,$10,$47,$00 - db $02,$16,$47,$00 - -FrameBlock29: - db $04 - db $18,$00,$47,$00 - db $12,$06,$47,$00 - db $0c,$0c,$47,$00 - db $06,$12,$47,$00 - -FrameBlock2a: - db $04 - db $00,$00,$44,$00 - db $00,$08,$44,$20 - db $08,$00,$44,$40 - db $08,$08,$44,$60 - -FrameBlock2b: - db $02 - db $06,$02,$47,$00 - db $00,$08,$47,$00 - -FrameBlock2c: - db $01 - db $a0,$00,$4d,$00 - -FrameBlock2d: - db $08 - db $00,$00,$26,$00 - db $00,$08,$27,$00 - db $08,$00,$36,$00 - db $08,$08,$37,$00 - db $10,$00,$28,$00 - db $10,$08,$29,$00 - db $18,$00,$38,$00 - db $18,$08,$39,$00 - -FrameBlock2e: - db $08 - db $00,$00,$27,$20 - db $00,$08,$26,$20 - db $08,$00,$37,$20 - db $08,$08,$36,$20 - db $10,$00,$29,$20 - db $10,$08,$28,$20 - db $18,$00,$39,$20 - db $18,$08,$38,$20 - -FrameBlock2f: - db $04 - db $00,$00,$0c,$00 - db $00,$08,$0d,$00 - db $08,$00,$0c,$40 - db $08,$08,$0d,$40 - -FrameBlock30: - db $04 - db $00,$00,$44,$00 - db $00,$08,$44,$20 - db $08,$00,$44,$40 - db $08,$08,$44,$60 - -FrameBlock31: - db $01 - db $00,$00,$45,$00 - -FrameBlock32: - db $07 - db $00,$00,$4d,$00 - db $00,$08,$2f,$00 - db $00,$10,$4d,$20 - db $08,$00,$4e,$00 - db $08,$08,$07,$00 - db $08,$10,$4e,$20 - db $10,$08,$3f,$00 - -FrameBlock33: - db $07 - db $00,$08,$3f,$40 - db $08,$00,$4e,$40 - db $08,$08,$07,$40 - db $08,$10,$4e,$60 - db $10,$00,$4d,$40 - db $10,$08,$2f,$40 - db $10,$10,$4d,$60 - -FrameBlock34: - db $01 - db $a0,$00,$00,$10 - -FrameBlock35: - db $06 - db $00,$00,$2a,$00 - db $00,$08,$2b,$00 - db $08,$00,$3a,$00 - db $10,$00,$3a,$40 - db $18,$00,$2a,$40 - db $18,$08,$2b,$40 - -FrameBlock36: - db $04 - db $00,$00,$00,$00 - db $00,$08,$01,$00 - db $08,$00,$10,$00 - db $08,$08,$11,$00 - -FrameBlock37: - db $04 - db $00,$00,$01,$a0 - db $00,$08,$00,$a0 - db $08,$00,$11,$a0 - db $08,$08,$10,$a0 - -FrameBlock38: - db $04 - db $00,$00,$0a,$00 - db $00,$08,$0b,$00 - db $08,$00,$1a,$00 - db $08,$08,$1b,$00 - -FrameBlock39: - db $04 - db $00,$00,$0b,$20 - db $00,$08,$0a,$20 - db $08,$00,$1b,$20 - db $08,$08,$1a,$20 - -FrameBlock3a: - db $04 - db $20,$00,$05,$00 - db $20,$08,$05,$20 - db $28,$00,$15,$00 - db $28,$08,$15,$20 - -FrameBlock3b: - db $05 - db $18,$00,$04,$00 - db $18,$08,$04,$20 - db $20,$00,$14,$00 - db $20,$08,$14,$20 - db $28,$04,$41,$00 - -FrameBlock3c: - db $06 - db $10,$00,$05,$00 - db $10,$08,$05,$20 - db $18,$00,$15,$00 - db $18,$08,$15,$20 - db $20,$04,$42,$00 - db $28,$04,$42,$00 - -FrameBlock3d: - db $07 - db $08,$00,$04,$00 - db $08,$08,$04,$20 - db $10,$00,$14,$00 - db $10,$08,$14,$20 - db $18,$04,$41,$00 - db $20,$04,$41,$00 - db $28,$04,$41,$00 - -FrameBlock3e: - db $08 - db $00,$00,$05,$00 - db $00,$08,$05,$20 - db $08,$00,$15,$00 - db $08,$08,$15,$20 - db $10,$04,$42,$00 - db $18,$04,$42,$00 - db $20,$04,$42,$00 - db $28,$04,$42,$00 - -FrameBlock3f: - db $08 - db $00,$00,$04,$00 - db $00,$08,$04,$20 - db $08,$00,$14,$00 - db $08,$08,$14,$20 - db $10,$04,$41,$00 - db $18,$04,$41,$00 - db $20,$04,$41,$00 - db $28,$04,$41,$00 - -FrameBlock40: - db $03 - db $00,$00,$3d,$00 - db $00,$08,$3d,$00 - db $08,$08,$3d,$00 - -FrameBlock41: - db $04 - db $00,$00,$06,$00 - db $00,$08,$06,$20 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock42: - db $0b - db $00,$10,$42,$00 - db $08,$00,$42,$00 - db $08,$08,$42,$00 - db $08,$10,$42,$00 - db $08,$18,$42,$00 - db $08,$20,$42,$00 - db $10,$10,$42,$00 - db $18,$08,$42,$00 - db $18,$18,$42,$00 - db $20,$00,$42,$00 - db $20,$20,$42,$00 - -FrameBlock43: - db $0b - db $00,$10,$41,$00 - db $08,$00,$41,$00 - db $08,$08,$41,$00 - db $08,$10,$41,$00 - db $08,$18,$41,$00 - db $08,$20,$41,$00 - db $10,$10,$41,$00 - db $18,$08,$41,$00 - db $18,$18,$41,$00 - db $20,$00,$41,$00 - db $20,$20,$41,$00 - -FrameBlock44: - db $04 - db $00,$00,$49,$00 - db $00,$28,$49,$00 - db $28,$00,$49,$00 - db $28,$28,$49,$00 - -FrameBlock45: - db $04 - db $00,$00,$49,$00 - db $00,$18,$49,$00 - db $18,$00,$49,$00 - db $18,$18,$49,$00 - -FrameBlock46: - db $04 - db $00,$00,$49,$00 - db $00,$08,$49,$00 - db $08,$00,$49,$00 - db $08,$08,$49,$00 - -FrameBlock47: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$43,$40 - db $08,$08,$43,$60 - -SmallBlackCircleFrameBlock: - db $04 - db $08,$08,$33,$00 - db $08,$10,$33,$20 - db $10,$08,$33,$40 - db $10,$10,$33,$60 - -LargeBlockCircleFrameBlock: - db $10 - db $00,$00,$22,$00 - db $00,$08,$23,$00 - db $00,$10,$23,$20 - db $00,$18,$22,$20 - db $08,$00,$32,$00 - db $08,$08,$43,$00 - db $08,$10,$43,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$43,$40 - db $10,$10,$43,$60 - db $10,$18,$32,$60 - db $18,$00,$22,$40 - db $18,$08,$23,$40 - db $18,$10,$23,$60 - db $18,$18,$22,$60 - -FrameBlock71: - db $10 - db $00,$00,$22,$00 - db $00,$08,$3b,$00 - db $00,$10,$23,$20 - db $00,$18,$22,$20 - db $08,$00,$32,$00 - db $08,$08,$43,$00 - db $08,$10,$43,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$43,$40 - db $10,$10,$43,$60 - db $10,$18,$32,$60 - db $18,$00,$22,$40 - db $18,$08,$23,$40 - db $18,$10,$23,$60 - db $18,$18,$22,$60 - -FrameBlock72: - db $0c - db $00,$00,$32,$00 - db $00,$08,$43,$00 - db $00,$10,$43,$20 - db $00,$18,$32,$20 - db $08,$00,$32,$40 - db $08,$08,$43,$40 - db $08,$10,$43,$60 - db $08,$18,$32,$60 - db $10,$00,$22,$40 - db $10,$08,$23,$40 - db $10,$10,$23,$60 - db $10,$18,$22,$60 - -FrameBlock73: - db $08 - db $00,$00,$32,$40 - db $00,$08,$43,$40 - db $00,$10,$43,$60 - db $00,$18,$32,$60 - db $08,$00,$22,$40 - db $08,$08,$23,$40 - db $08,$10,$23,$60 - db $08,$18,$22,$60 - -FrameBlock74: - db $04 - db $00,$00,$22,$40 - db $00,$08,$23,$40 - db $00,$10,$23,$60 - db $00,$18,$22,$60 - -FrameBlock4a: - db $04 - db $08,$18,$4c,$20 - db $20,$08,$4b,$00 - db $30,$20,$4c,$00 - db $18,$30,$4b,$40 - -FrameBlock4b: - db $04 - db $00,$18,$4c,$00 - db $20,$00,$4b,$40 - db $38,$20,$4c,$20 - db $18,$38,$4b,$00 - -FrameBlock4c: - db $04 - db $10,$08,$4a,$40 - db $30,$10,$4a,$00 - db $28,$30,$4a,$20 - db $08,$28,$4a,$60 - -FrameBlock4d: - db $04 - db $08,$00,$4a,$20 - db $38,$08,$4a,$60 - db $30,$38,$4a,$40 - db $00,$30,$4a,$00 - -FrameBlock4e: - db $08 - db $00,$30,$44,$00 - db $00,$38,$44,$20 - db $08,$30,$44,$40 - db $08,$38,$44,$60 - db $26,$0a,$44,$00 - db $26,$12,$44,$20 - db $2e,$0a,$44,$40 - db $2e,$12,$44,$60 - -FrameBlock4f: - db $0c - db $0e,$22,$44,$00 - db $0e,$2a,$44,$20 - db $16,$22,$44,$40 - db $16,$2a,$44,$60 - db $06,$32,$47,$00 - db $00,$38,$47,$00 - db $1a,$16,$44,$00 - db $1a,$1e,$44,$20 - db $22,$16,$44,$40 - db $22,$1e,$44,$60 - db $30,$08,$47,$00 - db $2a,$0e,$47,$00 - -FrameBlock50: - db $08 - db $06,$32,$47,$00 - db $00,$38,$47,$00 - db $12,$26,$47,$00 - db $0c,$2c,$47,$00 - db $1e,$1a,$47,$00 - db $18,$20,$47,$00 - db $2a,$0e,$47,$00 - db $24,$14,$47,$00 - -FrameBlock51: - db $08 - db $00,$00,$35,$20 - db $08,$00,$35,$40 - db $10,$00,$35,$00 - db $18,$00,$35,$60 - db $00,$40,$35,$00 - db $08,$40,$35,$60 - db $10,$40,$35,$20 - db $18,$40,$35,$40 - -FrameBlock52: - db $04 - db $00,$00,$2a,$00 - db $00,$08,$2b,$00 - db $08,$00,$3a,$00 - db $08,$08,$3b,$00 - -FrameBlock53: - db $03 - db $00,$00,$3f,$00 - db $00,$08,$3f,$00 - db $08,$06,$3f,$00 - -FrameBlock54: - db $04 - db $00,$00,$0e,$00 - db $00,$08,$0e,$20 - db $08,$00,$0f,$00 - db $08,$08,$0f,$20 - -FrameBlock55: - db $03 - db $10,$00,$2c,$00 - db $10,$08,$3c,$00 - db $10,$10,$2d,$00 - -FrameBlock56: - db $06 - db $10,$10,$31,$00 - db $10,$18,$31,$00 - db $08,$10,$2c,$00 - db $08,$18,$3c,$00 - db $08,$20,$2d,$00 - db $10,$20,$2d,$00 - -FrameBlock57: - db $09 - db $08,$20,$31,$00 - db $10,$20,$31,$00 - db $08,$28,$31,$00 - db $10,$28,$31,$00 - db $00,$20,$2c,$00 - db $00,$28,$3c,$00 - db $00,$30,$2d,$00 - db $08,$30,$2d,$00 - db $10,$30,$2d,$00 - -FrameBlock58: - db $07 - db $00,$00,$46,$00 - db $08,$02,$47,$00 - db $10,$03,$48,$00 - db $18,$04,$48,$00 - db $20,$05,$48,$00 - db $28,$05,$48,$00 - db $30,$05,$48,$00 - -FrameBlock59: - db $01 - db $00,$00,$42,$00 - -FrameBlock5a: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$10,$25,$20 - db $00,$18,$24,$20 - db $08,$18,$34,$20 - db $10,$00,$34,$40 - db $18,$00,$24,$40 - db $18,$08,$25,$40 - db $10,$18,$34,$60 - db $18,$10,$25,$60 - db $18,$18,$24,$60 - -FrameBlock5b: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$43,$40 - db $08,$08,$43,$60 - -FrameBlock5c: - db $08 - db $00,$00,$49,$00 - db $02,$08,$49,$00 - db $18,$00,$49,$00 - db $10,$10,$49,$00 - db $08,$00,$43,$00 - db $08,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - -FrameBlock5d: - db $0b - db $00,$00,$49,$00 - db $18,$02,$49,$00 - db $14,$10,$49,$00 - db $08,$00,$43,$00 - db $00,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - db $04,$08,$43,$00 - db $04,$10,$43,$20 - db $0c,$08,$43,$40 - db $0c,$10,$43,$60 - -FrameBlock5e: - db $0f - db $00,$08,$49,$00 - db $08,$10,$49,$00 - db $20,$00,$49,$00 - db $08,$00,$43,$00 - db $08,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - db $10,$10,$43,$00 - db $10,$18,$43,$20 - db $18,$10,$43,$40 - db $18,$18,$43,$60 - db $20,$08,$43,$00 - db $20,$10,$43,$20 - db $28,$08,$43,$40 - db $28,$10,$43,$60 - -FrameBlock5f: - db $04 - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - -FrameBlock60: - db $08 - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - -FrameBlock61: - db $0c - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - db $10,$00,$49,$00 - db $10,$10,$49,$00 - db $10,$20,$49,$00 - db $10,$30,$49,$00 - -FrameBlock62: - db $0f - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - db $10,$00,$49,$00 - db $10,$10,$49,$00 - db $10,$20,$49,$00 - db $10,$30,$49,$00 - db $18,$08,$49,$00 - db $18,$18,$49,$00 - db $18,$28,$49,$00 - db $18,$38,$49,$00 ; unused - -FrameBlock63: - db $06 - db $10,$00,$26,$00 - db $10,$08,$27,$00 - db $08,$10,$26,$00 - db $08,$18,$27,$00 - db $00,$20,$26,$00 - db $00,$28,$27,$00 - -FrameBlock64: - db $06 - db $18,$00,$27,$00 - db $10,$08,$26,$00 - db $10,$10,$27,$00 - db $08,$18,$26,$00 - db $08,$20,$27,$00 - db $00,$28,$26,$00 - -FrameBlock65: - db $06 - db $00,$00,$1c,$00 - db $00,$08,$1d,$00 - db $10,$00,$1c,$00 - db $10,$08,$1d,$00 - db $20,$00,$1c,$00 - db $20,$08,$1d,$00 - -FrameBlock66: - db $02 - db $00,$00,$03,$00 - db $08,$00,$13,$00 - -FrameBlock67: - db $01 - db $00,$00,$03,$00 - -FrameBlock68: - db $04 - db $00,$00,$03,$00 - db $00,$08,$03,$20 - db $08,$00,$13,$00 - db $08,$08,$13,$20 - -FrameBlock69: - db $01 - db $00,$00,$06,$00 - -FrameBlock6a: - db $08 - db $00,$00,$2e,$00 - db $00,$30,$2e,$20 - db $30,$00,$2e,$40 - db $30,$30,$2e,$60 - db $00,$18,$2f,$00 - db $30,$18,$2f,$40 - db $18,$00,$3e,$00 - db $18,$30,$3e,$20 - -FrameBlock6b: - db $08 - db $00,$00,$2e,$00 - db $00,$20,$2e,$20 - db $20,$00,$2e,$40 - db $20,$20,$2e,$60 - db $00,$10,$2f,$00 - db $20,$10,$2f,$40 - db $10,$00,$3e,$00 - db $10,$20,$3e,$20 - -FrameBlock6c: - db $08 - db $00,$00,$2e,$00 - db $00,$10,$2e,$20 - db $10,$00,$2e,$40 - db $10,$10,$2e,$60 - db $00,$08,$2f,$00 - db $10,$08,$2f,$40 - db $08,$00,$3e,$00 - db $08,$10,$3e,$20 - -FrameBlock6d: - db $02 - db $00,$00,$1e,$00 - db $00,$08,$1f,$00 - -FrameBlock6e: - db $04 - db $00,$00,$48,$00 - db $00,$08,$48,$20 - db $08,$00,$12,$00 - db $08,$08,$12,$20 - -FrameBlock6f: - db $04 - db $00,$00,$4a,$00 - db $00,$08,$07,$00 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock70: - db $04 - db $00,$00,$07,$20 - db $00,$08,$4a,$20 - db $08,$00,$17,$20 - db $08,$08,$16,$20 - -FrameBlock76: - db $07 - db $00,$10,$2f,$00 - db $01,$08,$2f,$00 - db $01,$18,$2f,$00 - db $02,$00,$2e,$00 - db $02,$20,$2e,$20 - db $0a,$00,$3e,$00 - db $0a,$20,$3e,$20 - -FrameBlock77: - db $04 - db $00,$02,$4b,$00 - db $00,$0a,$4c,$00 - db $08,$00,$4c,$60 - db $08,$08,$4b,$60 - -FrameBlock78: - db $01 - db $00,$00,$4d,$00 - -FrameBlock79: - db $01 - db $00,$00,$4e,$00 - -FrameBlockBaseCoords: - db $10,$68 - db $10,$70 - db $10,$78 - db $10,$80 - db $10,$88 - db $10,$90 - db $10,$98 - db $18,$68 - db $18,$70 - db $18,$78 - db $34,$28 - db $18,$80 - db $18,$88 - db $18,$98 - db $20,$68 - db $20,$70 - db $20,$78 - db $20,$80 - db $20,$88 - db $20,$90 - db $20,$98 - db $28,$68 - db $28,$70 - db $28,$78 - db $28,$80 - db $28,$88 - db $30,$68 - db $30,$70 - db $30,$78 - db $30,$80 - db $30,$90 - db $30,$98 - db $38,$68 - db $38,$78 - db $38,$80 - db $38,$88 - db $40,$68 - db $40,$70 - db $40,$78 - db $40,$80 - db $40,$88 - db $40,$98 - db $10,$60 - db $18,$60 - db $20,$60 - db $28,$60 - db $30,$60 - db $40,$60 - db $58,$28 - db $43,$38 - db $33,$48 - db $20,$58 - db $32,$78 - db $58,$58 - db $2C,$6C - db $34,$80 - db $48,$70 - db $42,$36 - db $38,$44 - db $40,$52 - db $48,$60 - db $3E,$6E - db $28,$7C - db $28,$8A - db $50,$3C - db $48,$50 - db $40,$64 - db $38,$38 - db $50,$30 - db $50,$38 - db $50,$40 - db $50,$48 - db $50,$50 - db $48,$58 - db $50,$44 - db $48,$48 - db $48,$4C - db $40,$50 - db $40,$54 - db $38,$58 - db $38,$5C - db $30,$64 - db $48,$40 - db $48,$39 - db $24,$88 - db $24,$70 - db $1C,$70 - db $1C,$88 - db $34,$68 - db $34,$88 - db $68,$50 - db $60,$50 - db $68,$60 - db $58,$50 - db $60,$60 - db $68,$40 - db $40,$40 - db $38,$40 - db $0B,$60 - db $44,$48 - db $40,$14 - db $48,$1C - db $50,$24 - db $4C,$24 - db $10,$62 - db $12,$62 - db $12,$60 - db $20,$72 - db $22,$72 - db $22,$70 - db $28,$62 - db $50,$0A - db $52,$0A - db $38,$30 - db $40,$48 - db $30,$48 - db $40,$30 - db $30,$40 - db $38,$48 - db $40,$4A - db $48,$4B - db $50,$4C - db $58,$4D - db $60,$4D - db $68,$4D - db $38,$10 - db $50,$10 - db $38,$28 - db $48,$18 - db $40,$20 - db $48,$20 - db $40,$3C - db $38,$50 - db $28,$64 - db $1C,$90 - db $24,$80 - db $2C,$70 - db $30,$38 - db $10,$50 - db $3C,$40 - db $40,$58 - db $30,$58 - db $58,$48 - db $50,$58 - db $48,$68 - db $40,$18 - db $28,$58 - db $40,$38 - db $48,$38 - db $08,$70 - db $44,$1C - db $3C,$58 - db $38,$60 - db $08,$60 - db $38,$70 - db $38,$6C - db $38,$64 - db $1C,$74 - db $2E,$74 - db $34,$50 - db $2F,$60 - db $31,$70 - db $4C,$30 - db $3B,$40 - db $2D,$50 - db $26,$60 - db $2D,$70 - db $28,$50 - db $1E,$60 - db $29,$70 - db $16,$60 - db $14,$58 - db $12,$54 - db $14,$50 - db $18,$4C - db $1C,$48 - db $48,$28 - -FrameBlock00: - db $00,$00 diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm deleted file mode 100644 index c8e240f2..00000000 --- a/data/baseStats/abra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ABRA ; pokedex id -db 25 ; base hp -db 20 ; base attack -db 15 ; base defense -db 90 ; base speed -db 105 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 200 ; catch rate -db 73 ; base exp yield -INCBIN "pic/ymon/abra.pic",0,1 ; 55, sprite dimensions -dw AbraPicFront -dw AbraPicBack -; attacks known at lvl 0 -db TELEPORT -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm deleted file mode 100644 index 7c9158f8..00000000 --- a/data/baseStats/aerodactyl.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_AERODACTYL ; pokedex id -db 80 ; base hp -db 105 ; base attack -db 65 ; base defense -db 130 ; base speed -db 60 ; base special -db ROCK ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 202 ; base exp yield -INCBIN "pic/ymon/aerodactyl.pic",0,1 ; 77, sprite dimensions -dw AerodactylPicFront -dw AerodactylPicBack -; attacks known at lvl 0 -db WING_ATTACK -db AGILITY -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,23 - tmlearn 31,32 - tmlearn 33,34,38,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm deleted file mode 100644 index 5a9bf426..00000000 --- a/data/baseStats/alakazam.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ALAKAZAM ; pokedex id -db 55 ; base hp -db 50 ; base attack -db 45 ; base defense -db 120 ; base speed -db 135 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 50 ; catch rate -db 186 ; base exp yield -INCBIN "pic/ymon/alakazam.pic",0,1 ; 77, sprite dimensions -dw AlakazamPicFront -dw AlakazamPicBack -; attacks known at lvl 0 -db TELEPORT -db KINESIS -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 28,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm deleted file mode 100644 index 1959af0c..00000000 --- a/data/baseStats/arbok.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARBOK ; pokedex id -db 60 ; base hp -db 85 ; base attack -db 69 ; base defense -db 80 ; base speed -db 65 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 90 ; catch rate -db 147 ; base exp yield -INCBIN "pic/ymon/arbok.pic",0,1 ; 77, sprite dimensions -dw ArbokPicFront -dw ArbokPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db POISON_STING -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 26,27,28,31,32 - tmlearn 34,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm deleted file mode 100644 index 68e111a1..00000000 --- a/data/baseStats/arcanine.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARCANINE ; pokedex id -db 90 ; base hp -db 110 ; base attack -db 80 ; base defense -db 95 ; base speed -db 80 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 213 ; base exp yield -INCBIN "pic/ymon/arcanine.pic",0,1 ; 77, sprite dimensions -dw ArcaninePicFront -dw ArcaninePicBack -; attacks known at lvl 0 -db ROAR -db EMBER -db LEER -db TAKE_DOWN -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,23 - tmlearn 28,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm deleted file mode 100644 index 6171d40c..00000000 --- a/data/baseStats/articuno.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARTICUNO ; pokedex id -db 90 ; base hp -db 85 ; base attack -db 100 ; base defense -db 85 ; base speed -db 125 ; base special -db ICE ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 215 ; base exp yield -INCBIN "pic/ymon/articuno.pic",0,1 ; 77, sprite dimensions -dw ArticunoPicFront -dw ArticunoPicBack -; attacks known at lvl 0 -db PECK -db ICE_BEAM -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm deleted file mode 100644 index 859d4835..00000000 --- a/data/baseStats/beedrill.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BEEDRILL ; pokedex id -db 65 ; base hp -db 80 ; base attack -db 40 ; base defense -db 75 ; base speed -db 45 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 159 ; base exp yield -INCBIN "pic/ymon/beedrill.pic",0,1 ; 77, sprite dimensions -dw BeedrillPicFront -dw BeedrillPicBack -; attacks known at lvl 0 -db FURY_ATTACK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm deleted file mode 100644 index 2126a422..00000000 --- a/data/baseStats/bellsprout.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BELLSPROUT ; pokedex id -db 50 ; base hp -db 75 ; base attack -db 35 ; base defense -db 40 ; base speed -db 70 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 84 ; base exp yield -INCBIN "pic/ymon/bellsprout.pic",0,1 ; 55, sprite dimensions -dw BellsproutPicFront -dw BellsproutPicBack -; attacks known at lvl 0 -db VINE_WHIP -db GROWTH -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm deleted file mode 100644 index c6fad5f0..00000000 --- a/data/baseStats/blastoise.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BLASTOISE ; pokedex id -db 79 ; base hp -db 83 ; base attack -db 100 ; base defense -db 78 ; base speed -db 85 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 210 ; base exp yield -INCBIN "pic/ymon/blastoise.pic",0,1 ; 77, sprite dimensions -dw BlastoisePicFront -dw BlastoisePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db BUBBLE -db WATER_GUN -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm deleted file mode 100644 index 225e8bec..00000000 --- a/data/baseStats/bulbasaur.asm +++ /dev/null @@ -1,30 +0,0 @@ -MonBaseStats: -db DEX_BULBASAUR ; pokedex id -db 45 ; base hp -db 49 ; base attack -db 49 ; base defense -db 45 ; base speed -db 65 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 64 ; base exp yield -INCBIN "pic/ymon/bulbasaur.pic",0,1 ; 55, sprite dimensions -dw BulbasaurPicFront -dw BulbasaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding -MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm deleted file mode 100644 index 4b161422..00000000 --- a/data/baseStats/butterfree.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BUTTERFREE ; pokedex id -db 60 ; base hp -db 45 ; base attack -db 50 ; base defense -db 70 ; base speed -db 80 ; base special -db BUG ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 160 ; base exp yield -INCBIN "pic/ymon/butterfree.pic",0,1 ; 77, sprite dimensions -dw ButterfreePicFront -dw ButterfreePicBack -; attacks known at lvl 0 -db CONFUSION -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm deleted file mode 100644 index 10615994..00000000 --- a/data/baseStats/caterpie.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CATERPIE ; pokedex id -db 45 ; base hp -db 30 ; base attack -db 35 ; base defense -db 45 ; base speed -db 20 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 255 ; catch rate -db 53 ; base exp yield -INCBIN "pic/ymon/caterpie.pic",0,1 ; 55, sprite dimensions -dw CaterpiePicFront -dw CaterpiePicBack -; attacks known at lvl 0 -db TACKLE -db STRING_SHOT -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm deleted file mode 100644 index 2097ef8c..00000000 --- a/data/baseStats/chansey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHANSEY ; pokedex id -db 250 ; base hp -db 5 ; base attack -db 5 ; base defense -db 50 ; base speed -db 105 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 30 ; catch rate -db 255 ; base exp yield -INCBIN "pic/ymon/chansey.pic",0,1 ; 66, sprite dimensions -dw ChanseyPicFront -dw ChanseyPicBack -; attacks known at lvl 0 -db POUND -db TAIL_WHIP -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,37,38,40 - tmlearn 41,44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm deleted file mode 100644 index c123bd18..00000000 --- a/data/baseStats/charizard.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARIZARD ; pokedex id -db 78 ; base hp -db 84 ; base attack -db 78 ; base defense -db 100 ; base speed -db 85 ; base special -db FIRE ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 209 ; base exp yield -INCBIN "pic/ymon/charizard.pic",0,1 ; 77, sprite dimensions -dw CharizardPicFront -dw CharizardPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db EMBER -db LEER -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,23 - tmlearn 26,27,28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,52,54 -db 0 ; padding diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm deleted file mode 100644 index 2e0189f2..00000000 --- a/data/baseStats/charmander.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARMANDER ; pokedex id -db 39 ; base hp -db 52 ; base attack -db 43 ; base defense -db 65 ; base speed -db 50 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 65 ; base exp yield -INCBIN "pic/ymon/charmander.pic",0,1 ; 55, sprite dimensions -dw CharmanderPicFront -dw CharmanderPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm deleted file mode 100644 index 419fc4b8..00000000 --- a/data/baseStats/charmeleon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARMELEON ; pokedex id -db 58 ; base hp -db 64 ; base attack -db 58 ; base defense -db 80 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 142 ; base exp yield -INCBIN "pic/ymon/charmeleon.pic",0,1 ; 66, sprite dimensions -dw CharmeleonPicFront -dw CharmeleonPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db EMBER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm deleted file mode 100644 index 473564b3..00000000 --- a/data/baseStats/clefable.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLEFABLE ; pokedex id -db 95 ; base hp -db 70 ; base attack -db 73 ; base defense -db 60 ; base speed -db 85 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 25 ; catch rate -db 129 ; base exp yield -INCBIN "pic/ymon/clefable.pic",0,1 ; 66, sprite dimensions -dw ClefablePicFront -dw ClefablePicBack -; attacks known at lvl 0 -db SING -db DOUBLESLAP -db MINIMIZE -db METRONOME -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm deleted file mode 100644 index c24f0c73..00000000 --- a/data/baseStats/clefairy.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLEFAIRY ; pokedex id -db 70 ; base hp -db 45 ; base attack -db 48 ; base defense -db 35 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 150 ; catch rate -db 68 ; base exp yield -INCBIN "pic/ymon/clefairy.pic",0,1 ; 55, sprite dimensions -dw ClefairyPicFront -dw ClefairyPicBack -; attacks known at lvl 0 -db POUND -db GROWL -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm deleted file mode 100644 index 4b174241..00000000 --- a/data/baseStats/cloyster.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLOYSTER ; pokedex id -db 50 ; base hp -db 95 ; base attack -db 180 ; base defense -db 70 ; base speed -db 85 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 60 ; catch rate -db 203 ; base exp yield -INCBIN "pic/ymon/cloyster.pic",0,1 ; 77, sprite dimensions -dw CloysterPicFront -dw CloysterPicBack -; attacks known at lvl 0 -db WITHDRAW -db SUPERSONIC -db CLAMP -db AURORA_BEAM -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,47 - tmlearn 49,50,53 -db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm deleted file mode 100644 index 598531d5..00000000 --- a/data/baseStats/cubone.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CUBONE ; pokedex id -db 50 ; base hp -db 50 ; base attack -db 95 ; base defense -db 35 ; base speed -db 40 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 190 ; catch rate -db 87 ; base exp yield -INCBIN "pic/ymon/cubone.pic",0,1 ; 55, sprite dimensions -dw CubonePicFront -dw CubonePicBack -; attacks known at lvl 0 -db GROWL -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm deleted file mode 100644 index cdeb45a7..00000000 --- a/data/baseStats/dewgong.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DEWGONG ; pokedex id -db 90 ; base hp -db 70 ; base attack -db 80 ; base defense -db 70 ; base speed -db 95 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 75 ; catch rate -db 176 ; base exp yield -INCBIN "pic/ymon/dewgong.pic",0,1 ; 66, sprite dimensions -dw DewgongPicFront -dw DewgongPicBack -; attacks known at lvl 0 -db HEADBUTT -db GROWL -db AURORA_BEAM -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm deleted file mode 100644 index 91fdc415..00000000 --- a/data/baseStats/diglett.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DIGLETT ; pokedex id -db 10 ; base hp -db 55 ; base attack -db 25 ; base defense -db 95 ; base speed -db 45 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 81 ; base exp yield -INCBIN "pic/ymon/diglett.pic",0,1 ; 55, sprite dimensions -dw DiglettPicFront -dw DiglettPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34 - tmlearn 44,48 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm deleted file mode 100644 index 456639c7..00000000 --- a/data/baseStats/ditto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DITTO ; pokedex id -db 48 ; base hp -db 48 ; base attack -db 48 ; base defense -db 48 ; base speed -db 48 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 35 ; catch rate -db 61 ; base exp yield -INCBIN "pic/ymon/ditto.pic",0,1 ; 55, sprite dimensions -dw DittoPicFront -dw DittoPicBack -; attacks known at lvl 0 -db TRANSFORM -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm deleted file mode 100644 index dfae1713..00000000 --- a/data/baseStats/dodrio.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DODRIO ; pokedex id -db 60 ; base hp -db 110 ; base attack -db 70 ; base defense -db 100 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 158 ; base exp yield -INCBIN "pic/ymon/dodrio.pic",0,1 ; 77, sprite dimensions -dw DodrioPicFront -dw DodrioPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db FURY_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 4,6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 43,44 - tmlearn 49,50,52 -db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm deleted file mode 100644 index 5571d09e..00000000 --- a/data/baseStats/doduo.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DODUO ; pokedex id -db 35 ; base hp -db 85 ; base attack -db 45 ; base defense -db 75 ; base speed -db 35 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 190 ; catch rate -db 96 ; base exp yield -INCBIN "pic/ymon/doduo.pic",0,1 ; 55, sprite dimensions -dw DoduoPicFront -dw DoduoPicBack -; attacks known at lvl 0 -db PECK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 4,6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 43,44 - tmlearn 49,50,52 -db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm deleted file mode 100644 index 6ec0031b..00000000 --- a/data/baseStats/dragonair.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRAGONAIR ; pokedex id -db 61 ; base hp -db 84 ; base attack -db 65 ; base defense -db 70 ; base speed -db 70 ; base special -db DRAGON ; species type 1 -db DRAGON ; species type 2 -db 27 ; catch rate -db 144 ; base exp yield -INCBIN "pic/ymon/dragonair.pic",0,1 ; 66, sprite dimensions -dw DragonairPicFront -dw DragonairPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db THUNDER_WAVE -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm deleted file mode 100644 index 02ac0c9b..00000000 --- a/data/baseStats/dragonite.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRAGONITE ; pokedex id -db 91 ; base hp -db 134 ; base attack -db 95 ; base defense -db 80 ; base speed -db 100 ; base special -db DRAGON ; species type 1 -db FLYING ; species type 2 -db 9 ; catch rate -db 218 ; base exp yield -INCBIN "pic/ymon/dragonite.pic",0,1 ; 77, sprite dimensions -dw DragonitePicFront -dw DragonitePicBack -; attacks known at lvl 0 -db WRAP -db LEER -db THUNDER_WAVE -db AGILITY -db 5 ; growth rate -; learnset - tmlearn 2,6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm deleted file mode 100644 index c3c659a4..00000000 --- a/data/baseStats/dratini.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRATINI ; pokedex id -db 41 ; base hp -db 64 ; base attack -db 45 ; base defense -db 50 ; base speed -db 50 ; base special -db DRAGON ; species type 1 -db DRAGON ; species type 2 -db 45 ; catch rate -db 67 ; base exp yield -INCBIN "pic/ymon/dratini.pic",0,1 ; 55, sprite dimensions -dw DratiniPicFront -dw DratiniPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm deleted file mode 100644 index 132c1b5c..00000000 --- a/data/baseStats/drowzee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DROWZEE ; pokedex id -db 60 ; base hp -db 48 ; base attack -db 45 ; base defense -db 42 ; base speed -db 90 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 190 ; catch rate -db 102 ; base exp yield -INCBIN "pic/ymon/drowzee.pic",0,1 ; 66, sprite dimensions -dw DrowzeePicFront -dw DrowzeePicBack -; attacks known at lvl 0 -db POUND -db HYPNOSIS -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 42,44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm deleted file mode 100644 index 07f551a5..00000000 --- a/data/baseStats/dugtrio.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DUGTRIO ; pokedex id -db 35 ; base hp -db 80 ; base attack -db 50 ; base defense -db 120 ; base speed -db 70 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 50 ; catch rate -db 153 ; base exp yield -INCBIN "pic/ymon/dugtrio.pic",0,1 ; 66, sprite dimensions -dw DugtrioPicFront -dw DugtrioPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db DIG -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34 - tmlearn 44,48 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm deleted file mode 100644 index 7e64bfd8..00000000 --- a/data/baseStats/eevee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EEVEE ; pokedex id -db 55 ; base hp -db 55 ; base attack -db 50 ; base defense -db 55 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 92 ; base exp yield -INCBIN "pic/ymon/eevee.pic",0,1 ; 55, sprite dimensions -dw EeveePicFront -dw EeveePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm deleted file mode 100644 index a4385e9c..00000000 --- a/data/baseStats/ekans.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EKANS ; pokedex id -db 35 ; base hp -db 60 ; base attack -db 44 ; base defense -db 55 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 62 ; base exp yield -INCBIN "pic/ymon/ekans.pic",0,1 ; 55, sprite dimensions -dw EkansPicFront -dw EkansPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20,21 - tmlearn 26,27,28,31,32 - tmlearn 34,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm deleted file mode 100644 index 8b85f12a..00000000 --- a/data/baseStats/electabuzz.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ELECTABUZZ ; pokedex id -db 65 ; base hp -db 83 ; base attack -db 57 ; base defense -db 105 ; base speed -db 85 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 45 ; catch rate -db 156 ; base exp yield -INCBIN "pic/ymon/electabuzz.pic",0,1 ; 66, sprite dimensions -dw ElectabuzzPicFront -dw ElectabuzzPicBack -; attacks known at lvl 0 -db QUICK_ATTACK -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,39,40 - tmlearn 44,45,46 - tmlearn 50,54,55 -db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm deleted file mode 100644 index d6842241..00000000 --- a/data/baseStats/electrode.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ELECTRODE ; pokedex id -db 60 ; base hp -db 50 ; base attack -db 70 ; base defense -db 140 ; base speed -db 80 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 60 ; catch rate -db 150 ; base exp yield -INCBIN "pic/ymon/electrode.pic",0,1 ; 55, sprite dimensions -dw ElectrodePicFront -dw ElectrodePicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db SONICBOOM -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,15 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,36,39,40 - tmlearn 44,45,47 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm deleted file mode 100644 index db0860fa..00000000 --- a/data/baseStats/exeggcute.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EXEGGCUTE ; pokedex id -db 60 ; base hp -db 40 ; base attack -db 80 ; base defense -db 40 ; base speed -db 60 ; base special -db GRASS ; species type 1 -db PSYCHIC ; species type 2 -db 90 ; catch rate -db 98 ; base exp yield -INCBIN "pic/ymon/exeggcute.pic",0,1 ; 77, sprite dimensions -dw ExeggcutePicFront -dw ExeggcutePicBack -; attacks known at lvl 0 -db BARRAGE -db HYPNOSIS -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20 - tmlearn 29,30,31,32 - tmlearn 33,34,36,37 - tmlearn 44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm deleted file mode 100644 index 1349e7d7..00000000 --- a/data/baseStats/exeggutor.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EXEGGUTOR ; pokedex id -db 95 ; base hp -db 95 ; base attack -db 85 ; base defense -db 55 ; base speed -db 125 ; base special -db GRASS ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 212 ; base exp yield -INCBIN "pic/ymon/exeggutor.pic",0,1 ; 77, sprite dimensions -dw ExeggutorPicFront -dw ExeggutorPicBack -; attacks known at lvl 0 -db BARRAGE -db HYPNOSIS -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,36,37 - tmlearn 44,46,47 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm deleted file mode 100644 index 801b672c..00000000 --- a/data/baseStats/farfetchd.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FARFETCHD ; pokedex id -db 52 ; base hp -db 65 ; base attack -db 55 ; base defense -db 60 ; base speed -db 58 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 94 ; base exp yield -INCBIN "pic/ymon/farfetchd.pic",0,1 ; 66, sprite dimensions -dw FarfetchdPicFront -dw FarfetchdPicBack -; attacks known at lvl 0 -db PECK -db SAND_ATTACK -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,3,4,6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,51,52 -db 0 ; padding diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm deleted file mode 100644 index 2da5d712..00000000 --- a/data/baseStats/fearow.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FEAROW ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 65 ; base defense -db 100 ; base speed -db 61 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 90 ; catch rate -db 162 ; base exp yield -INCBIN "pic/ymon/fearow.pic",0,1 ; 77, sprite dimensions -dw FearowPicFront -dw FearowPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db LEER -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm deleted file mode 100644 index 82add9d7..00000000 --- a/data/baseStats/flareon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FLAREON ; pokedex id -db 65 ; base hp -db 130 ; base attack -db 60 ; base defense -db 65 ; base speed -db 110 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 198 ; base exp yield -INCBIN "pic/ymon/flareon.pic",0,1 ; 66, sprite dimensions -dw FlareonPicFront -dw FlareonPicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db QUICK_ATTACK -db EMBER -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm deleted file mode 100644 index 10f5eebd..00000000 --- a/data/baseStats/gastly.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GASTLY ; pokedex id -db 30 ; base hp -db 35 ; base attack -db 30 ; base defense -db 80 ; base speed -db 100 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 95 ; base exp yield -INCBIN "pic/ymon/gastly.pic",0,1 ; 77, sprite dimensions -dw GastlyPicFront -dw GastlyPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,36 - tmlearn 42,44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm deleted file mode 100644 index 927e0d9b..00000000 --- a/data/baseStats/gengar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GENGAR ; pokedex id -db 60 ; base hp -db 65 ; base attack -db 60 ; base defense -db 110 ; base speed -db 130 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 190 ; base exp yield -INCBIN "pic/ymon/gengar.pic",0,1 ; 66, sprite dimensions -dw GengarPicFront -dw GengarPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,35,36,40 - tmlearn 42,44,46,47 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm deleted file mode 100644 index fb981766..00000000 --- a/data/baseStats/geodude.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GEODUDE ; pokedex id -db 40 ; base hp -db 80 ; base attack -db 100 ; base defense -db 20 ; base speed -db 30 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 86 ; base exp yield -INCBIN "pic/ymon/geodude.pic",0,1 ; 55, sprite dimensions -dw GeodudePicFront -dw GeodudePicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm deleted file mode 100644 index 35bfbba6..00000000 --- a/data/baseStats/gloom.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GLOOM ; pokedex id -db 60 ; base hp -db 65 ; base attack -db 70 ; base defense -db 40 ; base speed -db 85 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 132 ; base exp yield -INCBIN "pic/ymon/gloom.pic",0,1 ; 66, sprite dimensions -dw GloomPicFront -dw GloomPicBack -; attacks known at lvl 0 -db ABSORB -db POISONPOWDER -db STUN_SPORE -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm deleted file mode 100644 index 123ccad6..00000000 --- a/data/baseStats/golbat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLBAT ; pokedex id -db 75 ; base hp -db 80 ; base attack -db 70 ; base defense -db 90 ; base speed -db 75 ; base special -db POISON ; species type 1 -db FLYING ; species type 2 -db 90 ; catch rate -db 171 ; base exp yield -INCBIN "pic/ymon/golbat.pic",0,1 ; 77, sprite dimensions -dw GolbatPicFront -dw GolbatPicBack -; attacks known at lvl 0 -db LEECH_LIFE -db SCREECH -db BITE -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm deleted file mode 100644 index 7952ec18..00000000 --- a/data/baseStats/goldeen.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLDEEN ; pokedex id -db 45 ; base hp -db 67 ; base attack -db 60 ; base defense -db 63 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 111 ; base exp yield -INCBIN "pic/ymon/goldeen.pic",0,1 ; 66, sprite dimensions -dw GoldeenPicFront -dw GoldeenPicBack -; attacks known at lvl 0 -db PECK -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm deleted file mode 100644 index 6ac14021..00000000 --- a/data/baseStats/golduck.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLDUCK ; pokedex id -db 80 ; base hp -db 82 ; base attack -db 78 ; base defense -db 85 ; base speed -db 80 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 75 ; catch rate -db 174 ; base exp yield -INCBIN "pic/ymon/golduck.pic",0,1 ; 77, sprite dimensions -dw GolduckPicFront -dw GolduckPicBack -; attacks known at lvl 0 -db SCRATCH -db TAIL_WHIP -db DISABLE -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm deleted file mode 100644 index 5047de54..00000000 --- a/data/baseStats/golem.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLEM ; pokedex id -db 80 ; base hp -db 110 ; base attack -db 130 ; base defense -db 45 ; base speed -db 55 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 177 ; base exp yield -INCBIN "pic/ymon/golem.pic",0,1 ; 66, sprite dimensions -dw GolemPicFront -dw GolemPicBack -; attacks known at lvl 0 -db TACKLE -db DEFENSE_CURL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm deleted file mode 100644 index 898673b8..00000000 --- a/data/baseStats/graveler.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GRAVELER ; pokedex id -db 55 ; base hp -db 95 ; base attack -db 115 ; base defense -db 35 ; base speed -db 45 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 120 ; catch rate -db 134 ; base exp yield -INCBIN "pic/ymon/graveler.pic",0,1 ; 66, sprite dimensions -dw GravelerPicFront -dw GravelerPicBack -; attacks known at lvl 0 -db TACKLE -db DEFENSE_CURL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm deleted file mode 100644 index 0effddf4..00000000 --- a/data/baseStats/grimer.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GRIMER ; pokedex id -db 80 ; base hp -db 80 ; base attack -db 50 ; base defense -db 25 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 90 ; base exp yield -INCBIN "pic/ymon/grimer.pic",0,1 ; 55, sprite dimensions -dw GrimerPicFront -dw GrimerPicBack -; attacks known at lvl 0 -db POUND -db DISABLE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm deleted file mode 100644 index 39804054..00000000 --- a/data/baseStats/growlithe.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GROWLITHE ; pokedex id -db 55 ; base hp -db 70 ; base attack -db 45 ; base defense -db 60 ; base speed -db 50 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 91 ; base exp yield -INCBIN "pic/ymon/growlithe.pic",0,1 ; 55, sprite dimensions -dw GrowlithePicFront -dw GrowlithePicBack -; attacks known at lvl 0 -db BITE -db ROAR -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm deleted file mode 100644 index 742da527..00000000 --- a/data/baseStats/gyarados.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GYARADOS ; pokedex id -db 95 ; base hp -db 125 ; base attack -db 79 ; base defense -db 81 ; base speed -db 100 ; base special -db WATER ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 214 ; base exp yield -INCBIN "pic/ymon/gyarados.pic",0,1 ; 77, sprite dimensions -dw GyaradosPicFront -dw GyaradosPicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm deleted file mode 100644 index 8614c373..00000000 --- a/data/baseStats/haunter.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HAUNTER ; pokedex id -db 45 ; base hp -db 50 ; base attack -db 45 ; base defense -db 95 ; base speed -db 115 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 90 ; catch rate -db 126 ; base exp yield -INCBIN "pic/ymon/haunter.pic",0,1 ; 66, sprite dimensions -dw HaunterPicFront -dw HaunterPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,36 - tmlearn 42,44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm deleted file mode 100644 index 4a565d21..00000000 --- a/data/baseStats/hitmonchan.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HITMONCHAN ; pokedex id -db 50 ; base hp -db 105 ; base attack -db 79 ; base defense -db 76 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 140 ; base exp yield -INCBIN "pic/ymon/hitmonchan.pic",0,1 ; 66, sprite dimensions -dw HitmonchanPicFront -dw HitmonchanPicBack -; attacks known at lvl 0 -db COMET_PUNCH -db AGILITY -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 31,32 - tmlearn 34,35,39,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm deleted file mode 100644 index b08cd76c..00000000 --- a/data/baseStats/hitmonlee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HITMONLEE ; pokedex id -db 50 ; base hp -db 120 ; base attack -db 53 ; base defense -db 87 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 139 ; base exp yield -INCBIN "pic/ymon/hitmonlee.pic",0,1 ; 77, sprite dimensions -dw HitmonleePicFront -dw HitmonleePicBack -; attacks known at lvl 0 -db DOUBLE_KICK -db MEDITATE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 31,32 - tmlearn 34,35,39,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm deleted file mode 100644 index 86222be3..00000000 --- a/data/baseStats/horsea.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HORSEA ; pokedex id -db 30 ; base hp -db 40 ; base attack -db 70 ; base defense -db 60 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 83 ; base exp yield -INCBIN "pic/ymon/horsea.pic",0,1 ; 55, sprite dimensions -dw HorseaPicFront -dw HorseaPicBack -; attacks known at lvl 0 -db BUBBLE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm deleted file mode 100644 index 3d9cb355..00000000 --- a/data/baseStats/hypno.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HYPNO ; pokedex id -db 85 ; base hp -db 73 ; base attack -db 70 ; base defense -db 67 ; base speed -db 115 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 75 ; catch rate -db 165 ; base exp yield -INCBIN "pic/ymon/hypno.pic",0,1 ; 77, sprite dimensions -dw HypnoPicFront -dw HypnoPicBack -; attacks known at lvl 0 -db POUND -db HYPNOSIS -db DISABLE -db CONFUSION -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 42,44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm deleted file mode 100644 index 38d5ce6a..00000000 --- a/data/baseStats/ivysaur.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_IVYSAUR ; pokedex id -db 60 ; base hp -db 62 ; base attack -db 63 ; base defense -db 60 ; base speed -db 80 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 141 ; base exp yield -INCBIN "pic/ymon/ivysaur.pic",0,1 ; 66, sprite dimensions -dw IvysaurPicFront -dw IvysaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db LEECH_SEED -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm deleted file mode 100644 index bb8a1626..00000000 --- a/data/baseStats/jigglypuff.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JIGGLYPUFF ; pokedex id -db 115 ; base hp -db 45 ; base attack -db 20 ; base defense -db 20 ; base speed -db 25 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 170 ; catch rate -db 76 ; base exp yield -INCBIN "pic/ymon/jigglypuff.pic",0,1 ; 55, sprite dimensions -dw JigglypuffPicFront -dw JigglypuffPicBack -; attacks known at lvl 0 -db SING -db 0 -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm deleted file mode 100644 index dd1e3c5a..00000000 --- a/data/baseStats/jolteon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JOLTEON ; pokedex id -db 65 ; base hp -db 65 ; base attack -db 60 ; base defense -db 130 ; base speed -db 110 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 45 ; catch rate -db 197 ; base exp yield -INCBIN "pic/ymon/jolteon.pic",0,1 ; 66, sprite dimensions -dw JolteonPicFront -dw JolteonPicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db QUICK_ATTACK -db THUNDERSHOCK -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm deleted file mode 100644 index 72d28179..00000000 --- a/data/baseStats/jynx.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JYNX ; pokedex id -db 65 ; base hp -db 50 ; base attack -db 35 ; base defense -db 95 ; base speed -db 95 ; base special -db ICE ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 137 ; base exp yield -INCBIN "pic/ymon/jynx.pic",0,1 ; 66, sprite dimensions -dw JynxPicFront -dw JynxPicBack -; attacks known at lvl 0 -db POUND -db LOVELY_KISS -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,46 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm deleted file mode 100644 index dce77f2b..00000000 --- a/data/baseStats/kabuto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KABUTO ; pokedex id -db 30 ; base hp -db 80 ; base attack -db 90 ; base defense -db 55 ; base speed -db 45 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 119 ; base exp yield -INCBIN "pic/ymon/kabuto.pic",0,1 ; 55, sprite dimensions -dw KabutoPicFront -dw KabutoPicBack -; attacks known at lvl 0 -db SCRATCH -db HARDEN -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm deleted file mode 100644 index ef165079..00000000 --- a/data/baseStats/kabutops.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KABUTOPS ; pokedex id -db 60 ; base hp -db 115 ; base attack -db 105 ; base defense -db 80 ; base speed -db 70 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 201 ; base exp yield -INCBIN "pic/ymon/kabutops.pic",0,1 ; 66, sprite dimensions -dw KabutopsPicFront -dw KabutopsPicBack -; attacks known at lvl 0 -db SCRATCH -db HARDEN -db ABSORB -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,3,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51,53 -db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm deleted file mode 100644 index 37f9ded4..00000000 --- a/data/baseStats/kadabra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KADABRA ; pokedex id -db 40 ; base hp -db 35 ; base attack -db 30 ; base defense -db 105 ; base speed -db 120 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 100 ; catch rate -db 145 ; base exp yield -INCBIN "pic/ymon/kadabra.pic",0,1 ; 66, sprite dimensions -dw KadabraPicFront -dw KadabraPicBack -; attacks known at lvl 0 -db TELEPORT -db KINESIS -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 28,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm deleted file mode 100644 index ea59d67d..00000000 --- a/data/baseStats/kakuna.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KAKUNA ; pokedex id -db 45 ; base hp -db 25 ; base attack -db 50 ; base defense -db 35 ; base speed -db 25 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 71 ; base exp yield -INCBIN "pic/ymon/kakuna.pic",0,1 ; 55, sprite dimensions -dw KakunaPicFront -dw KakunaPicBack -; attacks known at lvl 0 -db HARDEN -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm deleted file mode 100644 index bca753e2..00000000 --- a/data/baseStats/kangaskhan.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KANGASKHAN ; pokedex id -db 105 ; base hp -db 95 ; base attack -db 80 ; base defense -db 90 ; base speed -db 40 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 175 ; base exp yield -INCBIN "pic/ymon/kangaskhan.pic",0,1 ; 77, sprite dimensions -dw KangaskhanPicFront -dw KangaskhanPicBack -; attacks known at lvl 0 -db COMET_PUNCH -db RAGE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm deleted file mode 100644 index d4030bb8..00000000 --- a/data/baseStats/kingler.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KINGLER ; pokedex id -db 55 ; base hp -db 130 ; base attack -db 115 ; base defense -db 75 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 60 ; catch rate -db 206 ; base exp yield -INCBIN "pic/ymon/kingler.pic",0,1 ; 77, sprite dimensions -dw KinglerPicFront -dw KinglerPicBack -; attacks known at lvl 0 -db BUBBLE -db LEER -db VICEGRIP -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm deleted file mode 100644 index a6034ea6..00000000 --- a/data/baseStats/koffing.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KOFFING ; pokedex id -db 40 ; base hp -db 65 ; base attack -db 95 ; base defense -db 35 ; base speed -db 60 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 114 ; base exp yield -INCBIN "pic/ymon/koffing.pic",0,1 ; 66, sprite dimensions -dw KoffingPicFront -dw KoffingPicBack -; attacks known at lvl 0 -db TACKLE -db SMOG -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm deleted file mode 100644 index b0b6ce66..00000000 --- a/data/baseStats/krabby.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KRABBY ; pokedex id -db 30 ; base hp -db 105 ; base attack -db 90 ; base defense -db 50 ; base speed -db 25 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 115 ; base exp yield -INCBIN "pic/ymon/krabby.pic",0,1 ; 55, sprite dimensions -dw KrabbyPicFront -dw KrabbyPicBack -; attacks known at lvl 0 -db BUBBLE -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm deleted file mode 100644 index 83df6278..00000000 --- a/data/baseStats/lapras.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_LAPRAS ; pokedex id -db 130 ; base hp -db 85 ; base attack -db 80 ; base defense -db 60 ; base speed -db 95 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 45 ; catch rate -db 219 ; base exp yield -INCBIN "pic/ymon/lapras.pic",0,1 ; 77, sprite dimensions -dw LaprasPicFront -dw LaprasPicBack -; attacks known at lvl 0 -db WATER_GUN -db GROWL -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,22,23,24 - tmlearn 25,29,31,32 - tmlearn 33,34,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm deleted file mode 100644 index 5db3fa6e..00000000 --- a/data/baseStats/lickitung.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_LICKITUNG ; pokedex id -db 90 ; base hp -db 55 ; base attack -db 75 ; base defense -db 30 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 127 ; base exp yield -INCBIN "pic/ymon/lickitung.pic",0,1 ; 77, sprite dimensions -dw LickitungPicFront -dw LickitungPicBack -; attacks known at lvl 0 -db WRAP -db SUPERSONIC -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm deleted file mode 100644 index dec82c74..00000000 --- a/data/baseStats/machamp.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHAMP ; pokedex id -db 90 ; base hp -db 130 ; base attack -db 80 ; base defense -db 55 ; base speed -db 65 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 193 ; base exp yield -INCBIN "pic/ymon/machamp.pic",0,1 ; 77, sprite dimensions -dw MachampPicFront -dw MachampPicBack -; attacks known at lvl 0 -db KARATE_CHOP -db LOW_KICK -db LEER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm deleted file mode 100644 index eee41d0c..00000000 --- a/data/baseStats/machoke.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHOKE ; pokedex id -db 80 ; base hp -db 100 ; base attack -db 70 ; base defense -db 45 ; base speed -db 50 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 90 ; catch rate -db 146 ; base exp yield -INCBIN "pic/ymon/machoke.pic",0,1 ; 77, sprite dimensions -dw MachokePicFront -dw MachokePicBack -; attacks known at lvl 0 -db KARATE_CHOP -db LOW_KICK -db LEER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm deleted file mode 100644 index 91250bfb..00000000 --- a/data/baseStats/machop.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHOP ; pokedex id -db 70 ; base hp -db 80 ; base attack -db 50 ; base defense -db 35 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 180 ; catch rate -db 88 ; base exp yield -INCBIN "pic/ymon/machop.pic",0,1 ; 55, sprite dimensions -dw MachopPicFront -dw MachopPicBack -; attacks known at lvl 0 -db KARATE_CHOP -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm deleted file mode 100644 index 941f8cd9..00000000 --- a/data/baseStats/magikarp.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGIKARP ; pokedex id -db 20 ; base hp -db 10 ; base attack -db 55 ; base defense -db 80 ; base speed -db 20 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 255 ; catch rate -db 20 ; base exp yield -INCBIN "pic/ymon/magikarp.pic",0,1 ; 66, sprite dimensions -dw MagikarpPicFront -dw MagikarpPicBack -; attacks known at lvl 0 -db SPLASH -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm deleted file mode 100644 index 6d503611..00000000 --- a/data/baseStats/magmar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGMAR ; pokedex id -db 65 ; base hp -db 95 ; base attack -db 57 ; base defense -db 93 ; base speed -db 85 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 167 ; base exp yield -INCBIN "pic/ymon/magmar.pic",0,1 ; 66, sprite dimensions -dw MagmarPicFront -dw MagmarPicBack -; attacks known at lvl 0 -db EMBER -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 34,35,38,40 - tmlearn 44,46 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm deleted file mode 100644 index a328f2ef..00000000 --- a/data/baseStats/magnemite.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGNEMITE ; pokedex id -db 25 ; base hp -db 35 ; base attack -db 70 ; base defense -db 45 ; base speed -db 95 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 89 ; base exp yield -INCBIN "pic/ymon/magnemite.pic",0,1 ; 55, sprite dimensions -dw MagnemitePicFront -dw MagnemitePicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,39 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm deleted file mode 100644 index 9cc52ec3..00000000 --- a/data/baseStats/magneton.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGNETON ; pokedex id -db 50 ; base hp -db 60 ; base attack -db 95 ; base defense -db 70 ; base speed -db 120 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 60 ; catch rate -db 161 ; base exp yield -INCBIN "pic/ymon/magneton.pic",0,1 ; 66, sprite dimensions -dw MagnetonPicFront -dw MagnetonPicBack -; attacks known at lvl 0 -db TACKLE -db SONICBOOM -db THUNDERSHOCK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,39 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm deleted file mode 100644 index b05fd16d..00000000 --- a/data/baseStats/mankey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MANKEY ; pokedex id -db 40 ; base hp -db 80 ; base attack -db 35 ; base defense -db 70 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 190 ; catch rate -db 74 ; base exp yield -INCBIN "pic/ymon/mankey.pic",0,1 ; 55, sprite dimensions -dw MankeyPicFront -dw MankeyPicBack -; attacks known at lvl 0 -db SCRATCH -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,16 - tmlearn 17,18,19,20,24 - tmlearn 25,28,31,32 - tmlearn 34,35,39,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm deleted file mode 100644 index bc767faf..00000000 --- a/data/baseStats/marowak.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAROWAK ; pokedex id -db 60 ; base hp -db 80 ; base attack -db 110 ; base defense -db 45 ; base speed -db 50 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 75 ; catch rate -db 124 ; base exp yield -INCBIN "pic/ymon/marowak.pic",0,1 ; 66, sprite dimensions -dw MarowakPicFront -dw MarowakPicBack -; attacks known at lvl 0 -db BONE_CLUB -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm deleted file mode 100644 index ce211d22..00000000 --- a/data/baseStats/meowth.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MEOWTH ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 35 ; base defense -db 90 ; base speed -db 40 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 255 ; catch rate -db 69 ; base exp yield -INCBIN "pic/ymon/meowth.pic",0,1 ; 55, sprite dimensions -dw MeowthPicFront -dw MeowthPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,16 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm deleted file mode 100644 index b29a323d..00000000 --- a/data/baseStats/metapod.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_METAPOD ; pokedex id -db 50 ; base hp -db 20 ; base attack -db 55 ; base defense -db 30 ; base speed -db 25 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 120 ; catch rate -db 72 ; base exp yield -INCBIN "pic/ymon/metapod.pic",0,1 ; 55, sprite dimensions -dw MetapodPicFront -dw MetapodPicBack -; attacks known at lvl 0 -db HARDEN -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm deleted file mode 100644 index 7381bf6f..00000000 --- a/data/baseStats/mew.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MEW ; pokedex id -db 100 ; base hp -db 100 ; base attack -db 100 ; base defense -db 100 ; base speed -db 100 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 64 ; base exp yield -INCBIN "pic/ymon/mew.pic",0,1 ; 55, sprite dimensions -dw MewPicFront -dw MewPicBack -; attacks known at lvl 0 -db POUND -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,2,3,4,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,21,22,23,24 - tmlearn 25,26,27,28,29,30,31,32 - tmlearn 33,34,35,36,37,38,39,40 - tmlearn 41,42,43,44,45,46,47,48 - tmlearn 49,50,51,52,53,54,55 -db 0 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm deleted file mode 100644 index d6239384..00000000 --- a/data/baseStats/mewtwo.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MEWTWO ; pokedex id -db 106 ; base hp -db 110 ; base attack -db 90 ; base defense -db 130 ; base speed -db 154 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 3 ; catch rate -db 220 ; base exp yield -INCBIN "pic/ymon/mewtwo.pic",0,1 ; 77, sprite dimensions -dw MewtwoPicFront -dw MewtwoPicBack -; attacks known at lvl 0 -db CONFUSION -db DISABLE -db SWIFT -db PSYCHIC_M -db 5 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,36,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm deleted file mode 100644 index 5588e0df..00000000 --- a/data/baseStats/moltres.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MOLTRES ; pokedex id -db 90 ; base hp -db 100 ; base attack -db 90 ; base defense -db 90 ; base speed -db 125 ; base special -db FIRE ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 217 ; base exp yield -INCBIN "pic/ymon/moltres.pic",0,1 ; 77, sprite dimensions -dw MoltresPicFront -dw MoltresPicBack -; attacks known at lvl 0 -db PECK -db FIRE_SPIN -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm deleted file mode 100644 index 87b110b7..00000000 --- a/data/baseStats/mrmime.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MR_MIME ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 65 ; base defense -db 90 ; base speed -db 100 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 136 ; base exp yield -INCBIN "pic/ymon/mr.mime.pic",0,1 ; 66, sprite dimensions -dw MrMimePicFront -dw MrMimePicBack -; attacks known at lvl 0 -db CONFUSION -db BARRIER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm deleted file mode 100644 index 4e67df43..00000000 --- a/data/baseStats/muk.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MUK ; pokedex id -db 105 ; base hp -db 105 ; base attack -db 75 ; base defense -db 50 ; base speed -db 65 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 75 ; catch rate -db 157 ; base exp yield -INCBIN "pic/ymon/muk.pic",0,1 ; 77, sprite dimensions -dw MukPicFront -dw MukPicBack -; attacks known at lvl 0 -db POUND -db DISABLE -db POISON_GAS -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 15 - tmlearn 20,21,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm deleted file mode 100644 index c9efa629..00000000 --- a/data/baseStats/nidoking.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDOKING ; pokedex id -db 81 ; base hp -db 92 ; base attack -db 77 ; base defense -db 85 ; base speed -db 75 ; base special -db POISON ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 195 ; base exp yield -INCBIN "pic/ymon/nidoking.pic",0,1 ; 77, sprite dimensions -dw NidokingPicFront -dw NidokingPicBack -; attacks known at lvl 0 -db TACKLE -db HORN_ATTACK -db POISON_STING -db THRASH -db 3 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 33,34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm deleted file mode 100644 index f37cc0af..00000000 --- a/data/baseStats/nidoqueen.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDOQUEEN ; pokedex id -db 90 ; base hp -db 82 ; base attack -db 87 ; base defense -db 76 ; base speed -db 75 ; base special -db POISON ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 194 ; base exp yield -INCBIN "pic/ymon/nidoqueen.pic",0,1 ; 77, sprite dimensions -dw NidoqueenPicFront -dw NidoqueenPicBack -; attacks known at lvl 0 -db TACKLE -db SCRATCH -db TAIL_WHIP -db BODY_SLAM -db 3 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 33,34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm deleted file mode 100644 index 9694a027..00000000 --- a/data/baseStats/nidoranf.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORAN_F ; pokedex id -db 55 ; base hp -db 47 ; base attack -db 52 ; base defense -db 41 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 235 ; catch rate -db 59 ; base exp yield -INCBIN "pic/ymon/nidoranf.pic",0,1 ; 55, sprite dimensions -dw NidoranFPicFront -dw NidoranFPicBack -; attacks known at lvl 0 -db GROWL -db TACKLE -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm deleted file mode 100644 index 0d04948e..00000000 --- a/data/baseStats/nidoranm.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORAN_M ; pokedex id -db 46 ; base hp -db 57 ; base attack -db 40 ; base defense -db 50 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 235 ; catch rate -db 60 ; base exp yield -INCBIN "pic/ymon/nidoranm.pic",0,1 ; 55, sprite dimensions -dw NidoranMPicFront -dw NidoranMPicBack -; attacks known at lvl 0 -db LEER -db TACKLE -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm deleted file mode 100644 index e8375d97..00000000 --- a/data/baseStats/nidorina.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORINA ; pokedex id -db 70 ; base hp -db 62 ; base attack -db 67 ; base defense -db 56 ; base speed -db 55 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 117 ; base exp yield -INCBIN "pic/ymon/nidorina.pic",0,1 ; 66, sprite dimensions -dw NidorinaPicFront -dw NidorinaPicBack -; attacks known at lvl 0 -db GROWL -db TACKLE -db SCRATCH -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm deleted file mode 100644 index ca28b121..00000000 --- a/data/baseStats/nidorino.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORINO ; pokedex id -db 61 ; base hp -db 72 ; base attack -db 57 ; base defense -db 65 ; base speed -db 55 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 118 ; base exp yield -INCBIN "pic/ymon/nidorino.pic",0,1 ; 66, sprite dimensions -dw NidorinoPicFront -dw NidorinoPicBack -; attacks known at lvl 0 -db LEER -db TACKLE -db HORN_ATTACK -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm deleted file mode 100644 index 212f6322..00000000 --- a/data/baseStats/ninetales.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NINETALES ; pokedex id -db 73 ; base hp -db 76 ; base attack -db 75 ; base defense -db 100 ; base speed -db 100 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 178 ; base exp yield -INCBIN "pic/ymon/ninetales.pic",0,1 ; 77, sprite dimensions -dw NinetalesPicFront -dw NinetalesPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db QUICK_ATTACK -db ROAR -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm deleted file mode 100644 index aabc873b..00000000 --- a/data/baseStats/oddish.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ODDISH ; pokedex id -db 45 ; base hp -db 50 ; base attack -db 55 ; base defense -db 30 ; base speed -db 75 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 78 ; base exp yield -INCBIN "pic/ymon/oddish.pic",0,1 ; 55, sprite dimensions -dw OddishPicFront -dw OddishPicBack -; attacks known at lvl 0 -db ABSORB -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm deleted file mode 100644 index 89a6b824..00000000 --- a/data/baseStats/omanyte.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_OMANYTE ; pokedex id -db 35 ; base hp -db 40 ; base attack -db 100 ; base defense -db 35 ; base speed -db 90 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 120 ; base exp yield -INCBIN "pic/ymon/omanyte.pic",0,1 ; 55, sprite dimensions -dw OmanytePicFront -dw OmanytePicBack -; attacks known at lvl 0 -db WATER_GUN -db WITHDRAW -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm deleted file mode 100644 index 2066c8c2..00000000 --- a/data/baseStats/omastar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_OMASTAR ; pokedex id -db 70 ; base hp -db 60 ; base attack -db 125 ; base defense -db 55 ; base speed -db 115 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 199 ; base exp yield -INCBIN "pic/ymon/omastar.pic",0,1 ; 66, sprite dimensions -dw OmastarPicFront -dw OmastarPicBack -; attacks known at lvl 0 -db WATER_GUN -db WITHDRAW -db HORN_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm deleted file mode 100644 index 1e2f6ed5..00000000 --- a/data/baseStats/onix.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ONIX ; pokedex id -db 35 ; base hp -db 45 ; base attack -db 160 ; base defense -db 70 ; base speed -db 30 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 108 ; base exp yield -INCBIN "pic/ymon/onix.pic",0,1 ; 77, sprite dimensions -dw OnixPicFront -dw OnixPicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34,36,40 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm deleted file mode 100644 index 273ec7a3..00000000 --- a/data/baseStats/paras.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PARAS ; pokedex id -db 35 ; base hp -db 70 ; base attack -db 55 ; base defense -db 25 ; base speed -db 55 ; base special -db BUG ; species type 1 -db GRASS ; species type 2 -db 190 ; catch rate -db 70 ; base exp yield -INCBIN "pic/ymon/paras.pic",0,1 ; 55, sprite dimensions -dw ParasPicFront -dw ParasPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm deleted file mode 100644 index ed5c7015..00000000 --- a/data/baseStats/parasect.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PARASECT ; pokedex id -db 60 ; base hp -db 95 ; base attack -db 80 ; base defense -db 30 ; base speed -db 80 ; base special -db BUG ; species type 1 -db GRASS ; species type 2 -db 75 ; catch rate -db 128 ; base exp yield -INCBIN "pic/ymon/parasect.pic",0,1 ; 77, sprite dimensions -dw ParasectPicFront -dw ParasectPicBack -; attacks known at lvl 0 -db SCRATCH -db STUN_SPORE -db LEECH_LIFE -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm deleted file mode 100644 index 5ace4f35..00000000 --- a/data/baseStats/persian.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PERSIAN ; pokedex id -db 65 ; base hp -db 70 ; base attack -db 60 ; base defense -db 115 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 90 ; catch rate -db 148 ; base exp yield -INCBIN "pic/ymon/persian.pic",0,1 ; 77, sprite dimensions -dw PersianPicFront -dw PersianPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db BITE -db SCREECH -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,15,16 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm deleted file mode 100644 index e0240fb1..00000000 --- a/data/baseStats/pidgeot.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEOT ; pokedex id -db 83 ; base hp -db 80 ; base attack -db 75 ; base defense -db 91 ; base speed -db 70 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 172 ; base exp yield -INCBIN "pic/ymon/pidgeot.pic",0,1 ; 77, sprite dimensions -dw PidgeotPicFront -dw PidgeotPicBack -; attacks known at lvl 0 -db GUST -db SAND_ATTACK -db QUICK_ATTACK -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm deleted file mode 100644 index 2930b5ae..00000000 --- a/data/baseStats/pidgeotto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEOTTO ; pokedex id -db 63 ; base hp -db 60 ; base attack -db 55 ; base defense -db 71 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 120 ; catch rate -db 113 ; base exp yield -INCBIN "pic/ymon/pidgeotto.pic",0,1 ; 66, sprite dimensions -dw PidgeottoPicFront -dw PidgeottoPicBack -; attacks known at lvl 0 -db GUST -db SAND_ATTACK -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm deleted file mode 100644 index c110a32e..00000000 --- a/data/baseStats/pidgey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEY ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 40 ; base defense -db 56 ; base speed -db 35 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 55 ; base exp yield -INCBIN "pic/ymon/pidgey.pic",0,1 ; 55, sprite dimensions -dw PidgeyPicFront -dw PidgeyPicBack -; attacks known at lvl 0 -db GUST -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm deleted file mode 100644 index 5e81a85f..00000000 --- a/data/baseStats/pikachu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIKACHU ; pokedex id -db 35 ; base hp -db 55 ; base attack -db 30 ; base defense -db 90 ; base speed -db 50 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 82 ; base exp yield -INCBIN "pic/ymon/pikachu.pic",0,1 ; 55, sprite dimensions -dw PikachuPicFront -dw PikachuPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,16 - tmlearn 17,19,20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm deleted file mode 100644 index b79f01a3..00000000 --- a/data/baseStats/pinsir.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PINSIR ; pokedex id -db 65 ; base hp -db 125 ; base attack -db 100 ; base defense -db 85 ; base speed -db 55 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 45 ; catch rate -db 200 ; base exp yield -INCBIN "pic/ymon/pinsir.pic",0,1 ; 77, sprite dimensions -dw PinsirPicFront -dw PinsirPicBack -; attacks known at lvl 0 -db VICEGRIP -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm deleted file mode 100644 index 9c89fc49..00000000 --- a/data/baseStats/poliwag.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWAG ; pokedex id -db 40 ; base hp -db 50 ; base attack -db 40 ; base defense -db 90 ; base speed -db 40 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 255 ; catch rate -db 77 ; base exp yield -INCBIN "pic/ymon/poliwag.pic",0,1 ; 55, sprite dimensions -dw PoliwagPicFront -dw PoliwagPicBack -; attacks known at lvl 0 -db BUBBLE -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 29,31,32 - tmlearn 34,40 - tmlearn 44,46 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm deleted file mode 100644 index c836e194..00000000 --- a/data/baseStats/poliwhirl.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWHIRL ; pokedex id -db 65 ; base hp -db 65 ; base attack -db 65 ; base defense -db 90 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 120 ; catch rate -db 131 ; base exp yield -INCBIN "pic/ymon/poliwhirl.pic",0,1 ; 66, sprite dimensions -dw PoliwhirlPicFront -dw PoliwhirlPicBack -; attacks known at lvl 0 -db BUBBLE -db HYPNOSIS -db WATER_GUN -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 26,27,29,31,32 - tmlearn 34,35,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm deleted file mode 100644 index 5a1acd9f..00000000 --- a/data/baseStats/poliwrath.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWRATH ; pokedex id -db 90 ; base hp -db 85 ; base attack -db 95 ; base defense -db 70 ; base speed -db 70 ; base special -db WATER ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 185 ; base exp yield -INCBIN "pic/ymon/poliwrath.pic",0,1 ; 77, sprite dimensions -dw PoliwrathPicFront -dw PoliwrathPicBack -; attacks known at lvl 0 -db HYPNOSIS -db WATER_GUN -db DOUBLESLAP -db BODY_SLAM -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,29,31,32 - tmlearn 34,35,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm deleted file mode 100644 index 3c779075..00000000 --- a/data/baseStats/ponyta.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PONYTA ; pokedex id -db 50 ; base hp -db 85 ; base attack -db 55 ; base defense -db 90 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 152 ; base exp yield -INCBIN "pic/ymon/ponyta.pic",0,1 ; 66, sprite dimensions -dw PonytaPicFront -dw PonytaPicBack -; attacks known at lvl 0 -db EMBER -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm deleted file mode 100644 index 502bbc4f..00000000 --- a/data/baseStats/porygon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PORYGON ; pokedex id -db 65 ; base hp -db 60 ; base attack -db 70 ; base defense -db 40 ; base speed -db 75 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 130 ; base exp yield -INCBIN "pic/ymon/porygon.pic",0,1 ; 66, sprite dimensions -dw PorygonPicFront -dw PorygonPicBack -; attacks known at lvl 0 -db TACKLE -db SHARPEN -db CONVERSION -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,13,14,15 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm deleted file mode 100644 index 3eeac4f3..00000000 --- a/data/baseStats/primeape.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PRIMEAPE ; pokedex id -db 65 ; base hp -db 105 ; base attack -db 60 ; base defense -db 95 ; base speed -db 60 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 75 ; catch rate -db 149 ; base exp yield -INCBIN "pic/ymon/primeape.pic",0,1 ; 77, sprite dimensions -dw PrimeapePicFront -dw PrimeapePicBack -; attacks known at lvl 0 -db SCRATCH -db LEER -db LOW_KICK -db KARATE_CHOP -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,28,31,32 - tmlearn 34,35,39,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm deleted file mode 100644 index e3ab72bb..00000000 --- a/data/baseStats/psyduck.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PSYDUCK ; pokedex id -db 50 ; base hp -db 52 ; base attack -db 48 ; base defense -db 55 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 80 ; base exp yield -INCBIN "pic/ymon/psyduck.pic",0,1 ; 55, sprite dimensions -dw PsyduckPicFront -dw PsyduckPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm deleted file mode 100644 index c63231b3..00000000 --- a/data/baseStats/raichu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RAICHU ; pokedex id -db 60 ; base hp -db 90 ; base attack -db 55 ; base defense -db 100 ; base speed -db 90 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 75 ; catch rate -db 122 ; base exp yield -INCBIN "pic/ymon/raichu.pic",0,1 ; 77, sprite dimensions -dw RaichuPicFront -dw RaichuPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db GROWL -db THUNDER_WAVE -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15,16 - tmlearn 17,19,20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm deleted file mode 100644 index 18781739..00000000 --- a/data/baseStats/rapidash.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RAPIDASH ; pokedex id -db 65 ; base hp -db 100 ; base attack -db 70 ; base defense -db 105 ; base speed -db 80 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 60 ; catch rate -db 192 ; base exp yield -INCBIN "pic/ymon/rapidash.pic",0,1 ; 77, sprite dimensions -dw RapidashPicFront -dw RapidashPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db STOMP -db GROWL -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm deleted file mode 100644 index 85aa044b..00000000 --- a/data/baseStats/raticate.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RATICATE ; pokedex id -db 55 ; base hp -db 81 ; base attack -db 60 ; base defense -db 97 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 90 ; catch rate -db 116 ; base exp yield -INCBIN "pic/ymon/raticate.pic",0,1 ; 66, sprite dimensions -dw RaticatePicFront -dw RaticatePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db QUICK_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,24 - tmlearn 25,28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm deleted file mode 100644 index 165dce14..00000000 --- a/data/baseStats/rattata.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RATTATA ; pokedex id -db 30 ; base hp -db 56 ; base attack -db 35 ; base defense -db 72 ; base speed -db 25 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 255 ; catch rate -db 57 ; base exp yield -INCBIN "pic/ymon/rattata.pic",0,1 ; 55, sprite dimensions -dw RattataPicFront -dw RattataPicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,14 - tmlearn 20,24 - tmlearn 25,28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm deleted file mode 100644 index b183c282..00000000 --- a/data/baseStats/rhydon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RHYDON ; pokedex id -db 105 ; base hp -db 130 ; base attack -db 120 ; base defense -db 40 ; base speed -db 45 ; base special -db GROUND ; species type 1 -db ROCK ; species type 2 -db 60 ; catch rate -db 204 ; base exp yield -INCBIN "pic/ymon/rhydon.pic",0,1 ; 77, sprite dimensions -dw RhydonPicFront -dw RhydonPicBack -; attacks known at lvl 0 -db HORN_ATTACK -db STOMP -db TAIL_WHIP -db FURY_ATTACK -db 5 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm deleted file mode 100644 index 41a1e360..00000000 --- a/data/baseStats/rhyhorn.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RHYHORN ; pokedex id -db 80 ; base hp -db 85 ; base attack -db 95 ; base defense -db 25 ; base speed -db 30 ; base special -db GROUND ; species type 1 -db ROCK ; species type 2 -db 120 ; catch rate -db 135 ; base exp yield -INCBIN "pic/ymon/rhyhorn.pic",0,1 ; 77, sprite dimensions -dw RhyhornPicFront -dw RhyhornPicBack -; attacks known at lvl 0 -db HORN_ATTACK -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10 - tmlearn 20,24 - tmlearn 25,26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm deleted file mode 100644 index b4c6abb8..00000000 --- a/data/baseStats/sandshrew.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SANDSHREW ; pokedex id -db 50 ; base hp -db 75 ; base attack -db 85 ; base defense -db 40 ; base speed -db 30 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 93 ; base exp yield -INCBIN "pic/ymon/sandshrew.pic",0,1 ; 55, sprite dimensions -dw SandshrewPicFront -dw SandshrewPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 17,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,39,40 - tmlearn 44,48 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm deleted file mode 100644 index e47467ef..00000000 --- a/data/baseStats/sandslash.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SANDSLASH ; pokedex id -db 75 ; base hp -db 100 ; base attack -db 110 ; base defense -db 65 ; base speed -db 55 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 90 ; catch rate -db 163 ; base exp yield -INCBIN "pic/ymon/sandslash.pic",0,1 ; 66, sprite dimensions -dw SandslashPicFront -dw SandslashPicBack -; attacks known at lvl 0 -db SCRATCH -db SAND_ATTACK -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 17,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,39,40 - tmlearn 44,48 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm deleted file mode 100644 index ea3f3cba..00000000 --- a/data/baseStats/scyther.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SCYTHER ; pokedex id -db 70 ; base hp -db 110 ; base attack -db 80 ; base defense -db 105 ; base speed -db 55 ; base special -db BUG ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 187 ; base exp yield -INCBIN "pic/ymon/scyther.pic",0,1 ; 77, sprite dimensions -dw ScytherPicFront -dw ScytherPicBack -; attacks known at lvl 0 -db QUICK_ATTACK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm deleted file mode 100644 index 4f5614af..00000000 --- a/data/baseStats/seadra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEADRA ; pokedex id -db 55 ; base hp -db 65 ; base attack -db 95 ; base defense -db 85 ; base speed -db 95 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 75 ; catch rate -db 155 ; base exp yield -INCBIN "pic/ymon/seadra.pic",0,1 ; 66, sprite dimensions -dw SeadraPicFront -dw SeadraPicBack -; attacks known at lvl 0 -db BUBBLE -db SMOKESCREEN -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm deleted file mode 100644 index de983475..00000000 --- a/data/baseStats/seaking.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEAKING ; pokedex id -db 80 ; base hp -db 92 ; base attack -db 65 ; base defense -db 68 ; base speed -db 80 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 60 ; catch rate -db 170 ; base exp yield -INCBIN "pic/ymon/seaking.pic",0,1 ; 77, sprite dimensions -dw SeakingPicFront -dw SeakingPicBack -; attacks known at lvl 0 -db PECK -db TAIL_WHIP -db SUPERSONIC -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm deleted file mode 100644 index 4a82ad72..00000000 --- a/data/baseStats/seel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEEL ; pokedex id -db 65 ; base hp -db 45 ; base attack -db 55 ; base defense -db 45 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 100 ; base exp yield -INCBIN "pic/ymon/seel.pic",0,1 ; 66, sprite dimensions -dw SeelPicFront -dw SeelPicBack -; attacks known at lvl 0 -db HEADBUTT -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm deleted file mode 100644 index 1a4644cb..00000000 --- a/data/baseStats/shellder.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SHELLDER ; pokedex id -db 30 ; base hp -db 65 ; base attack -db 100 ; base defense -db 40 ; base speed -db 45 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 97 ; base exp yield -INCBIN "pic/ymon/shellder.pic",0,1 ; 55, sprite dimensions -dw ShellderPicFront -dw ShellderPicBack -; attacks known at lvl 0 -db TACKLE -db WITHDRAW -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,47 - tmlearn 49,50,53 -db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm deleted file mode 100644 index f471a646..00000000 --- a/data/baseStats/slowbro.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SLOWBRO ; pokedex id -db 95 ; base hp -db 75 ; base attack -db 110 ; base defense -db 30 ; base speed -db 80 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 75 ; catch rate -db 164 ; base exp yield -INCBIN "pic/ymon/slowbro.pic",0,1 ; 77, sprite dimensions -dw SlowbroPicFront -dw SlowbroPicBack -; attacks known at lvl 0 -db CONFUSION -db DISABLE -db HEADBUTT -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20 - tmlearn 26,27,28,29,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,54,55 -db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm deleted file mode 100644 index f7a1a510..00000000 --- a/data/baseStats/slowpoke.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SLOWPOKE ; pokedex id -db 90 ; base hp -db 65 ; base attack -db 65 ; base defense -db 15 ; base speed -db 40 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 190 ; catch rate -db 99 ; base exp yield -INCBIN "pic/ymon/slowpoke.pic",0,1 ; 55, sprite dimensions -dw SlowpokePicFront -dw SlowpokePicBack -; attacks known at lvl 0 -db CONFUSION -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 20 - tmlearn 26,27,28,29,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,54,55 -db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm deleted file mode 100644 index 62144d31..00000000 --- a/data/baseStats/snorlax.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SNORLAX ; pokedex id -db 160 ; base hp -db 110 ; base attack -db 65 ; base defense -db 30 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 25 ; catch rate -db 154 ; base exp yield -INCBIN "pic/ymon/snorlax.pic",0,1 ; 77, sprite dimensions -dw SnorlaxPicFront -dw SnorlaxPicBack -; attacks known at lvl 0 -db HEADBUTT -db AMNESIA -db REST -db 0 -db 5 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,22,24 - tmlearn 25,26,27,29,31,32 - tmlearn 33,34,35,36,38,40 - tmlearn 44,46,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm deleted file mode 100644 index b7d35b3a..00000000 --- a/data/baseStats/spearow.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SPEAROW ; pokedex id -db 40 ; base hp -db 60 ; base attack -db 30 ; base defense -db 70 ; base speed -db 31 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 58 ; base exp yield -INCBIN "pic/ymon/spearow.pic",0,1 ; 55, sprite dimensions -dw SpearowPicFront -dw SpearowPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm deleted file mode 100644 index 1d302a00..00000000 --- a/data/baseStats/squirtle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SQUIRTLE ; pokedex id -db 44 ; base hp -db 48 ; base attack -db 65 ; base defense -db 43 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 66 ; base exp yield -INCBIN "pic/ymon/squirtle.pic",0,1 ; 55, sprite dimensions -dw SquirtlePicFront -dw SquirtlePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm deleted file mode 100644 index 8ef77af8..00000000 --- a/data/baseStats/starmie.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_STARMIE ; pokedex id -db 60 ; base hp -db 75 ; base attack -db 85 ; base defense -db 115 ; base speed -db 100 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 60 ; catch rate -db 207 ; base exp yield -INCBIN "pic/ymon/starmie.pic",0,1 ; 66, sprite dimensions -dw StarmiePicFront -dw StarmiePicBack -; attacks known at lvl 0 -db TACKLE -db WATER_GUN -db HARDEN -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,55 -db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm deleted file mode 100644 index bc774f42..00000000 --- a/data/baseStats/staryu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_STARYU ; pokedex id -db 30 ; base hp -db 45 ; base attack -db 55 ; base defense -db 85 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 106 ; base exp yield -INCBIN "pic/ymon/staryu.pic",0,1 ; 66, sprite dimensions -dw StaryuPicFront -dw StaryuPicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,55 -db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm deleted file mode 100644 index 8b76bde5..00000000 --- a/data/baseStats/tangela.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TANGELA ; pokedex id -db 65 ; base hp -db 55 ; base attack -db 115 ; base defense -db 60 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db GRASS ; species type 2 -db 45 ; catch rate -db 166 ; base exp yield -INCBIN "pic/ymon/tangela.pic",0,1 ; 66, sprite dimensions -dw TangelaPicFront -dw TangelaPicBack -; attacks known at lvl 0 -db CONSTRICT -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm deleted file mode 100644 index ac55ed65..00000000 --- a/data/baseStats/tauros.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TAUROS ; pokedex id -db 75 ; base hp -db 100 ; base attack -db 95 ; base defense -db 110 ; base speed -db 70 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 211 ; base exp yield -INCBIN "pic/ymon/tauros.pic",0,1 ; 77, sprite dimensions -dw TaurosPicFront -dw TaurosPicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,13,14,15 - tmlearn 20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm deleted file mode 100644 index 123d904c..00000000 --- a/data/baseStats/tentacool.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TENTACOOL ; pokedex id -db 40 ; base hp -db 40 ; base attack -db 35 ; base defense -db 70 ; base speed -db 100 ; base special -db WATER ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 105 ; base exp yield -INCBIN "pic/ymon/tentacool.pic",0,1 ; 55, sprite dimensions -dw TentacoolPicFront -dw TentacoolPicBack -; attacks known at lvl 0 -db ACID -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,11,12,13,14 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51,53 -db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm deleted file mode 100644 index 9c65fe15..00000000 --- a/data/baseStats/tentacruel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TENTACRUEL ; pokedex id -db 80 ; base hp -db 70 ; base attack -db 65 ; base defense -db 100 ; base speed -db 120 ; base special -db WATER ; species type 1 -db POISON ; species type 2 -db 60 ; catch rate -db 205 ; base exp yield -INCBIN "pic/ymon/tentacruel.pic",0,1 ; 66, sprite dimensions -dw TentacruelPicFront -dw TentacruelPicBack -; attacks known at lvl 0 -db ACID -db SUPERSONIC -db WRAP -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51,53 -db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm deleted file mode 100644 index 3d5024b5..00000000 --- a/data/baseStats/vaporeon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VAPOREON ; pokedex id -db 130 ; base hp -db 65 ; base attack -db 60 ; base defense -db 65 ; base speed -db 110 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 196 ; base exp yield -INCBIN "pic/ymon/vaporeon.pic",0,1 ; 66, sprite dimensions -dw VaporeonPicFront -dw VaporeonPicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db QUICK_ATTACK -db WATER_GUN -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm deleted file mode 100644 index 6709e42a..00000000 --- a/data/baseStats/venomoth.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENOMOTH ; pokedex id -db 70 ; base hp -db 65 ; base attack -db 60 ; base defense -db 90 ; base speed -db 90 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 75 ; catch rate -db 138 ; base exp yield -INCBIN "pic/ymon/venomoth.pic",0,1 ; 77, sprite dimensions -dw VenomothPicFront -dw VenomothPicBack -; attacks known at lvl 0 -db TACKLE -db DISABLE -db SUPERSONIC -db CONFUSION -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm deleted file mode 100644 index ef3db9a1..00000000 --- a/data/baseStats/venonat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENONAT ; pokedex id -db 60 ; base hp -db 55 ; base attack -db 50 ; base defense -db 45 ; base speed -db 40 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 75 ; base exp yield -INCBIN "pic/ymon/venonat.pic",0,1 ; 55, sprite dimensions -dw VenonatPicFront -dw VenonatPicBack -; attacks known at lvl 0 -db TACKLE -db DISABLE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 29,31,32 - tmlearn 33,34 - tmlearn 44,46 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm deleted file mode 100644 index d3725735..00000000 --- a/data/baseStats/venusaur.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENUSAUR ; pokedex id -db 80 ; base hp -db 82 ; base attack -db 83 ; base defense -db 80 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 208 ; base exp yield -INCBIN "pic/ymon/venusaur.pic",0,1 ; 77, sprite dimensions -dw VenusaurPicFront -dw VenusaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db LEECH_SEED -db VINE_WHIP -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm deleted file mode 100644 index 56bfd25a..00000000 --- a/data/baseStats/victreebel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VICTREEBEL ; pokedex id -db 80 ; base hp -db 105 ; base attack -db 65 ; base defense -db 70 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 191 ; base exp yield -INCBIN "pic/ymon/victreebel.pic",0,1 ; 77, sprite dimensions -dw VictreebelPicFront -dw VictreebelPicBack -; attacks known at lvl 0 -db SLEEP_POWDER -db STUN_SPORE -db ACID -db RAZOR_LEAF -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm deleted file mode 100644 index ed463650..00000000 --- a/data/baseStats/vileplume.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VILEPLUME ; pokedex id -db 75 ; base hp -db 80 ; base attack -db 85 ; base defense -db 50 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 184 ; base exp yield -INCBIN "pic/ymon/vileplume.pic",0,1 ; 77, sprite dimensions -dw VileplumePicFront -dw VileplumePicBack -; attacks known at lvl 0 -db STUN_SPORE -db SLEEP_POWDER -db ACID -db PETAL_DANCE -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm deleted file mode 100644 index ffd12992..00000000 --- a/data/baseStats/voltorb.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VOLTORB ; pokedex id -db 40 ; base hp -db 30 ; base attack -db 50 ; base defense -db 100 ; base speed -db 55 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 103 ; base exp yield -INCBIN "pic/ymon/voltorb.pic",0,1 ; 55, sprite dimensions -dw VoltorbPicFront -dw VoltorbPicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,45,47 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm deleted file mode 100644 index b67b9bbd..00000000 --- a/data/baseStats/vulpix.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VULPIX ; pokedex id -db 38 ; base hp -db 41 ; base attack -db 40 ; base defense -db 65 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 63 ; base exp yield -INCBIN "pic/ymon/vulpix.pic",0,1 ; 66, sprite dimensions -dw VulpixPicFront -dw VulpixPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm deleted file mode 100644 index daf85dc6..00000000 --- a/data/baseStats/wartortle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WARTORTLE ; pokedex id -db 59 ; base hp -db 63 ; base attack -db 80 ; base defense -db 58 ; base speed -db 65 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 143 ; base exp yield -INCBIN "pic/ymon/wartortle.pic",0,1 ; 66, sprite dimensions -dw WartortlePicFront -dw WartortlePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db BUBBLE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm deleted file mode 100644 index 44ca5c2c..00000000 --- a/data/baseStats/weedle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEDLE ; pokedex id -db 40 ; base hp -db 35 ; base attack -db 30 ; base defense -db 50 ; base speed -db 20 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 52 ; base exp yield -INCBIN "pic/ymon/weedle.pic",0,1 ; 55, sprite dimensions -dw WeedlePicFront -dw WeedlePicBack -; attacks known at lvl 0 -db POISON_STING -db STRING_SHOT -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm deleted file mode 100644 index 0ac287f8..00000000 --- a/data/baseStats/weepinbell.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEPINBELL ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 50 ; base defense -db 55 ; base speed -db 85 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 151 ; base exp yield -INCBIN "pic/ymon/weepinbell.pic",0,1 ; 66, sprite dimensions -dw WeepinbellPicFront -dw WeepinbellPicBack -; attacks known at lvl 0 -db VINE_WHIP -db GROWTH -db WRAP -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm deleted file mode 100644 index 089ef495..00000000 --- a/data/baseStats/weezing.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEZING ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 120 ; base defense -db 60 ; base speed -db 85 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 60 ; catch rate -db 173 ; base exp yield -INCBIN "pic/ymon/weezing.pic",0,1 ; 77, sprite dimensions -dw WeezingPicFront -dw WeezingPicBack -; attacks known at lvl 0 -db TACKLE -db SMOG -db SLUDGE -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm deleted file mode 100644 index 815b1244..00000000 --- a/data/baseStats/wigglytuff.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WIGGLYTUFF ; pokedex id -db 140 ; base hp -db 70 ; base attack -db 45 ; base defense -db 45 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 50 ; catch rate -db 109 ; base exp yield -INCBIN "pic/ymon/wigglytuff.pic",0,1 ; 66, sprite dimensions -dw WigglytuffPicFront -dw WigglytuffPicBack -; attacks known at lvl 0 -db SING -db DISABLE -db DEFENSE_CURL -db DOUBLESLAP -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm deleted file mode 100644 index b7befb99..00000000 --- a/data/baseStats/zapdos.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ZAPDOS ; pokedex id -db 90 ; base hp -db 90 ; base attack -db 85 ; base defense -db 100 ; base speed -db 125 ; base special -db ELECTRIC ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 216 ; base exp yield -INCBIN "pic/ymon/zapdos.pic",0,1 ; 77, sprite dimensions -dw ZapdosPicFront -dw ZapdosPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db DRILL_PECK -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,39 - tmlearn 43,44,45 - tmlearn 50,52,55 -db 0 ; padding diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm deleted file mode 100644 index 7ddad05c..00000000 --- a/data/baseStats/zubat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ZUBAT ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 35 ; base defense -db 55 ; base speed -db 40 ; base special -db POISON ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 54 ; base exp yield -INCBIN "pic/ymon/zubat.pic",0,1 ; 55, sprite dimensions -dw ZubatPicFront -dw ZubatPicBack -; attacks known at lvl 0 -db LEECH_LIFE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm deleted file mode 100755 index 23e85e0f..00000000 --- a/data/base_stats.asm +++ /dev/null @@ -1,151 +0,0 @@ -INCLUDE "data/baseStats/bulbasaur.asm" -INCLUDE "data/baseStats/ivysaur.asm" -INCLUDE "data/baseStats/venusaur.asm" -INCLUDE "data/baseStats/charmander.asm" -INCLUDE "data/baseStats/charmeleon.asm" -INCLUDE "data/baseStats/charizard.asm" -INCLUDE "data/baseStats/squirtle.asm" -INCLUDE "data/baseStats/wartortle.asm" -INCLUDE "data/baseStats/blastoise.asm" -INCLUDE "data/baseStats/caterpie.asm" -INCLUDE "data/baseStats/metapod.asm" -INCLUDE "data/baseStats/butterfree.asm" -INCLUDE "data/baseStats/weedle.asm" -INCLUDE "data/baseStats/kakuna.asm" -INCLUDE "data/baseStats/beedrill.asm" -INCLUDE "data/baseStats/pidgey.asm" -INCLUDE "data/baseStats/pidgeotto.asm" -INCLUDE "data/baseStats/pidgeot.asm" -INCLUDE "data/baseStats/rattata.asm" -INCLUDE "data/baseStats/raticate.asm" -INCLUDE "data/baseStats/spearow.asm" -INCLUDE "data/baseStats/fearow.asm" -INCLUDE "data/baseStats/ekans.asm" -INCLUDE "data/baseStats/arbok.asm" -INCLUDE "data/baseStats/pikachu.asm" -INCLUDE "data/baseStats/raichu.asm" -INCLUDE "data/baseStats/sandshrew.asm" -INCLUDE "data/baseStats/sandslash.asm" -INCLUDE "data/baseStats/nidoranf.asm" -INCLUDE "data/baseStats/nidorina.asm" -INCLUDE "data/baseStats/nidoqueen.asm" -INCLUDE "data/baseStats/nidoranm.asm" -INCLUDE "data/baseStats/nidorino.asm" -INCLUDE "data/baseStats/nidoking.asm" -INCLUDE "data/baseStats/clefairy.asm" -INCLUDE "data/baseStats/clefable.asm" -INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetales.asm" -INCLUDE "data/baseStats/jigglypuff.asm" -INCLUDE "data/baseStats/wigglytuff.asm" -INCLUDE "data/baseStats/zubat.asm" -INCLUDE "data/baseStats/golbat.asm" -INCLUDE "data/baseStats/oddish.asm" -INCLUDE "data/baseStats/gloom.asm" -INCLUDE "data/baseStats/vileplume.asm" -INCLUDE "data/baseStats/paras.asm" -INCLUDE "data/baseStats/parasect.asm" -INCLUDE "data/baseStats/venonat.asm" -INCLUDE "data/baseStats/venomoth.asm" -INCLUDE "data/baseStats/diglett.asm" -INCLUDE "data/baseStats/dugtrio.asm" -INCLUDE "data/baseStats/meowth.asm" -INCLUDE "data/baseStats/persian.asm" -INCLUDE "data/baseStats/psyduck.asm" -INCLUDE "data/baseStats/golduck.asm" -INCLUDE "data/baseStats/mankey.asm" -INCLUDE "data/baseStats/primeape.asm" -INCLUDE "data/baseStats/growlithe.asm" -INCLUDE "data/baseStats/arcanine.asm" -INCLUDE "data/baseStats/poliwag.asm" -INCLUDE "data/baseStats/poliwhirl.asm" -INCLUDE "data/baseStats/poliwrath.asm" -INCLUDE "data/baseStats/abra.asm" -INCLUDE "data/baseStats/kadabra.asm" -INCLUDE "data/baseStats/alakazam.asm" -INCLUDE "data/baseStats/machop.asm" -INCLUDE "data/baseStats/machoke.asm" -INCLUDE "data/baseStats/machamp.asm" -INCLUDE "data/baseStats/bellsprout.asm" -INCLUDE "data/baseStats/weepinbell.asm" -INCLUDE "data/baseStats/victreebel.asm" -INCLUDE "data/baseStats/tentacool.asm" -INCLUDE "data/baseStats/tentacruel.asm" -INCLUDE "data/baseStats/geodude.asm" -INCLUDE "data/baseStats/graveler.asm" -INCLUDE "data/baseStats/golem.asm" -INCLUDE "data/baseStats/ponyta.asm" -INCLUDE "data/baseStats/rapidash.asm" -INCLUDE "data/baseStats/slowpoke.asm" -INCLUDE "data/baseStats/slowbro.asm" -INCLUDE "data/baseStats/magnemite.asm" -INCLUDE "data/baseStats/magneton.asm" -INCLUDE "data/baseStats/farfetchd.asm" -INCLUDE "data/baseStats/doduo.asm" -INCLUDE "data/baseStats/dodrio.asm" -INCLUDE "data/baseStats/seel.asm" -INCLUDE "data/baseStats/dewgong.asm" -INCLUDE "data/baseStats/grimer.asm" -INCLUDE "data/baseStats/muk.asm" -INCLUDE "data/baseStats/shellder.asm" -INCLUDE "data/baseStats/cloyster.asm" -INCLUDE "data/baseStats/gastly.asm" -INCLUDE "data/baseStats/haunter.asm" -INCLUDE "data/baseStats/gengar.asm" -INCLUDE "data/baseStats/onix.asm" -INCLUDE "data/baseStats/drowzee.asm" -INCLUDE "data/baseStats/hypno.asm" -INCLUDE "data/baseStats/krabby.asm" -INCLUDE "data/baseStats/kingler.asm" -INCLUDE "data/baseStats/voltorb.asm" -INCLUDE "data/baseStats/electrode.asm" -INCLUDE "data/baseStats/exeggcute.asm" -INCLUDE "data/baseStats/exeggutor.asm" -INCLUDE "data/baseStats/cubone.asm" -INCLUDE "data/baseStats/marowak.asm" -INCLUDE "data/baseStats/hitmonlee.asm" -INCLUDE "data/baseStats/hitmonchan.asm" -INCLUDE "data/baseStats/lickitung.asm" -INCLUDE "data/baseStats/koffing.asm" -INCLUDE "data/baseStats/weezing.asm" -INCLUDE "data/baseStats/rhyhorn.asm" -INCLUDE "data/baseStats/rhydon.asm" -INCLUDE "data/baseStats/chansey.asm" -INCLUDE "data/baseStats/tangela.asm" -INCLUDE "data/baseStats/kangaskhan.asm" -INCLUDE "data/baseStats/horsea.asm" -INCLUDE "data/baseStats/seadra.asm" -INCLUDE "data/baseStats/goldeen.asm" -INCLUDE "data/baseStats/seaking.asm" -INCLUDE "data/baseStats/staryu.asm" -INCLUDE "data/baseStats/starmie.asm" -INCLUDE "data/baseStats/mrmime.asm" -INCLUDE "data/baseStats/scyther.asm" -INCLUDE "data/baseStats/jynx.asm" -INCLUDE "data/baseStats/electabuzz.asm" -INCLUDE "data/baseStats/magmar.asm" -INCLUDE "data/baseStats/pinsir.asm" -INCLUDE "data/baseStats/tauros.asm" -INCLUDE "data/baseStats/magikarp.asm" -INCLUDE "data/baseStats/gyarados.asm" -INCLUDE "data/baseStats/lapras.asm" -INCLUDE "data/baseStats/ditto.asm" -INCLUDE "data/baseStats/eevee.asm" -INCLUDE "data/baseStats/vaporeon.asm" -INCLUDE "data/baseStats/jolteon.asm" -INCLUDE "data/baseStats/flareon.asm" -INCLUDE "data/baseStats/porygon.asm" -INCLUDE "data/baseStats/omanyte.asm" -INCLUDE "data/baseStats/omastar.asm" -INCLUDE "data/baseStats/kabuto.asm" -INCLUDE "data/baseStats/kabutops.asm" -INCLUDE "data/baseStats/aerodactyl.asm" -INCLUDE "data/baseStats/snorlax.asm" -INCLUDE "data/baseStats/articuno.asm" -INCLUDE "data/baseStats/zapdos.asm" -INCLUDE "data/baseStats/moltres.asm" -INCLUDE "data/baseStats/dratini.asm" -INCLUDE "data/baseStats/dragonair.asm" -INCLUDE "data/baseStats/dragonite.asm" -INCLUDE "data/baseStats/mewtwo.asm" -INCLUDE "data/baseStats/mew.asm" diff --git a/data/battle/always_happen_effects.asm b/data/battle/always_happen_effects.asm new file mode 100644 index 00000000..c8e5247e --- /dev/null +++ b/data/battle/always_happen_effects.asm @@ -0,0 +1,13 @@ +AlwaysHappenSideEffects: +; Attacks that aren't finished after they faint the opponent. + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db EFFECT_1E + db ATTACK_TWICE_EFFECT + db RECOIL_EFFECT + db TWINEEDLE_EFFECT + db RAGE_EFFECT + db -1 ; end diff --git a/data/battle/critical_hit_moves.asm b/data/battle/critical_hit_moves.asm new file mode 100644 index 00000000..a567a934 --- /dev/null +++ b/data/battle/critical_hit_moves.asm @@ -0,0 +1,6 @@ +HighCriticalMoves: + db KARATE_CHOP + db RAZOR_LEAF + db CRABHAMMER + db SLASH + db -1 ; end diff --git a/data/battle/residual_effects_1.asm b/data/battle/residual_effects_1.asm new file mode 100644 index 00000000..b478487d --- /dev/null +++ b/data/battle/residual_effects_1.asm @@ -0,0 +1,20 @@ +; These are move effects (second value from the Moves table in bank $E). +ResidualEffects1: +; most non-side effects + db CONVERSION_EFFECT + db HAZE_EFFECT + db SWITCH_AND_TELEPORT_EFFECT + db MIST_EFFECT + db FOCUS_ENERGY_EFFECT + db CONFUSION_EFFECT + db HEAL_EFFECT + db TRANSFORM_EFFECT + db LIGHT_SCREEN_EFFECT + db REFLECT_EFFECT + db POISON_EFFECT + db PARALYZE_EFFECT + db SUBSTITUTE_EFFECT + db MIMIC_EFFECT + db LEECH_SEED_EFFECT + db SPLASH_EFFECT + db -1 ; end diff --git a/data/battle/residual_effects_2.asm b/data/battle/residual_effects_2.asm new file mode 100644 index 00000000..f58bb47c --- /dev/null +++ b/data/battle/residual_effects_2.asm @@ -0,0 +1,32 @@ +ResidualEffects2: +; non-side effects not included in ResidualEffects1 +; stat-affecting moves, sleep-inflicting moves, and Bide +; e.g., Meditate, Bide, Hypnosis + db EFFECT_01 + db ATTACK_UP1_EFFECT + db DEFENSE_UP1_EFFECT + db SPEED_UP1_EFFECT + db SPECIAL_UP1_EFFECT + db ACCURACY_UP1_EFFECT + db EVASION_UP1_EFFECT + db ATTACK_DOWN1_EFFECT + db DEFENSE_DOWN1_EFFECT + db SPEED_DOWN1_EFFECT + db SPECIAL_DOWN1_EFFECT + db ACCURACY_DOWN1_EFFECT + db EVASION_DOWN1_EFFECT + db BIDE_EFFECT + db SLEEP_EFFECT + db ATTACK_UP2_EFFECT + db DEFENSE_UP2_EFFECT + db SPEED_UP2_EFFECT + db SPECIAL_UP2_EFFECT + db ACCURACY_UP2_EFFECT + db EVASION_UP2_EFFECT + db ATTACK_DOWN2_EFFECT + db DEFENSE_DOWN2_EFFECT + db SPEED_DOWN2_EFFECT + db SPECIAL_DOWN2_EFFECT + db ACCURACY_DOWN2_EFFECT + db EVASION_DOWN2_EFFECT + db -1 ; end diff --git a/data/battle/set_damage_effects.asm b/data/battle/set_damage_effects.asm new file mode 100644 index 00000000..cedb3bc1 --- /dev/null +++ b/data/battle/set_damage_effects.asm @@ -0,0 +1,6 @@ +SetDamageEffects: +; moves that do damage but not through normal calculations +; e.g., Super Fang, Psywave + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db -1 ; end diff --git a/data/battle/special_effects.asm b/data/battle/special_effects.asm new file mode 100644 index 00000000..3e21ee2f --- /dev/null +++ b/data/battle/special_effects.asm @@ -0,0 +1,24 @@ +SpecialEffects: +; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage. +; Includes all effects that do not need to be called at the end of +; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db SWIFT_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db EFFECT_1E + db CHARGE_EFFECT + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db FLY_EFFECT + db ATTACK_TWICE_EFFECT + db JUMP_KICK_EFFECT + db RECOIL_EFFECT + ; fallthrough +SpecialEffectsCont: +; damaging moves whose effect is executed prior to damage calculation + db THRASH_PETAL_DANCE_EFFECT + db TRAPPING_EFFECT + db -1 ; end diff --git a/data/battle/stat_modifiers.asm b/data/battle/stat_modifiers.asm new file mode 100644 index 00000000..c0a6355a --- /dev/null +++ b/data/battle/stat_modifiers.asm @@ -0,0 +1,15 @@ +StatModifierRatios: +; first byte is numerator, second byte is denominator + db 25, 100 ; 0.25 + db 28, 100 ; 0.28 + db 33, 100 ; 0.33 + db 40, 100 ; 0.40 + db 50, 100 ; 0.50 + db 66, 100 ; 0.66 + db 1, 1 ; 1.00 + db 15, 10 ; 1.50 + db 2, 1 ; 2.00 + db 25, 10 ; 2.50 + db 3, 1 ; 3.00 + db 35, 10 ; 3.50 + db 4, 1 ; 4.00 diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm new file mode 100644 index 00000000..854780c6 --- /dev/null +++ b/data/battle/stat_names.asm @@ -0,0 +1,7 @@ +StatsTextStrings: + db "ATTACK@" + db "DEFENSE@" + db "SPEED@" + db "SPECIAL@" + db "ACCURACY@" + db "EVADE@" diff --git a/data/battle/unused_critical_hit_moves.asm b/data/battle/unused_critical_hit_moves.asm new file mode 100644 index 00000000..bc88b2cb --- /dev/null +++ b/data/battle/unused_critical_hit_moves.asm @@ -0,0 +1,6 @@ +UnusedHighCriticalMoves: + db KARATE_CHOP + db RAZOR_LEAF + db CRABHAMMER + db SLASH + db -1 ; end diff --git a/data/battle_anims/base_coords.asm b/data/battle_anims/base_coords.asm new file mode 100644 index 00000000..ad67baff --- /dev/null +++ b/data/battle_anims/base_coords.asm @@ -0,0 +1,178 @@ +FrameBlockBaseCoords: + db $10, $68 ; BASECOORD_00 + db $10, $70 ; BASECOORD_01 + db $10, $78 ; BASECOORD_02 + db $10, $80 ; BASECOORD_03 + db $10, $88 ; BASECOORD_04 + db $10, $90 ; BASECOORD_05 + db $10, $98 ; BASECOORD_06 + db $18, $68 ; BASECOORD_07 + db $18, $70 ; BASECOORD_08 + db $18, $78 ; BASECOORD_09 + db $34, $28 ; BASECOORD_0A + db $18, $80 ; BASECOORD_0B + db $18, $88 ; BASECOORD_0C + db $18, $98 ; BASECOORD_0D + db $20, $68 ; BASECOORD_0E + db $20, $70 ; BASECOORD_0F + db $20, $78 ; BASECOORD_10 + db $20, $80 ; BASECOORD_11 + db $20, $88 ; BASECOORD_12 + db $20, $90 ; BASECOORD_13 + db $20, $98 ; BASECOORD_14 + db $28, $68 ; BASECOORD_15 + db $28, $70 ; BASECOORD_16 + db $28, $78 ; BASECOORD_17 + db $28, $80 ; BASECOORD_18 + db $28, $88 ; BASECOORD_19 + db $30, $68 ; BASECOORD_1A + db $30, $70 ; BASECOORD_1B + db $30, $78 ; BASECOORD_1C + db $30, $80 ; BASECOORD_1D + db $30, $90 ; BASECOORD_1E + db $30, $98 ; BASECOORD_1F + db $38, $68 ; BASECOORD_20 + db $38, $78 ; BASECOORD_21 + db $38, $80 ; BASECOORD_22 + db $38, $88 ; BASECOORD_23 + db $40, $68 ; BASECOORD_24 + db $40, $70 ; BASECOORD_25 + db $40, $78 ; BASECOORD_26 + db $40, $80 ; BASECOORD_27 + db $40, $88 ; BASECOORD_28 + db $40, $98 ; BASECOORD_29 + db $10, $60 ; BASECOORD_2A + db $18, $60 ; BASECOORD_2B + db $20, $60 ; BASECOORD_2C + db $28, $60 ; BASECOORD_2D + db $30, $60 ; BASECOORD_2E + db $40, $60 ; BASECOORD_2F + db $58, $28 ; BASECOORD_30 + db $43, $38 ; BASECOORD_31 + db $33, $48 ; BASECOORD_32 + db $20, $58 ; BASECOORD_33 + db $32, $78 ; BASECOORD_34 + db $58, $58 ; BASECOORD_35 + db $2C, $6C ; BASECOORD_36 + db $34, $80 ; BASECOORD_37 + db $48, $70 ; BASECOORD_38 + db $42, $36 ; BASECOORD_39 + db $38, $44 ; BASECOORD_3A + db $40, $52 ; BASECOORD_3B + db $48, $60 ; BASECOORD_3C + db $3E, $6E ; BASECOORD_3D + db $28, $7C ; BASECOORD_3E + db $28, $8A ; BASECOORD_3F + db $50, $3C ; BASECOORD_40 + db $48, $50 ; BASECOORD_41 + db $40, $64 ; BASECOORD_42 + db $38, $38 ; BASECOORD_43 + db $50, $30 ; BASECOORD_44 + db $50, $38 ; BASECOORD_45 + db $50, $40 ; BASECOORD_46 + db $50, $48 ; BASECOORD_47 + db $50, $50 ; BASECOORD_48 + db $48, $58 ; BASECOORD_49 + db $50, $44 ; BASECOORD_4A + db $48, $48 ; BASECOORD_4B + db $48, $4C ; BASECOORD_4C + db $40, $50 ; BASECOORD_4D + db $40, $54 ; BASECOORD_4E + db $38, $58 ; BASECOORD_4F + db $38, $5C ; BASECOORD_50 + db $30, $64 ; BASECOORD_51 + db $48, $40 ; BASECOORD_52 + db $48, $39 ; BASECOORD_53 + db $24, $88 ; BASECOORD_54 + db $24, $70 ; BASECOORD_55 + db $1C, $70 ; BASECOORD_56 + db $1C, $88 ; BASECOORD_57 + db $34, $68 ; BASECOORD_58 + db $34, $88 ; BASECOORD_59 + db $68, $50 ; BASECOORD_5A + db $60, $50 ; BASECOORD_5B + db $68, $60 ; BASECOORD_5C + db $58, $50 ; BASECOORD_5D + db $60, $60 ; BASECOORD_5E + db $68, $40 ; BASECOORD_5F + db $40, $40 ; BASECOORD_60 + db $38, $40 ; BASECOORD_61 + db $0B, $60 ; BASECOORD_62 + db $44, $48 ; BASECOORD_63 + db $40, $14 ; BASECOORD_64 + db $48, $1C ; BASECOORD_65 + db $50, $24 ; BASECOORD_66 + db $4C, $24 ; BASECOORD_67 + db $10, $62 ; BASECOORD_68 + db $12, $62 ; BASECOORD_69 + db $12, $60 ; BASECOORD_6A + db $20, $72 ; BASECOORD_6B + db $22, $72 ; BASECOORD_6C + db $22, $70 ; BASECOORD_6D + db $28, $62 ; BASECOORD_6E + db $50, $0A ; BASECOORD_6F + db $52, $0A ; BASECOORD_70 + db $38, $30 ; BASECOORD_71 + db $40, $48 ; BASECOORD_72 + db $30, $48 ; BASECOORD_73 + db $40, $30 ; BASECOORD_74 + db $30, $40 ; BASECOORD_75 + db $38, $48 ; BASECOORD_76 + db $40, $4A ; BASECOORD_77 + db $48, $4B ; BASECOORD_78 + db $50, $4C ; BASECOORD_79 + db $58, $4D ; BASECOORD_7A + db $60, $4D ; BASECOORD_7B + db $68, $4D ; BASECOORD_7C + db $38, $10 ; BASECOORD_7D + db $50, $10 ; BASECOORD_7E + db $38, $28 ; BASECOORD_7F + db $48, $18 ; BASECOORD_80 + db $40, $20 ; BASECOORD_81 + db $48, $20 ; BASECOORD_82 + db $40, $3C ; BASECOORD_83 + db $38, $50 ; BASECOORD_84 + db $28, $64 ; BASECOORD_85 + db $1C, $90 ; BASECOORD_86 + db $24, $80 ; BASECOORD_87 + db $2C, $70 ; BASECOORD_88 + db $30, $38 ; BASECOORD_89 + db $10, $50 ; BASECOORD_8A + db $3C, $40 ; BASECOORD_8B + db $40, $58 ; BASECOORD_8C + db $30, $58 ; BASECOORD_8D + db $58, $48 ; BASECOORD_8E + db $50, $58 ; BASECOORD_8F + db $48, $68 ; BASECOORD_90 + db $40, $18 ; BASECOORD_91 + db $28, $58 ; BASECOORD_92 + db $40, $38 ; BASECOORD_93 + db $48, $38 ; BASECOORD_94 + db $08, $70 ; BASECOORD_95 + db $44, $1C ; BASECOORD_96 + db $3C, $58 ; BASECOORD_97 + db $38, $60 ; BASECOORD_98 + db $08, $60 ; BASECOORD_99 + db $38, $70 ; BASECOORD_9A + db $38, $6C ; BASECOORD_9B + db $38, $64 ; BASECOORD_9C + db $1C, $74 ; BASECOORD_9D + db $2E, $74 ; BASECOORD_9E + db $34, $50 ; BASECOORD_9F + db $2F, $60 ; BASECOORD_A0 + db $31, $70 ; BASECOORD_A1 + db $4C, $30 ; BASECOORD_A2 + db $3B, $40 ; BASECOORD_A3 + db $2D, $50 ; BASECOORD_A4 + db $26, $60 ; BASECOORD_A5 + db $2D, $70 ; BASECOORD_A6 + db $28, $50 ; BASECOORD_A7 + db $1E, $60 ; BASECOORD_A8 + db $29, $70 ; BASECOORD_A9 + db $16, $60 ; BASECOORD_AA + db $14, $58 ; BASECOORD_AB + db $12, $54 ; BASECOORD_AC + db $14, $50 ; BASECOORD_AD + db $18, $4C ; BASECOORD_AE + db $1C, $48 ; BASECOORD_AF + db $48, $28 ; BASECOORD_B0 diff --git a/data/battle_anims/frame_blocks.asm b/data/battle_anims/frame_blocks.asm new file mode 100644 index 00000000..8b9b0919 --- /dev/null +++ b/data/battle_anims/frame_blocks.asm @@ -0,0 +1,1238 @@ +FrameBlockPointers: + dw FrameBlock00 + dw FrameBlock01 + dw FrameBlock02 + dw FrameBlock03 + dw FrameBlock04 + dw FrameBlock05 + dw FrameBlock06 + dw FrameBlock07 + dw FrameBlock08 + dw FrameBlock09 + dw FrameBlock0a + dw FrameBlock0b + dw FrameBlock0c + dw FrameBlock0d + dw FrameBlock0e + dw FrameBlock0f + dw FrameBlock10 + dw FrameBlock11 + dw FrameBlock12 + dw FrameBlock13 + dw FrameBlock14 + dw FrameBlock15 + dw FrameBlock16 + dw FrameBlock17 + dw FrameBlock18 + dw FrameBlock19 + dw FrameBlock1a + dw FrameBlock1b + dw FrameBlock1c + dw FrameBlock1d + dw FrameBlock1e + dw FrameBlock1f + dw FrameBlock20 + dw FrameBlock21 + dw FrameBlock22 + dw FrameBlock23 + dw FrameBlock24 + dw FrameBlock25 + dw FrameBlock26 + dw FrameBlock27 + dw FrameBlock28 + dw FrameBlock29 + dw FrameBlock2a + dw FrameBlock2b + dw FrameBlock2c + dw FrameBlock2d + dw FrameBlock2e + dw FrameBlock2f + dw FrameBlock30 + dw FrameBlock31 + dw FrameBlock32 + dw FrameBlock33 + dw FrameBlock34 + dw FrameBlock35 + dw FrameBlock36 + dw FrameBlock37 + dw FrameBlock38 + dw FrameBlock39 + dw FrameBlock3a + dw FrameBlock3b + dw FrameBlock3c + dw FrameBlock3d + dw FrameBlock3e + dw FrameBlock3f + dw FrameBlock40 + dw FrameBlock41 + dw FrameBlock42 + dw FrameBlock43 + dw FrameBlock44 + dw FrameBlock45 + dw FrameBlock46 + dw FrameBlock47 + dw SmallBlackCircleFrameBlock + dw LargeBlackCircleFrameBlock + dw FrameBlock4a + dw FrameBlock4b + dw FrameBlock4c + dw FrameBlock4d + dw FrameBlock4e + dw FrameBlock4f + dw FrameBlock50 + dw FrameBlock51 + dw FrameBlock52 + dw FrameBlock53 + dw FrameBlock54 + dw FrameBlock55 + dw FrameBlock56 + dw FrameBlock57 + dw FrameBlock58 + dw FrameBlock59 + dw FrameBlock5a + dw FrameBlock5b + dw FrameBlock5c + dw FrameBlock5d + dw FrameBlock5e + dw FrameBlock5f + dw FrameBlock60 + dw FrameBlock61 + dw FrameBlock62 + dw FrameBlock63 + dw FrameBlock64 + dw FrameBlock65 + dw FrameBlock66 + dw FrameBlock67 + dw FrameBlock68 + dw FrameBlock69 + dw FrameBlock6a + dw FrameBlock6b + dw FrameBlock6c + dw FrameBlock6d + dw FrameBlock6e + dw FrameBlock6f + dw FrameBlock70 + dw FrameBlock71 + dw FrameBlock72 + dw FrameBlock73 + dw FrameBlock74 + dw FrameBlock75 + dw FrameBlock76 + dw FrameBlock77 + dw FrameBlock78 + dw FrameBlock79 + +FrameBlock01: + db 9 ; # + dbsprite 0, 0, 0, 0, $2c, 0 + dbsprite 1, 0, 0, 0, $2d, 0 + dbsprite 2, 0, 0, 0, $2c, OAM_HFLIP + dbsprite 0, 1, 0, 0, $3c, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + dbsprite 2, 1, 0, 0, $3c, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2c, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2d, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2c, OAM_HFLIP | OAM_VFLIP + +FrameBlock02: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock03: + db 4 ; # + dbsprite 0, 0, 0, 0, $02, 0 + dbsprite 1, 0, 0, 0, $02, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock04: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock05: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock06: + db 12 ; # + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + +FrameBlock07: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock08: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 3, 0, 0, 0, $21, OAM_HFLIP + dbsprite 4, 0, 0, 0, $20, OAM_HFLIP + dbsprite 3, 1, 0, 0, $31, OAM_HFLIP + dbsprite 4, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 3, 0, 0, $30, OAM_VFLIP + dbsprite 1, 3, 0, 0, $31, OAM_VFLIP + dbsprite 0, 4, 0, 0, $20, OAM_VFLIP + dbsprite 1, 4, 0, 0, $21, OAM_VFLIP + dbsprite 3, 3, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 3, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock09: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 3, 0, 0, 0, $25, OAM_HFLIP + dbsprite 4, 0, 0, 0, $24, OAM_HFLIP + dbsprite 4, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 3, 0, 0, $34, OAM_VFLIP + dbsprite 0, 4, 0, 0, $24, OAM_VFLIP + dbsprite 1, 4, 0, 0, $25, OAM_VFLIP + dbsprite 4, 3, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 4, 0, 0, 0, $25, OAM_HFLIP + dbsprite 5, 0, 0, 0, $24, OAM_HFLIP + dbsprite 5, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 4, 0, 0, $34, OAM_VFLIP + dbsprite 0, 5, 0, 0, $24, OAM_VFLIP + dbsprite 1, 5, 0, 0, $25, OAM_VFLIP + dbsprite 5, 4, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 5, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 5, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0b: + db 4 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + +FrameBlock0c: + db 4 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + +FrameBlock0d: + db 8 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $1c, 0 + dbsprite 1, 1, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 2, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 3, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock0e: + db 4 ; # + dbsprite 0, 4, 0, 0, $0c, 0 + dbsprite 1, 4, 0, 0, $0d, 0 + dbsprite 0, 5, 0, 0, $1c, 0 + dbsprite 1, 5, 0, 0, $1d, 0 + +FrameBlock0f: + db 4 ; # + dbsprite 0, 6, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 7, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 7, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock10: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 2, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 3, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 2, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 3, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock11: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 4, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 5, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 4, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 5, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock12: + db 3 ; # + dbsprite 0, 0, 0, 0, $37, 0 + dbsprite 2, 1, 0, 0, $37, 0 + dbsprite 4, 0, 0, 0, $37, 0 + +FrameBlock13: + db 4 ; # + dbsprite 0, 0, 0, 0, $36, 0 + dbsprite 1, 0, 0, 0, $36, OAM_HFLIP + dbsprite 0, 1, 0, 0, $36, OAM_VFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock14: + db 8 ; # + dbsprite 2, 0, 0, 0, $28, 0 + dbsprite 3, 0, 0, 0, $28, OAM_HFLIP + dbsprite 2, 1, 0, 0, $38, 0 + dbsprite 3, 1, 0, 0, $38, OAM_HFLIP + dbsprite 4, 0, 0, 0, $36, 0 + dbsprite 5, 0, 0, 0, $36, OAM_HFLIP + dbsprite 4, 1, 0, 0, $36, OAM_VFLIP + dbsprite 5, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock15: + db 12 ; # + dbsprite 0, 0, 0, 0, $28, 0 + dbsprite 1, 0, 0, 0, $28, OAM_HFLIP + dbsprite 0, 1, 0, 0, $38, 0 + dbsprite 1, 1, 0, 0, $38, OAM_HFLIP + dbsprite 2, 0, 0, 0, $29, 0 + dbsprite 3, 0, 0, 0, $29, OAM_HFLIP + dbsprite 2, 1, 0, 0, $39, 0 + dbsprite 3, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $28, 0 + dbsprite 5, 0, 0, 0, $28, OAM_HFLIP + dbsprite 4, 1, 0, 0, $38, 0 + dbsprite 5, 1, 0, 0, $38, OAM_HFLIP + +FrameBlock16: + db 8 ; # + dbsprite 0, 0, 0, 0, $29, 0 + dbsprite 1, 0, 0, 0, $29, OAM_HFLIP + dbsprite 0, 1, 0, 0, $39, 0 + dbsprite 1, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $29, 0 + dbsprite 5, 0, 0, 0, $29, OAM_HFLIP + dbsprite 4, 1, 0, 0, $39, 0 + dbsprite 5, 1, 0, 0, $39, OAM_HFLIP + +FrameBlock17: + db 4 ; # + dbsprite 0, 0, 0, 0, $08, 0 + dbsprite 1, 0, 0, 0, $09, 0 + dbsprite 0, 1, 0, 0, $18, 0 + dbsprite 1, 1, 0, 0, $19, 0 + +FrameBlock18: + db 1 ; # + dbsprite 0, 3, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + +FrameBlock19: + db 2 ; # + dbsprite 1, 3, 0, 0, $45, 0 + dbsprite 1, 2, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1a: + db 2 ; # + dbsprite 2, 2, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $46, 0 + +FrameBlock1b: + db 2 ; # + dbsprite 3, 2, 0, 0, $45, 0 + dbsprite 3, 1, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1c: + db 2 ; # + dbsprite 4, 1, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 2, 0, 0, $46, 0 + +FrameBlock1d: + db 2 ; # + dbsprite 5, 1, 0, 0, $45, 0 + dbsprite 5, 0, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1e: + db 2 ; # + dbsprite 6, 0, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 1, 0, 0, $46, 0 + +FrameBlock75: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $22, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock1f: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + +FrameBlock20: + db 6 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock21: + db 12 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + +FrameBlock22: + db 19 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 0, 3, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 1, 3, 0, 0, $03, 0 + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 2, 3, 0, 0, $13, 0 + dbsprite 3, 3, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 4, 3, 0, 0, $13, OAM_HFLIP + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 5, 3, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + dbsprite 6, 3, 0, 0, $13, OAM_HFLIP + +FrameBlock23: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock24: + db 2 ; # + dbsprite 0, 1, 0, 0, $0a, 0 + dbsprite 1, 1, 0, 0, $0b, 0 + +FrameBlock25: + db 12 ; # + dbsprite 0, 2, 0, 0, $0a, 0 + dbsprite 1, 2, 0, 0, $0b, 0 + dbsprite 0, 3, 0, 0, $1a, 0 + dbsprite 1, 3, 0, 0, $1b, 0 + dbsprite 2, 0, 0, 0, $0a, 0 + dbsprite 3, 0, 0, 0, $0b, 0 + dbsprite 2, 1, 0, 0, $1a, 0 + dbsprite 3, 1, 0, 0, $1b, 0 + dbsprite 4, 1, 0, 0, $0a, 0 + dbsprite 5, 1, 0, 0, $0b, 0 + dbsprite 4, 2, 0, 0, $1a, 0 + dbsprite 5, 2, 0, 0, $1b, 0 + +FrameBlock26: + db 4 ; # + dbsprite 2, 0, 0, 0, $44, 0 + dbsprite 3, 0, 0, 0, $44, OAM_HFLIP + dbsprite 2, 1, 0, 0, $44, OAM_VFLIP + dbsprite 3, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock27: + db 5 ; # + dbsprite 1, 1, 0, 0, $44, 0 + dbsprite 2, 1, 0, 0, $44, OAM_HFLIP + dbsprite 1, 2, 0, 0, $44, OAM_VFLIP + dbsprite 2, 2, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $47, 0 + +FrameBlock28: + db 6 ; # + dbsprite 0, 2, 0, 0, $44, 0 + dbsprite 1, 2, 0, 0, $44, OAM_HFLIP + dbsprite 0, 3, 0, 0, $44, OAM_VFLIP + dbsprite 1, 3, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $47, 0 + dbsprite 2, 0, 6, 2, $47, 0 + +FrameBlock29: + db 4 ; # + dbsprite 0, 3, 0, 0, $47, 0 + dbsprite 0, 2, 6, 2, $47, 0 + dbsprite 1, 1, 4, 4, $47, 0 + dbsprite 2, 0, 2, 6, $47, 0 + +FrameBlock2a: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock2b: + db 2 ; # + dbsprite 0, 0, 2, 6, $47, 0 + dbsprite 1, 0, 0, 0, $47, 0 + +FrameBlock2c: + db 1 ; # + dbsprite 0, 20, 0, 0, $4d, 0 + +FrameBlock2d: + db 8 ; # + dbsprite 0, 0, 0, 0, $26, 0 + dbsprite 1, 0, 0, 0, $27, 0 + dbsprite 0, 1, 0, 0, $36, 0 + dbsprite 1, 1, 0, 0, $37, 0 + dbsprite 0, 2, 0, 0, $28, 0 + dbsprite 1, 2, 0, 0, $29, 0 + dbsprite 0, 3, 0, 0, $38, 0 + dbsprite 1, 3, 0, 0, $39, 0 + +FrameBlock2e: + db 8 ; # + dbsprite 0, 0, 0, 0, $27, OAM_HFLIP + dbsprite 1, 0, 0, 0, $26, OAM_HFLIP + dbsprite 0, 1, 0, 0, $37, OAM_HFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP + dbsprite 0, 2, 0, 0, $29, OAM_HFLIP + dbsprite 1, 2, 0, 0, $28, OAM_HFLIP + dbsprite 0, 3, 0, 0, $39, OAM_HFLIP + dbsprite 1, 3, 0, 0, $38, OAM_HFLIP + +FrameBlock2f: + db 4 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $0c, OAM_VFLIP + dbsprite 1, 1, 0, 0, $0d, OAM_VFLIP + +FrameBlock30: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock31: + db 1 ; # + dbsprite 0, 0, 0, 0, $45, 0 + +FrameBlock32: + db 7 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 2, 0, 0, 0, $4d, OAM_HFLIP + dbsprite 0, 1, 0, 0, $4e, 0 + dbsprite 1, 1, 0, 0, $07, 0 + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP + dbsprite 1, 2, 0, 0, $3f, 0 + +FrameBlock33: + db 7 ; # + dbsprite 1, 0, 0, 0, $3f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $4e, OAM_VFLIP + dbsprite 1, 1, 0, 0, $07, OAM_VFLIP + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $4d, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 2, 2, 0, 0, $4d, OAM_HFLIP | OAM_VFLIP + +FrameBlock34: + db 1 ; # + dbsprite 0, 20, 0, 0, $00, OAM_OBP1 + +FrameBlock35: + db 6 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 0, 2, 0, 0, $3a, OAM_VFLIP + dbsprite 0, 3, 0, 0, $2a, OAM_VFLIP + dbsprite 1, 3, 0, 0, $2b, OAM_VFLIP + +FrameBlock36: + db 4 ; # + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 0, 1, 0, 0, $10, 0 + dbsprite 1, 1, 0, 0, $11, 0 + +FrameBlock37: + db 4 ; # + dbsprite 0, 0, 0, 0, $01, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 0, 0, 0, $00, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 0, 1, 0, 0, $11, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 1, 0, 0, $10, OAM_BEHIND_BG | OAM_HFLIP + +FrameBlock38: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock39: + db 4 ; # + dbsprite 0, 0, 0, 0, $0b, OAM_HFLIP + dbsprite 1, 0, 0, 0, $0a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $1b, OAM_HFLIP + dbsprite 1, 1, 0, 0, $1a, OAM_HFLIP + +FrameBlock3a: + db 4 ; # + dbsprite 0, 4, 0, 0, $05, 0 + dbsprite 1, 4, 0, 0, $05, OAM_HFLIP + dbsprite 0, 5, 0, 0, $15, 0 + dbsprite 1, 5, 0, 0, $15, OAM_HFLIP + +FrameBlock3b: + db 5 ; # + dbsprite 0, 3, 0, 0, $04, 0 + dbsprite 1, 3, 0, 0, $04, OAM_HFLIP + dbsprite 0, 4, 0, 0, $14, 0 + dbsprite 1, 4, 0, 0, $14, OAM_HFLIP + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3c: + db 6 ; # + dbsprite 0, 2, 0, 0, $05, 0 + dbsprite 1, 2, 0, 0, $05, OAM_HFLIP + dbsprite 0, 3, 0, 0, $15, 0 + dbsprite 1, 3, 0, 0, $15, OAM_HFLIP + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3d: + db 7 ; # + dbsprite 0, 1, 0, 0, $04, 0 + dbsprite 1, 1, 0, 0, $04, OAM_HFLIP + dbsprite 0, 2, 0, 0, $14, 0 + dbsprite 1, 2, 0, 0, $14, OAM_HFLIP + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3e: + db 8 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + dbsprite 0, 2, 4, 0, $42, 0 + dbsprite 0, 3, 4, 0, $42, 0 + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3f: + db 8 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + dbsprite 0, 2, 4, 0, $41, 0 + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock40: + db 3 ; # + dbsprite 0, 0, 0, 0, $3d, 0 + dbsprite 1, 0, 0, 0, $3d, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + +FrameBlock41: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock42: + db 11 ; # + dbsprite 2, 0, 0, 0, $42, 0 + dbsprite 0, 1, 0, 0, $42, 0 + dbsprite 1, 1, 0, 0, $42, 0 + dbsprite 2, 1, 0, 0, $42, 0 + dbsprite 3, 1, 0, 0, $42, 0 + dbsprite 4, 1, 0, 0, $42, 0 + dbsprite 2, 2, 0, 0, $42, 0 + dbsprite 1, 3, 0, 0, $42, 0 + dbsprite 3, 3, 0, 0, $42, 0 + dbsprite 0, 4, 0, 0, $42, 0 + dbsprite 4, 4, 0, 0, $42, 0 + +FrameBlock43: + db 11 ; # + dbsprite 2, 0, 0, 0, $41, 0 + dbsprite 0, 1, 0, 0, $41, 0 + dbsprite 1, 1, 0, 0, $41, 0 + dbsprite 2, 1, 0, 0, $41, 0 + dbsprite 3, 1, 0, 0, $41, 0 + dbsprite 4, 1, 0, 0, $41, 0 + dbsprite 2, 2, 0, 0, $41, 0 + dbsprite 1, 3, 0, 0, $41, 0 + dbsprite 3, 3, 0, 0, $41, 0 + dbsprite 0, 4, 0, 0, $41, 0 + dbsprite 4, 4, 0, 0, $41, 0 + +FrameBlock44: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 5, 0, 0, 0, $49, 0 + dbsprite 0, 5, 0, 0, $49, 0 + dbsprite 5, 5, 0, 0, $49, 0 + +FrameBlock45: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 3, 0, 0, 0, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + +FrameBlock46: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + +FrameBlock47: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +SmallBlackCircleFrameBlock: + db 4 ; # + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + +LargeBlackCircleFrameBlock: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock71: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $3b, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock72: + db 12 ; # + dbsprite 0, 0, 0, 0, $32, 0 + dbsprite 1, 0, 0, 0, $43, 0 + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_VFLIP + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $22, OAM_VFLIP + dbsprite 1, 2, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock73: + db 8 ; # + dbsprite 0, 0, 0, 0, $32, OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_VFLIP + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 1, 0, 0, $22, OAM_VFLIP + dbsprite 1, 1, 0, 0, $23, OAM_VFLIP + dbsprite 2, 1, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock74: + db 4 ; # + dbsprite 0, 0, 0, 0, $22, OAM_VFLIP + dbsprite 1, 0, 0, 0, $23, OAM_VFLIP + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock4a: + db 4 ; # + dbsprite 3, 1, 0, 0, $4c, OAM_HFLIP + dbsprite 1, 4, 0, 0, $4b, 0 + dbsprite 4, 6, 0, 0, $4c, 0 + dbsprite 6, 3, 0, 0, $4b, OAM_VFLIP + +FrameBlock4b: + db 4 ; # + dbsprite 3, 0, 0, 0, $4c, 0 + dbsprite 0, 4, 0, 0, $4b, OAM_VFLIP + dbsprite 4, 7, 0, 0, $4c, OAM_HFLIP + dbsprite 7, 3, 0, 0, $4b, 0 + +FrameBlock4c: + db 4 ; # + dbsprite 1, 2, 0, 0, $4a, OAM_VFLIP + dbsprite 2, 6, 0, 0, $4a, 0 + dbsprite 6, 5, 0, 0, $4a, OAM_HFLIP + dbsprite 5, 1, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + +FrameBlock4d: + db 4 ; # + dbsprite 0, 1, 0, 0, $4a, OAM_HFLIP + dbsprite 1, 7, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + dbsprite 7, 6, 0, 0, $4a, OAM_VFLIP + dbsprite 6, 0, 0, 0, $4a, 0 + +FrameBlock4e: + db 8 ; # + dbsprite 6, 0, 0, 0, $44, 0 + dbsprite 7, 0, 0, 0, $44, OAM_HFLIP + dbsprite 6, 1, 0, 0, $44, OAM_VFLIP + dbsprite 7, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 2, 6, $44, 0 + dbsprite 2, 4, 2, 6, $44, OAM_HFLIP + dbsprite 1, 5, 2, 6, $44, OAM_VFLIP + dbsprite 2, 5, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock4f: + db 12 ; # + dbsprite 4, 1, 2, 6, $44, 0 + dbsprite 5, 1, 2, 6, $44, OAM_HFLIP + dbsprite 4, 2, 2, 6, $44, OAM_VFLIP + dbsprite 5, 2, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 2, 3, 6, 2, $44, 0 + dbsprite 3, 3, 6, 2, $44, OAM_HFLIP + dbsprite 2, 4, 6, 2, $44, OAM_VFLIP + dbsprite 3, 4, 6, 2, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + +FrameBlock50: + db 8 ; # + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 4, 2, 6, 2, $47, 0 + dbsprite 5, 1, 4, 4, $47, 0 + dbsprite 3, 3, 2, 6, $47, 0 + dbsprite 4, 3, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + dbsprite 2, 4, 4, 4, $47, 0 + +FrameBlock51: + db 8 ; # + dbsprite 0, 0, 0, 0, $35, OAM_HFLIP + dbsprite 0, 1, 0, 0, $35, OAM_VFLIP + dbsprite 0, 2, 0, 0, $35, 0 + dbsprite 0, 3, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 0, 0, 0, $35, 0 + dbsprite 8, 1, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 2, 0, 0, $35, OAM_HFLIP + dbsprite 8, 3, 0, 0, $35, OAM_VFLIP + +FrameBlock52: + db 4 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 1, 1, 0, 0, $3b, 0 + +FrameBlock53: + db 3 ; # + dbsprite 0, 0, 0, 0, $3f, 0 + dbsprite 1, 0, 0, 0, $3f, 0 + dbsprite 0, 1, 6, 0, $3f, 0 + +FrameBlock54: + db 4 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 0, 1, 0, 0, $0f, 0 + dbsprite 1, 1, 0, 0, $0f, OAM_HFLIP + +FrameBlock55: + db 3 ; # + dbsprite 0, 2, 0, 0, $2c, 0 + dbsprite 1, 2, 0, 0, $3c, 0 + dbsprite 2, 2, 0, 0, $2d, 0 + +FrameBlock56: + db 6 ; # + dbsprite 2, 2, 0, 0, $31, 0 + dbsprite 3, 2, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $2c, 0 + dbsprite 3, 1, 0, 0, $3c, 0 + dbsprite 4, 1, 0, 0, $2d, 0 + dbsprite 4, 2, 0, 0, $2d, 0 + +FrameBlock57: + db 9 ; # + dbsprite 4, 1, 0, 0, $31, 0 + dbsprite 4, 2, 0, 0, $31, 0 + dbsprite 5, 1, 0, 0, $31, 0 + dbsprite 5, 2, 0, 0, $31, 0 + dbsprite 4, 0, 0, 0, $2c, 0 + dbsprite 5, 0, 0, 0, $3c, 0 + dbsprite 6, 0, 0, 0, $2d, 0 + dbsprite 6, 1, 0, 0, $2d, 0 + dbsprite 6, 2, 0, 0, $2d, 0 + +FrameBlock58: + db 7 ; # + dbsprite 0, 0, 0, 0, $46, 0 + dbsprite 0, 1, 2, 0, $47, 0 + dbsprite 0, 2, 3, 0, $48, 0 + dbsprite 0, 3, 4, 0, $48, 0 + dbsprite 0, 4, 5, 0, $48, 0 + dbsprite 0, 5, 5, 0, $48, 0 + dbsprite 0, 6, 5, 0, $48, 0 + +FrameBlock59: + db 1 ; # + dbsprite 0, 0, 0, 0, $42, 0 + +FrameBlock5a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 2, 0, 0, 0, $25, OAM_HFLIP + dbsprite 3, 0, 0, 0, $24, OAM_HFLIP + dbsprite 3, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 2, 0, 0, $34, OAM_VFLIP + dbsprite 0, 3, 0, 0, $24, OAM_VFLIP + dbsprite 1, 3, 0, 0, $25, OAM_VFLIP + dbsprite 3, 2, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock5b: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5c: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 2, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5d: + db 11 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 0, 3, 2, 0, $49, 0 + dbsprite 2, 2, 0, 4, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 4, $43, 0 + dbsprite 2, 0, 0, 4, $43, OAM_HFLIP + dbsprite 1, 1, 0, 4, $43, OAM_VFLIP + dbsprite 2, 1, 0, 4, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5e: + db 15 ; # + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 2, 1, 0, 0, $49, 0 + dbsprite 0, 4, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, 0 + dbsprite 3, 2, 0, 0, $43, OAM_HFLIP + dbsprite 2, 3, 0, 0, $43, OAM_VFLIP + dbsprite 3, 3, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 0, 0, $43, 0 + dbsprite 2, 4, 0, 0, $43, OAM_HFLIP + dbsprite 1, 5, 0, 0, $43, OAM_VFLIP + dbsprite 2, 5, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5f: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + +FrameBlock60: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + +FrameBlock61: + db 12 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + +FrameBlock62: + db 15 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + dbsprite 1, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + dbsprite 5, 3, 0, 0, $49, 0 + dbsprite 7, 3, 0, 0, $49, 0 + +FrameBlock63: + db 6 ; # + dbsprite 0, 2, 0, 0, $26, 0 + dbsprite 1, 2, 0, 0, $27, 0 + dbsprite 2, 1, 0, 0, $26, 0 + dbsprite 3, 1, 0, 0, $27, 0 + dbsprite 4, 0, 0, 0, $26, 0 + dbsprite 5, 0, 0, 0, $27, 0 + +FrameBlock64: + db 6 ; # + dbsprite 0, 3, 0, 0, $27, 0 + dbsprite 1, 2, 0, 0, $26, 0 + dbsprite 2, 2, 0, 0, $27, 0 + dbsprite 3, 1, 0, 0, $26, 0 + dbsprite 4, 1, 0, 0, $27, 0 + dbsprite 5, 0, 0, 0, $26, 0 + +FrameBlock65: + db 6 ; # + dbsprite 0, 0, 0, 0, $1c, 0 + dbsprite 1, 0, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1c, 0 + dbsprite 1, 2, 0, 0, $1d, 0 + dbsprite 0, 4, 0, 0, $1c, 0 + dbsprite 1, 4, 0, 0, $1d, 0 + +FrameBlock66: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + +FrameBlock67: + db 1 ; # + dbsprite 0, 0, 0, 0, $03, 0 + +FrameBlock68: + db 4 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 1, 0, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock69: + db 1 ; # + dbsprite 0, 0, 0, 0, $06, 0 + +FrameBlock6a: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 6, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 6, 0, 0, $2e, OAM_VFLIP + dbsprite 6, 6, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $2f, 0 + dbsprite 3, 6, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 3, 0, 0, $3e, 0 + dbsprite 6, 3, 0, 0, $3e, OAM_HFLIP + +FrameBlock6b: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 4, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 4, 0, 0, $2e, OAM_VFLIP + dbsprite 4, 4, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 2, 4, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 2, 0, 0, $3e, 0 + dbsprite 4, 2, 0, 0, $3e, OAM_HFLIP + +FrameBlock6c: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 2, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2e, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $3e, 0 + dbsprite 2, 1, 0, 0, $3e, OAM_HFLIP + +FrameBlock6d: + db 2 ; # + dbsprite 0, 0, 0, 0, $1e, 0 + dbsprite 1, 0, 0, 0, $1f, 0 + +FrameBlock6e: + db 4 ; # + dbsprite 0, 0, 0, 0, $48, 0 + dbsprite 1, 0, 0, 0, $48, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock6f: + db 4 ; # + dbsprite 0, 0, 0, 0, $4a, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock70: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $4a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock76: + db 7 ; # + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 1, 0, 0, 1, $2f, 0 + dbsprite 3, 0, 0, 1, $2f, 0 + dbsprite 0, 0, 0, 2, $2e, 0 + dbsprite 4, 0, 0, 2, $2e, OAM_HFLIP + dbsprite 0, 1, 0, 2, $3e, 0 + dbsprite 4, 1, 0, 2, $3e, OAM_HFLIP + +FrameBlock77: + db 4 ; # + dbsprite 0, 0, 2, 0, $4b, 0 + dbsprite 1, 0, 2, 0, $4c, 0 + dbsprite 0, 1, 0, 0, $4c, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $4b, OAM_HFLIP | OAM_VFLIP + +FrameBlock78: + db 1 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + +FrameBlock79: + db 1 ; # + dbsprite 0, 0, 0, 0, $4e, 0 + +INCLUDE "data/battle_anims/base_coords.asm" + +FrameBlock00: + db 0 ; # + + db $00 ; unused diff --git a/data/battle_anims/special_effect_pointers.asm b/data/battle_anims/special_effect_pointers.asm new file mode 100644 index 00000000..4e2fb857 --- /dev/null +++ b/data/battle_anims/special_effect_pointers.asm @@ -0,0 +1,47 @@ +special_effect: MACRO + db \1 + dw \2 +ENDM + +SpecialEffectPointers: + ; special effect id, effect routine address + special_effect SE_DARK_SCREEN_FLASH, AnimationFlashScreen ; $FE + special_effect SE_DARK_SCREEN_PALETTE, AnimationDarkScreenPalette ; $FD + special_effect SE_RESET_SCREEN_PALETTE, AnimationResetScreenPalette ; $FC + special_effect SE_SHAKE_SCREEN, AnimationShakeScreen ; $FB + special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA + special_effect SE_DARKEN_MON_PALETTE, AnimationDarkenMonPalette ; $F9 + special_effect SE_FLASH_SCREEN_LONG, AnimationFlashScreenLong ; $F8 + special_effect SE_SLIDE_MON_UP, AnimationSlideMonUp ; $F7 + special_effect SE_SLIDE_MON_DOWN, AnimationSlideMonDown ; $F6 + special_effect SE_FLASH_MON_PIC, AnimationFlashMonPic ; $F5 + special_effect SE_SLIDE_MON_OFF, AnimationSlideMonOff ; $F4 + special_effect SE_BLINK_MON, AnimationBlinkMon ; $F3 + special_effect SE_MOVE_MON_HORIZONTALLY, AnimationMoveMonHorizontally ; $F2 + special_effect SE_RESET_MON_POSITION, AnimationResetMonPosition ; $F1 + special_effect SE_LIGHT_SCREEN_PALETTE, AnimationLightScreenPalette ; $F0 + special_effect SE_HIDE_MON_PIC, AnimationHideMonPic ; $EF + special_effect SE_SQUISH_MON_PIC, AnimationSquishMonPic ; $EE + special_effect SE_SHOOT_BALLS_UPWARD, AnimationShootBallsUpward ; $ED + special_effect SE_SHOOT_MANY_BALLS_UPWARD, AnimationShootManyBallsUpward ; $EC + special_effect SE_BOUNCE_UP_AND_DOWN, AnimationBoundUpAndDown ; $EB + special_effect SE_MINIMIZE_MON, AnimationMinimizeMon ; $EA + special_effect SE_SLIDE_MON_DOWN_AND_HIDE, AnimationSlideMonDownAndHide ; $E9 + special_effect SE_TRANSFORM_MON, AnimationTransformMon ; $E8 + special_effect SE_LEAVES_FALLING, AnimationLeavesFalling ; $E7 + special_effect SE_PETALS_FALLING, AnimationPetalsFalling ; $E6 + special_effect SE_SLIDE_MON_HALF_OFF, AnimationSlideMonHalfOff ; $E5 + special_effect SE_SHAKE_ENEMY_HUD, AnimationShakeEnemyHUD ; $E4 + special_effect SE_SHAKE_ENEMY_HUD_2, AnimationShakeEnemyHUD ; $E3 unused + special_effect SE_SPIRAL_BALLS_INWARD, AnimationSpiralBallsInward ; $E2 + special_effect SE_DELAY_ANIMATION_10, AnimationDelay10 ; $E1 + special_effect SE_FLASH_ENEMY_MON_PIC, AnimationFlashEnemyMonPic ; $E0 unused + special_effect SE_HIDE_ENEMY_MON_PIC, AnimationHideEnemyMonPic ; $DF + special_effect SE_BLINK_ENEMY_MON, AnimationBlinkEnemyMon ; $DE + special_effect SE_SHOW_MON_PIC, AnimationShowMonPic ; $DD + special_effect SE_SHOW_ENEMY_MON_PIC, AnimationShowEnemyMonPic ; $DC + special_effect SE_SLIDE_ENEMY_MON_OFF, AnimationSlideEnemyMonOff ; $DB + special_effect SE_SHAKE_BACK_AND_FORTH, AnimationShakeBackAndForth ; $DA + special_effect SE_SUBSTITUTE_MON, AnimationSubstitute ; $D9 + special_effect SE_WAVY_SCREEN, AnimationWavyScreen ; $D8 + db -1 ; end diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm new file mode 100644 index 00000000..dd73ff8d --- /dev/null +++ b/data/battle_anims/special_effects.asm @@ -0,0 +1,32 @@ +anim_special_effect: MACRO + db \1 + dw \2 +ENDM + +AnimationIdSpecialEffects: + ; animation id, effect routine address + anim_special_effect MEGA_PUNCH, AnimationFlashScreen + anim_special_effect GUILLOTINE, AnimationFlashScreen + anim_special_effect MEGA_KICK, AnimationFlashScreen + anim_special_effect HEADBUTT, AnimationFlashScreen + anim_special_effect TAIL_WHIP, TailWhipAnimationUnused + anim_special_effect GROWL, DoGrowlSpecialEffects + anim_special_effect DISABLE, AnimationFlashScreen + anim_special_effect BLIZZARD, DoBlizzardSpecialEffects + anim_special_effect BUBBLEBEAM, AnimationFlashScreen + anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks + anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks + anim_special_effect REFLECT, AnimationFlashScreen + anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects + anim_special_effect SPORE, FlashScreenEveryFourFrameBlocks + anim_special_effect EXPLOSION, DoExplodeSpecialEffects + anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects + anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon + anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball + anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball + anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects + anim_special_effect POOF_ANIM, DoPoofSpecialEffects + anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects + db -1 ; end diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm new file mode 100644 index 00000000..bbdc45c0 --- /dev/null +++ b/data/battle_anims/subanimations.asm @@ -0,0 +1,954 @@ +SubanimationPointers: + dw Subanimation00 + dw Subanimation01 + dw Subanimation02 + dw Subanimation03 + dw Subanimation04 + dw Subanimation05 + dw Subanimation06 + dw Subanimation07 + dw Subanimation08 + dw Subanimation09 + dw Subanimation0a + dw Subanimation0b + dw Subanimation0c + dw Subanimation0d + dw Subanimation0e + dw Subanimation0f + dw Subanimation10 + dw Subanimation11 + dw Subanimation12 + dw Subanimation13 + dw Subanimation14 + dw Subanimation15 + dw Subanimation16 + dw Subanimation17 + dw Subanimation18 + dw Subanimation19 + dw Subanimation1a + dw Subanimation1b + dw Subanimation1c + dw Subanimation1d + dw Subanimation1e + dw Subanimation1f + dw Subanimation20 + dw Subanimation21 + dw Subanimation22 + dw Subanimation23 + dw Subanimation24 + dw Subanimation25 + dw Subanimation26 + dw Subanimation27 + dw Subanimation28 + dw Subanimation29 + dw Subanimation2a + dw Subanimation2b + dw Subanimation2c + dw Subanimation2d + dw Subanimation2e + dw Subanimation2f + dw Subanimation30 + dw Subanimation31 + dw Subanimation32 + dw Subanimation33 + dw Subanimation34 + dw Subanimation35 + dw Subanimation36 + dw Subanimation37 + dw Subanimation38 + dw Subanimation39 + dw Subanimation3a + dw Subanimation3b + dw Subanimation3c + dw Subanimation3d + dw Subanimation3e + dw Subanimation3f + dw Subanimation40 + dw Subanimation41 + dw Subanimation42 + dw Subanimation43 + dw Subanimation44 + dw Subanimation45 + dw Subanimation46 + dw Subanimation47 + dw Subanimation48 + dw Subanimation49 + dw Subanimation4a + dw Subanimation4b + dw Subanimation4c + dw Subanimation4d + dw Subanimation4e + dw Subanimation4f + dw Subanimation50 + dw Subanimation51 + dw Subanimation52 + dw Subanimation53 + dw Subanimation54 + dw Subanimation55 + +; format: +; subanim type, count +; REPT count +; db frame block id, base coordinate id, frame block mode +; endr + +subanim: MACRO + db (\1 << 5) | \2 +ENDM + +Subanimation04: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_02, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_03, FRAMEBLOCKMODE_00 + +Subanimation05: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation08: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_94, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_60, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_9F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A0, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A1, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation07: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A3, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A4, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A5, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A6, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation06: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation09: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_21, FRAMEBLOCKMODE_04 + +Subanimation0a: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_06, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_09, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation0b: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_01, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_35, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation55: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_9D, FRAMEBLOCKMODE_00 + +Subanimation11: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation2b: + subanim SUBANIMTYPE_HFLIP, 11 + db FRAMEBLOCK_0D, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0E, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0F, BASECOORD_03, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2c: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_12, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + +Subanimation12: + subanim SUBANIMTYPE_COORDFLIP, 9 + db FRAMEBLOCK_17, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_39, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation00: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation01: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_01, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation02: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_01, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation03: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_01, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation0c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_00 + +Subanimation0d: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_00 + +Subanimation0e: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_09, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_0C, FRAMEBLOCKMODE_00 + +Subanimation1f: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_0C, BASECOORD_30, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_40, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_41, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_42, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation2e: + subanim SUBANIMTYPE_HVFLIP, 14 + db FRAMEBLOCK_18, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_52, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_19, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_63, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1A, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_4D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1B, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_97, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1C, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_98, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1D, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_58, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1E, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2f: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_1F, BASECOORD_24, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_20, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_21, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_22, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation30: + subanim SUBANIMTYPE_HFLIP, 18 + db FRAMEBLOCK_23, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_07, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_24, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + +Subanimation0f: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_26, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_27, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_28, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_29, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation16: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_2A, BASECOORD_05, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2B, BASECOORD_05, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_0C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_11, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_11, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_2F, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation10: + subanim SUBANIMTYPE_REVERSE, 8 + db FRAMEBLOCK_2D, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_45, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_47, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_48, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_49, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation31: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_2F, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_51, FRAMEBLOCKMODE_00 + +Subanimation13: + subanim SUBANIMTYPE_REVERSE, 6 + db FRAMEBLOCK_30, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation14: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_31, BASECOORD_1C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_31, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_22, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation41: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation42: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_08, FRAMEBLOCKMODE_00 + +Subanimation15: + subanim SUBANIMTYPE_HVFLIP, 2 + db FRAMEBLOCK_35, BASECOORD_52, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_35, BASECOORD_53, FRAMEBLOCKMODE_00 + +Subanimation17: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation18: + subanim SUBANIMTYPE_ENEMY, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation40: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_17, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_57, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_13, FRAMEBLOCKMODE_00 + +Subanimation19: + subanim SUBANIMTYPE_REVERSE, 12 + db FRAMEBLOCK_38, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation1a: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_3A, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3A, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + +Subanimation1b: + subanim SUBANIMTYPE_REVERSE, 4 + db FRAMEBLOCK_40, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation1c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_41, BASECOORD_58, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_59, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation1d: + subanim SUBANIMTYPE_ENEMY, 15 + db FRAMEBLOCK_24, BASECOORD_9A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_22, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1D, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_98, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_2C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_03 + +Subanimation1e: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_25, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation20: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_42, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_43, BASECOORD_07, FRAMEBLOCKMODE_00 + +Subanimation21: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_44, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_10, FRAMEBLOCKMODE_02 + +Subanimation22: + subanim SUBANIMTYPE_REVERSE, 11 + db FRAMEBLOCK_47, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AA, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AB, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AC, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AD, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AE, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AF, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_B0, FRAMEBLOCKMODE_00 + +Subanimation2d: + subanim SUBANIMTYPE_COORDFLIP, 6 + db FRAMEBLOCK_44, BASECOORD_64, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_65, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + +Subanimation39: + subanim SUBANIMTYPE_COORDFLIP, 1 + db FRAMEBLOCK_47, BASECOORD_67, FRAMEBLOCKMODE_00 + +Subanimation4e: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_03 + +Subanimation4f: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + +Subanimation50: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_16, FRAMEBLOCKMODE_00 + +Subanimation29: + subanim SUBANIMTYPE_HFLIP, 29 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + +Subanimation2a: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_4E, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4F, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + +Subanimation23: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation24: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation25: + subanim SUBANIMTYPE_COORDFLIP, 2 + db FRAMEBLOCK_52, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation26: + subanim SUBANIMTYPE_NORMAL, 2 + db FRAMEBLOCK_52, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation3a: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_53, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_81, FRAMEBLOCKMODE_00 + +Subanimation3b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_53, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation27: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_54, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_54, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation28: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_55, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_56, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_57, BASECOORD_73, FRAMEBLOCKMODE_00 + +Subanimation32: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_47, BASECOORD_74, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_43, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation33: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3c: + subanim SUBANIMTYPE_COORDFLIP, 7 + db FRAMEBLOCK_59, BASECOORD_79, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7B, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_77, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_78, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7C, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3d: + subanim SUBANIMTYPE_NORMAL, 8 + db FRAMEBLOCK_3A, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation34: + subanim SUBANIMTYPE_HVFLIP, 21 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_82, FRAMEBLOCKMODE_00 + +Subanimation35: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_5B, BASECOORD_83, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5C, BASECOORD_84, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5D, BASECOORD_85, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5E, BASECOORD_09, FRAMEBLOCKMODE_00 + +Subanimation36: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_5F, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5F, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation37: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_63, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_64, BASECOORD_75, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_63, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_0D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_86, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_87, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_88, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation38: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_66, BASECOORD_8A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_67, BASECOORD_24, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_01, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_10, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_28, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_0E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_26, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_03, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_12, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_29, FRAMEBLOCKMODE_00 + +Subanimation3e: + subanim SUBANIMTYPE_REVERSE, 18 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation3f: + subanim SUBANIMTYPE_COORDFLIP, 18 + db FRAMEBLOCK_68, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_06, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_90, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation44: + subanim SUBANIMTYPE_HVFLIP, 12 + db FRAMEBLOCK_69, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_06, FRAMEBLOCKMODE_00 + +Subanimation43: + subanim SUBANIMTYPE_ENEMY, 3 + db FRAMEBLOCK_6A, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6B, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6C, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation45: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation46: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_0A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_89, FRAMEBLOCKMODE_00 + +Subanimation47: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_06, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_96, FRAMEBLOCKMODE_00 + +Subanimation48: + subanim SUBANIMTYPE_NORMAL, 6 + db FRAMEBLOCK_03, BASECOORD_41, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation49: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation4a: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_04, BASECOORD_84, FRAMEBLOCKMODE_03 + +Subanimation4b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_06, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation4c: + subanim SUBANIMTYPE_COORDFLIP, 8 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + +Subanimation4d: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_32, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_16, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_0D, FRAMEBLOCKMODE_00 + +Subanimation51: + subanim SUBANIMTYPE_ENEMY, 6 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation52: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_77, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation53: + subanim SUBANIMTYPE_NORMAL, 12 + db FRAMEBLOCK_78, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_34, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_9E, FRAMEBLOCKMODE_00 + +Subanimation54: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_79, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_34, FRAMEBLOCKMODE_00 diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm deleted file mode 100755 index 48c2cee6..00000000 --- a/data/bike_riding_tilesets.asm +++ /dev/null @@ -1,2 +0,0 @@ -BikeRidingTilesets:: - db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF diff --git a/data/collision.asm b/data/collision.asm deleted file mode 100644 index 8d35793d..00000000 --- a/data/collision.asm +++ /dev/null @@ -1,25 +0,0 @@ -Underground_Coll:: INCBIN "gfx/tilesets/underground.tilecoll" -Overworld_Coll:: INCBIN "gfx/tilesets/overworld.tilecoll" -RedsHouse1_Coll:: -RedsHouse2_Coll:: INCBIN "gfx/tilesets/reds_house.tilecoll" -Mart_Coll:: -Pokecenter_Coll:: INCBIN "gfx/tilesets/pokecenter.tilecoll" -Dojo_Coll:: -Gym_Coll:: INCBIN "gfx/tilesets/gym.tilecoll" -Forest_Coll:: INCBIN "gfx/tilesets/forest.tilecoll" -House_Coll:: INCBIN "gfx/tilesets/house.tilecoll" -ForestGate_Coll:: -Museum_Coll:: -Gate_Coll:: INCBIN "gfx/tilesets/gate.tilecoll" -Ship_Coll:: INCBIN "gfx/tilesets/ship.tilecoll" -ShipPort_Coll:: INCBIN "gfx/tilesets/ship_port.tilecoll" -Cemetery_Coll:: INCBIN "gfx/tilesets/cemetery.tilecoll" -Interior_Coll:: INCBIN "gfx/tilesets/interior.tilecoll" -Cavern_Coll:: INCBIN "gfx/tilesets/cavern.tilecoll" -Lobby_Coll:: INCBIN "gfx/tilesets/lobby.tilecoll" -Mansion_Coll:: INCBIN "gfx/tilesets/mansion.tilecoll" -Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" -Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" -Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" -Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" -BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll" diff --git a/data/credit_mons.asm b/data/credits/credits_mons.asm index 15212048..15212048 100755 --- a/data/credit_mons.asm +++ b/data/credits/credits_mons.asm diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm new file mode 100755 index 00000000..c2b5e523 --- /dev/null +++ b/data/credits/credits_order.asm @@ -0,0 +1,37 @@ +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_POKEMON, CRED_VERSION, CRED_TEXT_FADE_MON + db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON + 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_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 new file mode 100755 index 00000000..766690df --- /dev/null +++ b/data/credits/credits_text.asm @@ -0,0 +1,265 @@ +CreditsTextPointers: +; entries correspond to CRED_* constants + 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 + +CreditsText_Version: + db -6, "YELLOW VERSION" + next " STAFF@" +CreditsText_Tajiri: + db -6, "SATOSHI TAJIRI@" +CreditsText_Oota: + db -6, "TAKENORI OOTA@" +CreditsText_Morimoto: + db -7, "SHIGEKI MORIMOTO@" +CreditsText_Watanabe: + db -7, "TETSUYA WATANABE@" +CreditsText_Masuda: + db -6, "JUNICHI MASUDA@" +CreditsText_Nishino: + db -5, "KOHJI NISHINO@" +CreditsText_Sugimori: + db -5, "KEN SUGIMORI@" +CreditsText_Nishida: + db -6, "ATSUKO NISHIDA@" +CreditsText_Miyamoto: + db -7, "SHIGERU MIYAMOTO@" +CreditsText_Kawaguchi: + db -8, "TAKASHI KAWAGUCHI@" +CreditsText_Ishihara: + db -8, "TSUNEKAZU ISHIHARA@" +CreditsText_Yamauchi: + db -7, "HIROSHI YAMAUCHI@" +CreditsText_Zinnai: + db -7, "HIROYUKI ZINNAI@" +CreditsText_Hishida: + db -7, "TATSUYA HISHIDA@" +CreditsText_Sakai: + db -6, "YASUHIRO SAKAI@" +CreditsText_Yamaguchi: + db -7, "WATARU YAMAGUCHI@" +CreditsText_Yamamoto: + db -8, "KAZUYUKI YAMAMOTO@" +CreditsText_Taniguchi: + db -8, "RYOHSUKE TANIGUCHI@" +CreditsText_Nonomura: + db -8, "FUMIHIRO NONOMURA@" +CreditsText_Fuziwara: + db -7, "MOTOFUMI FUZIWARA@" +CreditsText_Matsusima: + db -7, "KENJI MATSUSIMA@" +CreditsText_Tomisawa: + db -7, "AKIHITO TOMISAWA@" +CreditsText_Kawamoto: + db -7, "HIROSHI KAWAMOTO@" +CreditsText_Kakei: + db -6, "AKIYOSHI KAKEI@" +CreditsText_Tsuchiya: + db -7, "KAZUKI TSUCHIYA@" +CreditsText_Nakamura: + db -6, "TAKEO NAKAMURA@" +CreditsText_Yuda: + db -6, "MASAMITSU YUDA@" +CreditsText_Pokemon: + db -3, "#MON@" +CreditsText_Director: + db -3, "DIRECTOR@" +CreditsText_Programmers: + db -5, "PROGRAMMERS@" +CreditsText_CharacterDesign: + db -7, "CHARACTER DESIGN@" +CreditsText_Music: + db -2, "MUSIC@" +CreditsText_SoundEffects: + db -6, "SOUND EFFECTS@" +CreditsText_GameDesign: + db -5, "GAME DESIGN@" +CreditsText_MonsterDesign: + db -6, "MONSTER DESIGN@" +CreditsText_GameScenario: + db -6, "GAME SCENARIO@" +CreditsText_ParametricDesign: + db -7, "PARAMETRIC DESIGN@" +CreditsText_MapDesign: + db -4, "MAP DESIGN@" +CreditsText_Testing: + db -6, "PRODUCT TESTING@" +CreditsText_SpecialThanks: + db -6, "SPECIAL THANKS@" +CreditsText_Producers: + db -4, "PRODUCERS@" +CreditsText_Producer: + db -3, "PRODUCER@" +CreditsText_ExecutiveProducer: + db -8, "EXECUTIVE PRODUCER@" +CreditsText_Tamada: + db -6, "SOUSUKE TAMADA@" +CreditsText_Oota2: + db -5, "SATOSHI OOTA@" +CreditsText_Yoshikawa: + db -6, "RENA YOSHIKAWA@" +CreditsText_Oota23: + db -6, "TOMOMICHI OOTA@" +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@" +CreditsText_USCoord: + db -7, "US COORDINATION@" +CreditsText_Tilden: + db -5, "GAIL TILDEN@" +CreditsText_Kawakami: + db -6, "NAOKO KAWAKAMI@" +CreditsText_Nakamura2: + db -6, "HIRO NAKAMURA@" +CreditsText_Shoemake: + db -6, "RANDY SHOEMAKE@" +CreditsText_Osborne: + db -5, "SARA OSBORNE@" +CreditsText_Translation: + db -7, "TEXT TRANSLATION@" +CreditsText_Ogasawara: + db -6, "NOB OGASAWARA@" +CreditsText_Iwata: + db -5, "SATORU IWATA@" +CreditsText_Izushi2: + db -7, "TAKEHIRO IZUSHI@" +CreditsText_Harada2: + db -7, "TAKAHIRO HARADA@" +CreditsText_Murakawa: + db -7, "TERUKI MURAKAWA@" +CreditsText_Fukui: + db -5, "KOHTA FUKUI@" +CreditsText_SuperMarioClub2: + db -9, "NCL SUPER MARIO CLUB@" +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/credits_order.asm b/data/credits_order.asm deleted file mode 100755 index c818ac07..00000000 --- a/data/credits_order.asm +++ /dev/null @@ -1,38 +0,0 @@ -CreditsOrder: -; subsequent credits elements will be displayed on separate lines. -; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used -; to go to the next set of credits texts. - db CRED_POKEMON, CRED_VERSION, CRED_TEXT_FADE_MON - db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON - 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_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 - db CRED_TEXT_FADE_MON - db CRED_THE_END diff --git a/data/cries.asm b/data/cries.asm deleted file mode 100755 index 7031536e..00000000 --- a/data/cries.asm +++ /dev/null @@ -1,192 +0,0 @@ -CryData: - ;$BaseCry, $Pitch, $Length - db $11, $00, $80; Rhydon - db $03, $00, $80; Kangaskhan - db $00, $00, $80; Nidoran♂ - db $19, $CC, $01; Clefairy - db $10, $00, $80; Spearow - db $06, $ED, $80; Voltorb - db $09, $00, $80; Nidoking - db $1F, $00, $80; Slowbro - db $0F, $20, $80; Ivysaur - db $0D, $00, $80; Exeggutor - db $0C, $00, $80; Lickitung - db $0B, $00, $80; Exeggcute - db $05, $00, $80; Grimer - db $07, $00, $FF; Gengar - db $01, $00, $80; Nidoran♀ - db $0A, $00, $80; Nidoqueen - db $19, $00, $80; Cubone - db $04, $00, $80; Rhyhorn - db $1B, $00, $80; Lapras - db $15, $00, $80; Arcanine - db $1E, $EE, $FF; Mew - db $17, $00, $80; Gyarados - db $18, $00, $80; Shellder - db $1A, $00, $80; Tentacool - db $1C, $00, $80; Gastly - db $16, $00, $80; Scyther - db $1E, $02, $20; Staryu - db $13, $00, $80; Blastoise - db $14, $00, $80; Pinsir - db $12, $00, $80; Tangela - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $1F, $20, $40; Growlithe - db $17, $FF, $C0; Onix - db $18, $40, $A0; Fearow - db $0E, $DF, $04; Pidgey - db $02, $00, $80; Slowpoke - db $1C, $A8, $C0; Kadabra - db $24, $00, $80; Graveler - db $14, $0A, $C0; Chansey - db $1F, $48, $60; Machoke - db $20, $08, $40; Mr.Mime - db $12, $80, $C0; Hitmonlee - db $0C, $EE, $C0; Hitmonchan - db $17, $E0, $10; Arbok - db $1E, $42, $FF; Parasect - db $21, $20, $60; Psyduck - db $0D, $88, $20; Drowzee - db $12, $E0, $40; Golem - db $00, $00, $00; MissingNo. - db $04, $FF, $30; Magmar - db $00, $00, $00; MissingNo. - db $06, $8F, $FF; Electabuzz - db $1C, $20, $C0; Magneton - db $12, $E6, $DD; Koffing - db $00, $00, $00; MissingNo. - db $0A, $DD, $60; Mankey - db $0C, $88, $C0; Seel - db $0B, $AA, $01; Diglett - db $1D, $11, $40; Tauros - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $10, $DD, $01; Farfetch'd - db $1A, $44, $40; Venonat - db $0F, $3C, $C0; Dragonite - db $00, $80, $10; MissingNo. - db $00, $00, $00; MissingNo. - db $1D, $E0, $80; MissingNo. - db $0B, $BB, $01; Doduo - db $0E, $FF, $FF; Poliwag - db $0D, $FF, $FF; Jynx - db $09, $F8, $40; Moltres - db $09, $80, $40; Articuno - db $18, $FF, $80; Zapdos - db $0E, $FF, $FF; Ditto - db $19, $77, $10; Meowth - db $20, $20, $E0; Krabby - db $22, $FF, $40; MissingNo. - db $00, $00, $00; MissingNo. - db $0E, $E0, $60; MissingNo. - db $24, $4F, $10; Vulpix - db $24, $88, $60; Ninetales - db $0F, $EE, $01; Pikachu - db $09, $EE, $08; Raichu - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $0F, $60, $40; Dratini - db $0F, $40, $80; Dragonair - db $16, $BB, $40; Kabuto - db $18, $EE, $01; Kabutops - db $19, $99, $10; Horsea - db $19, $3C, $01; Seadra - db $0F, $40, $C0; MissingNo. - db $0F, $20, $C0; MissingNo. - db $00, $20, $40; Sandshrew - db $00, $FF, $FF; Sandslash - db $1F, $F0, $01; Omanyte - db $1F, $FF, $40; Omastar - db $0E, $FF, $35; Jigglypuff - db $0E, $68, $60; Wigglytuff - db $1A, $88, $60; Eevee - db $1A, $10, $20; Flareon - db $1A, $3D, $80; Jolteon - db $1A, $AA, $FF; Vaporeon - db $1F, $EE, $01; Machop - db $1D, $E0, $80; Zubat - db $17, $12, $40; Ekans - db $1E, $20, $E0; Paras - db $0E, $77, $60; Poliwhirl - db $0E, $00, $FF; Poliwrath - db $15, $EE, $01; Weedle - db $13, $FF, $01; Kakuna - db $13, $60, $80; Beedrill - db $00, $00, $00; MissingNo. - db $0B, $99, $20; Dodrio - db $0A, $AF, $40; Primeape - db $0B, $2A, $10; Dugtrio - db $1A, $29, $80; Venomoth - db $0C, $23, $FF; Dewgong - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $16, $80, $20; Caterpie - db $1C, $CC, $01; Metapod - db $16, $77, $40; Butterfree - db $1F, $08, $C0; Machamp - db $11, $20, $10; MissingNo. - db $21, $FF, $40; Golduck - db $0D, $EE, $40; Hypno - db $1D, $FA, $80; Golbat - db $1E, $99, $FF; Mewtwo - db $05, $55, $01; Snorlax - db $17, $80, $00; Magikarp - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $07, $EF, $FF; Muk - db $0F, $40, $80; MissingNo. - db $20, $EE, $E0; Kingler - db $18, $6F, $E0; Cloyster - db $00, $00, $00; MissingNo. - db $06, $A8, $90; Electrode - db $19, $AA, $20; Clefable - db $12, $FF, $FF; Weezing - db $19, $99, $FF; Persian - db $08, $4F, $60; Marowak - db $00, $00, $00; MissingNo. - db $1C, $30, $40; Haunter - db $1C, $C0, $01; Abra - db $1C, $98, $FF; Alakazam - db $14, $28, $C0; Pidgeotto - db $14, $11, $FF; Pidgeot - db $1E, $00, $80; Starmie - db $0F, $80, $01; Bulbasaur - db $0F, $00, $C0; Venusaur - db $1A, $EE, $FF; Tentacruel - db $00, $00, $00; MissingNo. - db $16, $80, $40; Goldeen - db $16, $10, $FF; Seaking - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $25, $00, $80; Ponyta - db $25, $20, $C0; Rapidash - db $22, $00, $80; Rattata - db $22, $20, $FF; Raticate - db $00, $2C, $C0; Nidorino - db $01, $2C, $E0; Nidorina - db $24, $F0, $10; Geodude - db $25, $AA, $FF; Porygon - db $23, $20, $F0; Aerodactyl - db $00, $00, $00; MissingNo. - db $1C, $80, $60; Magnemite - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $04, $60, $40; Charmander - db $1D, $60, $40; Squirtle - db $04, $20, $40; Charmeleon - db $1D, $20, $40; Wartortle - db $04, $00, $80; Charizard - db $1D, $00, $80; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $08, $DD, $01; Oddish - db $08, $AA, $40; Gloom - db $23, $22, $FF; Vileplume - db $21, $55, $01; Bellsprout - db $25, $44, $20; Weepinbell - db $25, $66, $CC; Victreebel diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm deleted file mode 100755 index 01e86714..00000000 --- a/data/dungeon_tilesets.asm +++ /dev/null @@ -1,2 +0,0 @@ -DungeonTilesets: - db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm new file mode 100644 index 00000000..f597a26d --- /dev/null +++ b/data/events/bench_guys.asm @@ -0,0 +1,23 @@ +bench_guy_text: MACRO + db \1, \2 + db_tx_pre \3 +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 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/card_key_coords.asm b/data/events/card_key_coords.asm new file mode 100644 index 00000000..afdcfbd4 --- /dev/null +++ b/data/events/card_key_coords.asm @@ -0,0 +1,36 @@ +; These tables are probably supposed to be door locations in Silph Co., +; but they are unused. +; The reason there are 3 tables is unknown. + +; Format: map ID, Y, X, gate ID? + +CardKeyTable1: + db SILPH_CO_2F, $04, $04, 0 + db SILPH_CO_2F, $04, $05, 1 + db SILPH_CO_4F, $0C, $04, 2 + db SILPH_CO_4F, $0C, $05, 3 + db SILPH_CO_7F, $06, $0A, 4 + db SILPH_CO_7F, $06, $0B, 5 + db SILPH_CO_9F, $04, $12, 6 + db SILPH_CO_9F, $04, $13, 7 + db SILPH_CO_10F, $08, $0A, 8 + db SILPH_CO_10F, $08, $0B, 9 + db -1 ; end + +CardKeyTable2: + db SILPH_CO_3F, $08, $09, 10 + db SILPH_CO_3F, $09, $09, 11 + db SILPH_CO_5F, $04, $07, 12 + db SILPH_CO_5F, $05, $07, 13 + db SILPH_CO_6F, $0C, $05, 14 + db SILPH_CO_6F, $0D, $05, 15 + db SILPH_CO_8F, $08, $07, 16 + db SILPH_CO_8F, $09, $07, 17 + db SILPH_CO_9F, $08, $03, 18 + db SILPH_CO_9F, $09, $03, 19 + db -1 ; end + +CardKeyTable3: + db SILPH_CO_11F, $08, $09, 20 + db SILPH_CO_11F, $09, $09, 21 + db -1 ; end diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm new file mode 100644 index 00000000..c66f31d9 --- /dev/null +++ b/data/events/card_key_maps.asm @@ -0,0 +1,12 @@ +SilphCoMapList: + db SILPH_CO_2F + db SILPH_CO_3F + db SILPH_CO_4F + db SILPH_CO_5F + db SILPH_CO_6F + db SILPH_CO_7F + db SILPH_CO_8F + db SILPH_CO_9F + db SILPH_CO_10F + db SILPH_CO_11F + db -1 ; end diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm new file mode 100755 index 00000000..bcdbcd80 --- /dev/null +++ b/data/events/hidden_coins.asm @@ -0,0 +1,19 @@ +hidden_coin: MACRO + db \1, \3, \2 +ENDM + +HiddenCoinCoords: + ; map id, x, y + hidden_coin GAME_CORNER, 0, 8 + hidden_coin GAME_CORNER, 1, 16 + hidden_coin GAME_CORNER, 3, 11 + hidden_coin GAME_CORNER, 3, 14 + hidden_coin GAME_CORNER, 4, 12 + hidden_coin GAME_CORNER, 9, 12 + hidden_coin GAME_CORNER, 9, 15 + hidden_coin GAME_CORNER, 16, 14 + hidden_coin GAME_CORNER, 10, 16 + hidden_coin GAME_CORNER, 11, 7 + hidden_coin GAME_CORNER, 15, 8 + hidden_coin GAME_CORNER, 12, 15 + db -1 ; end diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm new file mode 100755 index 00000000..5705feed --- /dev/null +++ b/data/events/hidden_item_coords.asm @@ -0,0 +1,62 @@ +hidden_item: MACRO + db \1, \3, \2 +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 MT_MOON_B2F, 33, 9 + hidden_item SS_ANNE_B1F_ROOMS, 3, 1 + 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 ROUTE_10, 9, 17 + hidden_item ROUTE_10, 16, 53 + hidden_item POWER_PLANT, 17, 16 + hidden_item POWER_PLANT, 12, 1 + 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 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 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 new file mode 100755 index 00000000..2afd1275 --- /dev/null +++ b/data/events/hidden_objects.asm @@ -0,0 +1,560 @@ +HiddenObjectMaps: + 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 + db \1 ; x coord + db \3 ; item id + dba \4 ; object routine +ENDM + +hidden_text_predef: MACRO + db \2 ; y coord + db \1 ; x coord + db_tx_pre \3 ; text id + dba \4 ; object routine +ENDM + +; Some hidden objects use SPRITE_FACING_* values, +; but these do not actually prevent the player +; 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 + db -1 ; end + +ColosseumHiddenObjects: + hidden_object 5, 4, ANY_FACING, CableClubRightGameboy + 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 + db -1 ; end + +BluesHouseHiddenObjects: + hidden_object 0, 1, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 1, 1, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 7, 1, SPRITE_FACING_UP, PrintBookcaseText + db -1 ; end + +OaksLabHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_UP, DisplayOakLabLeftPoster + hidden_object 5, 0, SPRITE_FACING_UP, DisplayOakLabRightPoster + hidden_object 0, 1, SPRITE_FACING_UP, DisplayOakLabEmailText + 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 + +ViridianSchoolHiddenObjects: + hidden_text_predef 3, 4, ViridianSchoolNotebook, PrintNotebookText + hidden_text_predef 3, 0, ViridianSchoolBlackboard, PrintBlackboardLinkCableText + db -1 ; end + +ViridianGymHiddenObjects: + hidden_object 15, 15, SPRITE_FACING_UP, GymStatues + hidden_object 18, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +Museum1FHiddenObjects: + hidden_object 2, 3, SPRITE_FACING_UP, AerodactylFossil + hidden_object 2, 6, SPRITE_FACING_UP, KabutopsFossil + db -1 ; end + +PewterGymHiddenObjects: + hidden_object 3, 10, SPRITE_FACING_UP, GymStatues + hidden_object 6, 10, SPRITE_FACING_UP, GymStatues + 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 + db -1 ; end + +CeruleanGymHiddenObjects: + hidden_object 3, 11, SPRITE_FACING_UP, GymStatues + hidden_object 6, 11, SPRITE_FACING_UP, GymStatues + 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 + +CeruleanCave1HiddenObjects: + hidden_object 18, 7, PP_UP, HiddenItems + db -1 ; end + +LavenderPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + 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 + hidden_object 6, 1, SPRITE_FACING_DOWN, PrintTrashText + ; third param: [wGymTrashCanIndex] + hidden_object 1, 7, 0, GymTrashScript + hidden_object 1, 9, 1, GymTrashScript + hidden_object 1, 11, 2, GymTrashScript + hidden_object 3, 7, 3, GymTrashScript + hidden_object 3, 9, 4, GymTrashScript + hidden_object 3, 11, 5, GymTrashScript + hidden_object 5, 7, 6, GymTrashScript + hidden_object 5, 9, 7, GymTrashScript + hidden_object 5, 11, 8, GymTrashScript + hidden_object 7, 7, 9, GymTrashScript + hidden_object 7, 9, 10, GymTrashScript + hidden_object 7, 11, 11, GymTrashScript + hidden_object 9, 7, 12, GymTrashScript + hidden_object 9, 9, 13, GymTrashScript + 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 + db -1 ; end + +CeladonGymHiddenObjects: + hidden_object 3, 15, SPRITE_FACING_UP, GymStatues + hidden_object 6, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +GameCornerHiddenObjects: + hidden_object 18, 15, ANY_FACING, StartSlotMachine + hidden_object 18, 14, ANY_FACING, StartSlotMachine + hidden_object 18, 13, ANY_FACING, StartSlotMachine + hidden_object 18, 12, ANY_FACING, StartSlotMachine + hidden_object 18, 11, ANY_FACING, StartSlotMachine + hidden_object 18, 10, SLOTS_SOMEONESKEYS, StartSlotMachine + hidden_object 13, 10, ANY_FACING, StartSlotMachine + hidden_object 13, 11, ANY_FACING, StartSlotMachine + hidden_object 13, 12, SLOTS_OUTTOLUNCH, StartSlotMachine + hidden_object 13, 13, ANY_FACING, StartSlotMachine + hidden_object 13, 14, ANY_FACING, StartSlotMachine + hidden_object 13, 15, ANY_FACING, StartSlotMachine + hidden_object 12, 15, ANY_FACING, StartSlotMachine + hidden_object 12, 14, ANY_FACING, StartSlotMachine + hidden_object 12, 13, ANY_FACING, StartSlotMachine + hidden_object 12, 12, ANY_FACING, StartSlotMachine + hidden_object 12, 11, ANY_FACING, StartSlotMachine + hidden_object 12, 10, ANY_FACING, StartSlotMachine + hidden_object 7, 10, ANY_FACING, StartSlotMachine + hidden_object 7, 11, ANY_FACING, StartSlotMachine + hidden_object 7, 12, ANY_FACING, StartSlotMachine + hidden_object 7, 13, ANY_FACING, StartSlotMachine + hidden_object 7, 14, ANY_FACING, StartSlotMachine + hidden_object 7, 15, ANY_FACING, StartSlotMachine + hidden_object 6, 15, ANY_FACING, StartSlotMachine + hidden_object 6, 14, ANY_FACING, StartSlotMachine + hidden_object 6, 13, ANY_FACING, StartSlotMachine + hidden_object 6, 12, SLOTS_OUTOFORDER, StartSlotMachine + hidden_object 6, 11, ANY_FACING, StartSlotMachine + hidden_object 6, 10, ANY_FACING, StartSlotMachine + hidden_object 1, 10, ANY_FACING, StartSlotMachine + hidden_object 1, 11, ANY_FACING, StartSlotMachine + hidden_object 1, 12, ANY_FACING, StartSlotMachine + hidden_object 1, 13, ANY_FACING, StartSlotMachine + hidden_object 1, 14, ANY_FACING, StartSlotMachine + hidden_object 1, 15, ANY_FACING, StartSlotMachine + hidden_object 0, 8, COIN+10, HiddenCoins + hidden_object 1, 16, COIN+10, HiddenCoins + hidden_object 3, 11, COIN+20, HiddenCoins + hidden_object 3, 14, COIN+10, HiddenCoins + hidden_object 4, 12, COIN+10, HiddenCoins + hidden_object 9, 12, COIN+20, HiddenCoins + hidden_object 9, 15, COIN+10, HiddenCoins + hidden_object 16, 14, COIN+10, HiddenCoins + hidden_object 10, 16, COIN+10, HiddenCoins + hidden_object 11, 7, COIN+40, HiddenCoins + hidden_object 15, 8, COIN+100, HiddenCoins + hidden_object 12, 15, COIN+10, HiddenCoins + 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] + hidden_object 15, 7, (FALSE << 4) | 1, PrintCinnabarQuiz + hidden_object 10, 1, (TRUE << 4) | 2, PrintCinnabarQuiz + hidden_object 9, 7, (TRUE << 4) | 3, PrintCinnabarQuiz + hidden_object 9, 13, (TRUE << 4) | 4, PrintCinnabarQuiz + hidden_object 1, 13, (FALSE << 4) | 5, PrintCinnabarQuiz + hidden_object 1, 7, (TRUE << 4) | 6, PrintCinnabarQuiz + db -1 ; end + +CinnabarLab4HiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 2, 4, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +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 new file mode 100755 index 00000000..53a2a966 --- /dev/null +++ b/data/events/prize_mon_levels.asm @@ -0,0 +1,8 @@ +PrizeMonLevelDictionary: + db ABRA, 15 + db VULPIX, 18 + db WIGGLYTUFF, 22 + + db SCYTHER, 30 + db PINSIR, 30 + db PORYGON, 26 diff --git a/data/events/prizes.asm b/data/events/prizes.asm new file mode 100755 index 00000000..61d7b5f5 --- /dev/null +++ b/data/events/prizes.asm @@ -0,0 +1,40 @@ +PrizeDifferentMenuPtrs: + dw PrizeMenuMon1Entries, PrizeMenuMon1Cost + dw PrizeMenuMon2Entries, PrizeMenuMon2Cost + dw PrizeMenuTMsEntries, PrizeMenuTMsCost + +PrizeMenuMon1Entries: + db ABRA + db VULPIX + db WIGGLYTUFF + db "@" + +PrizeMenuMon1Cost: + coins 230 + coins 1000 + coins 2680 + db "@" + +PrizeMenuMon2Entries: + db SCYTHER + db PINSIR + db PORYGON + db "@" + +PrizeMenuMon2Cost: + coins 6500 + coins 6500 + coins 9999 + db "@" + +PrizeMenuTMsEntries: + db TM_DRAGON_RAGE + db TM_HYPER_BEAM + db TM_SUBSTITUTE + db "@" + +PrizeMenuTMsCost: + coins 3300 + coins 5500 + coins 7700 + db "@" diff --git a/data/slot_machine_wheels.asm b/data/events/slot_machine_wheels.asm index 88a89822..88a89822 100755 --- a/data/slot_machine_wheels.asm +++ b/data/events/slot_machine_wheels.asm diff --git a/data/events/trades.asm b/data/events/trades.asm new file mode 100755 index 00000000..44f7ec21 --- /dev/null +++ b/data/events/trades.asm @@ -0,0 +1,13 @@ +TradeMons: +; entries correspond to TRADE_FOR_* constants + ; give mon, get mon, dialog id, nickname + 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/evos_moves.asm b/data/evos_moves.asm deleted file mode 100755 index 27397eb0..00000000 --- a/data/evos_moves.asm +++ /dev/null @@ -1,2161 +0,0 @@ -; See constants/evolution_constants.asm -; The max number of evolutions per monster is MAX_EVOLUTIONS - -EvosMovesPointerTable: - dw RhydonEvosMoves - dw KangaskhanEvosMoves - dw NidoranMEvosMoves - dw ClefairyEvosMoves - dw SpearowEvosMoves - dw VoltorbEvosMoves - dw NidokingEvosMoves - dw SlowbroEvosMoves - dw IvysaurEvosMoves - dw ExeggutorEvosMoves - dw LickitungEvosMoves - dw ExeggcuteEvosMoves - dw GrimerEvosMoves - dw GengarEvosMoves - dw NidoranFEvosMoves - dw NidoqueenEvosMoves - dw CuboneEvosMoves - dw RhyhornEvosMoves - dw LaprasEvosMoves - dw ArcanineEvosMoves - dw MewEvosMoves - dw GyaradosEvosMoves - dw ShellderEvosMoves - dw TentacoolEvosMoves - dw GastlyEvosMoves - dw ScytherEvosMoves - dw StaryuEvosMoves - dw BlastoiseEvosMoves - dw PinsirEvosMoves - dw TangelaEvosMoves - dw MissingNo1FEvosMoves - dw MissingNo20EvosMoves - dw GrowlitheEvosMoves - dw OnixEvosMoves - dw FearowEvosMoves - dw PidgeyEvosMoves - dw SlowpokeEvosMoves - dw KadabraEvosMoves - dw GravelerEvosMoves - dw ChanseyEvosMoves - dw MachokeEvosMoves - dw MrMimeEvosMoves - dw HitmonleeEvosMoves - dw HitmonchanEvosMoves - dw ArbokEvosMoves - dw ParasectEvosMoves - dw PsyduckEvosMoves - dw DrowzeeEvosMoves - dw GolemEvosMoves - dw MissingNo32EvosMoves - dw MagmarEvosMoves - dw MissingNo34EvosMoves - dw ElectabuzzEvosMoves - dw MagnetonEvosMoves - dw KoffingEvosMoves - dw MissingNo38EvosMoves - dw MankeyEvosMoves - dw SeelEvosMoves - dw DiglettEvosMoves - dw TaurosEvosMoves - dw MissingNo3DEvosMoves - dw MissingNo3EEvosMoves - dw MissingNo3FEvosMoves - dw FarfetchdEvosMoves - dw VenonatEvosMoves - dw DragoniteEvosMoves - dw MissingNo43EvosMoves - dw MissingNo44EvosMoves - dw MissingNo45EvosMoves - dw DoduoEvosMoves - dw PoliwagEvosMoves - dw JynxEvosMoves - dw MoltresEvosMoves - dw ArticunoEvosMoves - dw ZapdosEvosMoves - dw DittoEvosMoves - dw MeowthEvosMoves - dw KrabbyEvosMoves - dw MissingNo4FEvosMoves - dw MissingNo50EvosMoves - dw MissingNo51EvosMoves - dw VulpixEvosMoves - dw NinetalesEvosMoves - dw PikachuEvosMoves - dw RaichuEvosMoves - dw MissingNo56EvosMoves - dw MissingNo57EvosMoves - dw DratiniEvosMoves - dw DragonairEvosMoves - dw KabutoEvosMoves - dw KabutopsEvosMoves - dw HorseaEvosMoves - dw SeadraEvosMoves - dw MissingNo5EEvosMoves - dw MissingNo5FEvosMoves - dw SandshrewEvosMoves - dw SandslashEvosMoves - dw OmanyteEvosMoves - dw OmastarEvosMoves - dw JigglypuffEvosMoves - dw WigglytuffEvosMoves - dw EeveeEvosMoves - dw FlareonEvosMoves - dw JolteonEvosMoves - dw VaporeonEvosMoves - dw MachopEvosMoves - dw ZubatEvosMoves - dw EkansEvosMoves - dw ParasEvosMoves - dw PoliwhirlEvosMoves - dw PoliwrathEvosMoves - dw WeedleEvosMoves - dw KakunaEvosMoves - dw BeedrillEvosMoves - dw MissingNo73EvosMoves - dw DodrioEvosMoves - dw PrimeapeEvosMoves - dw DugtrioEvosMoves - dw VenomothEvosMoves - dw DewgongEvosMoves - dw MissingNo79EvosMoves - dw MissingNo7AEvosMoves - dw CaterpieEvosMoves - dw MetapodEvosMoves - dw ButterfreeEvosMoves - dw MachampEvosMoves - dw MissingNo7FEvosMoves - dw GolduckEvosMoves - dw HypnoEvosMoves - dw GolbatEvosMoves - dw MewtwoEvosMoves - dw SnorlaxEvosMoves - dw MagikarpEvosMoves - dw MissingNo86EvosMoves - dw MissingNo87EvosMoves - dw MukEvosMoves - dw MissingNo8AEvosMoves - dw KinglerEvosMoves - dw CloysterEvosMoves - dw MissingNo8CEvosMoves - dw ElectrodeEvosMoves - dw ClefableEvosMoves - dw WeezingEvosMoves - dw PersianEvosMoves - dw MarowakEvosMoves - dw MissingNo92EvosMoves - dw HaunterEvosMoves - dw AbraEvosMoves - dw AlakazamEvosMoves - dw PidgeottoEvosMoves - dw PidgeotEvosMoves - dw StarmieEvosMoves - dw BulbasaurEvosMoves - dw VenusaurEvosMoves - dw TentacruelEvosMoves - dw MissingNo9CEvosMoves - dw GoldeenEvosMoves - dw SeakingEvosMoves - dw MissingNo9FEvosMoves - dw MissingNoA0EvosMoves - dw MissingNoA1EvosMoves - dw MissingNoA2EvosMoves - dw PonytaEvosMoves - dw RapidashEvosMoves - dw RattataEvosMoves - dw RaticateEvosMoves - dw NidorinoEvosMoves - dw NidorinaEvosMoves - dw GeodudeEvosMoves - dw PorygonEvosMoves - dw AerodactylEvosMoves - dw MissingNoACEvosMoves - dw MagnemiteEvosMoves - dw MissingNoAEEvosMoves - dw MissingNoAFEvosMoves - dw CharmanderEvosMoves - dw SquirtleEvosMoves - dw CharmeleonEvosMoves - dw WartortleEvosMoves - dw CharizardEvosMoves - dw MissingNoB5EvosMoves - dw FossilKabutopsEvosMoves - dw FossilAerodactylEvosMoves - dw MonGhostEvosMoves - dw OddishEvosMoves - dw GloomEvosMoves - dw VileplumeEvosMoves - dw BellsproutEvosMoves - dw WeepinbellEvosMoves - dw VictreebelEvosMoves - -RhydonEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER - db 64, TAKE_DOWN - db 0 - -KangaskhanEvosMoves: -; Evolutions - db 0 -; Learnset - db 26, BITE - db 31, TAIL_WHIP - db 36, MEGA_PUNCH - db 41, LEER - db 46, DIZZY_PUNCH - db 0 - -NidoranMEvosMoves: -; Evolutions - db EV_LEVEL, 16, NIDORINO - db 0 -; Learnset - db 8, HORN_ATTACK - db 12, DOUBLE_KICK - db 17, POISON_STING - db 23, FOCUS_ENERGY - db 30, FURY_ATTACK - db 38, HORN_DRILL - db 0 - -ClefairyEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, CLEFABLE - db 0 -; Learnset - db 13, SING - db 18, DOUBLESLAP - db 24, MINIMIZE - db 31, METRONOME - db 39, DEFENSE_CURL - db 48, LIGHT_SCREEN - db 0 - -SpearowEvosMoves: -; Evolutions - db EV_LEVEL, 20, FEAROW - db 0 -; Learnset - db 9, LEER - db 15, FURY_ATTACK - db 22, MIRROR_MOVE - db 29, DRILL_PECK - db 36, AGILITY - db 0 - -VoltorbEvosMoves: -; Evolutions - db EV_LEVEL, 30, ELECTRODE - db 0 -; Learnset - db 17, SONICBOOM - db 22, SELFDESTRUCT - db 29, LIGHT_SCREEN - db 36, SWIFT - db 43, EXPLOSION - db 0 - -NidokingEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, HORN_ATTACK - db 12, DOUBLE_KICK - db 23, THRASH - db 0 - -SlowbroEvosMoves: -; Evolutions - db 0 -; Learnset - db 18, DISABLE - db 22, HEADBUTT - db 27, GROWL - db 33, WATER_GUN - db 37, WITHDRAW - db 44, AMNESIA - db 55, PSYCHIC_M - db 0 - -IvysaurEvosMoves: -; Evolutions - db EV_LEVEL, 32, VENUSAUR - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 38, GROWTH - db 46, SLEEP_POWDER - db 54, SOLARBEAM - db 0 - -ExeggutorEvosMoves: -; Evolutions - db 0 -; Learnset - db 28, STOMP - db 0 - -LickitungEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, STOMP - db 15, DISABLE - db 23, DEFENSE_CURL - db 31, SLAM - db 39, SCREECH - db 0 - -ExeggcuteEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR - db 0 -; Learnset - db 25, REFLECT - db 28, LEECH_SEED - db 32, STUN_SPORE - db 37, POISONPOWDER - db 42, SOLARBEAM - db 48, SLEEP_POWDER - db 0 - -GrimerEvosMoves: -; Evolutions - db EV_LEVEL, 38, MUK - db 0 -; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 42, HARDEN - db 48, SCREECH - db 55, ACID_ARMOR - db 0 - -GengarEvosMoves: -; Evolutions - db 0 -; Learnset - db 29, HYPNOSIS - db 38, DREAM_EATER - db 0 - -NidoranFEvosMoves: -; Evolutions - db EV_LEVEL, 16, NIDORINA - db 0 -; Learnset - db 8, SCRATCH - db 12, DOUBLE_KICK - db 17, POISON_STING - db 23, TAIL_WHIP - db 30, BITE - db 38, FURY_SWIPES - db 0 - -NidoqueenEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, SCRATCH - db 12, DOUBLE_KICK - db 23, BODY_SLAM - db 0 - -CuboneEvosMoves: -; Evolutions - 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 - db 43, BONEMERANG - db 46, RAGE - db 0 - -RhyhornEvosMoves: -; Evolutions - db EV_LEVEL, 42, RHYDON - db 0 -; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 45, HORN_DRILL - db 50, LEER - db 55, TAKE_DOWN - db 0 - -LaprasEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, SING - db 20, MIST - db 25, BODY_SLAM - db 31, CONFUSE_RAY - db 38, ICE_BEAM - db 46, HYDRO_PUMP - db 0 - -ArcanineEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MewEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, TRANSFORM - db 20, MEGA_PUNCH - db 30, METRONOME - db 40, PSYCHIC_M - db 0 - -GyaradosEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, BITE - db 25, DRAGON_RAGE - db 32, LEER - db 41, HYDRO_PUMP - db 52, HYPER_BEAM - db 0 - -ShellderEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, CLOYSTER - db 0 -; Learnset - db 18, SUPERSONIC - db 23, CLAMP - db 30, AURORA_BEAM - db 39, LEER - db 50, ICE_BEAM - db 0 - -TentacoolEvosMoves: -; Evolutions - db EV_LEVEL, 30, TENTACRUEL - db 0 -; Learnset - db 7, SUPERSONIC - db 13, WRAP - db 18, POISON_STING - db 22, WATER_GUN - db 27, CONSTRICT - db 33, BARRIER - db 40, SCREECH - db 48, HYDRO_PUMP - db 0 - -GastlyEvosMoves: -; Evolutions - db EV_LEVEL, 25, HAUNTER - db 0 -; Learnset - db 27, HYPNOSIS - db 35, DREAM_EATER - db 0 - -ScytherEvosMoves: -; Evolutions - db 0 -; Learnset - db 17, LEER - db 20, FOCUS_ENERGY - db 24, DOUBLE_TEAM - db 29, SLASH - db 35, SWORDS_DANCE - db 42, AGILITY - db 50, WING_ATTACK - db 0 - -StaryuEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, STARMIE - db 0 -; Learnset - db 17, WATER_GUN - db 22, HARDEN - db 27, RECOVER - db 32, SWIFT - db 37, MINIMIZE - db 42, LIGHT_SCREEN - db 47, HYDRO_PUMP - db 0 - -BlastoiseEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW - db 42, SKULL_BASH - db 52, HYDRO_PUMP - db 0 - -PinsirEvosMoves: -; Evolutions - db 0 -; Learnset - db 21, BIND - db 25, SEISMIC_TOSS - db 30, GUILLOTINE - db 36, FOCUS_ENERGY - db 43, HARDEN - db 49, SLASH - db 54, SWORDS_DANCE - db 0 - -TangelaEvosMoves: -; Evolutions - db 0 -; Learnset - 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 48, GROWTH - db 0 - -MissingNo1FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo20EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GrowlitheEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, ARCANINE - db 0 -; Learnset - db 18, EMBER - db 23, LEER - db 30, TAKE_DOWN - db 39, AGILITY - db 50, FLAMETHROWER - db 0 - -OnixEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, BIND - db 19, ROCK_THROW - db 25, RAGE - db 33, SLAM - db 43, HARDEN - db 0 - -FearowEvosMoves: -; Evolutions - db 0 -; Learnset - db 9, LEER - db 15, FURY_ATTACK - db 25, MIRROR_MOVE - db 34, DRILL_PECK - db 43, AGILITY - db 0 - -PidgeyEvosMoves: -; Evolutions - db EV_LEVEL, 18, PIDGEOTTO - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 19, WHIRLWIND - db 28, WING_ATTACK - db 36, AGILITY - db 44, MIRROR_MOVE - db 0 - -SlowpokeEvosMoves: -; Evolutions - db EV_LEVEL, 37, SLOWBRO - db 0 -; Learnset - db 18, DISABLE - db 22, HEADBUTT - db 27, GROWL - db 33, WATER_GUN - db 40, AMNESIA - db 48, PSYCHIC_M - db 0 - -KadabraEvosMoves: -; Evolutions - db EV_TRADE, 1, ALAKAZAM - db 0 -; Learnset - db 16, CONFUSION - db 20, DISABLE - db 27, PSYBEAM - db 31, RECOVER - db 38, PSYCHIC_M - db 42, REFLECT - db 0 - -GravelerEvosMoves: -; Evolutions - db EV_TRADE, 1, GOLEM - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 0 - -ChanseyEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, DOUBLESLAP - db 24, SING - db 30, GROWL - db 38, MINIMIZE - db 44, DEFENSE_CURL - db 48, LIGHT_SCREEN - db 54, DOUBLE_EDGE - db 0 - -MachokeEvosMoves: -; Evolutions - db EV_TRADE, 1, MACHAMP - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 36, FOCUS_ENERGY - db 44, SEISMIC_TOSS - db 52, SUBMISSION - db 0 - -MrMimeEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, CONFUSION - db 23, LIGHT_SCREEN - db 31, DOUBLESLAP - db 39, MEDITATE - db 47, SUBSTITUTE - db 0 - -HitmonleeEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, ROLLING_KICK - db 38, JUMP_KICK - db 43, FOCUS_ENERGY - db 48, HI_JUMP_KICK - db 53, MEGA_KICK - db 0 - -HitmonchanEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, FIRE_PUNCH - db 38, ICE_PUNCH - db 43, THUNDERPUNCH - db 48, MEGA_PUNCH - db 53, COUNTER - db 0 - -ArbokEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, POISON_STING - db 17, BITE - db 27, GLARE - db 36, SCREECH - db 47, ACID - db 0 - -ParasectEvosMoves: -; Evolutions - db 0 -; Learnset - db 13, STUN_SPORE - db 20, LEECH_LIFE - db 30, SPORE - db 39, SLASH - db 48, GROWTH - db 0 - -PsyduckEvosMoves: -; Evolutions - db EV_LEVEL, 33, GOLDUCK - db 0 -; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 36, CONFUSION - db 43, FURY_SWIPES - db 52, HYDRO_PUMP - db 0 - -DrowzeeEvosMoves: -; Evolutions - db EV_LEVEL, 26, HYPNO - db 0 -; Learnset - db 12, DISABLE - db 17, CONFUSION - db 24, HEADBUTT - db 29, POISON_GAS - db 32, PSYCHIC_M - db 37, MEDITATE - db 0 - -GolemEvosMoves: -; Evolutions - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 0 - -MissingNo32EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MagmarEvosMoves: -; Evolutions - db 0 -; Learnset - db 36, LEER - db 39, CONFUSE_RAY - db 43, FIRE_PUNCH - db 48, SMOKESCREEN - db 52, SMOG - db 55, FLAMETHROWER - db 0 - -MissingNo34EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -ElectabuzzEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, THUNDERSHOCK - db 37, SCREECH - db 42, THUNDERPUNCH - db 49, LIGHT_SCREEN - db 54, THUNDER - db 0 - -MagnetonEvosMoves: -; Evolutions - db 0 -; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 38, THUNDER_WAVE - db 46, SWIFT - db 54, SCREECH - db 0 - -KoffingEvosMoves: -; Evolutions - db EV_LEVEL, 35, WEEZING - db 0 -; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 45, HAZE - db 48, EXPLOSION - db 0 - -MissingNo38EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MankeyEvosMoves: -; Evolutions - 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: -; Evolutions - db EV_LEVEL, 34, DEWGONG - db 0 -; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 40, REST - db 45, TAKE_DOWN - db 50, ICE_BEAM - db 0 - -DiglettEvosMoves: -; Evolutions - db EV_LEVEL, 26, DUGTRIO - db 0 -; Learnset - db 15, GROWL - db 19, DIG - db 24, SAND_ATTACK - db 31, SLASH - db 40, EARTHQUAKE - db 0 - -TaurosEvosMoves: -; Evolutions - db 0 -; Learnset - db 21, STOMP - db 28, TAIL_WHIP - db 35, LEER - db 44, RAGE - db 51, TAKE_DOWN - db 0 - -MissingNo3DEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo3EEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo3FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FarfetchdEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, LEER - db 15, FURY_ATTACK - db 23, SWORDS_DANCE - db 31, AGILITY - db 39, SLASH - db 0 - -VenonatEvosMoves: -; Evolutions - db EV_LEVEL, 31, VENOMOTH - db 0 -; Learnset - db 11, SUPERSONIC - db 19, CONFUSION - db 22, POISONPOWDER - db 27, LEECH_LIFE - db 30, STUN_SPORE - db 35, PSYBEAM - db 38, SLEEP_POWDER - db 43, PSYCHIC_M - db 0 - -DragoniteEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 35, SLAM - db 45, DRAGON_RAGE - db 60, HYPER_BEAM - db 0 - -MissingNo43EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo44EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo45EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DoduoEvosMoves: -; Evolutions - db EV_LEVEL, 31, DODRIO - db 0 -; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 36, RAGE - db 40, TRI_ATTACK - db 44, AGILITY - db 0 - -PoliwagEvosMoves: -; Evolutions - db EV_LEVEL, 25, POLIWHIRL - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 25, DOUBLESLAP - db 31, BODY_SLAM - db 38, AMNESIA - db 45, HYDRO_PUMP - db 0 - -JynxEvosMoves: -; Evolutions - db 0 -; Learnset - db 18, LICK - db 23, DOUBLESLAP - db 31, ICE_PUNCH - db 39, BODY_SLAM - db 47, THRASH - db 58, BLIZZARD - db 0 - -MoltresEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, LEER - db 55, AGILITY - db 60, SKY_ATTACK - db 0 - -ArticunoEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, BLIZZARD - db 55, AGILITY - db 60, MIST - db 0 - -ZapdosEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, THUNDER - db 55, AGILITY - db 60, LIGHT_SCREEN - db 0 - -DittoEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MeowthEvosMoves: -; Evolutions - db EV_LEVEL, 28, PERSIAN - db 0 -; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 33, FURY_SWIPES - db 44, SLASH - db 0 - -KrabbyEvosMoves: -; Evolutions - db EV_LEVEL, 28, KINGLER - db 0 -; Learnset - db 20, VICEGRIP - db 25, GUILLOTINE - db 30, STOMP - db 35, CRABHAMMER - db 40, HARDEN - db 0 - -MissingNo4FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo50EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo51EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -VulpixEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, NINETALES - db 0 -; Learnset - db 16, QUICK_ATTACK - db 21, ROAR - db 28, CONFUSE_RAY - db 35, FLAMETHROWER - db 42, FIRE_SPIN - db 0 - -NinetalesEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -PikachuEvosMoves: -; Evolutions - db EV_ITEM, THUNDER_STONE, 1, RAICHU - db 0 -; Learnset - 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 41, THUNDER - db 50, LIGHT_SCREEN - db 0 - -RaichuEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo56EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo57EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DratiniEvosMoves: -; Evolutions - db EV_LEVEL, 30, DRAGONAIR - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 30, SLAM - db 40, DRAGON_RAGE - db 50, HYPER_BEAM - db 0 - -DragonairEvosMoves: -; Evolutions - db EV_LEVEL, 55, DRAGONITE - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 35, SLAM - db 45, DRAGON_RAGE - db 55, HYPER_BEAM - db 0 - -KabutoEvosMoves: -; Evolutions - db EV_LEVEL, 40, KABUTOPS - db 0 -; Learnset - db 34, ABSORB - db 39, SLASH - db 44, LEER - db 49, HYDRO_PUMP - db 0 - -KabutopsEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, ABSORB - db 39, SLASH - db 46, LEER - db 53, HYDRO_PUMP - db 0 - -HorseaEvosMoves: -; Evolutions - db EV_LEVEL, 32, SEADRA - db 0 -; Learnset - db 19, SMOKESCREEN - db 24, LEER - db 30, WATER_GUN - db 37, AGILITY - db 45, HYDRO_PUMP - db 0 - -SeadraEvosMoves: -; Evolutions - db 0 -; Learnset - db 19, SMOKESCREEN - db 24, LEER - db 30, WATER_GUN - db 41, AGILITY - db 52, HYDRO_PUMP - db 0 - -MissingNo5EEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo5FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -SandshrewEvosMoves: -; Evolutions - db EV_LEVEL, 22, SANDSLASH - db 0 -; Learnset - db 10, SAND_ATTACK - db 17, SLASH - db 24, POISON_STING - db 31, SWIFT - db 38, FURY_SWIPES - db 0 - -SandslashEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, SAND_ATTACK - db 17, SLASH - db 27, POISON_STING - db 36, SWIFT - db 47, FURY_SWIPES - db 0 - -OmanyteEvosMoves: -; Evolutions - db EV_LEVEL, 40, OMASTAR - db 0 -; Learnset - db 34, HORN_ATTACK - db 39, LEER - db 46, SPIKE_CANNON - db 53, HYDRO_PUMP - db 0 - -OmastarEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, HORN_ATTACK - db 39, LEER - db 44, SPIKE_CANNON - db 49, HYDRO_PUMP - db 0 - -JigglypuffEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF - db 0 -; Learnset - db 9, POUND - db 14, DISABLE - db 19, DEFENSE_CURL - db 24, DOUBLESLAP - db 29, REST - db 34, BODY_SLAM - db 39, DOUBLE_EDGE - db 0 - -WigglytuffEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -EeveeEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, FLAREON - db EV_ITEM, THUNDER_STONE, 1, JOLTEON - db EV_ITEM, WATER_STONE, 1, VAPOREON - db 0 -; Learnset - 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 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 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 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: -; Evolutions - db EV_LEVEL, 28, MACHOKE - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 32, FOCUS_ENERGY - db 39, SEISMIC_TOSS - db 46, SUBMISSION - db 0 - -ZubatEvosMoves: -; Evolutions - db EV_LEVEL, 22, GOLBAT - db 0 -; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 28, WING_ATTACK - db 36, HAZE - db 0 - -EkansEvosMoves: -; Evolutions - db EV_LEVEL, 22, ARBOK - db 0 -; Learnset - db 10, POISON_STING - db 17, BITE - db 24, GLARE - db 31, SCREECH - db 38, ACID - db 0 - -ParasEvosMoves: -; Evolutions - db EV_LEVEL, 24, PARASECT - db 0 -; Learnset - db 13, STUN_SPORE - db 20, LEECH_LIFE - db 27, SPORE - db 34, SLASH - db 41, GROWTH - db 0 - -PoliwhirlEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, POLIWRATH - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 26, DOUBLESLAP - db 33, BODY_SLAM - db 41, AMNESIA - db 49, HYDRO_PUMP - db 0 - -PoliwrathEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 0 - -WeedleEvosMoves: -; Evolutions - db EV_LEVEL, 7, KAKUNA - db 0 -; Learnset - db 0 - -KakunaEvosMoves: -; Evolutions - db EV_LEVEL, 10, BEEDRILL - db 0 -; Learnset - db 0 - -BeedrillEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, FURY_ATTACK - db 16, FOCUS_ENERGY - db 20, TWINEEDLE - db 25, RAGE - db 30, PIN_MISSILE - db 35, AGILITY - db 0 - -MissingNo73EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DodrioEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 39, RAGE - db 45, TRI_ATTACK - db 51, AGILITY - db 0 - -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: -; Evolutions - db 0 -; Learnset - db 15, GROWL - db 19, DIG - db 24, SAND_ATTACK - db 35, SLASH - db 47, EARTHQUAKE - db 0 - -VenomothEvosMoves: -; Evolutions - db 0 -; Learnset - db 22, POISONPOWDER - db 27, LEECH_LIFE - db 30, STUN_SPORE - db 38, PSYBEAM - db 43, SLEEP_POWDER - db 50, PSYCHIC_M - db 0 - -DewgongEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 44, REST - db 50, TAKE_DOWN - db 56, ICE_BEAM - db 0 - -MissingNo79EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo7AEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -CaterpieEvosMoves: -; Evolutions - db EV_LEVEL, 7, METAPOD - db 0 -; Learnset - db 0 - -MetapodEvosMoves: -; Evolutions - db EV_LEVEL, 10, BUTTERFREE - db 0 -; Learnset - db 7, HARDEN - db 0 - -ButterfreeEvosMoves: -; Evolutions - db 0 -; Learnset - 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: -; Evolutions - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 36, FOCUS_ENERGY - db 44, SEISMIC_TOSS - db 52, SUBMISSION - db 0 - -MissingNo7FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GolduckEvosMoves: -; Evolutions - db 0 -; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 39, CONFUSION - db 48, FURY_SWIPES - db 59, HYDRO_PUMP - db 0 - -HypnoEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, DISABLE - db 17, CONFUSION - db 24, HEADBUTT - db 33, POISON_GAS - db 37, PSYCHIC_M - db 43, MEDITATE - db 0 - -GolbatEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 32, WING_ATTACK - db 43, HAZE - db 0 - -MewtwoEvosMoves: -; Evolutions - db 0 -; Learnset - db 63, BARRIER - db 66, PSYCHIC_M - db 70, RECOVER - db 75, MIST - db 81, AMNESIA - db 0 - -SnorlaxEvosMoves: -; Evolutions - db 0 -; Learnset - db 35, BODY_SLAM - db 41, HARDEN - db 48, DOUBLE_EDGE - db 56, HYPER_BEAM - db 0 - -MagikarpEvosMoves: -; Evolutions - db EV_LEVEL, 20, GYARADOS - db 0 -; Learnset - db 15, TACKLE - db 0 - -MissingNo86EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo87EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MukEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 45, HARDEN - db 53, SCREECH - db 60, ACID_ARMOR - db 0 - -MissingNo8AEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -KinglerEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, VICEGRIP - db 25, GUILLOTINE - db 34, STOMP - db 42, CRABHAMMER - db 49, HARDEN - db 0 - -CloysterEvosMoves: -; Evolutions - db 0 -; Learnset - db 50, SPIKE_CANNON - db 0 - -MissingNo8CEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -ElectrodeEvosMoves: -; Evolutions - db 0 -; Learnset - db 17, SONICBOOM - db 22, SELFDESTRUCT - db 29, LIGHT_SCREEN - db 40, SWIFT - db 50, EXPLOSION - db 0 - -ClefableEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -WeezingEvosMoves: -; Evolutions - db 0 -; Learnset - db 32, SLUDGE - db 39, SMOKESCREEN - db 43, SELFDESTRUCT - db 49, HAZE - db 53, EXPLOSION - db 0 - -PersianEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 37, FURY_SWIPES - db 51, SLASH - db 0 - -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 - db 48, BONEMERANG - db 55, RAGE - db 0 - -MissingNo92EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -HaunterEvosMoves: -; Evolutions - db EV_TRADE, 1, GENGAR - db 0 -; Learnset - db 29, HYPNOSIS - db 38, DREAM_EATER - db 0 - -AbraEvosMoves: -; Evolutions - db EV_LEVEL, 16, KADABRA - db 0 -; Learnset - db 0 - -AlakazamEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, CONFUSION - db 20, DISABLE - db 27, PSYBEAM - db 31, RECOVER - db 38, PSYCHIC_M - db 42, REFLECT - db 0 - -PidgeottoEvosMoves: -; Evolutions - db EV_LEVEL, 36, PIDGEOT - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 21, WHIRLWIND - db 31, WING_ATTACK - db 40, AGILITY - db 49, MIRROR_MOVE - db 0 - -PidgeotEvosMoves: -; Evolutions - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 21, WHIRLWIND - db 31, WING_ATTACK - db 44, AGILITY - db 54, MIRROR_MOVE - db 0 - -StarmieEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -BulbasaurEvosMoves: -; Evolutions - db EV_LEVEL, 16, IVYSAUR - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 20, POISONPOWDER - db 27, RAZOR_LEAF - db 34, GROWTH - db 41, SLEEP_POWDER - db 48, SOLARBEAM - db 0 - -VenusaurEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 43, GROWTH - db 55, SLEEP_POWDER - db 65, SOLARBEAM - db 0 - -TentacruelEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, SUPERSONIC - db 13, WRAP - db 18, POISON_STING - db 22, WATER_GUN - db 27, CONSTRICT - db 35, BARRIER - db 43, SCREECH - db 50, HYDRO_PUMP - db 0 - -MissingNo9CEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GoldeenEvosMoves: -; Evolutions - db EV_LEVEL, 33, SEAKING - db 0 -; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 37, WATERFALL - db 45, HORN_DRILL - db 54, AGILITY - db 0 - -SeakingEvosMoves: -; Evolutions - db 0 -; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 39, WATERFALL - db 48, HORN_DRILL - db 54, AGILITY - db 0 - -MissingNo9FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA0EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA1EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA2EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -PonytaEvosMoves: -; Evolutions - db EV_LEVEL, 40, RAPIDASH - db 0 -; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 43, TAKE_DOWN - db 48, AGILITY - db 0 - -RapidashEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 47, TAKE_DOWN - db 55, AGILITY - db 0 - -RattataEvosMoves: -; Evolutions - db EV_LEVEL, 20, RATICATE - db 0 -; Learnset - db 7, QUICK_ATTACK - db 14, HYPER_FANG - db 23, FOCUS_ENERGY - db 34, SUPER_FANG - db 0 - -RaticateEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, QUICK_ATTACK - db 14, HYPER_FANG - db 27, FOCUS_ENERGY - db 41, SUPER_FANG - db 0 - -NidorinoEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOKING - db 0 -; Learnset - db 8, HORN_ATTACK - db 12, DOUBLE_KICK - db 19, POISON_STING - db 27, FOCUS_ENERGY - db 36, FURY_ATTACK - db 46, HORN_DRILL - db 0 - -NidorinaEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOQUEEN - db 0 -; Learnset - db 8, SCRATCH - db 12, DOUBLE_KICK - db 19, POISON_STING - db 27, TAIL_WHIP - db 36, BITE - db 46, FURY_SWIPES - db 0 - -GeodudeEvosMoves: -; Evolutions - db EV_LEVEL, 25, GRAVELER - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 26, HARDEN - db 31, EARTHQUAKE - db 36, EXPLOSION - db 0 - -PorygonEvosMoves: -; Evolutions - db 0 -; Learnset - db 23, PSYBEAM - db 28, RECOVER - db 35, AGILITY - db 42, TRI_ATTACK - db 0 - -AerodactylEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, SUPERSONIC - db 38, BITE - db 45, TAKE_DOWN - db 54, HYPER_BEAM - db 0 - -MissingNoACEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MagnemiteEvosMoves: -; Evolutions - db EV_LEVEL, 30, MAGNETON - db 0 -; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH - db 0 - -MissingNoAEEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoAFEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -CharmanderEvosMoves: -; Evolutions - db EV_LEVEL, 16, CHARMELEON - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 22, RAGE - db 30, SLASH - db 38, FLAMETHROWER - db 46, FIRE_SPIN - db 0 - -SquirtleEvosMoves: -; Evolutions - db EV_LEVEL, 16, WARTORTLE - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 22, BITE - db 28, WITHDRAW - db 35, SKULL_BASH - db 42, HYDRO_PUMP - db 0 - -CharmeleonEvosMoves: -; Evolutions - db EV_LEVEL, 36, CHARIZARD - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 24, RAGE - db 33, SLASH - db 42, FLAMETHROWER - db 56, FIRE_SPIN - db 0 - -WartortleEvosMoves: -; Evolutions - db EV_LEVEL, 36, BLASTOISE - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW - db 39, SKULL_BASH - db 47, HYDRO_PUMP - db 0 - -CharizardEvosMoves: -; Evolutions - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 24, RAGE - db 36, SLASH - db 46, FLAMETHROWER - db 55, FIRE_SPIN - db 0 - -MissingNoB5EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FossilKabutopsEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FossilAerodactylEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MonGhostEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -OddishEvosMoves: -; Evolutions - db EV_LEVEL, 21, GLOOM - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 24, ACID - db 33, PETAL_DANCE - db 46, SOLARBEAM - db 0 - -GloomEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, VILEPLUME - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 28, ACID - db 38, PETAL_DANCE - db 52, SOLARBEAM - db 0 - -VileplumeEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 0 - -BellsproutEvosMoves: -; Evolutions - db EV_LEVEL, 21, WEEPINBELL - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 21, STUN_SPORE - db 26, ACID - db 33, RAZOR_LEAF - db 42, SLAM - db 0 - -WeepinbellEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, VICTREEBEL - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 23, STUN_SPORE - db 29, ACID - db 38, RAZOR_LEAF - db 49, SLAM - db 0 - -VictreebelEvosMoves: -; Evolutions - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 0 diff --git a/data/facing.asm b/data/facing.asm deleted file mode 100644 index 944a31c8..00000000 --- a/data/facing.asm +++ /dev/null @@ -1,133 +0,0 @@ -SpriteFacingAndAnimationTable: - dw SpriteFacingDownAndStanding ; facing down, walk animation frame 0 - dw SpriteFacingDownAndWalking ; facing down, walk animation frame 1 - dw SpriteFacingDownAndStanding ; facing down, walk animation frame 2 - dw SpriteFacingDownAndWalking2 ; facing down, walk animation frame 3 - - dw SpriteFacingUpAndStanding ; facing up, walk animation frame 0 - dw SpriteFacingUpAndWalking ; facing up, walk animation frame 1 - dw SpriteFacingUpAndStanding ; facing up, walk animation frame 2 - dw SpriteFacingUpAndWalking2 ; facing up, walk animation frame 3 - - dw SpriteFacingLeftAndStanding ; facing left, walk animation frame 0 - dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 1 - dw SpriteFacingLeftAndStanding ; facing left, walk animation frame 2 - dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 3 - - dw SpriteFacingRightAndStanding ; facing right, walk animation frame 0 - dw SpriteFacingRightAndWalking ; facing right, walk animation frame 1 - dw SpriteFacingRightAndStanding ; facing right, walk animation frame 2 - dw SpriteFacingRightAndWalking ; facing right, walk animation frame 3 - - dw SpriteFacingDownAndStanding ; --- - dw SpriteFacingDownAndStanding ; This table is used for sprites $a and $b. - dw SpriteFacingDownAndStanding ; All orientation and animation parameters - dw SpriteFacingDownAndStanding ; lead to the same result. Used for immobile - dw SpriteFacingDownAndStanding ; sprites like items on the ground - dw SpriteFacingDownAndStanding ; --- - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding - dw SpriteFacingDownAndStanding -; special case - dw SpriteSpecialCase ; pikachu maybe? - -SpriteFacingDownAndStanding: - 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 - -SpriteFacingDownAndWalking: - 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 - -SpriteFacingDownAndWalking2: - db $04 -; Sprite OAM Parameters - db $00,$08,$80,OAMFLAG_VFLIPPED ; top left - db $00,$00,$81,OAMFLAG_VFLIPPED ; top right - db $08,$08,$82,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left - db $08,$00,$83,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - -SpriteFacingUpAndStanding: - 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 - -SpriteFacingUpAndWalking: - 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 - -SpriteFacingUpAndWalking2: - db $04 -; Sprite OAM Parameters - db $00,$08,$84,OAMFLAG_VFLIPPED ; top left - db $00,$00,$85,OAMFLAG_VFLIPPED ; top right - db $08,$08,$86,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left - db $08,$00,$87,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - -SpriteFacingLeftAndStanding: - 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 - -SpriteFacingLeftAndWalking: - 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 - -SpriteFacingRightAndStanding: - db $04 -; Sprite OAM Parameters - db $00,$08,$08,OAMFLAG_VFLIPPED ; top left - db $00,$00,$09,OAMFLAG_VFLIPPED ; top right - db $08,$08,$0a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left - db $08,$00,$0b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - -SpriteFacingRightAndWalking: - db $04 -; Sprite OAM Parameters - db $00,$08,$88,OAMFLAG_VFLIPPED ; top left - db $00,$00,$89,OAMFLAG_VFLIPPED ; top right - db $08,$08,$8a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left - db $08,$00,$8b,OAMFLAG_VFLIPPED | 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,OAMFLAG_VFLIPPED - 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/force_bike_surf.asm b/data/force_bike_surf.asm deleted file mode 100755 index fb352aa9..00000000 --- a/data/force_bike_surf.asm +++ /dev/null @@ -1,11 +0,0 @@ -ForcedBikeOrSurfMaps: -; map id, y, x - db ROUTE_16,$0A,$11 - db ROUTE_16,$0B,$11 - db ROUTE_18,$08,$21 - db ROUTE_18,$09,$21 - db SEAFOAM_ISLANDS_B3F,$07,$12 - db SEAFOAM_ISLANDS_B3F,$07,$13 - db SEAFOAM_ISLANDS_B4F,$0E,$04 - db SEAFOAM_ISLANDS_B4F,$0E,$05 - db $FF ;end diff --git a/data/good_rod.asm b/data/good_rod.asm deleted file mode 100755 index 6c23f402..00000000 --- a/data/good_rod.asm +++ /dev/null @@ -1,3 +0,0 @@ -GoodRodMons: - db 10,GOLDEEN - db 10,POLIWAG diff --git a/data/growth_rates.asm b/data/growth_rates.asm new file mode 100644 index 00000000..32354a64 --- /dev/null +++ b/data/growth_rates.asm @@ -0,0 +1,19 @@ +growth_rate: MACRO +; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5] + dn \1, \2 + if \3 & $80 ; signed + db -\3 | $80 + else + db \3 + endc + db \4, \5 +ENDM + +GrowthRateTable: +; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) + growth_rate 1, 1, 0, 0, 0 ; Medium Fast + growth_rate 3, 4, 10, 0, 30 ; Slightly Fast + growth_rate 3, 4, 20, 0, 70 ; Slightly Slow + growth_rate 6, 5, -15, 100, 140 ; Medium Slow + growth_rate 4, 5, 0, 0, 0 ; Fast + growth_rate 5, 4, 0, 0, 0 ; Slow diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm deleted file mode 100755 index b7358572..00000000 --- a/data/hidden_coins.asm +++ /dev/null @@ -1,14 +0,0 @@ -HiddenCoinCoords: - db GAME_CORNER,$08,$00 - db GAME_CORNER,$10,$01 - db GAME_CORNER,$0b,$03 - db GAME_CORNER,$0e,$03 - db GAME_CORNER,$0c,$04 - db GAME_CORNER,$0c,$09 - db GAME_CORNER,$0f,$09 - db GAME_CORNER,$0e,$10 - db GAME_CORNER,$10,$0a - db GAME_CORNER,$07,$0b - db GAME_CORNER,$08,$0f - db GAME_CORNER,$0f,$0c - db $ff diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm deleted file mode 100755 index acc79172..00000000 --- a/data/hidden_item_coords.asm +++ /dev/null @@ -1,58 +0,0 @@ -HiddenItemCoords: -; map ID, then coords - db SILPH_CO_5F,$03,$0c - db SILPH_CO_9F,$0f,$02 - db POKEMON_MANSION_3F,$09,$01 - db POKEMON_MANSION_B1F,$09,$01 - db SAFARI_ZONE_WEST,$05,$06 - db CERULEAN_CAVE_2F,$0d,$10 - db CERULEAN_CAVE_B1F,$0e,$08 - db UNUSED_MAP_6F,$0b,$0e - db SEAFOAM_ISLANDS_B2F,$0f,$0f - db SEAFOAM_ISLANDS_B3F,$10,$09 - db SEAFOAM_ISLANDS_B4F,$11,$19 - db VIRIDIAN_FOREST,$12,$01 - db VIRIDIAN_FOREST,$2a,$10 - db MT_MOON_B2F,$0c,$12 - db MT_MOON_B2F,$09,$21 - db SS_ANNE_B1F_ROOMS,$01,$03 - db SS_ANNE_KITCHEN,$09,$0d - db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03 - db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04 - db UNDERGROUND_PATH_WEST_EAST,$02,$0c - db UNDERGROUND_PATH_WEST_EAST,$05,$15 - db ROCKET_HIDEOUT_B1F,$0f,$15 - db ROCKET_HIDEOUT_B3F,$11,$1b - db ROCKET_HIDEOUT_B4F,$01,$19 - db ROUTE_10,$11,$09 - db ROUTE_10,$35,$10 - db POWER_PLANT,$10,$11 - db POWER_PLANT,$01,$0c - db ROUTE_11,$05,$30 - db ROUTE_12,$3f,$02 - db ROUTE_13,$0e,$01 - db ROUTE_13,$0d,$10 - db ROUTE_17,$0e,$0f - db ROUTE_17,$2d,$08 - db ROUTE_17,$48,$11 - db ROUTE_17,$5b,$04 - db ROUTE_17,$79,$08 - db ROUTE_23,$2c,$09 - db ROUTE_23,$46,$13 - db ROUTE_23,$5a,$08 - db VICTORY_ROAD_2F,$02,$05 - db VICTORY_ROAD_2F,$07,$1a - db ROUTE_25,$03,$26 - db ROUTE_25,$01,$0a - db ROUTE_4,$03,$28 - db ROUTE_9,$07,$0e - db COPYCATS_HOUSE_2F,$01,$01 - db VIRIDIAN_CITY,$04,$0e - db CERULEAN_CITY,$08,$0f - db CERULEAN_CAVE_1F,$07,$12 - db POKEMON_TOWER_5F,$0c,$04 - db VERMILION_CITY,$0b,$0e - db CELADON_CITY,$0f,$30 - db SAFARI_ZONE_GATE,$01,$0a - db POKEMON_MANSION_1F,$10,$08 - db $ff diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm deleted file mode 100755 index f4865bb9..00000000 --- a/data/hidden_objects.asm +++ /dev/null @@ -1,545 +0,0 @@ -HiddenObjectMaps: - 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 $ff - -; format: y-coord, x-coord, text id/item id, object routine -hidden_object: macro - db \1, \2, \3 - dba \4 - endm - -SilphCo11FHiddenObjects: - hidden_object 12, 10, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -SilphCo5FHiddenObjects: - hidden_object 3, 12, ELIXER, HiddenItems - db $ff - -SilphCo9FHiddenObjects: - hidden_object 15, 2, MAX_POTION, HiddenItems - db $ff - -Mansion2HiddenObjects: - hidden_object 11, 2, SPRITE_FACING_UP, Mansion2Script_Switches - db $ff - -Mansion3HiddenObjects: - hidden_object 9, 1, MAX_REVIVE, HiddenItems - hidden_object 5, 10, SPRITE_FACING_UP, Mansion3Script_Switches - db $ff - -Mansion4HiddenObjects: - hidden_object 9, 1, RARE_CANDY, HiddenItems - hidden_object 3, 20, SPRITE_FACING_UP, Mansion4Script_Switches - hidden_object 25, 18, SPRITE_FACING_UP, Mansion4Script_Switches - db $ff - -SafariZoneWestHiddenObjects: - hidden_object 5, 6, REVIVE, HiddenItems - db $ff - -CeruleanCave2HiddenObjects: - hidden_object 13, 16, PP_UP, HiddenItems - db $ff - -CeruleanCave3HiddenObjects: - hidden_object 14, 8, PP_UP, HiddenItems - db $ff - -UnusedMap6FHiddenObjects: - hidden_object 11, 14, MAX_ELIXER, HiddenItems - db $ff - -SeafoamIslands3HiddenObjects: - hidden_object 15, 15, NUGGET, HiddenItems - db $ff - -SeafoamIslands4HiddenObjects: - hidden_object 16, 9, MAX_ELIXER, HiddenItems - db $ff - -SeafoamIslands5HiddenObjects: - hidden_object 17, 25, ULTRA_BALL, HiddenItems - db $ff - -ViridianForestHiddenObjects: - hidden_object 18, 1, POTION, HiddenItems - hidden_object 42, 16, ANTIDOTE, HiddenItems - db $ff - -MtMoon3HiddenObjects: - hidden_object 12, 18, MOON_STONE, HiddenItems - hidden_object 9, 33, ETHER, HiddenItems - db $ff - -SSAnne10HiddenObjects: - hidden_object 1, 3, HYPER_POTION, HiddenItems - db $ff - -SSAnne6HiddenObjects: - hidden_object 5, 13, SPRITE_FACING_DOWN, PrintTrashText - hidden_object 7, 13, SPRITE_FACING_DOWN, PrintTrashText - hidden_object 9, 13, GREAT_BALL, HiddenItems - db $ff - -UndergroundPathNsHiddenObjects: - hidden_object 4, 3, FULL_RESTORE, HiddenItems - hidden_object 34, 4, X_SPECIAL, HiddenItems - db $ff - -UndergroundPathWeHiddenObjects: - hidden_object 2, 12, NUGGET, HiddenItems - hidden_object 5, 21, ELIXER, HiddenItems - db $ff - -RocketHideout1HiddenObjects: - hidden_object 15, 21, PP_UP, HiddenItems - db $ff - -RocketHideout3HiddenObjects: - hidden_object 17, 27, NUGGET, HiddenItems - db $ff - -RocketHideout4HiddenObjects: - hidden_object 1, 25, SUPER_POTION, HiddenItems - db $ff - -Route10HiddenObjects: - hidden_object 17, 9, SUPER_POTION, HiddenItems - hidden_object 53, 16, MAX_ETHER, HiddenItems - db $ff - -RockTunnelPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -PowerPlantHiddenObjects: - hidden_object 16, 17, MAX_ELIXER, HiddenItems - hidden_object 1, 12, PP_UP, HiddenItems - db $ff - -Route11HiddenObjects: - hidden_object 5, 48, ESCAPE_ROPE, HiddenItems - db $ff - -Route12HiddenObjects: - hidden_object 63, 2, HYPER_POTION, HiddenItems - db $ff - -Route13HiddenObjects: - hidden_object 14, 1, PP_UP, HiddenItems - hidden_object 13, 16, CALCIUM, HiddenItems - db $ff - -Route15Gate2FHiddenObjects: - hidden_object 2, 1, SPRITE_FACING_UP, Route15GateLeftBinoculars - db $ff - -Route17HiddenObjects: - hidden_object 14, 15, RARE_CANDY, HiddenItems - hidden_object 45, 8, FULL_RESTORE, HiddenItems - hidden_object 72, 17, PP_UP, HiddenItems - hidden_object 91, 4, MAX_REVIVE, HiddenItems - hidden_object 121, 8, MAX_ELIXER, HiddenItems - db $ff - -Route23HiddenObjects: - hidden_object 44, 9, FULL_RESTORE, HiddenItems - hidden_object 70, 19, ULTRA_BALL, HiddenItems - hidden_object 90, 8, MAX_ETHER, HiddenItems - db $ff - -VictoryRoad2HiddenObjects: - hidden_object 2, 5, ULTRA_BALL, HiddenItems - hidden_object 7, 26, FULL_RESTORE, HiddenItems - db $ff - -Route25HiddenObjects: - hidden_object 3, 38, ETHER, HiddenItems - hidden_object 1, 10, ELIXER, HiddenItems - db $ff - -BillsHouseHiddenObjects: - hidden_object 4, 1, SPRITE_FACING_UP, BillsHousePC - db $ff - -Route4HiddenObjects: - hidden_object 3, 40, GREAT_BALL, HiddenItems - db $ff - -MtMoonPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -Route9HiddenObjects: - hidden_object 7, 14, ETHER, HiddenItems - db $ff - -TradeCenterHiddenObjects: - hidden_object 4, 5, $d0, CableClubRightGameboy - hidden_object 4, 4, $d0, CableClubLeftGameboy - db $ff - -ColosseumHiddenObjects: - hidden_object 4, 5, $d0, CableClubRightGameboy - hidden_object 4, 4, $d0, CableClubLeftGameboy - db $ff - -IndigoPlateauHiddenObjects: - hidden_object 13, 8, $ff, PrintIndigoPlateauHQText - hidden_object 13, 11, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText - db $ff - -IndigoPlateauLobbyHiddenObjects: - hidden_object 7, 15, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CopycatsHouse2FHiddenObjects: - hidden_object 1, 1, NUGGET, HiddenItems - db $ff - -FightingDojoHiddenObjects: - hidden_object 9, 3, SPRITE_FACING_UP, PrintFightingDojoText - hidden_object 9, 6, SPRITE_FACING_UP, PrintFightingDojoText - hidden_object 0, 4, SPRITE_FACING_UP, PrintFightingDojoText2 - hidden_object 0, 5, SPRITE_FACING_UP, PrintFightingDojoText3 - db $ff - -SaffronGymHiddenObjects: - hidden_object 15, 9, SPRITE_FACING_UP, GymStatues - db $ff - -SaffronPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -RedsHouse2FHiddenObjects: - hidden_object 1, 0, SPRITE_FACING_UP, OpenRedsPC - hidden_object 5, 3, $d0, PrintRedSNESText - db $ff - -BluesHouseHiddenObjects: - hidden_object 1, 0, SPRITE_FACING_UP, PrintBookcaseText - hidden_object 1, 1, SPRITE_FACING_UP, PrintBookcaseText - hidden_object 1, 7, SPRITE_FACING_UP, PrintBookcaseText - db $ff - -OaksLabHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_UP, DisplayOakLabLeftPoster - hidden_object 0, 5, SPRITE_FACING_UP, DisplayOakLabRightPoster - hidden_object 1, 0, SPRITE_FACING_UP, DisplayOakLabEmailText - hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText - db $ff - -ViridianCityHiddenObjects: - hidden_object 4, 14, POTION, HiddenItems - db $ff - -ViridianPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -ViridianSchoolHiddenObjects: - hidden_object 4, 3, (ViridianSchoolNotebook_id - TextPredefs) / 2 + 1, PrintNotebookText - hidden_object 0, 3, (ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText - db $ff - -ViridianGymHiddenObjects: - hidden_object 15, 15, SPRITE_FACING_UP, GymStatues - hidden_object 15, 18, SPRITE_FACING_UP, GymStatues - db $ff - -Museum1FHiddenObjects: - hidden_object 3, 2, SPRITE_FACING_UP, AerodactylFossil - hidden_object 6, 2, SPRITE_FACING_UP, KabutopsFossil - db $ff - -PewterGymHiddenObjects: - hidden_object 10, 3, SPRITE_FACING_UP, GymStatues - hidden_object 10, 6, SPRITE_FACING_UP, GymStatues - db $ff - -PewterPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CeruleanCityHiddenObjects: - hidden_object 8, 15, RARE_CANDY, HiddenItems - db $ff - -CeruleanPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CeruleanGymHiddenObjects: - hidden_object 11, 3, SPRITE_FACING_UP, GymStatues - hidden_object 11, 6, SPRITE_FACING_UP, GymStatues - db $ff - -BikeShopHiddenObjects: - hidden_object 0, 1, $d0, PrintNewBikeText - hidden_object 1, 2, $d0, PrintNewBikeText - hidden_object 2, 1, $d0, PrintNewBikeText - hidden_object 2, 3, $d0, PrintNewBikeText - hidden_object 4, 0, $d0, PrintNewBikeText - hidden_object 5, 1, $d0, PrintNewBikeText - db $ff - -CeruleanCave1HiddenObjects: - hidden_object 7, 18, PP_UP, HiddenItems - db $ff - -LavenderPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -Pokemontower5HiddenObjects: - hidden_object 12, 4, ELIXER, HiddenItems - db $ff - -LavenderHouse1HiddenObjects: - hidden_object 1, 0, SPRITE_FACING_DOWN, PrintMagazinesText - hidden_object 1, 1, SPRITE_FACING_DOWN, PrintMagazinesText - hidden_object 1, 7, SPRITE_FACING_DOWN, PrintMagazinesText - db $ff - -VermilionCityHiddenObjects: - hidden_object 11, 14, MAX_ETHER, HiddenItems - db $ff - -VermilionPokecenterHiddenObjects: - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText - db $ff - -PokemonFanClubHiddenObjects: - hidden_object 0, 1, SPRITE_FACING_UP, FanClubPicture1 - hidden_object 0, 6, SPRITE_FACING_UP, FanClubPicture2 - db $ff - -VermilionGymHiddenObjects: - hidden_object 14, 3, SPRITE_FACING_UP, GymStatues - hidden_object 14, 6, SPRITE_FACING_UP, GymStatues - hidden_object 1, 6, SPRITE_FACING_DOWN, PrintTrashText - hidden_object 7, 1, 0, GymTrashScript - hidden_object 9, 1, 1, GymTrashScript - hidden_object 11, 1, 2, GymTrashScript - hidden_object 7, 3, 3, GymTrashScript - hidden_object 9, 3, 4, GymTrashScript - hidden_object 11, 3, 5, GymTrashScript - hidden_object 7, 5, 6, GymTrashScript - hidden_object 9, 5, 7, GymTrashScript - hidden_object 11, 5, 8, GymTrashScript - hidden_object 7, 7, 9, GymTrashScript - hidden_object 9, 7, 10, GymTrashScript - hidden_object 11, 7, 11, GymTrashScript - hidden_object 7, 9, 12, GymTrashScript - hidden_object 9, 9, 13, GymTrashScript - hidden_object 11, 9, 14, GymTrashScript - db $ff - -CeladonCityHiddenObjects: - hidden_object 15, 48, PP_UP, HiddenItems - db $ff - -CeladonHotelHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - db $ff - -CeladonMansion2HiddenObjects: - hidden_object 5, 0, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CeladonMansion5HiddenObjects: - hidden_object 0, 3, (LinkCableHelp_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText - hidden_object 0, 4, (LinkCableHelp_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText - hidden_object 4, 3, (TMNotebook_id - TextPredefs) / 2 + 1, PrintNotebookText - db $ff - -CeladonPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CeladonGymHiddenObjects: - hidden_object 15, 3, SPRITE_FACING_UP, GymStatues - hidden_object 15, 6, SPRITE_FACING_UP, GymStatues - db $ff - -GameCornerHiddenObjects: - hidden_object 15, 18, $d0, StartSlotMachine - hidden_object 14, 18, $d0, StartSlotMachine - hidden_object 13, 18, $d0, StartSlotMachine - hidden_object 12, 18, $d0, StartSlotMachine - hidden_object 11, 18, $d0, StartSlotMachine - hidden_object 10, 18, $ff, StartSlotMachine ; "Someone's Keys" - hidden_object 10, 13, $d0, StartSlotMachine - hidden_object 11, 13, $d0, StartSlotMachine - hidden_object 12, 13, $fe, StartSlotMachine ; "Out To Lunch" - hidden_object 13, 13, $d0, StartSlotMachine - hidden_object 14, 13, $d0, StartSlotMachine - hidden_object 15, 13, $d0, StartSlotMachine - hidden_object 15, 12, $d0, StartSlotMachine - hidden_object 14, 12, $d0, StartSlotMachine - hidden_object 13, 12, $d0, StartSlotMachine - hidden_object 12, 12, $d0, StartSlotMachine - hidden_object 11, 12, $d0, StartSlotMachine - hidden_object 10, 12, $d0, StartSlotMachine - hidden_object 10, 7, $d0, StartSlotMachine - hidden_object 11, 7, $d0, StartSlotMachine - hidden_object 12, 7, $d0, StartSlotMachine - hidden_object 13, 7, $d0, StartSlotMachine - hidden_object 14, 7, $d0, StartSlotMachine - hidden_object 15, 7, $d0, StartSlotMachine - hidden_object 15, 6, $d0, StartSlotMachine - hidden_object 14, 6, $d0, StartSlotMachine - hidden_object 13, 6, $d0, StartSlotMachine - hidden_object 12, 6, $fd, StartSlotMachine ; "Out Of Order" - hidden_object 11, 6, $d0, StartSlotMachine - hidden_object 10, 6, $d0, StartSlotMachine - hidden_object 10, 1, $d0, StartSlotMachine - hidden_object 11, 1, $d0, StartSlotMachine - hidden_object 12, 1, $d0, StartSlotMachine - hidden_object 13, 1, $d0, StartSlotMachine - hidden_object 14, 1, $d0, StartSlotMachine - hidden_object 15, 1, $d0, StartSlotMachine - hidden_object 8, 0, COIN + 10, HiddenCoins - hidden_object 16, 1, COIN + 10, HiddenCoins - hidden_object 11, 3, COIN + 20, HiddenCoins - hidden_object 14, 3, COIN + 10, HiddenCoins - hidden_object 12, 4, COIN + 10, HiddenCoins - hidden_object 12, 9, COIN + 20, HiddenCoins - hidden_object 15, 9, COIN + 10, HiddenCoins - hidden_object 14, 16, COIN + 10, HiddenCoins - hidden_object 16, 10, COIN + 10, HiddenCoins - hidden_object 7, 11, COIN + 40, HiddenCoins - hidden_object 8, 15, COIN + 100, HiddenCoins - hidden_object 15, 12, COIN + 10, HiddenCoins - db $ff - -FuchsiaPokecenterHiddenObjects: - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText - db $ff - -SafariZoneEntranceHiddenObjects: - hidden_object 1, 10, NUGGET, HiddenItems - db $ff - -FuchsiaGymHiddenObjects: - hidden_object 15, 3, SPRITE_FACING_UP, GymStatues - hidden_object 15, 6, SPRITE_FACING_UP, GymStatues - db $ff - -Mansion1HiddenObjects: - hidden_object 16, 8, MOON_STONE, HiddenItems - hidden_object 5, 2, SPRITE_FACING_UP, Mansion1Script_Switches - db $ff - -CinnabarGymHiddenObjects: - hidden_object 13, 17, SPRITE_FACING_UP, GymStatues - hidden_object 7, 15, (0 << 4) | 1, PrintCinnabarQuiz - hidden_object 1, 10, (1 << 4) | 2, PrintCinnabarQuiz - hidden_object 7, 9, (1 << 4) | 3, PrintCinnabarQuiz - hidden_object 13, 9, (1 << 4) | 4, PrintCinnabarQuiz - hidden_object 13, 1, (0 << 4) | 5, PrintCinnabarQuiz - hidden_object 7, 1, (1 << 4) | 6, PrintCinnabarQuiz - db $ff - -CinnabarLab4HiddenObjects: - hidden_object 4, 0, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 4, 2, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff - -CinnabarPokecenterHiddenObjects: - hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC - db $ff diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm deleted file mode 100755 index df9e5e8f..00000000 --- a/data/hide_show_data.asm +++ /dev/null @@ -1,593 +0,0 @@ -; data for default hidden/shown -; objects for each map ($00-$F8) - -; Table of 2-Byte pointers, one pointer per map, -; goes up to Map_F7, ends with $FFFF. -; points to table listing all missable object in the area -MapHSPointers: - dw MapHS00 - dw MapHS01 - dw MapHS02 - dw MapHS03 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS0A - dw MapHSXX - dw MapHSXX - dw MapHS0D - dw MapHSXX - dw MapHS0F - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS14 - dw MapHSXX - dw MapHSXX - dw MapHS17 - dw MapHSXX - dw MapHSXX - dw MapHS1A - dw MapHS1B - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS21 - dw MapHSXX - dw MapHS23 - dw MapHS24 - dw MapHSXX - dw MapHSXX - dw MapHS27 - dw MapHS28 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS2D - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS33 - dw MapHS34 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS3B - dw MapHSXX - dw MapHS3D - dw MapHSXX - dw MapHS3F - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS53 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS58 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS60 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS66 - dw MapHS67 - dw MapHS68 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS6C - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS78 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS84 - dw MapHSXX - dw MapHSXX - dw MapHS87 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS8F - dw MapHS90 - dw MapHS91 - dw MapHS92 - dw MapHS93 - dw MapHS94 - dw MapHS95 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS9B - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS9F - dw MapHSA0 - dw MapHSA1 - dw MapHSA2 - dw MapHSXX - dw MapHSXX - dw MapHSA5 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSB1 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSB5 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSC0 - dw MapHSXX - dw MapHSC2 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSC6 - dw MapHSC7 - dw MapHSC8 - dw MapHSC9 - dw MapHSCA - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSCF - dw MapHSD0 - dw MapHSD1 - dw MapHSD2 - dw MapHSD3 - dw MapHSD4 - dw MapHSD5 - dw MapHSD6 - dw MapHSD7 - dw MapHSD8 - dw MapHSD9 - dw MapHSDA - dw MapHSDB - dw MapHSDC - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSE2 - dw MapHSE3 - dw MapHSE4 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSE9 - dw MapHSEA - dw MapHSEB - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSF4 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX ; beach house - dw $FFFF - -; Structure: -; 3 bytes per object -; [Map_ID][Object_ID][H/S] -; -; Program stops reading when either: -; a) Map_ID = $FF -; b) Map_ID ≠ currentMapID -; -; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) - -; These constants come from the bytes for Predef functions: -Hide EQU $11 ; (HideObjectPredef - PredefPointers) / 3 -Show EQU $15 ; (ShowObjectPredef - PredefPointers) / 3 - -MapHSXX: - db $FF,$FF,$FF -MapHS00: - db PALLET_TOWN,$01,Hide -MapHS01: - db VIRIDIAN_CITY,$05,Show - db VIRIDIAN_CITY,$07,Hide - db VIRIDIAN_CITY,$08,Hide -MapHS02: - db PEWTER_CITY,$03,Show - db PEWTER_CITY,$05,Show -MapHS03: - db CERULEAN_CITY,$01,Hide - db CERULEAN_CITY,$02,Show - db CERULEAN_CITY,$06,Hide - db CERULEAN_CITY,$0A,Show - db CERULEAN_CITY,$0B,Show -MapHS0A: - db SAFFRON_CITY,$01,Show - db SAFFRON_CITY,$02,Show - db SAFFRON_CITY,$03,Show - db SAFFRON_CITY,$04,Show - db SAFFRON_CITY,$05,Show - db SAFFRON_CITY,$06,Show - db SAFFRON_CITY,$07,Show - db SAFFRON_CITY,$08,Hide - db SAFFRON_CITY,$09,Hide - db SAFFRON_CITY,$0A,Hide - db SAFFRON_CITY,$0B,Hide - db SAFFRON_CITY,$0C,Hide - db SAFFRON_CITY,$0D,Hide - db SAFFRON_CITY,$0E,Show - db SAFFRON_CITY,$0F,Hide -MapHS0D: - db ROUTE_2,$01,Show - db ROUTE_2,$02,Show -MapHS0F: - db ROUTE_4,$03,Show -MapHS14: - db ROUTE_9,$0A,Show -MapHS17: - db ROUTE_12,$01,Show - db ROUTE_12,$09,Show - db ROUTE_12,$0A,Show -MapHS1A: - db ROUTE_15,$0B,Show -MapHS1B: - db ROUTE_16,$07,Show -MapHS21: - db ROUTE_22,$01,Hide - db ROUTE_22,$02,Hide -MapHS23: - db ROUTE_24,$01,Show - db ROUTE_24,$08,Show -MapHS24: - db ROUTE_25,$0A,Show -MapHS27: - db BLUES_HOUSE,$01,Show - db BLUES_HOUSE,$02,Hide - db BLUES_HOUSE,$03,Show -MapHS28: - db OAKS_LAB,$01,Show - db OAKS_LAB,$02,Show - db OAKS_LAB,$03,Hide - db OAKS_LAB,$04,Show - db OAKS_LAB,$05,Show - db OAKS_LAB,$06,Hide -MapHS2D: - db VIRIDIAN_GYM,$01,Show - db VIRIDIAN_GYM,$0B,Show -MapHS34: - db MUSEUM_1F,$05,Show -MapHS3F: ; bulbasaur adoption house - db CERULEAN_TRADE_HOUSE,$02,Show -MapHSE4: - db CERULEAN_CAVE_1F,$01,Show - db CERULEAN_CAVE_1F,$02,Show - db CERULEAN_CAVE_1F,$03,Show - db CERULEAN_CAVE_1F,$04,Show -MapHS8F: - db POKEMON_TOWER_2F,$01,Show -MapHS90: - db POKEMON_TOWER_3F,$04,Show -MapHS91: - db POKEMON_TOWER_4F,$04,Show - db POKEMON_TOWER_4F,$05,Show - db POKEMON_TOWER_4F,$06,Show -MapHS92: - db POKEMON_TOWER_5F,$06,Show -MapHS93: - db POKEMON_TOWER_6F,$04,Show - db POKEMON_TOWER_6F,$05,Show -MapHS94: - db POKEMON_TOWER_7F,$01,Hide ; jessie & james? - db POKEMON_TOWER_7F,$02,Hide - db POKEMON_TOWER_7F,$03,Show -MapHS95: - db MR_FUJIS_HOUSE,$05,Hide -MapHS84: - db CELADON_MANSION_ROOF_HOUSE,$02,Show -MapHS87: - db GAME_CORNER,$0B,Show -MapHS9B: - db WARDENS_HOUSE,$02,Show -MapHSA5: - db POKEMON_MANSION_1F,$02,Show - db POKEMON_MANSION_1F,$03,Show -MapHSB1: - db FIGHTING_DOJO,$06,Show - db FIGHTING_DOJO,$07,Show -MapHSB5: - db SILPH_CO_1F,$01,Hide -MapHS53: - db POWER_PLANT,$01,Show - db POWER_PLANT,$02,Show - db POWER_PLANT,$03,Show - db POWER_PLANT,$04,Show - db POWER_PLANT,$05,Show - db POWER_PLANT,$06,Show - db POWER_PLANT,$07,Show - db POWER_PLANT,$08,Show - db POWER_PLANT,$09,Show - db POWER_PLANT,$0A,Show - db POWER_PLANT,$0B,Show - db POWER_PLANT,$0C,Show - db POWER_PLANT,$0D,Show - db POWER_PLANT,$0E,Show -MapHSC2: - db VICTORY_ROAD_2F,$06,Show - db VICTORY_ROAD_2F,$07,Show - db VICTORY_ROAD_2F,$08,Show - db VICTORY_ROAD_2F,$09,Show - db VICTORY_ROAD_2F,$0A,Show - db VICTORY_ROAD_2F,$0D,Show -MapHS58: - db BILLS_HOUSE,$01,Show - db BILLS_HOUSE,$02,Hide - db BILLS_HOUSE,$03,Hide -MapHS33: - db VIRIDIAN_FOREST,$07,Show - db VIRIDIAN_FOREST,$08,Show - db VIRIDIAN_FOREST,$09,Show -MapHS3B: - db MT_MOON_1F,$08,Show - db MT_MOON_1F,$09,Show - db MT_MOON_1F,$0A,Show - db MT_MOON_1F,$0B,Show - db MT_MOON_1F,$0C,Show - db MT_MOON_1F,$0D,Show -MapHS3D: - 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 -MapHS60: - db SS_ANNE_2F,$02,Hide -MapHS66: - db SS_ANNE_1F_ROOMS,$0A,Show -MapHS67: - db SS_ANNE_2F_ROOMS,$06,Show - db SS_ANNE_2F_ROOMS,$09,Show -MapHS68: - db SS_ANNE_B1F_ROOMS,$09,Show - db SS_ANNE_B1F_ROOMS,$0A,Show - db SS_ANNE_B1F_ROOMS,$0B,Show -MapHSC6: - db VICTORY_ROAD_3F,$05,Show - db VICTORY_ROAD_3F,$06,Show - db VICTORY_ROAD_3F,$0A,Show -MapHSC7: - db ROCKET_HIDEOUT_B1F,$06,Show - db ROCKET_HIDEOUT_B1F,$07,Show -MapHSC8: - db ROCKET_HIDEOUT_B2F,$02,Show - db ROCKET_HIDEOUT_B2F,$03,Show - db ROCKET_HIDEOUT_B2F,$04,Show - db ROCKET_HIDEOUT_B2F,$05,Show -MapHSC9: - db ROCKET_HIDEOUT_B3F,$03,Show - db ROCKET_HIDEOUT_B3F,$04,Show -MapHSCA: - 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 - db ROCKET_HIDEOUT_B4F,$08,Hide - db ROCKET_HIDEOUT_B4F,$09,Hide -MapHSCF: - db SILPH_CO_2F,$01,Show - db SILPH_CO_2F,$02,Show - db SILPH_CO_2F,$03,Show - db SILPH_CO_2F,$04,Show - db SILPH_CO_2F,$05,Show -MapHSD0: - db SILPH_CO_3F,$02,Show - db SILPH_CO_3F,$03,Show - db SILPH_CO_3F,$04,Show -MapHSD1: - db SILPH_CO_4F,$02,Show - db SILPH_CO_4F,$03,Show - db SILPH_CO_4F,$04,Show - db SILPH_CO_4F,$05,Show - db SILPH_CO_4F,$06,Show - db SILPH_CO_4F,$07,Show -MapHSD2: - db SILPH_CO_5F,$02,Show - db SILPH_CO_5F,$03,Show - db SILPH_CO_5F,$04,Show - db SILPH_CO_5F,$05,Show - db SILPH_CO_5F,$06,Show - db SILPH_CO_5F,$07,Show - db SILPH_CO_5F,$08,Show -MapHSD3: - db SILPH_CO_6F,$06,Show - db SILPH_CO_6F,$07,Show - db SILPH_CO_6F,$08,Show - db SILPH_CO_6F,$09,Show - db SILPH_CO_6F,$0A,Show -MapHSD4: - db SILPH_CO_7F,$05,Show - db SILPH_CO_7F,$06,Show - db SILPH_CO_7F,$07,Show - db SILPH_CO_7F,$08,Show - db SILPH_CO_7F,$09,Show - db SILPH_CO_7F,$0A,Show - db SILPH_CO_7F,$0B,Show - db SILPH_CO_7F,$0C,Show -MapHSD5: - db SILPH_CO_8F,$02,Show - db SILPH_CO_8F,$03,Show - db SILPH_CO_8F,$04,Show -MapHSE9: - db SILPH_CO_9F,$02,Show - db SILPH_CO_9F,$03,Show - db SILPH_CO_9F,$04,Show -MapHSEA: - db SILPH_CO_10F,$01,Show - db SILPH_CO_10F,$02,Show - db SILPH_CO_10F,$03,Show - db SILPH_CO_10F,$04,Show - db SILPH_CO_10F,$05,Show - db SILPH_CO_10F,$06,Show -MapHSEB: - db SILPH_CO_11F,$03,Show - db SILPH_CO_11F,$04,Show - db SILPH_CO_11F,$05,Show - db SILPH_CO_11F,$06,Show -MapHSF4: - db UNUSED_MAP_F4,$02,Show -MapHSD6: - db POKEMON_MANSION_2F,$02,Show -MapHSD7: - db POKEMON_MANSION_3F,$03,Show - db POKEMON_MANSION_3F,$04,Show -MapHSD8: - db POKEMON_MANSION_B1F,$03,Show - db POKEMON_MANSION_B1F,$04,Show - db POKEMON_MANSION_B1F,$05,Show - db POKEMON_MANSION_B1F,$06,Show - db POKEMON_MANSION_B1F,$08,Show -MapHSD9: - db SAFARI_ZONE_EAST,$01,Show - db SAFARI_ZONE_EAST,$02,Show - db SAFARI_ZONE_EAST,$03,Show - db SAFARI_ZONE_EAST,$04,Show -MapHSDA: - db SAFARI_ZONE_NORTH,$01,Show - db SAFARI_ZONE_NORTH,$02,Show -MapHSDB: - db SAFARI_ZONE_WEST,$01,Show - db SAFARI_ZONE_WEST,$02,Show - db SAFARI_ZONE_WEST,$03,Show - db SAFARI_ZONE_WEST,$04,Show -MapHSDC: - db SAFARI_ZONE_CENTER,$01,Show -MapHSE2: - db CERULEAN_CAVE_2F,$01,Show - db CERULEAN_CAVE_2F,$02,Show - db CERULEAN_CAVE_2F,$03,Show - db CERULEAN_CAVE_2F,$04,Show -MapHSE3: - 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 -MapHS6C: - db VICTORY_ROAD_1F,$03,Show - db VICTORY_ROAD_1F,$04,Show -MapHS78: - db CHAMPIONS_ROOM,$02,Hide -MapHSC0: - db SEAFOAM_ISLANDS_1F,$01,Show - db SEAFOAM_ISLANDS_1F,$02,Show -MapHS9F: - db SEAFOAM_ISLANDS_B1F,$01,Hide - db SEAFOAM_ISLANDS_B1F,$02,Hide -MapHSA0: - db SEAFOAM_ISLANDS_B2F,$01,Hide - db SEAFOAM_ISLANDS_B2F,$02,Hide -MapHSA1: - db SEAFOAM_ISLANDS_B3F,$02,Show - db SEAFOAM_ISLANDS_B3F,$03,Show - db SEAFOAM_ISLANDS_B3F,$05,Hide - db SEAFOAM_ISLANDS_B3F,$06,Hide -MapHSA2: - db SEAFOAM_ISLANDS_B4F,$01,Hide - db SEAFOAM_ISLANDS_B4F,$02,Hide - db SEAFOAM_ISLANDS_B4F,$03,Show - -MapHS27Copy: -; 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/icon_pointers.asm b/data/icon_pointers.asm new file mode 100644 index 00000000..9092e1b1 --- /dev/null +++ b/data/icon_pointers.asm @@ -0,0 +1,39 @@ +mon_icon_header: MACRO + dw \1 tile \2 + db \3 + db BANK(\1) + dw vSprites tile (\4) +ENDM + +MonPartySpritePointers: + ; gfx pointer, gfx tile offset, # tiles, vSprites tile offset + mon_icon_header MonsterSprite, 12, 4, ICON_MON << 2 + mon_icon_header PokeBallSprite, 0, 8, ICON_BALL << 2 + mon_icon_header FairySprite, 12, 4, ICON_FAIRY << 2 + mon_icon_header BirdSprite, 12, 4, ICON_BIRD << 2 + mon_icon_header SeelSprite, 0, 4, ICON_WATER << 2 + mon_icon_header BugIconFrame2, 0, 1, ICON_BUG << 2 + mon_icon_header BugIconFrame2, 1, 1, ICON_BUG << 2 + 2 + mon_icon_header PlantIconFrame2, 0, 1, ICON_GRASS << 2 + mon_icon_header PlantIconFrame2, 1, 1, ICON_GRASS << 2 + 2 + mon_icon_header SnakeIconFrame1, 0, 1, ICON_SNAKE << 2 + 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 + mon_icon_header FairySprite, 0, 4, ICONOFFSET + ICON_FAIRY << 2 + mon_icon_header BirdSprite, 0, 4, ICONOFFSET + ICON_BIRD << 2 + mon_icon_header SeelSprite, 12, 4, ICONOFFSET + ICON_WATER << 2 + mon_icon_header BugIconFrame1, 0, 1, ICONOFFSET + ICON_BUG << 2 + mon_icon_header BugIconFrame1, 1, 1, ICONOFFSET + ICON_BUG << 2 + 2 + mon_icon_header PlantIconFrame1, 0, 1, ICONOFFSET + ICON_GRASS << 2 + mon_icon_header PlantIconFrame1, 1, 1, ICONOFFSET + ICON_GRASS << 2 + 2 + mon_icon_header SnakeIconFrame2, 0, 1, ICONOFFSET + ICON_SNAKE << 2 + 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/item_prices.asm b/data/item_prices.asm deleted file mode 100755 index 15a1bd34..00000000 --- a/data/item_prices.asm +++ /dev/null @@ -1,98 +0,0 @@ -ItemPrices: - money 0 ; MASTER_BALL - money 1200 ; ULTRA_BALL - money 600 ; GREAT_BALL - money 200 ; POKE_BALL - money 0 ; TOWN_MAP - money 0 ; BICYCLE - money 0 ; SURFBOARD - money 1000 ; SAFARI_BALL - money 0 ; POKEDEX - money 0 ; MOON_STONE - money 100 ; ANTIDOTE - money 250 ; BURN_HEAL - money 250 ; ICE_HEAL - money 200 ; AWAKENING - money 200 ; PARLYZ_HEAL - money 3000 ; FULL_RESTORE - money 2500 ; MAX_POTION - money 1500 ; HYPER_POTION - money 700 ; SUPER_POTION - money 300 ; POTION - money 0 ; BOULDERBADGE - money 0 ; CASCADEBADGE - money 0 ; THUNDERBADGE - money 0 ; RAINBOWBADGE - money 0 ; SOULBADGE - money 0 ; MARSHBADGE - money 0 ; VOLCANOBADGE - money 0 ; EARTHBADGE - money 550 ; ESCAPE_ROPE - money 350 ; REPEL - money 0 ; OLD_AMBER - money 2100 ; FIRE_STONE - money 2100 ; THUNDER_STONE - money 2100 ; WATER_STONE - money 9800 ; HP_UP - money 9800 ; PROTEIN - money 9800 ; IRON - money 9800 ; CARBOS - money 9800 ; CALCIUM - money 4800 ; RARE_CANDY - money 0 ; DOME_FOSSIL - money 0 ; HELIX_FOSSIL - money 0 ; SECRET_KEY - money 0 ; XXX - money 0 ; BIKE_VOUCHER - money 950 ; X_ACCURACY - money 2100 ; LEAF_STONE - money 0 ; CARD_KEY - money 10000 ; NUGGET - money 9800 ; XXX PP_UP - money 1000 ; POKE_DOLL - money 600 ; FULL_HEAL - money 1500 ; REVIVE - money 4000 ; MAX_REVIVE - money 700 ; GUARD_SPEC - money 500 ; SUPER_REPEL - money 700 ; MAX_REPEL - money 650 ; DIRE_HIT - money 10 ; COIN - money 200 ; FRESH_WATER - money 300 ; SODA_POP - money 350 ; LEMONADE - money 0 ; S_S_TICKET - money 0 ; GOLD_TEETH - money 500 ; X_ATTACK - money 550 ; X_DEFEND - money 350 ; X_SPEED - money 350 ; X_SPECIAL - money 0 ; COIN_CASE - money 0 ; OAKS_PARCEL - money 0 ; ITEMFINDER - money 0 ; SILPH_SCOPE - money 0 ; POKE_FLUTE - money 0 ; LIFT_KEY - money 0 ; EXP_ALL - money 0 ; OLD_ROD - money 0 ; GOOD_ROD - money 0 ; SUPER_ROD - money 0 ; PP_UP - money 0 ; ETHER - money 0 ; MAX_ETHER - money 0 ; ELIXER - money 0 ; MAX_ELIXER - money 0 ; FLOOR_B2F - money 0 ; FLOOR_B1F - money 0 ; FLOOR_1F - money 0 ; FLOOR_2F - money 0 ; FLOOR_3F - money 0 ; FLOOR_4F - money 0 ; FLOOR_5F - money 0 ; FLOOR_6F - money 0 ; FLOOR_7F - money 0 ; FLOOR_8F - money 0 ; FLOOR_9F - money 0 ; FLOOR_10F - money 0 ; FLOOR_11F - money 0 ; FLOOR_B4F diff --git a/data/items/guard_drink_items.asm b/data/items/guard_drink_items.asm new file mode 100644 index 00000000..e76d1f77 --- /dev/null +++ b/data/items/guard_drink_items.asm @@ -0,0 +1,5 @@ +GuardDrinksList: + db FRESH_WATER + db SODA_POP + db LEMONADE + db 0 ; end diff --git a/data/items/key_items.asm b/data/items/key_items.asm new file mode 100755 index 00000000..aca8cf81 --- /dev/null +++ b/data/items/key_items.asm @@ -0,0 +1,103 @@ +key_item_bits: MACRO +_bit = 0 +_byte = 0 +REPT _NARG +_byte = _byte | ((\1) << _bit) +_bit = _bit + 1 +IF _bit == 8 + db _byte +_byte = 0 +_bit = 0 +ENDC +SHIFT +ENDR +IF _bit > 0 + db _byte +ENDC +ENDM + +KeyItemBitfield: + key_item_bits \ + FALSE, \ ; MASTER_BALL + FALSE, \ ; ULTRA_BALL + FALSE, \ ; GREAT_BALL + FALSE, \ ; POKE_BALL + TRUE, \ ; TOWN_MAP + TRUE, \ ; BICYCLE + TRUE, \ ; SURFBOARD + TRUE, \ ; SAFARI_BALL + TRUE, \ ; POKEDEX + FALSE, \ ; MOON_STONE + FALSE, \ ; ANTIDOTE + FALSE, \ ; BURN_HEAL + FALSE, \ ; ICE_HEAL + FALSE, \ ; AWAKENING + FALSE, \ ; PARLYZ_HEAL + FALSE, \ ; FULL_RESTORE + FALSE, \ ; MAX_POTION + FALSE, \ ; HYPER_POTION + FALSE, \ ; SUPER_POTION + FALSE, \ ; POTION + TRUE, \ ; BOULDERBADGE + TRUE, \ ; CASCADEBADGE + TRUE, \ ; THUNDERBADGE + TRUE, \ ; RAINBOWBADGE + TRUE, \ ; SOULBADGE + TRUE, \ ; MARSHBADGE + TRUE, \ ; VOLCANOBADGE + TRUE, \ ; EARTHBADGE + FALSE, \ ; ESCAPE_ROPE + FALSE, \ ; REPEL + TRUE, \ ; OLD_AMBER + FALSE, \ ; FIRE_STONE + FALSE, \ ; THUNDER_STONE + FALSE, \ ; WATER_STONE + FALSE, \ ; HP_UP + FALSE, \ ; PROTEIN + FALSE, \ ; IRON + FALSE, \ ; CARBOS + FALSE, \ ; CALCIUM + FALSE, \ ; RARE_CANDY + TRUE, \ ; DOME_FOSSIL + TRUE, \ ; HELIX_FOSSIL + TRUE, \ ; SECRET_KEY + TRUE, \ ; UNUSED_ITEM + TRUE, \ ; BIKE_VOUCHER + FALSE, \ ; X_ACCURACY + FALSE, \ ; LEAF_STONE + TRUE, \ ; CARD_KEY + FALSE, \ ; NUGGET + FALSE, \ ; PP_UP_2 + FALSE, \ ; POKE_DOLL + FALSE, \ ; FULL_HEAL + FALSE, \ ; REVIVE + FALSE, \ ; MAX_REVIVE + FALSE, \ ; GUARD_SPEC + FALSE, \ ; SUPER_REPEL + FALSE, \ ; MAX_REPEL + FALSE, \ ; DIRE_HIT + FALSE, \ ; COIN + FALSE, \ ; FRESH_WATER + FALSE, \ ; SODA_POP + FALSE, \ ; LEMONADE + TRUE, \ ; S_S_TICKET + TRUE, \ ; GOLD_TEETH + FALSE, \ ; X_ATTACK + FALSE, \ ; X_DEFEND + FALSE, \ ; X_SPEED + FALSE, \ ; X_SPECIAL + TRUE, \ ; COIN_CASE + TRUE, \ ; OAKS_PARCEL + TRUE, \ ; ITEMFINDER + TRUE, \ ; SILPH_SCOPE + TRUE, \ ; POKE_FLUTE + TRUE, \ ; LIFT_KEY + FALSE, \ ; EXP_ALL + TRUE, \ ; OLD_ROD + TRUE, \ ; GOOD_ROD + TRUE, \ ; SUPER_ROD + FALSE, \ ; PP_UP + FALSE, \ ; ETHER + FALSE, \ ; MAX_ETHER + FALSE, \ ; ELIXER + FALSE ; MAX_ELIXER diff --git a/data/items/marts.asm b/data/items/marts.asm new file mode 100755 index 00000000..30eb7d9a --- /dev/null +++ b/data/items/marts.asm @@ -0,0 +1,64 @@ +; mart inventories are below +; they are texts + +; Viridian +ViridianCashierText:: + script_mart POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL + +; Pewter +PewterCashierText:: + script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL + +; Cerulean +CeruleanCashierText:: + script_mart POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL + +; Bike shop + script_mart BICYCLE + +; Vermilion +VermilionCashierText:: + script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL + +; Lavender +LavenderCashierText:: + script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL + +; Celadon Dept. Store 2F (1) +CeladonMart2Clerk1Text:: + script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL + +; Celadon Dept. Store 2F (2) +CeladonMart2Clerk2Text:: + script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION + +; Celadon Dept. Store 4F +CeladonMart4ClerkText:: + script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE + +; Celadon Dept. Store 5F (1) +CeladonMart5Clerk1Text:: + script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL + +; Celadon Dept. Store 5F (2) +CeladonMart5Clerk2Text:: + script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM + +; Fuchsia +FuchsiaCashierText:: + 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 + +; Cinnabar +CinnabarCashierText:: + script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE + +; Saffron +SaffronCashierText:: + script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE + +; Indigo +IndigoCashierText:: + script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL diff --git a/data/items/names.asm b/data/items/names.asm new file mode 100755 index 00000000..0c07fe5d --- /dev/null +++ b/data/items/names.asm @@ -0,0 +1,98 @@ +ItemNames:: + db "MASTER BALL@" + db "ULTRA BALL@" + db "GREAT BALL@" + db "POKé BALL@" + db "TOWN MAP@" + db "BICYCLE@" + db "?????@" + db "SAFARI BALL@" + db "POKéDEX@" + db "MOON STONE@" + db "ANTIDOTE@" + db "BURN HEAL@" + db "ICE HEAL@" + db "AWAKENING@" + db "PARLYZ HEAL@" + db "FULL RESTORE@" + db "MAX POTION@" + db "HYPER POTION@" + db "SUPER POTION@" + db "POTION@" + db "BOULDERBADGE@" + db "CASCADEBADGE@" + db "THUNDERBADGE@" + db "RAINBOWBADGE@" + db "SOULBADGE@" + db "MARSHBADGE@" + db "VOLCANOBADGE@" + db "EARTHBADGE@" + db "ESCAPE ROPE@" + db "REPEL@" + db "OLD AMBER@" + db "FIRE STONE@" + db "THUNDERSTONE@" + db "WATER STONE@" + db "HP UP@" + db "PROTEIN@" + db "IRON@" + db "CARBOS@" + db "CALCIUM@" + db "RARE CANDY@" + db "DOME FOSSIL@" + db "HELIX FOSSIL@" + db "SECRET KEY@" + db "?????@" + db "BIKE VOUCHER@" + db "X ACCURACY@" + db "LEAF STONE@" + db "CARD KEY@" + db "NUGGET@" + db "PP UP@" + db "POKé DOLL@" + db "FULL HEAL@" + db "REVIVE@" + db "MAX REVIVE@" + db "GUARD SPEC.@" + db "SUPER REPEL@" + db "MAX REPEL@" + db "DIRE HIT@" + db "COIN@" + db "FRESH WATER@" + db "SODA POP@" + db "LEMONADE@" + db "S.S.TICKET@" + db "GOLD TEETH@" + db "X ATTACK@" + db "X DEFEND@" + db "X SPEED@" + db "X SPECIAL@" + db "COIN CASE@" + db "OAK's PARCEL@" + db "ITEMFINDER@" + db "SILPH SCOPE@" + db "POKé FLUTE@" + db "LIFT KEY@" + db "EXP.ALL@" + db "OLD ROD@" + db "GOOD ROD@" + db "SUPER ROD@" + db "PP UP@" + db "ETHER@" + db "MAX ETHER@" + db "ELIXER@" + db "MAX ELIXER@" + db "B2F@" + db "B1F@" + db "1F@" + db "2F@" + db "3F@" + db "4F@" + db "5F@" + db "6F@" + db "7F@" + db "8F@" + db "9F@" + db "10F@" + db "11F@" + db "B4F@" diff --git a/data/items/prices.asm b/data/items/prices.asm new file mode 100755 index 00000000..f3d8f76b --- /dev/null +++ b/data/items/prices.asm @@ -0,0 +1,98 @@ +ItemPrices:: + money 0 ; MASTER_BALL + money 1200 ; ULTRA_BALL + money 600 ; GREAT_BALL + money 200 ; POKE_BALL + money 0 ; TOWN_MAP + money 0 ; BICYCLE + money 0 ; SURFBOARD + money 1000 ; SAFARI_BALL + money 0 ; POKEDEX + money 0 ; MOON_STONE + money 100 ; ANTIDOTE + money 250 ; BURN_HEAL + money 250 ; ICE_HEAL + money 200 ; AWAKENING + money 200 ; PARLYZ_HEAL + money 3000 ; FULL_RESTORE + money 2500 ; MAX_POTION + money 1500 ; HYPER_POTION + money 700 ; SUPER_POTION + money 300 ; POTION + money 0 ; BOULDERBADGE + money 0 ; CASCADEBADGE + money 0 ; THUNDERBADGE + money 0 ; RAINBOWBADGE + money 0 ; SOULBADGE + money 0 ; MARSHBADGE + money 0 ; VOLCANOBADGE + money 0 ; EARTHBADGE + money 550 ; ESCAPE_ROPE + money 350 ; REPEL + money 0 ; OLD_AMBER + money 2100 ; FIRE_STONE + money 2100 ; THUNDER_STONE + money 2100 ; WATER_STONE + money 9800 ; HP_UP + money 9800 ; PROTEIN + money 9800 ; IRON + money 9800 ; CARBOS + money 9800 ; CALCIUM + money 4800 ; RARE_CANDY + money 0 ; DOME_FOSSIL + money 0 ; HELIX_FOSSIL + money 0 ; SECRET_KEY + money 0 ; XXX + money 0 ; BIKE_VOUCHER + money 950 ; X_ACCURACY + money 2100 ; LEAF_STONE + money 0 ; CARD_KEY + money 10000 ; NUGGET + money 9800 ; XXX PP_UP + money 1000 ; POKE_DOLL + money 600 ; FULL_HEAL + money 1500 ; REVIVE + money 4000 ; MAX_REVIVE + money 700 ; GUARD_SPEC + money 500 ; SUPER_REPEL + money 700 ; MAX_REPEL + money 650 ; DIRE_HIT + money 10 ; COIN + money 200 ; FRESH_WATER + money 300 ; SODA_POP + money 350 ; LEMONADE + money 0 ; S_S_TICKET + money 0 ; GOLD_TEETH + money 500 ; X_ATTACK + money 550 ; X_DEFEND + money 350 ; X_SPEED + money 350 ; X_SPECIAL + money 0 ; COIN_CASE + money 0 ; OAKS_PARCEL + money 0 ; ITEMFINDER + money 0 ; SILPH_SCOPE + money 0 ; POKE_FLUTE + money 0 ; LIFT_KEY + money 0 ; EXP_ALL + money 0 ; OLD_ROD + money 0 ; GOOD_ROD + money 0 ; SUPER_ROD + money 0 ; PP_UP + money 0 ; ETHER + money 0 ; MAX_ETHER + money 0 ; ELIXER + money 0 ; MAX_ELIXER + money 0 ; FLOOR_B2F + money 0 ; FLOOR_B1F + money 0 ; FLOOR_1F + money 0 ; FLOOR_2F + money 0 ; FLOOR_3F + money 0 ; FLOOR_4F + money 0 ; FLOOR_5F + money 0 ; FLOOR_6F + money 0 ; FLOOR_7F + money 0 ; FLOOR_8F + money 0 ; FLOOR_9F + money 0 ; FLOOR_10F + money 0 ; FLOOR_11F + money 0 ; FLOOR_B4F diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm new file mode 100755 index 00000000..7f007e9d --- /dev/null +++ b/data/items/tm_prices.asm @@ -0,0 +1,27 @@ +TechnicalMachinePrices: +; In thousands (nybbles). + dn 3, 2 ; TM01, TM02 + dn 2, 1 ; TM03, TM04 + dn 3, 4 ; TM05, TM06 + dn 2, 4 ; TM07, TM08 + dn 3, 4 ; TM09, TM10 + dn 2, 1 ; TM11, TM12 + dn 4, 5 ; TM13, TM14 + dn 5, 5 ; TM15, TM16 + dn 3, 2 ; TM17, TM18 + dn 3, 2 ; TM19, TM20 + dn 5, 5 ; TM21, TM22 + dn 5, 2 ; TM23, TM24 + dn 5, 4 ; TM25, TM26 + dn 5, 2 ; TM27, TM28 + dn 4, 1 ; TM29, TM30 + dn 2, 1 ; TM31, TM32 + dn 1, 2 ; TM33, TM34 + dn 4, 2 ; TM35, TM36 + dn 2, 5 ; TM37, TM38 + dn 2, 4 ; TM39, TM40 + dn 2, 2 ; TM41, TM42 + dn 5, 2 ; TM43, TM44 + dn 2, 4 ; TM45, TM46 + dn 3, 4 ; TM47, TM48 + dn 4, 2 ; TM49, TM50 diff --git a/data/items/use_overworld.asm b/data/items/use_overworld.asm new file mode 100644 index 00000000..5a2ba102 --- /dev/null +++ b/data/items/use_overworld.asm @@ -0,0 +1,9 @@ +; items which close the item menu when used +UsableItems_CloseMenu: + db ESCAPE_ROPE + db ITEMFINDER + db POKE_FLUTE + db OLD_ROD + db GOOD_ROD + db SUPER_ROD + db -1 ; end diff --git a/data/items/use_party.asm b/data/items/use_party.asm new file mode 100644 index 00000000..e8da68be --- /dev/null +++ b/data/items/use_party.asm @@ -0,0 +1,39 @@ +; items which bring up the party menu when used +UsableItems_PartyMenu: + db MOON_STONE + db ANTIDOTE + db BURN_HEAL + db ICE_HEAL + db AWAKENING + db PARLYZ_HEAL + db FULL_RESTORE + db MAX_POTION + db HYPER_POTION + db SUPER_POTION + db POTION + db FIRE_STONE + db THUNDER_STONE + db WATER_STONE + db HP_UP + db PROTEIN + db IRON + db CARBOS + db CALCIUM + db RARE_CANDY + db LEAF_STONE + db FULL_HEAL + db REVIVE + db MAX_REVIVE + db FRESH_WATER + db SODA_POP + db LEMONADE + db X_ATTACK + db X_DEFEND + db X_SPEED + db X_SPECIAL + db PP_UP + db ETHER + db MAX_ETHER + db ELIXER + db MAX_ELIXER + db -1 ; end diff --git a/data/items/vending_prices.asm b/data/items/vending_prices.asm new file mode 100644 index 00000000..131d525d --- /dev/null +++ b/data/items/vending_prices.asm @@ -0,0 +1,10 @@ +vend_item: MACRO + db \1 + money \2 +ENDM + +VendingPrices: + ; item id, price + vend_item FRESH_WATER, 200 + vend_item SODA_POP, 300 + vend_item LEMONADE, 350 diff --git a/data/key_items.asm b/data/key_items.asm deleted file mode 100755 index afa586af..00000000 --- a/data/key_items.asm +++ /dev/null @@ -1,12 +0,0 @@ -KeyItemBitfield: - db %11110000 - db %00000001 - db %11110000 - db %01001111 - db %00000000 - db %10011111 - db %00000000 - db %11000000 - db %11110000 - db %00111011 - db %00000000 diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm deleted file mode 100755 index 73cd7291..00000000 --- a/data/mapHeaders/AgathasRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -AgathasRoom_h: - db CEMETERY ; tileset - db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) - dw AgathasRoom_Blocks ; blocks - dw AgathasRoom_TextPointers ; texts - dw AgathasRoom_Script ; scripts - db 0 ; connections - dw AgathasRoom_Object ; objects diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm deleted file mode 100755 index c447fd80..00000000 --- a/data/mapHeaders/BikeShop.asm +++ /dev/null @@ -1,8 +0,0 @@ -BikeShop_h: - db CLUB ; tileset - db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) - dw BikeShop_Blocks ; blocks - dw BikeShop_TextPointers ; texts - dw BikeShop_Script ; scripts - db 0 ; connections - dw BikeShop_Object ; objects diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm deleted file mode 100755 index bba9cf83..00000000 --- a/data/mapHeaders/BillsHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -BillsHouse_h: - db INTERIOR ; tileset - db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) - dw BillsHouse_Blocks ; blocks - dw BillsHouse_TextPointers ; texts - dw BillsHouse_Script ; scripts - db 0 ; connections - dw BillsHouse_Object ; objects diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm deleted file mode 100755 index 6ef0433e..00000000 --- a/data/mapHeaders/BluesHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -BluesHouse_h: - db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) - dw BluesHouse_Blocks ; blocks - dw BluesHouse_TextPointers ; texts - dw BluesHouse_Script ; scripts - db 0 ; connections - dw BluesHouse_Object ; objects diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm deleted file mode 100755 index 78c7989d..00000000 --- a/data/mapHeaders/BrunosRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -BrunosRoom_h: - db GYM ; tileset - db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) - dw BrunosRoom_Blocks ; blocks - dw BrunosRoom_TextPointers ; texts - dw BrunosRoom_Script ; scripts - db 0 ; connections - dw BrunosRoom_Object ; objects diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm deleted file mode 100755 index a31c8121..00000000 --- a/data/mapHeaders/CeladonChiefHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonChiefHouse_h: - db MANSION ; tileset - db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonChiefHouse_Blocks ; blocks - dw CeladonChiefHouse_TextPointers ; texts - dw CeladonChiefHouse_Script ; scripts - db 0 ; connections - dw CeladonChiefHouse_Object ; objects diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm deleted file mode 100755 index 62243d27..00000000 --- a/data/mapHeaders/CeladonCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -CeladonCity_h: - db OVERWORLD ; tileset - db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) - dw CeladonCity_Blocks ; blocks - dw CeladonCity_TextPointers ; texts - dw CeladonCity_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks - EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1 - dw CeladonCity_Object ; objects diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm deleted file mode 100755 index d4220db7..00000000 --- a/data/mapHeaders/CeladonDiner.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonDiner_h: - db LOBBY ; tileset - db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) - dw CeladonDiner_Blocks ; blocks - dw CeladonDiner_TextPointers ; texts - dw CeladonDiner_Script ; scripts - db 0 ; connections - dw CeladonDiner_Object ; objects diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm deleted file mode 100755 index 04a9427c..00000000 --- a/data/mapHeaders/CeladonGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonGym_h: - db GYM ; tileset - db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) - dw CeladonGym_Blocks ; blocks - dw CeladonGym_TextPointers ; texts - dw CeladonGym_Script ; scripts - db 0 ; connections - dw CeladonGym_Object ; objects diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm deleted file mode 100755 index e06c2fd3..00000000 --- a/data/mapHeaders/CeladonHotel.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonHotel_h: - db POKECENTER ; tileset - db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) - dw CeladonHotel_Blocks ; blocks - dw CeladonHotel_TextPointers ; texts - dw CeladonHotel_Script ; scripts - db 0 ; connections - dw CeladonHotel_Object ; objects diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm deleted file mode 100755 index d2d0ee99..00000000 --- a/data/mapHeaders/CeladonMansion1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion1F_h: - db MANSION ; tileset - db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x) - dw CeladonMansion1F_Blocks ; blocks - dw CeladonMansion1F_TextPointers ; texts - dw CeladonMansion1F_Script ; scripts - db 0 ; connections - dw CeladonMansion1F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm deleted file mode 100755 index eceac30e..00000000 --- a/data/mapHeaders/CeladonMansion2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion2F_h: - db MANSION ; tileset - db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x) - dw CeladonMansion2F_Blocks ; blocks - dw CeladonMansion2F_TextPointers ; texts - dw CeladonMansion2F_Script ; scripts - db 0 ; connections - dw CeladonMansion2F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm deleted file mode 100755 index b5a0a705..00000000 --- a/data/mapHeaders/CeladonMansion3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion3F_h: - db MANSION ; tileset - db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x) - dw CeladonMansion3F_Blocks ; blocks - dw CeladonMansion3F_TextPointers ; texts - dw CeladonMansion3F_Script ; scripts - db 0 ; connections - dw CeladonMansion3F_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm deleted file mode 100755 index d7a050c8..00000000 --- a/data/mapHeaders/CeladonMansionRoof.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansionRoof_h: - db MANSION ; tileset - db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMansionRoof_Blocks ; blocks - dw CeladonMansionRoof_TextPointers ; texts - dw CeladonMansionRoof_Script ; scripts - db 0 ; connections - dw CeladonMansionRoof_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm deleted file mode 100755 index 7fcf49e1..00000000 --- a/data/mapHeaders/CeladonMansionRoofHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansionRoofHouse_h: - db HOUSE ; tileset - db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonMansionRoofHouse_Blocks ; blocks - dw CeladonMansionRoofHouse_TextPointers ; texts - dw CeladonMansionRoofHouse_Script ; scripts - db 0 ; connections - dw CeladonMansionRoofHouse_Object ; objects diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm deleted file mode 100755 index 51e968fa..00000000 --- a/data/mapHeaders/CeladonMart1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart1F_h: - db LOBBY ; tileset - db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x) - dw CeladonMart1F_Blocks ; blocks - dw CeladonMart1F_TextPointers ; texts - dw CeladonMart1F_Script ; scripts - db 0 ; connections - dw CeladonMart1F_Object ; objects diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm deleted file mode 100755 index 77106405..00000000 --- a/data/mapHeaders/CeladonMart2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart2F_h: - db LOBBY ; tileset - db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x) - dw CeladonMart2F_Blocks ; blocks - dw CeladonMart2F_TextPointers ; texts - dw CeladonMart2F_Script ; scripts - db 0 ; connections - dw CeladonMart2F_Object ; objects diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm deleted file mode 100755 index c460945c..00000000 --- a/data/mapHeaders/CeladonMart3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart3F_h: - db LOBBY ; tileset - db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x) - dw CeladonMart3F_Blocks ; blocks - dw CeladonMart3F_TextPointers ; texts - dw CeladonMart3F_Script ; scripts - db 0 ; connections - dw CeladonMart3F_Object ; objects diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm deleted file mode 100755 index a742570b..00000000 --- a/data/mapHeaders/CeladonMart4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart4F_h: - db LOBBY ; tileset - db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x) - dw CeladonMart4F_Blocks ; blocks - dw CeladonMart4F_TextPointers ; texts - dw CeladonMart4F_Script ; scripts - db 0 ; connections - dw CeladonMart4F_Object ; objects diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm deleted file mode 100755 index 4b5223e0..00000000 --- a/data/mapHeaders/CeladonMart5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart5F_h: - db LOBBY ; tileset - db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x) - dw CeladonMart5F_Blocks ; blocks - dw CeladonMart5F_TextPointers ; texts - dw CeladonMart5F_Script ; scripts - db 0 ; connections - dw CeladonMart5F_Object ; objects diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm deleted file mode 100755 index 06e87608..00000000 --- a/data/mapHeaders/CeladonMartElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMartElevator_h: - db LOBBY ; tileset - db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) - dw CeladonMartElevator_Blocks ; blocks - dw CeladonMartElevator_TextPointers ; texts - dw CeladonMartElevator_Script ; scripts - db 0 ; connections - dw CeladonMartElevator_Object ; objects diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm deleted file mode 100755 index 163e25ed..00000000 --- a/data/mapHeaders/CeladonMartRoof.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMartRoof_h: - db LOBBY ; tileset - db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMartRoof_Blocks ; blocks - dw CeladonMartRoof_TextPointers ; texts - dw CeladonMartRoof_Script ; scripts - db 0 ; connections - dw CeladonMartRoof_Object ; objects diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm deleted file mode 100755 index b5d9bd73..00000000 --- a/data/mapHeaders/CeladonPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonPokecenter_h: - db POKECENTER ; tileset - db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) - dw CeladonPokecenter_Blocks ; blocks - dw CeladonPokecenter_TextPointers ; texts - dw CeladonPokecenter_Script ; scripts - db 0 ; connections - dw CeladonPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm deleted file mode 100755 index a94f1912..00000000 --- a/data/mapHeaders/CeruleanBadgeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanBadgeHouse_h: - db SHIP ; tileset - db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanBadgeHouse_Blocks ; blocks - dw CeruleanBadgeHouse_TextPointers ; texts - dw CeruleanBadgeHouse_Script ; scripts - db 0 ; connections - dw CeruleanBadgeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm deleted file mode 100755 index 932dfb48..00000000 --- a/data/mapHeaders/CeruleanCave1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave1F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x) - dw CeruleanCave1F_Blocks ; blocks - dw CeruleanCave1F_TextPointers ; texts - dw CeruleanCave1F_Script ; scripts - db 0 ; connections - dw CeruleanCave1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm deleted file mode 100755 index 7cf82371..00000000 --- a/data/mapHeaders/CeruleanCave2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave2F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x) - dw CeruleanCave2F_Blocks ; blocks - dw CeruleanCave2F_TextPointers ; texts - dw CeruleanCave2F_Script ; scripts - db 0 ; connections - dw CeruleanCave2F_Object ; objects diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm deleted file mode 100755 index eb940faa..00000000 --- a/data/mapHeaders/CeruleanCaveB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCaveB1F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x) - dw CeruleanCaveB1F_Blocks ; blocks - dw CeruleanCaveB1F_TextPointers ; texts - dw CeruleanCaveB1F_Script ; scripts - db 0 ; connections - dw CeruleanCaveB1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm deleted file mode 100755 index cd5444ab..00000000 --- a/data/mapHeaders/CeruleanCity.asm +++ /dev/null @@ -1,12 +0,0 @@ -CeruleanCity_h: - db OVERWORLD ; tileset - db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) - dw CeruleanCity_Blocks ; blocks - dw CeruleanCity_TextPointers ; texts - dw CeruleanCity_Script ; scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks - SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1 - WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks - EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks - dw CeruleanCity_Object ; objects diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm deleted file mode 100755 index 3bdb0283..00000000 --- a/data/mapHeaders/CeruleanGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanGym_h: - db GYM ; tileset - db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) - dw CeruleanGym_Blocks ; blocks - dw CeruleanGym_TextPointers ; texts - dw CeruleanGym_Script ; scripts - db 0 ; connections - dw CeruleanGym_Object ; objects diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm deleted file mode 100755 index f020d4a3..00000000 --- a/data/mapHeaders/CeruleanMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanMart_h: - db MART ; tileset - db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) - dw CeruleanMart_Blocks ; blocks - dw CeruleanMart_TextPointers ; texts - dw CeruleanMart_Script ; scripts - db 0 ; connections - dw CeruleanMart_Object ; objects diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm deleted file mode 100755 index 3286acbb..00000000 --- a/data/mapHeaders/CeruleanPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanPokecenter_h: - db POKECENTER ; tileset - db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) - dw CeruleanPokecenter_Blocks ; blocks - dw CeruleanPokecenter_TextPointers ; texts - dw CeruleanPokecenter_Script ; scripts - db 0 ; connections - dw CeruleanPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm deleted file mode 100755 index 23c5062c..00000000 --- a/data/mapHeaders/CeruleanTradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanTradeHouse_h: - db HOUSE ; tileset - db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanTradeHouse_Blocks ; blocks - dw CeruleanTradeHouse_TextPointers ; texts - dw CeruleanTradeHouse_Script ; scripts - db 0 ; connections - dw CeruleanTradeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm deleted file mode 100755 index e105b1ed..00000000 --- a/data/mapHeaders/CeruleanTrashedHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanTrashedHouse_h: - db HOUSE ; tileset - db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanTrashedHouse_Blocks ; blocks - dw CeruleanTrashedHouse_TextPointers ; texts - dw CeruleanTrashedHouse_Script ; scripts - db 0 ; connections - dw CeruleanTrashedHouse_Object ; objects diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm deleted file mode 100755 index a22b236a..00000000 --- a/data/mapHeaders/ChampionsRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -ChampionsRoom_h: - db GYM ; tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) - dw ChampionsRoom_Blocks ; blocks - dw ChampionsRoom_TextPointers ; texts - dw ChampionsRoom_Script ; scripts - db $0 ; connections - dw ChampionsRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm deleted file mode 100755 index e871b8f3..00000000 --- a/data/mapHeaders/CinnabarGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarGym_h: - db FACILITY ; tileset - db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) - dw CinnabarGym_Blocks ; blocks - dw CinnabarGym_TextPointers ; texts - dw CinnabarGym_Script ; scripts - db 0 ; connections - dw CinnabarGym_Object ; objects diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm deleted file mode 100755 index b8c5d7d4..00000000 --- a/data/mapHeaders/CinnabarIsland.asm +++ /dev/null @@ -1,10 +0,0 @@ -CinnabarIsland_h: - db OVERWORLD ; tileset - db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) - dw CinnabarIsland_Blocks ; blocks - dw CinnabarIsland_TextPointers ; texts - dw CinnabarIsland_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks - EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks - dw CinnabarIsland_Object ; objects diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm deleted file mode 100755 index c1167960..00000000 --- a/data/mapHeaders/CinnabarLab.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLab_h: - db LAB ; tileset - db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x) - dw CinnabarLab_Blocks ; blocks - dw CinnabarLab_TextPointers ; texts - dw CinnabarLab_Script ; scripts - db 0 ; connections - dw CinnabarLab_Object ; objects diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm deleted file mode 100755 index 4ac2963b..00000000 --- a/data/mapHeaders/CinnabarLabFossilRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabFossilRoom_h: - db LAB ; tileset - db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabFossilRoom_Blocks ; blocks - dw CinnabarLabFossilRoom_TextPointers ; texts - dw CinnabarLabFossilRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabFossilRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm deleted file mode 100755 index 8eb9e502..00000000 --- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabMetronomeRoom_h: - db LAB ; tileset - db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabMetronomeRoom_Blocks ; blocks - dw CinnabarLabMetronomeRoom_TextPointers ; texts - dw CinnabarLabMetronomeRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabMetronomeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm deleted file mode 100755 index 1e0ffd0e..00000000 --- a/data/mapHeaders/CinnabarLabTradeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabTradeRoom_h: - db LAB ; tileset - db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabTradeRoom_Blocks ; blocks - dw CinnabarLabTradeRoom_TextPointers ; texts - dw CinnabarLabTradeRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabTradeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm deleted file mode 100755 index 5833b2ef..00000000 --- a/data/mapHeaders/CinnabarMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarMart_h: - db MART ; tileset - db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) - dw CinnabarMart_Blocks ; blocks - dw CinnabarMart_TextPointers ; texts - dw CinnabarMart_Script ; scripts - db 0 ; connections - dw CinnabarMart_Object ; objects diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm deleted file mode 100755 index 9c54b9b9..00000000 --- a/data/mapHeaders/CinnabarPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarPokecenter_h: - db POKECENTER ; tileset - db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) - dw CinnabarPokecenter_Blocks ; blocks - dw CinnabarPokecenter_TextPointers ; texts - dw CinnabarPokecenter_Script ; scripts - db 0 ; connections - dw CinnabarPokecenter_Object ; objects diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm deleted file mode 100755 index 9b106204..00000000 --- a/data/mapHeaders/Colosseum.asm +++ /dev/null @@ -1,8 +0,0 @@ -Colosseum_h: - db CLUB ; tileset - db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) - dw Colosseum_Blocks ; blocks - dw Colosseum_TextPointers ; texts - dw Colosseum_Script ; scripts - db 0 ; connections - dw Colosseum_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm deleted file mode 100755 index f3cfc261..00000000 --- a/data/mapHeaders/CopycatsHouse1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CopycatsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw CopycatsHouse1F_Blocks ; blocks - dw CopycatsHouse1F_TextPointers ; texts - dw CopycatsHouse1F_Script ; scripts - db 0 ; connections - dw CopycatsHouse1F_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm deleted file mode 100755 index 453ba455..00000000 --- a/data/mapHeaders/CopycatsHouse2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CopycatsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw CopycatsHouse2F_Blocks ; blocks - dw CopycatsHouse2F_TextPointers ; texts - dw CopycatsHouse2F_Script ; scripts - db 0 ; connections - dw CopycatsHouse2F_Object ; objects diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm deleted file mode 100755 index 2fb7a771..00000000 --- a/data/mapHeaders/Daycare.asm +++ /dev/null @@ -1,8 +0,0 @@ -Daycare_h: - db HOUSE ; tileset - db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x) - dw Daycare_Blocks ; blocks - dw Daycare_TextPointers ; texts - dw Daycare_Script ; scripts - db 0 ; connections - dw Daycare_Object ; objects diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm deleted file mode 100755 index 096019de..00000000 --- a/data/mapHeaders/DiglettsCave.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) - dw DiglettsCave_Blocks ; blocks - dw DiglettsCave_TextPointers ; texts - dw DiglettsCave_Script ; scripts - db 0 ; connections - dw DiglettsCave_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm deleted file mode 100755 index 363859b2..00000000 --- a/data/mapHeaders/DiglettsCaveRoute11.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCaveRoute11_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute11_Blocks ; blocks - dw DiglettsCaveRoute11_TextPointers ; texts - dw DiglettsCaveRoute11_Script ; scripts - db 0 ; connections - dw DiglettsCaveRoute11_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm deleted file mode 100755 index c977415b..00000000 --- a/data/mapHeaders/DiglettsCaveRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCaveRoute2_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute2_Blocks ; blocks - dw DiglettsCaveRoute2_TextPointers ; texts - dw DiglettsCaveRoute2_Script ; scripts - db 0 ; connections - dw DiglettsCaveRoute2_Object ; objects diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm deleted file mode 100755 index 5c802843..00000000 --- a/data/mapHeaders/FightingDojo.asm +++ /dev/null @@ -1,8 +0,0 @@ -FightingDojo_h: - db DOJO ; tileset - db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) - dw FightingDojo_Blocks ; blocks - dw FightingDojo_TextPointers ; texts - dw FightingDojo_Script ; scripts - db 0 ; connections - dw FightingDojo_Object ; objects diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm deleted file mode 100755 index bc4fe8e6..00000000 --- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaBillsGrandpasHouse_h: - db HOUSE ; tileset - db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x) - dw FuchsiaBillsGrandpasHouse_Blocks ; blocks - dw FuchsiaBillsGrandpasHouse_TextPointers ; texts - dw FuchsiaBillsGrandpasHouse_Script ; scripts - db 0 ; connections - dw FuchsiaBillsGrandpasHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm deleted file mode 100755 index 87398877..00000000 --- a/data/mapHeaders/FuchsiaCity.asm +++ /dev/null @@ -1,11 +0,0 @@ -FuchsiaCity_h: - db OVERWORLD ; tileset - db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) - dw FuchsiaCity_Blocks ; blocks - dw FuchsiaCity_TextPointers ; texts - dw FuchsiaCity_Script ; scripts - db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks - WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks - dw FuchsiaCity_Object ; objects diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm deleted file mode 100755 index 4871970e..00000000 --- a/data/mapHeaders/FuchsiaGoodRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaGoodRodHouse_h: - db SHIP ; tileset - db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw FuchsiaGoodRodHouse_Blocks ; blocks - dw FuchsiaGoodRodHouse_TextPointers ; texts - dw FuchsiaGoodRodHouse_Script ; scripts - db 0 ; connections - dw FuchsiaGoodRodHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm deleted file mode 100755 index 71ef5960..00000000 --- a/data/mapHeaders/FuchsiaGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaGym_h: - db GYM ; tileset - db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) - dw FuchsiaGym_Blocks ; blocks - dw FuchsiaGym_TextPointers ; texts - dw FuchsiaGym_Script ; scripts - db 0 ; connections - dw FuchsiaGym_Object ; objects diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm deleted file mode 100755 index 7c1c34d2..00000000 --- a/data/mapHeaders/FuchsiaMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaMart_h: - db MART ; tileset - db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) - dw FuchsiaMart_Blocks ; blocks - dw FuchsiaMart_TextPointers ; texts - dw FuchsiaMart_Script ; scripts - db 0 ; connections - dw FuchsiaMart_Object ; objects diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm deleted file mode 100755 index 8bc0cdbf..00000000 --- a/data/mapHeaders/FuchsiaMeetingRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaMeetingRoom_h: - db LAB ; tileset - db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) - dw FuchsiaMeetingRoom_Blocks ; blocks - dw FuchsiaMeetingRoom_TextPointers ; texts - dw FuchsiaMeetingRoom_Script ; scripts - db 0 ; connections - dw FuchsiaMeetingRoom_Object ; objects diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm deleted file mode 100755 index bf654ea6..00000000 --- a/data/mapHeaders/FuchsiaPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaPokecenter_h: - db POKECENTER ; tileset - db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) - dw FuchsiaPokecenter_Blocks ; blocks - dw FuchsiaPokecenter_TextPointers ; texts - dw FuchsiaPokecenter_Script ; scripts - db 0 ; connections - dw FuchsiaPokecenter_Object ; objects diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm deleted file mode 100755 index c8b69724..00000000 --- a/data/mapHeaders/GameCorner.asm +++ /dev/null @@ -1,8 +0,0 @@ -GameCorner_h: - db LOBBY ; tileset - db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) - dw GameCorner_Blocks ; blocks - dw GameCorner_TextPointers ; texts - dw GameCorner_Script ; scripts - db 0 ; connections - dw GameCorner_Object ; objects diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm deleted file mode 100755 index e43d2ec7..00000000 --- a/data/mapHeaders/GameCornerPrizeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -GameCornerPrizeRoom_h: - db LOBBY ; tileset - db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x) - dw GameCornerPrizeRoom_Blocks ; blocks - dw GameCornerPrizeRoom_TextPointers ; texts - dw GameCornerPrizeRoom_Script ; scripts - db 0 ; connections - dw GameCornerPrizeRoom_Object ; objects diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm deleted file mode 100755 index e7f7a982..00000000 --- a/data/mapHeaders/HallOfFame.asm +++ /dev/null @@ -1,8 +0,0 @@ -HallOfFame_h: - db GYM ; tileset - db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) - dw HallOfFame_Blocks ; blocks - dw HallOfFame_TextPointers ; texts - dw HallOfFame_Script ; scripts - db 0 ; connections - dw HallOfFame_Object ; objects diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm deleted file mode 100755 index ee8b2f0c..00000000 --- a/data/mapHeaders/IndigoPlateau.asm +++ /dev/null @@ -1,9 +0,0 @@ -IndigoPlateau_h: - db PLATEAU ; tileset - db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) - dw IndigoPlateau_Blocks ; blocks - dw IndigoPlateau_TextPointers ; texts - dw IndigoPlateau_Script ; scripts - db SOUTH ; connections - SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks - dw IndigoPlateau_Object ; objects diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm deleted file mode 100755 index f099c87d..00000000 --- a/data/mapHeaders/IndigoPlateauLobby.asm +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateauLobby_h: - db MART ; tileset - db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) - dw IndigoPlateauLobby_Blocks ; blocks - dw IndigoPlateauLobby_TextPointers ; texts - dw IndigoPlateauLobby_Script ; scripts - db 0 ; connections - dw IndigoPlateauLobby_Object ; objects diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm deleted file mode 100755 index a9cea4b6..00000000 --- a/data/mapHeaders/LancesRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -LancesRoom_h: - db DOJO ; tileset - db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) - dw LancesRoom_Blocks ; blocks - dw LancesRoom_TextPointers ; texts - dw LancesRoom_Script ; scripts - db 0 ; connections - dw LancesRoom_Object ; objects diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm deleted file mode 100755 index 06e9cb40..00000000 --- a/data/mapHeaders/LavenderCuboneHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderCuboneHouse_h: - db HOUSE ; tileset - db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x) - dw LavenderCuboneHouse_Blocks ; blocks - dw LavenderCuboneHouse_TextPointers ; texts - dw LavenderCuboneHouse_Script ; scripts - db 0 ; connections - dw LavenderCuboneHouse_Object ; objects diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm deleted file mode 100755 index c6869d3c..00000000 --- a/data/mapHeaders/LavenderMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderMart_h: - db MART ; tileset - db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) - dw LavenderMart_Blocks ; blocks - dw LavenderMart_TextPointers ; texts - dw LavenderMart_Script ; scripts - db 0 ; connections - dw LavenderMart_Object ; objects diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm deleted file mode 100755 index 820e19cd..00000000 --- a/data/mapHeaders/LavenderPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderPokecenter_h: - db POKECENTER ; tileset - db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) - dw LavenderPokecenter_Blocks ; blocks - dw LavenderPokecenter_TextPointers ; texts - dw LavenderPokecenter_Script ; scripts - db 0 ; connections - dw LavenderPokecenter_Object ; objects diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm deleted file mode 100755 index 99c9515d..00000000 --- a/data/mapHeaders/LavenderTown.asm +++ /dev/null @@ -1,11 +0,0 @@ -LavenderTown_h: - db OVERWORLD ; tileset - db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) - dw LavenderTown_Blocks ; blocks - dw LavenderTown_TextPointers ; texts - dw LavenderTown_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks - SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1 - WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks - dw LavenderTown_Object ; objects diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm deleted file mode 100755 index 216b6621..00000000 --- a/data/mapHeaders/LoreleisRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -LoreleisRoom_h: - db GYM ; tileset - db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) - dw LoreleisRoom_Blocks ; blocks - dw LoreleisRoom_TextPointers ; texts - dw LoreleisRoom_Script ; scripts - db 0 ; connections - dw LoreleisRoom_Object ; objects diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm deleted file mode 100755 index 4ae9c5b7..00000000 --- a/data/mapHeaders/MrFujisHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -MrFujisHouse_h: - db HOUSE ; tileset - db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x) - dw MrFujisHouse_Blocks ; blocks - dw MrFujisHouse_TextPointers ; texts - dw MrFujisHouse_Script ; scripts - db 0 ; connections - dw MrFujisHouse_Object ; objects diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm deleted file mode 100755 index 5e4ce91b..00000000 --- a/data/mapHeaders/MrPsychicsHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -MrPsychicsHouse_h: - db HOUSE ; tileset - db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x) - dw MrPsychicsHouse_Blocks ; blocks - dw MrPsychicsHouse_TextPointers ; texts - dw MrPsychicsHouse_Script ; scripts - db 0 ; connections - dw MrPsychicsHouse_Object ; objects diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm deleted file mode 100755 index 29ce5d6b..00000000 --- a/data/mapHeaders/MtMoon1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon1F_h: - db CAVERN ; tileset - db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x) - dw MtMoon1F_Blocks ; blocks - dw MtMoon1F_TextPointers ; texts - dw MtMoon1F_Script ; scripts - db 0 ; connections - dw MtMoon1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm deleted file mode 100755 index 7ebc3dab..00000000 --- a/data/mapHeaders/MtMoonB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonB1F_h: - db CAVERN ; tileset - db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x) - dw MtMoonB1F_Blocks ; blocks - dw MtMoonB1F_TextPointers ; texts - dw MtMoonB1F_Script ; scripts - db 0 ; connections - dw MtMoonB1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm deleted file mode 100755 index 2ec86247..00000000 --- a/data/mapHeaders/MtMoonB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonB2F_h: - db CAVERN ; tileset - db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x) - dw MtMoonB2F_Blocks ; blocks - dw MtMoonB2F_TextPointers ; texts - dw MtMoonB2F_Script ; scripts - db 0 ; connections - dw MtMoonB2F_Object ; objects diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm deleted file mode 100755 index c3c014ff..00000000 --- a/data/mapHeaders/MtMoonPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonPokecenter_h: - db POKECENTER ; tileset - db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) - dw MtMoonPokecenter_Blocks ; blocks - dw MtMoonPokecenter_TextPointers ; texts - dw MtMoonPokecenter_Script ; scripts - db 0 ; connections - dw MtMoonPokecenter_Object ; objects diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm deleted file mode 100755 index 55625fc4..00000000 --- a/data/mapHeaders/Museum1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Museum1F_h: - db MUSEUM ; tileset - db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) - dw Museum1F_Blocks ; blocks - dw Museum1F_TextPointers ; texts - dw Museum1F_Script ; scripts - db 0 ; connections - dw Museum1F_Object ; objects diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm deleted file mode 100755 index b39e161d..00000000 --- a/data/mapHeaders/Museum2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Museum2F_h: - db MUSEUM ; tileset - db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) - dw Museum2F_Blocks ; blocks - dw Museum2F_TextPointers ; texts - dw Museum2F_Script ; scripts - db 0 ; connections - dw Museum2F_Object ; objects diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm deleted file mode 100755 index 7e3acee1..00000000 --- a/data/mapHeaders/NameRatersHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -NameRatersHouse_h: - db HOUSE ; tileset - db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) - dw NameRatersHouse_Blocks ; blocks - dw NameRatersHouse_TextPointers ; texts - dw NameRatersHouse_Script ; scripts - db 0 ; connections - dw NameRatersHouse_Object ; objects diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm deleted file mode 100755 index ffbcdd52..00000000 --- a/data/mapHeaders/OaksLab.asm +++ /dev/null @@ -1,8 +0,0 @@ -OaksLab_h: - db DOJO ; tileset - db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) - dw OaksLab_Blocks ; blocks - dw OaksLab_TextPointers ; texts - dw OaksLab_Script ; scripts - db 0 ; connections - dw OaksLab_Object ; objects diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm deleted file mode 100755 index eb8525ae..00000000 --- a/data/mapHeaders/PalletTown.asm +++ /dev/null @@ -1,10 +0,0 @@ -PalletTown_h: - db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) - dw PalletTown_Blocks ; blocks - dw PalletTown_TextPointers ; texts - dw PalletTown_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks - SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1 - dw PalletTown_Object ; objects diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm deleted file mode 100755 index 73610f86..00000000 --- a/data/mapHeaders/PewterCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -PewterCity_h: - db OVERWORLD ; tileset - db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) - dw PewterCity_Blocks ; blocks - dw PewterCity_TextPointers ; texts - dw PewterCity_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks - EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks - dw PewterCity_Object ; objects diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm deleted file mode 100755 index bb9c2e84..00000000 --- a/data/mapHeaders/PewterGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterGym_h: - db GYM ; tileset - db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) - dw PewterGym_Blocks ; blocks - dw PewterGym_TextPointers ; texts - dw PewterGym_Script ; scripts - db 0 ; connections - dw PewterGym_Object ; objects diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm deleted file mode 100755 index dc8c5c78..00000000 --- a/data/mapHeaders/PewterMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterMart_h: - db MART ; tileset - db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) - dw PewterMart_Blocks ; blocks - dw PewterMart_TextPointers ; texts - dw PewterMart_Script ; scripts - db 0 ; connections - dw PewterMart_Object ; objects diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm deleted file mode 100755 index ffab8473..00000000 --- a/data/mapHeaders/PewterNidoranHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterNidoranHouse_h: - db HOUSE ; tileset - db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x) - dw PewterNidoranHouse_Blocks ; blocks - dw PewterNidoranHouse_TextPointers ; texts - dw PewterNidoranHouse_Script ; scripts - db 0 ; connections - dw PewterNidoranHouse_Object ; objects diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm deleted file mode 100755 index 89adbb80..00000000 --- a/data/mapHeaders/PewterPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterPokecenter_h: - db POKECENTER ; tileset - db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) - dw PewterPokecenter_Blocks ; blocks - dw PewterPokecenter_TextPointers ; texts - dw PewterPokecenter_Script ; scripts - db 0 ; connections - dw PewterPokecenter_Object ; objects diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm deleted file mode 100755 index 7750c8c7..00000000 --- a/data/mapHeaders/PewterSpeechHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterSpeechHouse_h: - db HOUSE ; tileset - db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x) - dw PewterSpeechHouse_Blocks ; blocks - dw PewterSpeechHouse_TextPointers ; texts - dw PewterSpeechHouse_Script ; scripts - db 0 ; connections - dw PewterSpeechHouse_Object ; objects diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm deleted file mode 100755 index 18ebb923..00000000 --- a/data/mapHeaders/PokemonFanClub.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonFanClub_h: - db INTERIOR ; tileset - db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) - dw PokemonFanClub_Blocks ; blocks - dw PokemonFanClub_TextPointers ; texts - dw PokemonFanClub_Script ; scripts - db 0 ; connections - dw PokemonFanClub_Object ; objects diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm deleted file mode 100755 index 357b0cbb..00000000 --- a/data/mapHeaders/PokemonMansion1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion1F_h: - db FACILITY ; tileset - db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x) - dw PokemonMansion1F_Blocks ; blocks - dw PokemonMansion1F_TextPointers ; texts - dw PokemonMansion1F_Script ; scripts - db 0 ; connections - dw PokemonMansion1F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm deleted file mode 100755 index 71c0e3bb..00000000 --- a/data/mapHeaders/PokemonMansion2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion2F_h: - db FACILITY ; tileset - db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x) - dw PokemonMansion2F_Blocks ; blocks - dw PokemonMansion2F_TextPointers ; texts - dw PokemonMansion2F_Script ; scripts - db 0 ; connections - dw PokemonMansion2F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm deleted file mode 100755 index fe4076f9..00000000 --- a/data/mapHeaders/PokemonMansion3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion3F_h: - db FACILITY ; tileset - db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x) - dw PokemonMansion3F_Blocks ; blocks - dw PokemonMansion3F_TextPointers ; texts - dw PokemonMansion3F_Script ; scripts - db 0 ; connections - dw PokemonMansion3F_Object ; objects diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm deleted file mode 100755 index ccf892b2..00000000 --- a/data/mapHeaders/PokemonMansionB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansionB1F_h: - db FACILITY ; tileset - db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x) - dw PokemonMansionB1F_Blocks ; blocks - dw PokemonMansionB1F_TextPointers ; texts - dw PokemonMansionB1F_Script ; scripts - db 0 ; connections - dw PokemonMansionB1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm deleted file mode 100755 index 561274bb..00000000 --- a/data/mapHeaders/PokemonTower1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower1F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x) - dw PokemonTower1F_Blocks ; blocks - dw PokemonTower1F_TextPointers ; texts - dw PokemonTower1F_Script ; scripts - db 0 ; connections - dw PokemonTower1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm deleted file mode 100755 index 41e3271e..00000000 --- a/data/mapHeaders/PokemonTower2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower2F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x) - dw PokemonTower2F_Blocks ; blocks - dw PokemonTower2F_TextPointers ; texts - dw PokemonTower2F_Script ; scripts - db 0 ; connections - dw PokemonTower2F_Object ; objects diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm deleted file mode 100755 index 932c4a20..00000000 --- a/data/mapHeaders/PokemonTower3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower3F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x) - dw PokemonTower3F_Blocks ; blocks - dw PokemonTower3F_TextPointers ; texts - dw PokemonTower3F_Script ; scripts - db 0 ; connections - dw PokemonTower3F_Object ; objects diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm deleted file mode 100755 index b3027cb0..00000000 --- a/data/mapHeaders/PokemonTower4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower4F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x) - dw PokemonTower4F_Blocks ; blocks - dw PokemonTower4F_TextPointers ; texts - dw PokemonTower4F_Script ; scripts - db 0 ; connections - dw PokemonTower4F_Object ; objects diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm deleted file mode 100755 index 9452c553..00000000 --- a/data/mapHeaders/PokemonTower5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower5F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x) - dw PokemonTower5F_Blocks ; blocks - dw PokemonTower5F_TextPointers ; texts - dw PokemonTower5F_Script ; scripts - db 0 ; connections - dw PokemonTower5F_Object ; objects diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm deleted file mode 100755 index 336c8f66..00000000 --- a/data/mapHeaders/PokemonTower6F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower6F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x) - dw PokemonTower6F_Blocks ; blocks - dw PokemonTower6F_TextPointers ; texts - dw PokemonTower6F_Script ; scripts - db 0 ; connections - dw PokemonTower6F_Object ; objects diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm deleted file mode 100755 index da10fa53..00000000 --- a/data/mapHeaders/PokemonTower7F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower7F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x) - dw PokemonTower7F_Blocks ; blocks - dw PokemonTower7F_TextPointers ; texts - dw PokemonTower7F_Script ; scripts - db 0 ; connections - dw PokemonTower7F_Object ; objects diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm deleted file mode 100755 index 91f03d63..00000000 --- a/data/mapHeaders/PowerPlant.asm +++ /dev/null @@ -1,8 +0,0 @@ -PowerPlant_h: - db FACILITY ; tileset - db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) - dw PowerPlant_Blocks ; blocks - dw PowerPlant_TextPointers ; texts - dw PowerPlant_Script ; scripts - db 0 ; connections - dw PowerPlant_Object ; objects diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm deleted file mode 100755 index c9acc489..00000000 --- a/data/mapHeaders/RedsHouse1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RedsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw RedsHouse1F_Blocks ; blocks - dw RedsHouse1F_TextPointers ; texts - dw RedsHouse1F_Script ; scripts - db 0 ; connections - dw RedsHouse1F_Object ; objects diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm deleted file mode 100755 index 42215466..00000000 --- a/data/mapHeaders/RedsHouse2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RedsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw RedsHouse2F_Blocks ; blocks - dw RedsHouse2F_TextPointers ; texts - dw RedsHouse2F_Script ; scripts - db $00 ; connections - dw RedsHouse2F_Object ; objects diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm deleted file mode 100755 index dd552ac9..00000000 --- a/data/mapHeaders/RockTunnel1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel1F_h: - db CAVERN ; tileset - db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x) - dw RockTunnel1F_Blocks ; blocks - dw RockTunnel1F_TextPointers ; texts - dw RockTunnel1F_Script ; scripts - db 0 ; connections - dw RockTunnel1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm deleted file mode 100755 index 4e765f20..00000000 --- a/data/mapHeaders/RockTunnelB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnelB1F_h: - db CAVERN ; tileset - db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x) - dw RockTunnelB1F_Blocks ; blocks - dw RockTunnelB1F_TextPointers ; texts - dw RockTunnelB1F_Script ; scripts - db 0 ; connections - dw RockTunnelB1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm deleted file mode 100755 index ac29f1cf..00000000 --- a/data/mapHeaders/RockTunnelPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnelPokecenter_h: - db POKECENTER ; tileset - db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) - dw RockTunnelPokecenter_Blocks ; blocks - dw RockTunnelPokecenter_TextPointers ; texts - dw RockTunnelPokecenter_Script ; scripts - db 0 ; connections - dw RockTunnelPokecenter_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm deleted file mode 100755 index 3c842f1e..00000000 --- a/data/mapHeaders/RocketHideoutB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB1F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x) - dw RocketHideoutB1F_Blocks ; blocks - dw RocketHideoutB1F_TextPointers ; texts - dw RocketHideoutB1F_Script ; scripts - db 0 ; connections - dw RocketHideoutB1F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm deleted file mode 100755 index b570c2a6..00000000 --- a/data/mapHeaders/RocketHideoutB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB2F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x) - dw RocketHideoutB2F_Blocks ; blocks - dw RocketHideoutB2F_TextPointers ; texts - dw RocketHideoutB2F_Script ; scripts - db 0 ; connections - dw RocketHideoutB2F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm deleted file mode 100755 index 7eab257e..00000000 --- a/data/mapHeaders/RocketHideoutB3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB3F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x) - dw RocketHideoutB3F_Blocks ; blocks - dw RocketHideoutB3F_TextPointers ; texts - dw RocketHideoutB3F_Script ; scripts - db 0 ; connections - dw RocketHideoutB3F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm deleted file mode 100755 index 57797c56..00000000 --- a/data/mapHeaders/RocketHideoutB4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB4F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x) - dw RocketHideoutB4F_Blocks ; blocks - dw RocketHideoutB4F_TextPointers ; texts - dw RocketHideoutB4F_Script ; scripts - db 0 ; connections - dw RocketHideoutB4F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm deleted file mode 100755 index 742d0038..00000000 --- a/data/mapHeaders/RocketHideoutElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutElevator_h: - db LOBBY ; tileset - db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) - dw RocketHideoutElevator_Blocks ; blocks - dw RocketHideoutElevator_TextPointers ; texts - dw RocketHideoutElevator_Script ; scripts - db 0 ; connections - dw RocketHideoutElevator_Object ; objects diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm deleted file mode 100755 index ce460937..00000000 --- a/data/mapHeaders/Route1.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route1_h: - db OVERWORLD ; tileset - db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) - dw Route1_Blocks ; blocks - dw Route1_TextPointers ; texts - dw Route1_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1 - dw Route1_Object ; objects diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm deleted file mode 100755 index 8c51bfc6..00000000 --- a/data/mapHeaders/Route10.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route10_h: - db OVERWORLD ; tileset - db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) - dw Route10_Blocks ; blocks - dw Route10_TextPointers ; texts - dw Route10_Script ; scripts - db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks - dw Route10_Object ; objects diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm deleted file mode 100755 index b7814465..00000000 --- a/data/mapHeaders/Route11.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route11_h: - db OVERWORLD ; tileset - db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) - dw Route11_Blocks ; blocks - dw Route11_TextPointers ; texts - dw Route11_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1 - dw Route11_Object ; objects diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm deleted file mode 100755 index 2e01d168..00000000 --- a/data/mapHeaders/Route11Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11Gate1F_h: - db GATE ; tileset - db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) - dw Route11Gate1F_Blocks ; blocks - dw Route11Gate1F_TextPointers ; texts - dw Route11Gate1F_Script ; scripts - db 0 ; connections - dw Route11Gate1F_Object ; objects diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm deleted file mode 100755 index ecb2ab7c..00000000 --- a/data/mapHeaders/Route11Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11Gate2F_h: - db GATE ; tileset - db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) - dw Route11Gate2F_Blocks ; blocks - dw Route11Gate2F_TextPointers ; texts - dw Route11Gate2F_Script ; scripts - db 0 ; connections - dw Route11Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm deleted file mode 100755 index 2f76aa27..00000000 --- a/data/mapHeaders/Route12.asm +++ /dev/null @@ -1,11 +0,0 @@ -Route12_h: - db OVERWORLD ; tileset - db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) - dw Route12_Blocks ; blocks - dw Route12_TextPointers ; texts - dw Route12_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks - WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks - dw Route12_Object ; objects diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm deleted file mode 100755 index e44aecab..00000000 --- a/data/mapHeaders/Route12Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12Gate1F_h: - db GATE ; tileset - db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) - dw Route12Gate1F_Blocks ; blocks - dw Route12Gate1F_TextPointers ; texts - dw Route12Gate1F_Script ; scripts - db 0 ; connections - dw Route12Gate1F_Object ; objects diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm deleted file mode 100755 index 94d5d54c..00000000 --- a/data/mapHeaders/Route12Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12Gate2F_h: - db GATE ; tileset - db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) - dw Route12Gate2F_Blocks ; blocks - dw Route12Gate2F_TextPointers ; texts - dw Route12Gate2F_Script ; scripts - db 0 ; connections - dw Route12Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm deleted file mode 100755 index ef5e0f2c..00000000 --- a/data/mapHeaders/Route12SuperRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12SuperRodHouse_h: - db HOUSE ; tileset - db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw Route12SuperRodHouse_Blocks ; blocks - dw Route12SuperRodHouse_TextPointers ; texts - dw Route12SuperRodHouse_Script ; scripts - db 0 ; connections - dw Route12SuperRodHouse_Object ; objects diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm deleted file mode 100755 index e6e244b9..00000000 --- a/data/mapHeaders/Route13.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route13_h: - db OVERWORLD ; tileset - db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) - dw Route13_Blocks ; blocks - dw Route13_TextPointers ; texts - dw Route13_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks - WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks - dw Route13_Object ; objects diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm deleted file mode 100755 index c3934ac5..00000000 --- a/data/mapHeaders/Route14.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route14_h: - db OVERWORLD ; tileset - db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) - dw Route14_Blocks ; blocks - dw Route14_TextPointers ; texts - dw Route14_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks - EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks - dw Route14_Object ; objects diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm deleted file mode 100755 index eb14d750..00000000 --- a/data/mapHeaders/Route15.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route15_h: - db OVERWORLD ; tileset - db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) - dw Route15_Blocks ; blocks - dw Route15_TextPointers ; texts - dw Route15_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks - EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks - dw Route15_Object ; objects diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm deleted file mode 100755 index b1ae5662..00000000 --- a/data/mapHeaders/Route15Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15Gate1F_h: - db GATE ; tileset - db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) - dw Route15Gate1F_Blocks ; blocks - dw Route15Gate1F_TextPointers ; texts - dw Route15Gate1F_Script ; scripts - db 0 ; connections - dw Route15Gate1F_Object ; objects diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm deleted file mode 100755 index 501da092..00000000 --- a/data/mapHeaders/Route15Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15Gate2F_h: - db GATE ; tileset - db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) - dw Route15Gate2F_Blocks ; blocks - dw Route15Gate2F_TextPointers ; texts - dw Route15Gate2F_Script ; scripts - db 0 ; connections - dw Route15Gate2F_Object ; objects diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm deleted file mode 100755 index d12b6ea9..00000000 --- a/data/mapHeaders/Route16.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route16_h: - db OVERWORLD ; tileset - db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) - dw Route16_Blocks ; blocks - dw Route16_TextPointers ; texts - dw Route16_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks - EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1 - dw Route16_Object ; objects diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm deleted file mode 100755 index 0d3f828d..00000000 --- a/data/mapHeaders/Route16FlyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16FlyHouse_h: - db HOUSE ; tileset - db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x) - dw Route16FlyHouse_Blocks ; blocks - dw Route16FlyHouse_TextPointers ; texts - dw Route16FlyHouse_Script ; scripts - db 0 ; connections - dw Route16FlyHouse_Object ; objects diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm deleted file mode 100755 index 561fb597..00000000 --- a/data/mapHeaders/Route16Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16Gate1F_h: - db GATE ; tileset - db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) - dw Route16Gate1F_Blocks ; blocks - dw Route16Gate1F_TextPointers ; texts - dw Route16Gate1F_Script ; scripts - db 0 ; connections - dw Route16Gate1F_Object ; objects diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm deleted file mode 100755 index 90783ab7..00000000 --- a/data/mapHeaders/Route16Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16Gate2F_h: - db GATE ; tileset - db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) - dw Route16Gate2F_Blocks ; blocks - dw Route16Gate2F_TextPointers ; texts - dw Route16Gate2F_Script ; scripts - db 0 ; connections - dw Route16Gate2F_Object ; objects diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm deleted file mode 100755 index 58a785b4..00000000 --- a/data/mapHeaders/Route17.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route17_h: - db OVERWORLD ; tileset - db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) - dw Route17_Blocks ; blocks - dw Route17_TextPointers ; texts - dw Route17_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1 - dw Route17_Object ; objects diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm deleted file mode 100755 index 5e10bdbd..00000000 --- a/data/mapHeaders/Route18.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route18_h: - db OVERWORLD ; tileset - db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) - dw Route18_Blocks ; blocks - dw Route18_TextPointers ; texts - dw Route18_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks - EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1 - dw Route18_Object ; objects diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm deleted file mode 100755 index 0e4a0dc3..00000000 --- a/data/mapHeaders/Route18Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18Gate1F_h: - db GATE ; tileset - db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) - dw Route18Gate1F_Blocks ; blocks - dw Route18Gate1F_TextPointers ; texts - dw Route18Gate1F_Script ; scripts - db 0 ; connections - dw Route18Gate1F_Object ; objects diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm deleted file mode 100755 index 5d8f7126..00000000 --- a/data/mapHeaders/Route18Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18Gate2F_h: - db GATE ; tileset - db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) - dw Route18Gate2F_Blocks ; blocks - dw Route18Gate2F_TextPointers ; texts - dw Route18Gate2F_Script ; scripts - db 0 ; connections - dw Route18Gate2F_Object ; objects diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm deleted file mode 100755 index 79972677..00000000 --- a/data/mapHeaders/Route19.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route19_h: - db OVERWORLD ; tileset - db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) - dw Route19_Blocks ; blocks - dw Route19_TextPointers ; texts - dw Route19_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks - WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks - dw Route19_Object ; objects diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm deleted file mode 100755 index 94511d06..00000000 --- a/data/mapHeaders/Route2.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route2_h: - db OVERWORLD ; tileset - db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) - dw Route2_Blocks ; blocks - dw Route2_TextPointers ; texts - dw Route2_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1 - dw Route2_Object ; objects diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm deleted file mode 100755 index 689f51cd..00000000 --- a/data/mapHeaders/Route20.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route20_h: - db OVERWORLD ; tileset - db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) - dw Route20_Blocks ; blocks - dw Route20_TextPointers ; texts - dw Route20_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks - dw Route20_Object ; objects diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm deleted file mode 100755 index f37869dc..00000000 --- a/data/mapHeaders/Route21.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route21_h: - db OVERWORLD ; tileset - db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) - dw Route21_Blocks ; blocks - dw Route21_TextPointers ; texts - dw Route21_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks - SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1 - dw Route21_Object ; objects diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm deleted file mode 100755 index 4d07475f..00000000 --- a/data/mapHeaders/Route22.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route22_h: - db OVERWORLD ; tileset - db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) - dw Route22_Blocks ; blocks - dw Route22_TextPointers ; texts - dw Route22_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks - EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1 - dw Route22_Object ; objects diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm deleted file mode 100755 index 4d3ae0cc..00000000 --- a/data/mapHeaders/Route22Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route22Gate_h: - db GATE ; tileset - db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) - dw Route22Gate_Blocks ; blocks - dw Route22Gate_TextPointers ; texts - dw Route22Gate_Script ; scripts - db 0 ; connections - dw Route22Gate_Object ; objects diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm deleted file mode 100755 index 6b1fde97..00000000 --- a/data/mapHeaders/Route23.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route23_h: - db PLATEAU ; tileset - db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) - dw Route23_Blocks ; blocks - dw Route23_TextPointers ; texts - dw Route23_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1 - dw Route23_Object ; objects diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm deleted file mode 100755 index 87776f60..00000000 --- a/data/mapHeaders/Route24.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route24_h: - db OVERWORLD ; tileset - db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) - dw Route24_Blocks ; blocks - dw Route24_TextPointers ; texts - dw Route24_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1 - EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks - dw Route24_Object ; objects diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm deleted file mode 100755 index c300eeb3..00000000 --- a/data/mapHeaders/Route25.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route25_h: - db OVERWORLD ; tileset - db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) - dw Route25_Blocks ; blocks - dw Route25_TextPointers ; texts - dw Route25_Script ; scripts - db WEST ; connections - WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks - dw Route25_Object ; objects diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm deleted file mode 100755 index 9b284178..00000000 --- a/data/mapHeaders/Route2Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2Gate_h: - db GATE ; tileset - db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) - dw Route2Gate_Blocks ; blocks - dw Route2Gate_TextPointers ; texts - dw Route2Gate_Script ; scripts - db 0 ; connections - dw Route2Gate_Object ; objects diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm deleted file mode 100755 index 33693943..00000000 --- a/data/mapHeaders/Route2TradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2TradeHouse_h: - db HOUSE ; tileset - db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw Route2TradeHouse_Blocks ; blocks - dw Route2TradeHouse_TextPointers ; texts - dw Route2TradeHouse_Script ; scripts - db 0 ; connections - dw Route2TradeHouse_Object ; objects diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm deleted file mode 100755 index c611e4b8..00000000 --- a/data/mapHeaders/Route3.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route3_h: - db OVERWORLD ; tileset - db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) - dw Route3_Blocks ; blocks - dw Route3_TextPointers ; texts - dw Route3_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks - WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks - dw Route3_Object ; objects diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm deleted file mode 100755 index 999a1207..00000000 --- a/data/mapHeaders/Route4.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route4_h: - db OVERWORLD ; tileset - db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4_Blocks ; blocks - dw Route4_TextPointers ; texts - dw Route4_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks - EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1 - dw Route4_Object ; objects diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm deleted file mode 100755 index 6480aebd..00000000 --- a/data/mapHeaders/Route5.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route5_h: - db OVERWORLD ; tileset - db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) - dw Route5_Blocks ; blocks - dw Route5_TextPointers ; texts - dw Route5_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1 - dw Route5_Object ; objects diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm deleted file mode 100755 index bb418182..00000000 --- a/data/mapHeaders/Route5Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route5Gate_h: - db GATE ; tileset - db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) - dw Route5Gate_Blocks ; blocks - dw Route5Gate_TextPointers ; texts - dw Route5Gate_Script ; scripts - db 0 ; connections - dw Route5Gate_Object ; objects diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm deleted file mode 100755 index 9385ce5f..00000000 --- a/data/mapHeaders/Route6.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route6_h: - db OVERWORLD ; tileset - db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) - dw Route6_Blocks ; blocks - dw Route6_TextPointers ; texts - dw Route6_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1 - dw Route6_Object ; objects diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm deleted file mode 100755 index 282cc5b6..00000000 --- a/data/mapHeaders/Route6Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route6Gate_h: - db GATE ; tileset - db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) - dw Route6Gate_Blocks ; blocks - dw Route6Gate_TextPointers ; texts - dw Route6Gate_Script ; scripts - db 0 ; connections - dw Route6Gate_Object ; objects diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm deleted file mode 100755 index 9b34ea1f..00000000 --- a/data/mapHeaders/Route7.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route7_h: - db OVERWORLD ; tileset - db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) - dw Route7_Blocks ; blocks - dw Route7_TextPointers ; texts - dw Route7_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks - EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1 - dw Route7_Object ; objects diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm deleted file mode 100755 index 61771e42..00000000 --- a/data/mapHeaders/Route7Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route7Gate_h: - db GATE ; tileset - db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) - dw Route7Gate_Blocks ; blocks - dw Route7Gate_TextPointers ; texts - dw Route7Gate_Script ; scripts - db 0 ; connections - dw Route7Gate_Object ; objects diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm deleted file mode 100755 index bd2ee71e..00000000 --- a/data/mapHeaders/Route8.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route8_h: - db OVERWORLD ; tileset - db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) - dw Route8_Blocks ; blocks - dw Route8_TextPointers ; texts - dw Route8_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks - EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - dw Route8_Object ; objects diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm deleted file mode 100755 index dd14a237..00000000 --- a/data/mapHeaders/Route8Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route8Gate_h: - db GATE ; tileset - db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) - dw Route8Gate_Blocks ; blocks - dw Route8Gate_TextPointers ; texts - dw Route8Gate_Script ; scripts - db 0 ; connections - dw Route8Gate_Object ; objects diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm deleted file mode 100755 index 3dec3b0a..00000000 --- a/data/mapHeaders/Route9.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route9_h: - db OVERWORLD ; tileset - db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) - dw Route9_Blocks ; blocks - dw Route9_TextPointers ; texts - dw Route9_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks - EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1 - dw Route9_Object ; objects diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm deleted file mode 100755 index a69423d6..00000000 --- a/data/mapHeaders/SSAnne1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne1F_h: - db SHIP ; tileset - db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x) - dw SSAnne1F_Blocks ; blocks - dw SSAnne1F_TextPointers ; texts - dw SSAnne1F_Script ; scripts - db 0 ; connections - dw SSAnne1F_Object ; objects diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm deleted file mode 100755 index 1f8af23d..00000000 --- a/data/mapHeaders/SSAnne1FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne1FRooms_h: - db SHIP ; tileset - db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnne1FRooms_Blocks ; blocks - dw SSAnne1FRooms_TextPointers ; texts - dw SSAnne1FRooms_Script ; scripts - db 0 ; connections - dw SSAnne1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm deleted file mode 100755 index d42d16f4..00000000 --- a/data/mapHeaders/SSAnne2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne2F_h: - db SHIP ; tileset - db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x) - dw SSAnne2F_Blocks ; blocks - dw SSAnne2F_TextPointers ; texts - dw SSAnne2F_Script ; scripts - db 0 ; connections - dw SSAnne2F_Object ; objects diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm deleted file mode 100755 index f22de0fa..00000000 --- a/data/mapHeaders/SSAnne2FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne2FRooms_h: - db SHIP ; tileset - db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnne2FRooms_Blocks ; blocks - dw SSAnne2FRooms_TextPointers ; texts - dw SSAnne2FRooms_Script ; scripts - db 0 ; connections - dw SSAnne2FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm deleted file mode 100755 index 1c5dafea..00000000 --- a/data/mapHeaders/SSAnne3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne3F_h: - db SHIP ; tileset - db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x) - dw SSAnne3F_Blocks ; blocks - dw SSAnne3F_TextPointers ; texts - dw SSAnne3F_Script ; scripts - db 0 ; connections - dw SSAnne3F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm deleted file mode 100755 index a3ca6dfa..00000000 --- a/data/mapHeaders/SSAnneB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneB1F_h: - db SHIP ; tileset - db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x) - dw SSAnneB1F_Blocks ; blocks - dw SSAnneB1F_TextPointers ; texts - dw SSAnneB1F_Script ; scripts - db 0 ; connections - dw SSAnneB1F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm deleted file mode 100755 index f08e343b..00000000 --- a/data/mapHeaders/SSAnneB1FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneB1FRooms_h: - db SHIP ; tileset - db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnneB1FRooms_Blocks ; blocks - dw SSAnneB1FRooms_TextPointers ; texts - dw SSAnneB1FRooms_Script ; scripts - db 0 ; connections - dw SSAnneB1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm deleted file mode 100755 index baa71147..00000000 --- a/data/mapHeaders/SSAnneBow.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneBow_h: - db SHIP ; tileset - db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x) - dw SSAnneBow_Blocks ; blocks - dw SSAnneBow_TextPointers ; texts - dw SSAnneBow_Script ; scripts - db 0 ; connections - dw SSAnneBow_Object ; objects diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm deleted file mode 100755 index 433f060a..00000000 --- a/data/mapHeaders/SSAnneCaptainsRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneCaptainsRoom_h: - db SHIP ; tileset - db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x) - dw SSAnneCaptainsRoom_Blocks ; blocks - dw SSAnneCaptainsRoom_TextPointers ; texts - dw SSAnneCaptainsRoom_Script ; scripts - db 0 ; connections - dw SSAnneCaptainsRoom_Object ; objects diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm deleted file mode 100755 index eacbbfb8..00000000 --- a/data/mapHeaders/SSAnneKitchen.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneKitchen_h: - db SHIP ; tileset - db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x) - dw SSAnneKitchen_Blocks ; blocks - dw SSAnneKitchen_TextPointers ; texts - dw SSAnneKitchen_Script ; scripts - db 0 ; connections - dw SSAnneKitchen_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm deleted file mode 100755 index 8ec6c890..00000000 --- a/data/mapHeaders/SafariZoneCenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneCenter_h: - db FOREST ; tileset - db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) - dw SafariZoneCenter_Blocks ; blocks - dw SafariZoneCenter_TextPointers ; texts - dw SafariZoneCenter_Script ; scripts - db 0 ; connections - dw SafariZoneCenter_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm deleted file mode 100755 index 9b1064f2..00000000 --- a/data/mapHeaders/SafariZoneCenterRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneCenterRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneCenterRestHouse_Blocks ; blocks - dw SafariZoneCenterRestHouse_TextPointers ; texts - dw SafariZoneCenterRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneCenterRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm deleted file mode 100755 index 99556473..00000000 --- a/data/mapHeaders/SafariZoneEast.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneEast_h: - db FOREST ; tileset - db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) - dw SafariZoneEast_Blocks ; blocks - dw SafariZoneEast_TextPointers ; texts - dw SafariZoneEast_Script ; scripts - db 0 ; connections - dw SafariZoneEast_Object ; objects diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm deleted file mode 100755 index b9f219c5..00000000 --- a/data/mapHeaders/SafariZoneEastRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneEastRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneEastRestHouse_Blocks ; blocks - dw SafariZoneEastRestHouse_TextPointers ; texts - dw SafariZoneEastRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneEastRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm deleted file mode 100755 index ed306ad0..00000000 --- a/data/mapHeaders/SafariZoneGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneGate_h: - db GATE ; tileset - db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x) - dw SafariZoneGate_Blocks ; blocks - dw SafariZoneGate_TextPointers ; texts - dw SafariZoneGate_Script ; scripts - db 0 ; connections - dw SafariZoneGate_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm deleted file mode 100755 index 3d1a2f51..00000000 --- a/data/mapHeaders/SafariZoneNorth.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneNorth_h: - db FOREST ; tileset - db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) - dw SafariZoneNorth_Blocks ; blocks - dw SafariZoneNorth_TextPointers ; texts - dw SafariZoneNorth_Script ; scripts - db 0 ; connections - dw SafariZoneNorth_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm deleted file mode 100755 index 938c15cf..00000000 --- a/data/mapHeaders/SafariZoneNorthRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneNorthRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneNorthRestHouse_Blocks ; blocks - dw SafariZoneNorthRestHouse_TextPointers ; texts - dw SafariZoneNorthRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneNorthRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm deleted file mode 100755 index 91068691..00000000 --- a/data/mapHeaders/SafariZoneSecretHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneSecretHouse_h: - db LAB ; tileset - db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneSecretHouse_Blocks ; blocks - dw SafariZoneSecretHouse_TextPointers ; texts - dw SafariZoneSecretHouse_Script ; scripts - db 0 ; connections - dw SafariZoneSecretHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm deleted file mode 100755 index 876169d1..00000000 --- a/data/mapHeaders/SafariZoneWest.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneWest_h: - db FOREST ; tileset - db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) - dw SafariZoneWest_Blocks ; blocks - dw SafariZoneWest_TextPointers ; texts - dw SafariZoneWest_Script ; scripts - db 0 ; connections - dw SafariZoneWest_Object ; objects diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm deleted file mode 100755 index 886382ec..00000000 --- a/data/mapHeaders/SafariZoneWestRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneWestRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneWestRestHouse_Blocks ; blocks - dw SafariZoneWestRestHouse_TextPointers ; texts - dw SafariZoneWestRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneWestRestHouse_Object ; objects diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm deleted file mode 100755 index 13239891..00000000 --- a/data/mapHeaders/SaffronCity.asm +++ /dev/null @@ -1,12 +0,0 @@ -SaffronCity_h: - db OVERWORLD ; tileset - db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) - dw SaffronCity_Blocks ; blocks - dw SaffronCity_TextPointers ; texts - dw SaffronCity_Script ; scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1 - WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks - EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks - dw SaffronCity_Object ; objects diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm deleted file mode 100755 index 6cbadb2c..00000000 --- a/data/mapHeaders/SaffronGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronGym_h: - db FACILITY ; tileset - db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) - dw SaffronGym_Blocks ; blocks - dw SaffronGym_TextPointers ; texts - dw SaffronGym_Script ; scripts - db 0 ; connections - dw SaffronGym_Object ; objects diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm deleted file mode 100755 index abd537b6..00000000 --- a/data/mapHeaders/SaffronMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronMart_h: - db MART ; tileset - db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) - dw SaffronMart_Blocks ; blocks - dw SaffronMart_TextPointers ; texts - dw SaffronMart_Script ; scripts - db 0 ; connections - dw SaffronMart_Object ; objects diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm deleted file mode 100755 index 5d6e21ae..00000000 --- a/data/mapHeaders/SaffronPidgeyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronPidgeyHouse_h: - db HOUSE ; tileset - db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) - dw SaffronPidgeyHouse_Blocks ; blocks - dw SaffronPidgeyHouse_TextPointers ; texts - dw SaffronPidgeyHouse_Script ; scripts - db 0 ; connections - dw SaffronPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm deleted file mode 100755 index 32f1ec71..00000000 --- a/data/mapHeaders/SaffronPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronPokecenter_h: - db POKECENTER ; tileset - db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) - dw SaffronPokecenter_Blocks ; blocks - dw SaffronPokecenter_TextPointers ; texts - dw SaffronPokecenter_Script ; scripts - db 0 ; connections - dw SaffronPokecenter_Object ; objects diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm deleted file mode 100755 index f5260cda..00000000 --- a/data/mapHeaders/SeafoamIslands1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands1F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x) - dw SeafoamIslands1F_Blocks ; blocks - dw SeafoamIslands1F_TextPointers ; texts - dw SeafoamIslands1F_Script ; scripts - db 0 ; connections - dw SeafoamIslands1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm deleted file mode 100755 index 23116f74..00000000 --- a/data/mapHeaders/SeafoamIslandsB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB1F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB1F_Blocks ; blocks - dw SeafoamIslandsB1F_TextPointers ; texts - dw SeafoamIslandsB1F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm deleted file mode 100755 index 10d45dad..00000000 --- a/data/mapHeaders/SeafoamIslandsB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB2F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB2F_Blocks ; blocks - dw SeafoamIslandsB2F_TextPointers ; texts - dw SeafoamIslandsB2F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB2F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm deleted file mode 100755 index 812d1121..00000000 --- a/data/mapHeaders/SeafoamIslandsB3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB3F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB3F_Blocks ; blocks - dw SeafoamIslandsB3F_TextPointers ; texts - dw SeafoamIslandsB3F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB3F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm deleted file mode 100755 index 96c25e06..00000000 --- a/data/mapHeaders/SeafoamIslandsB4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB4F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB4F_Blocks ; blocks - dw SeafoamIslandsB4F_TextPointers ; texts - dw SeafoamIslandsB4F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB4F_Object ; objects diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm deleted file mode 100755 index ad040479..00000000 --- a/data/mapHeaders/SilphCo10F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo10F_h: - db FACILITY ; tileset - db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) - dw SilphCo10F_Blocks ; blocks - dw SilphCo10F_TextPointers ; texts - dw SilphCo10F_Script ; scripts - db 0 ; connections - dw SilphCo10F_Object ; objects diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm deleted file mode 100755 index 08d6d650..00000000 --- a/data/mapHeaders/SilphCo11F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo11F_h: - db INTERIOR ; tileset - db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) - dw SilphCo11F_Blocks ; blocks - dw SilphCo11F_TextPointers ; texts - dw SilphCo11F_Script ; scripts - db 0 ; connections - dw SilphCo11F_Object ; objects diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm deleted file mode 100755 index 45e6c5bf..00000000 --- a/data/mapHeaders/SilphCo1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo1F_h: - db FACILITY ; tileset - db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) - dw SilphCo1F_Blocks ; blocks - dw SilphCo1F_TextPointers ; texts - dw SilphCo1F_Script ; scripts - db 0 ; connections - dw SilphCo1F_Object ; objects diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm deleted file mode 100755 index 69c2fb51..00000000 --- a/data/mapHeaders/SilphCo2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo2F_h: - db FACILITY ; tileset - db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) - dw SilphCo2F_Blocks ; blocks - dw SilphCo2F_TextPointers ; texts - dw SilphCo2F_Script ; scripts - db 0 ; connections - dw SilphCo2F_Object ; objects diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm deleted file mode 100755 index 6911a604..00000000 --- a/data/mapHeaders/SilphCo3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo3F_h: - db FACILITY ; tileset - db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) - dw SilphCo3F_Blocks ; blocks - dw SilphCo3F_TextPointers ; texts - dw SilphCo3F_Script ; scripts - db 0 ; connections - dw SilphCo3F_Object ; objects diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm deleted file mode 100755 index 591ddc07..00000000 --- a/data/mapHeaders/SilphCo4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo4F_h: - db FACILITY ; tileset - db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) - dw SilphCo4F_Blocks ; blocks - dw SilphCo4F_TextPointers ; texts - dw SilphCo4F_Script ; scripts - db 0 ; connections - dw SilphCo4F_Object ; objects diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm deleted file mode 100755 index 0303ceba..00000000 --- a/data/mapHeaders/SilphCo5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo5F_h: - db FACILITY ; tileset - db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) - dw SilphCo5F_Blocks ; blocks - dw SilphCo5F_TextPointers ; texts - dw SilphCo5F_Script ; scripts - db 0 ; connections - dw SilphCo5F_Object ; objects diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm deleted file mode 100755 index b26a7587..00000000 --- a/data/mapHeaders/SilphCo6F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo6F_h: - db FACILITY ; tileset - db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) - dw SilphCo6F_Blocks ; blocks - dw SilphCo6F_TextPointers ; texts - dw SilphCo6F_Script ; scripts - db 0 ; connections - dw SilphCo6F_Object ; objects diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm deleted file mode 100755 index 5c6ea959..00000000 --- a/data/mapHeaders/SilphCo7F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo7F_h: - db FACILITY ; tileset - db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) - dw SilphCo7F_Blocks ; blocks - dw SilphCo7F_TextPointers ; texts - dw SilphCo7F_Script ; scripts - db 0 ; connections - dw SilphCo7F_Object ; objects diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm deleted file mode 100755 index e467298e..00000000 --- a/data/mapHeaders/SilphCo8F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo8F_h: - db FACILITY ; tileset - db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) - dw SilphCo8F_Blocks ; blocks - dw SilphCo8F_TextPointers ; texts - dw SilphCo8F_Script ; scripts - db 0 ; connections - dw SilphCo8F_Object ; objects diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm deleted file mode 100755 index ec591e51..00000000 --- a/data/mapHeaders/SilphCo9F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo9F_h: - db FACILITY ; tileset - db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) - dw SilphCo9F_Blocks ; blocks - dw SilphCo9F_TextPointers ; texts - dw SilphCo9F_Script ; scripts - db 0 ; connections - dw SilphCo9F_Object ; objects diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm deleted file mode 100755 index 0abe2810..00000000 --- a/data/mapHeaders/SilphCoElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCoElevator_h: - db LOBBY ; tileset - db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) - dw SilphCoElevator_Blocks ; blocks - dw SilphCoElevator_TextPointers ; texts - dw SilphCoElevator_Script ; scripts - db 0 ; connections - dw SilphCoElevator_Object ; objects diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm deleted file mode 100755 index 39981c35..00000000 --- a/data/mapHeaders/TradeCenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -TradeCenter_h: - db CLUB ; tileset - db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) - dw TradeCenter_Blocks ; blocks - dw TradeCenter_TextPointers ; texts - dw TradeCenter_Script ; scripts - db 0 ; connections - dw TradeCenter_Object ; objects diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm deleted file mode 100755 index 5dd8cdf8..00000000 --- a/data/mapHeaders/UndergroundPathNorthSouth.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathNorthSouth_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x) - dw UndergroundPathNorthSouth_Blocks ; blocks - dw UndergroundPathNorthSouth_TextPointers ; texts - dw UndergroundPathNorthSouth_Script ; scripts - db 0 ; connections - dw UndergroundPathNorthSouth_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm deleted file mode 100755 index 14c6aa4d..00000000 --- a/data/mapHeaders/UndergroundPathRoute5.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute5_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute5_Blocks ; blocks - dw UndergroundPathRoute5_TextPointers ; texts - dw UndergroundPathRoute5_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute5_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm deleted file mode 100755 index 6aea459c..00000000 --- a/data/mapHeaders/UndergroundPathRoute6.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute6_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute6_Blocks ; blocks - dw UndergroundPathRoute6_TextPointers ; texts - dw UndergroundPathRoute6_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute6_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm deleted file mode 100755 index 91495ea3..00000000 --- a/data/mapHeaders/UndergroundPathRoute7.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute7_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute7_Blocks ; blocks - dw UndergroundPathRoute7_TextPointers ; texts - dw UndergroundPathRoute7_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute7_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm deleted file mode 100755 index 9d3f4c62..00000000 --- a/data/mapHeaders/UndergroundPathRoute7Copy.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute7Copy_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute7Copy_Blocks ; blocks - dw UndergroundPathRoute7Copy_TextPointers ; texts - dw UndergroundPathRoute7Copy_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute7Copy_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm deleted file mode 100755 index f34265b8..00000000 --- a/data/mapHeaders/UndergroundPathRoute8.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute8_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute8_Blocks ; blocks - dw UndergroundPathRoute8_TextPointers ; texts - dw UndergroundPathRoute8_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute8_Object ; objects diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm deleted file mode 100755 index d084bd73..00000000 --- a/data/mapHeaders/UndergroundPathWestEast.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathWestEast_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x) - dw UndergroundPathWestEast_Blocks ; blocks - dw UndergroundPathWestEast_TextPointers ; texts - dw UndergroundPathWestEast_Script ; scripts - db 0 ; connections - dw UndergroundPathWestEast_Object ; objects diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm deleted file mode 100755 index 6521ad89..00000000 --- a/data/mapHeaders/VermilionCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_h: - db OVERWORLD ; tileset - db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) - dw VermilionCity_Blocks ; blocks - dw VermilionCity_TextPointers ; texts - dw VermilionCity_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks - EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks - dw VermilionCity_Object ; objects diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm deleted file mode 100755 index f7dca8e6..00000000 --- a/data/mapHeaders/VermilionDock.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionDock_h: - db SHIP_PORT ; tileset - db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) - dw VermilionDock_Blocks ; blocks - dw VermilionDock_TextPointers ; texts - dw VermilionDock_Script ; scripts - db 0 ; connections - dw VermilionDock_Object ; objects diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm deleted file mode 100755 index fe304a2e..00000000 --- a/data/mapHeaders/VermilionGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionGym_h: - db GYM ; tileset - db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) - dw VermilionGym_Blocks ; blocks - dw VermilionGym_TextPointers ; texts - dw VermilionGym_Script ; scripts - db 0 ; connections - dw VermilionGym_Object ; objects diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm deleted file mode 100755 index 67f24f59..00000000 --- a/data/mapHeaders/VermilionMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionMart_h: - db MART ; tileset - db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) - dw VermilionMart_Blocks ; blocks - dw VermilionMart_TextPointers ; texts - dw VermilionMart_Script ; scripts - db 0 ; connections - dw VermilionMart_Object ; objects diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm deleted file mode 100755 index f4b69110..00000000 --- a/data/mapHeaders/VermilionOldRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionOldRodHouse_h: - db HOUSE ; tileset - db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionOldRodHouse_Blocks ; blocks - dw VermilionOldRodHouse_TextPointers ; texts - dw VermilionOldRodHouse_Script ; scripts - db 0 ; connections - dw VermilionOldRodHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm deleted file mode 100755 index af052fa6..00000000 --- a/data/mapHeaders/VermilionPidgeyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionPidgeyHouse_h: - db HOUSE ; tileset - db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionPidgeyHouse_Blocks ; blocks - dw VermilionPidgeyHouse_TextPointers ; texts - dw VermilionPidgeyHouse_Script ; scripts - db 0 ; connections - dw VermilionPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm deleted file mode 100755 index 3d4c23ec..00000000 --- a/data/mapHeaders/VermilionPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionPokecenter_h: - db POKECENTER ; tileset - db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) - dw VermilionPokecenter_Blocks ; blocks - dw VermilionPokecenter_TextPointers ; texts - dw VermilionPokecenter_Script ; scripts - db 0 ; connections - dw VermilionPokecenter_Object ; objects diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm deleted file mode 100755 index 21d30049..00000000 --- a/data/mapHeaders/VermilionTradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionTradeHouse_h: - db HOUSE ; tileset - db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionTradeHouse_Blocks ; blocks - dw VermilionTradeHouse_TextPointers ; texts - dw VermilionTradeHouse_Script ; scripts - db 0 ; connections - dw VermilionTradeHouse_Object ; objects diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm deleted file mode 100755 index 3508d782..00000000 --- a/data/mapHeaders/VictoryRoad1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad1F_h: - db CAVERN ; tileset - db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x) - dw VictoryRoad1F_Blocks ; blocks - dw VictoryRoad1F_TextPointers ; texts - dw VictoryRoad1F_Script ; scripts - db 0 ; connections - dw VictoryRoad1F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm deleted file mode 100755 index 31693c1c..00000000 --- a/data/mapHeaders/VictoryRoad2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad2F_h: - db CAVERN ; tileset - db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x) - dw VictoryRoad2F_Blocks ; blocks - dw VictoryRoad2F_TextPointers ; texts - dw VictoryRoad2F_Script ; scripts - db 0 ; connections - dw VictoryRoad2F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm deleted file mode 100755 index 3f5e21d2..00000000 --- a/data/mapHeaders/VictoryRoad3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad3F_h: - db CAVERN ; tileset - db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x) - dw VictoryRoad3F_Blocks ; blocks - dw VictoryRoad3F_TextPointers ; texts - dw VictoryRoad3F_Script ; scripts - db 0 ; connections - dw VictoryRoad3F_Object ; objects diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm deleted file mode 100755 index 09f7b9f4..00000000 --- a/data/mapHeaders/ViridianCity.asm +++ /dev/null @@ -1,11 +0,0 @@ -ViridianCity_h: - db OVERWORLD ; tileset - db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) - dw ViridianCity_Blocks ; blocks - dw ViridianCity_TextPointers ; texts - dw ViridianCity_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1 - WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks - dw ViridianCity_Object ; objects diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm deleted file mode 100755 index a8df3e6e..00000000 --- a/data/mapHeaders/ViridianForest.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForest_h: - db FOREST ; tileset - db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) - dw ViridianForest_Blocks ; blocks - dw ViridianForest_TextPointers ; texts - dw ViridianForest_Script ; scripts - db 0 ; connections - dw ViridianForest_Object ; objects diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm deleted file mode 100755 index 48535977..00000000 --- a/data/mapHeaders/ViridianForestNorthGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForestNorthGate_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x) - dw ViridianForestNorthGate_Blocks ; blocks - dw ViridianForestNorthGate_TextPointers ; texts - dw ViridianForestNorthGate_Script ; scripts - db 0 ; connections - dw ViridianForestNorthGate_Object ; objects diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm deleted file mode 100755 index b134ebea..00000000 --- a/data/mapHeaders/ViridianForestSouthGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForestSouthGate_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x) - dw ViridianForestSouthGate_Blocks ; blocks - dw ViridianForestSouthGate_TextPointers ; texts - dw ViridianForestSouthGate_Script ; scripts - db 0 ; connections - dw ViridianForestSouthGate_Object ; objects diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm deleted file mode 100755 index 9b27845c..00000000 --- a/data/mapHeaders/ViridianGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianGym_h: - db GYM ; tileset - db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) - dw ViridianGym_Blocks ; blocks - dw ViridianGym_TextPointers ; texts - dw ViridianGym_Script ; scripts - db 0 ; connections - dw ViridianGym_Object ; objects diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm deleted file mode 100755 index 063f3327..00000000 --- a/data/mapHeaders/ViridianMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianMart_h: - db MART ; tileset - db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) - dw ViridianMart_Blocks ; blocks - dw ViridianMart_TextPointers ; texts - dw ViridianMart_Script ; scripts - db 0 ; connections - dw ViridianMart_Object ; objects diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm deleted file mode 100755 index b6a00392..00000000 --- a/data/mapHeaders/ViridianNicknameHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianNicknameHouse_h: - db HOUSE ; tileset - db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianNicknameHouse_Blocks ; blocks - dw ViridianNicknameHouse_TextPointers ; texts - dw ViridianNicknameHouse_Script ; scripts - db 0 ; connections - dw ViridianNicknameHouse_Object ; objects diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm deleted file mode 100755 index 25c569d8..00000000 --- a/data/mapHeaders/ViridianPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianPokecenter_h: - db POKECENTER ; tileset - db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) - dw ViridianPokecenter_Blocks ; blocks - dw ViridianPokecenter_TextPointers ; texts - dw ViridianPokecenter_Script ; scripts - db 0 ; connections - dw ViridianPokecenter_Object ; objects diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm deleted file mode 100755 index 15e5c88f..00000000 --- a/data/mapHeaders/ViridianSchoolHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianSchoolHouse_h: - db HOUSE ; tileset - db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianSchoolHouse_Blocks ; blocks - dw ViridianSchoolHouse_TextPointers ; texts - dw ViridianSchoolHouse_Script ; scripts - db 0 ; connections - dw ViridianSchoolHouse_Object ; objects diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm deleted file mode 100755 index 128e357a..00000000 --- a/data/mapHeaders/WardensHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -WardensHouse_h: - db LAB ; tileset - db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x) - dw WardensHouse_Blocks ; blocks - dw WardensHouse_TextPointers ; texts - dw WardensHouse_Script ; scripts - db 0 ; connections - dw WardensHouse_Object ; objects diff --git a/data/mapObjects/AgathasRoom.asm b/data/mapObjects/AgathasRoom.asm deleted file mode 100755 index 4a82e78d..00000000 --- a/data/mapObjects/AgathasRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -AgathasRoom_Object: - db $0 ; border block - - db 4 ; warps - warp 4, 11, 2, BRUNOS_ROOM - warp 5, 11, 3, BRUNOS_ROOM - warp 4, 0, 0, LANCES_ROOM - warp 5, 0, 0, LANCES_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 - - ; warp-to - warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM - warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/BeachHouse.asm b/data/mapObjects/BeachHouse.asm deleted file mode 100644 index 02bd8037..00000000 --- a/data/mapObjects/BeachHouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -BeachHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2,7,0,-1 - warp 3,7,0,-1 - - db 4 ; signs - sign 3,0,3 - sign 7,0,4 - sign 11,0,5 - sign 13,1,6 - - db 2 ; objects - object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude - object $3d, 5, 3, WALK, $01, 2 ; pikachu - - ; warp-to - warp_to 2,7, BEACH_HOUSE_WIDTH - warp_to 3,7, BEACH_HOUSE_WIDTH diff --git a/data/mapObjects/BikeShop.asm b/data/mapObjects/BikeShop.asm deleted file mode 100755 index 9f21ab3e..00000000 --- a/data/mapObjects/BikeShop.asm +++ /dev/null @@ -1,17 +0,0 @@ -BikeShop_Object: - db $e ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person - object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, BIKE_SHOP_WIDTH - warp_to 3, 7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/BillsHouse.asm b/data/mapObjects/BillsHouse.asm deleted file mode 100755 index c8f708cb..00000000 --- a/data/mapObjects/BillsHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BillsHouse_Object: - db $d ; border block - - db 2 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, BILLS_HOUSE_WIDTH - warp_to 3, 7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/BluesHouse.asm b/data/mapObjects/BluesHouse.asm deleted file mode 100755 index 24c5baab..00000000 --- a/data/mapObjects/BluesHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BluesHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1, 0 ; Daisy, sitting by map - object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table - - ; warp-to - warp_to 2, 7, BLUES_HOUSE_WIDTH - warp_to 3, 7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/BrunosRoom.asm b/data/mapObjects/BrunosRoom.asm deleted file mode 100755 index dde1e2dd..00000000 --- a/data/mapObjects/BrunosRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -BrunosRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, LORELEIS_ROOM - warp 5, 11, 3, LORELEIS_ROOM - warp 4, 0, 0, AGATHAS_ROOM - warp 5, 0, 1, AGATHAS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 - - ; warp-to - warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/mapObjects/CeladonChiefHouse.asm deleted file mode 100755 index 88850f35..00000000 --- a/data/mapObjects/CeladonChiefHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonChiefHouse_Object: - db $f ; border block - - db 2 ; warps - warp 2, 7, 11, -1 - warp 3, 7, 11, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person - object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person - - ; warp-to - warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH - warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH diff --git a/data/mapObjects/CeladonCity.asm b/data/mapObjects/CeladonCity.asm deleted file mode 100755 index 005fc61e..00000000 --- a/data/mapObjects/CeladonCity.asm +++ /dev/null @@ -1,54 +0,0 @@ -CeladonCity_Object: - db $f ; border block - - db 13 ; warps - warp 8, 13, 0, CELADON_MART_1F - warp 10, 13, 2, CELADON_MART_1F - warp 24, 9, 0, CELADON_MANSION_1F - warp 24, 3, 2, CELADON_MANSION_1F - warp 25, 3, 2, CELADON_MANSION_1F - warp 41, 9, 0, CELADON_POKECENTER - warp 12, 27, 0, CELADON_GYM - warp 28, 19, 0, GAME_CORNER - warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used - warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM - warp 31, 27, 0, CELADON_DINER - warp 35, 27, 0, CELADON_CHIEF_HOUSE - warp 43, 27, 0, CELADON_HOTEL - - db 9 ; signs - sign 27, 15, 10 ; CeladonCityText10 - sign 19, 15, 11 ; CeladonCityText11 - sign 42, 9, 12 ; PokeCenterSignText - sign 13, 29, 13 ; CeladonCityText13 - sign 21, 9, 14 ; CeladonCityText14 - sign 12, 13, 15 ; CeladonCityText15 - sign 39, 21, 16 ; CeladonCityText16 - sign 33, 21, 17 ; CeladonCityText17 - sign 27, 21, 18 ; CeladonCityText18 - - db 9 ; objects - object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person - object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person - object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person - object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person - object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person - object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person - object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person - object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person - object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person - - ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F - warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM - warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE - warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/CeladonDiner.asm b/data/mapObjects/CeladonDiner.asm deleted file mode 100755 index 0a4a895d..00000000 --- a/data/mapObjects/CeladonDiner.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonDiner_Object: - db $f ; border block - - db 2 ; warps - warp 3, 7, 10, -1 - warp 4, 7, 10, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person - object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person - object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person - object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CELADON_DINER_WIDTH - warp_to 4, 7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/CeladonGym.asm b/data/mapObjects/CeladonGym.asm deleted file mode 100755 index 98fce576..00000000 --- a/data/mapObjects/CeladonGym.asm +++ /dev/null @@ -1,22 +0,0 @@ -CeladonGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 6, -1 - warp 5, 17, 6, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 - object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 - object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 - object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 - object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 - object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 - object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 - - ; warp-to - warp_to 4, 17, CELADON_GYM_WIDTH - warp_to 5, 17, CELADON_GYM_WIDTH diff --git a/data/mapObjects/CeladonHotel.asm b/data/mapObjects/CeladonHotel.asm deleted file mode 100755 index f4aa1305..00000000 --- a/data/mapObjects/CeladonHotel.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonHotel_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 12, -1 - warp 4, 7, 12, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CELADON_HOTEL_WIDTH - warp_to 4, 7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/mapObjects/CeladonMansion1F.asm deleted file mode 100755 index 1abd434c..00000000 --- a/data/mapObjects/CeladonMansion1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMansion1F_Object: - db $f ; border block - - db 5 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - warp 4, 0, 4, -1 - warp 7, 1, 1, CELADON_MANSION_2F - warp 2, 1, 2, CELADON_MANSION_2F - - db 1 ; signs - sign 4, 9, 5 ; CeladonMansion1Text5 - - db 4 ; objects - object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person - object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person - object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 4, 11, CELADON_MANSION_1F_WIDTH - warp_to 5, 11, CELADON_MANSION_1F_WIDTH - warp_to 4, 0, CELADON_MANSION_1F_WIDTH - warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F - warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm deleted file mode 100755 index 09c94d29..00000000 --- a/data/mapObjects/CeladonMansion2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonMansion2F_Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_3F - warp 7, 1, 3, CELADON_MANSION_1F - warp 2, 1, 4, CELADON_MANSION_1F - warp 4, 1, 3, CELADON_MANSION_3F - - db 1 ; signs - sign 4, 9, 1 ; CeladonMansion2Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F - warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F - warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F - warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/mapObjects/CeladonMansion3F.asm deleted file mode 100755 index 32701f14..00000000 --- a/data/mapObjects/CeladonMansion3F.asm +++ /dev/null @@ -1,26 +0,0 @@ -CeladonMansion3F_Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_2F - warp 7, 1, 0, CELADON_MANSION_ROOF - warp 2, 1, 1, CELADON_MANSION_ROOF - warp 4, 1, 3, CELADON_MANSION_2F - - db 4 ; signs - sign 1, 3, 5 ; CeladonMansion3Text5 - sign 4, 3, 6 ; CeladonMansion3Text6 - sign 1, 6, 7 ; CeladonMansion3Text7 - sign 4, 9, 8 ; CeladonMansion3Text8 - - db 4 ; objects - object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person - object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person - object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F - warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF - warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF - warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm deleted file mode 100755 index 353b0b96..00000000 --- a/data/mapObjects/CeladonMansionRoof.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonMansionRoof_Object: - db $9 ; border block - - db 3 ; warps - warp 6, 1, 1, CELADON_MANSION_3F - warp 2, 1, 2, CELADON_MANSION_3F - warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE - - db 1 ; signs - sign 3, 7, 1 ; CeladonMansion4Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F - warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F - warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm deleted file mode 100755 index b6a6149f..00000000 --- a/data/mapObjects/CeladonMansionRoofHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeladonMansionRoofHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, CELADON_MANSION_ROOF - warp 3, 7, 2, CELADON_MANSION_ROOF - - db 0 ; signs - - db 2 ; objects - object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF - warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF diff --git a/data/mapObjects/CeladonMart1F.asm b/data/mapObjects/CeladonMart1F.asm deleted file mode 100755 index 2037369a..00000000 --- a/data/mapObjects/CeladonMart1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMart1F_Object: - db $f ; border block - - db 6 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 12, 1, 0, CELADON_MART_2F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 2 ; signs - sign 11, 4, 2 ; CeladonMart1Text2 - sign 14, 1, 3 ; CeladonMart1Text3 - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, CELADON_MART_1F_WIDTH - warp_to 3, 7, CELADON_MART_1F_WIDTH - warp_to 16, 7, CELADON_MART_1F_WIDTH - warp_to 17, 7, CELADON_MART_1F_WIDTH - warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart2F.asm b/data/mapObjects/CeladonMart2F.asm deleted file mode 100755 index 2f5f428e..00000000 --- a/data/mapObjects/CeladonMart2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart2F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 4, CELADON_MART_1F - warp 16, 1, 1, CELADON_MART_3F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart2Text5 - - db 4 ; objects - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person - object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F - warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F - warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart3F.asm b/data/mapObjects/CeladonMart3F.asm deleted file mode 100755 index 6c6adfd4..00000000 --- a/data/mapObjects/CeladonMart3F.asm +++ /dev/null @@ -1,33 +0,0 @@ -CeladonMart3F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_4F - warp 16, 1, 1, CELADON_MART_2F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 12 ; signs - sign 2, 4, 6 ; CeladonMart3Text6 - sign 3, 4, 7 ; CeladonMart3Text7 - sign 5, 4, 8 ; CeladonMart3Text8 - sign 6, 4, 9 ; CeladonMart3Text9 - sign 2, 6, 10 ; CeladonMart3Text10 - sign 3, 6, 11 ; CeladonMart3Text11 - sign 5, 6, 12 ; CeladonMart3Text12 - sign 6, 6, 13 ; CeladonMart3Text13 - sign 14, 1, 14 ; CeladonMart3Text14 - sign 4, 1, 15 ; CeladonMart3Text15 - sign 6, 1, 16 ; CeladonMart3Text16 - sign 10, 1, 17 ; CeladonMart3Text17 - - db 5 ; objects - object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person - object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person - object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person - object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F - warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart4F.asm b/data/mapObjects/CeladonMart4F.asm deleted file mode 100755 index 18ba3bdc..00000000 --- a/data/mapObjects/CeladonMart4F.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonMart4F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_3F - warp 16, 1, 1, CELADON_MART_5F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 4 ; CeladonMart4Text4 - - db 3 ; objects - object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person - object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F - warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F - warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart5F.asm b/data/mapObjects/CeladonMart5F.asm deleted file mode 100755 index fb1201c9..00000000 --- a/data/mapObjects/CeladonMart5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart5F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_ROOF - warp 16, 1, 1, CELADON_MART_4F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart5Text5 - - db 4 ; objects - object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person - object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF - warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F - warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/mapObjects/CeladonMartElevator.asm deleted file mode 100755 index 9688daef..00000000 --- a/data/mapObjects/CeladonMartElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeladonMartElevator_Object: - db $f ; border block - - db 2 ; warps - warp 1, 3, 5, CELADON_MART_1F - warp 2, 3, 5, CELADON_MART_1F - - db 1 ; signs - sign 3, 0, 1 ; CeladonMartElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F - warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/mapObjects/CeladonMartRoof.asm deleted file mode 100755 index 05cef2d4..00000000 --- a/data/mapObjects/CeladonMartRoof.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeladonMartRoof_Object: - db $42 ; border block - - db 1 ; warps - warp 15, 2, 0, CELADON_MART_5F - - db 4 ; signs - sign 10, 1, 3 ; CeladonMartRoofText3 - sign 11, 1, 4 ; CeladonMartRoofText4 - sign 12, 2, 5 ; CeladonMartRoofText5 - sign 13, 2, 6 ; CeladonMartRoofText6 - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person - - ; warp-to - warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/mapObjects/CeladonPokecenter.asm deleted file mode 100755 index 91698e34..00000000 --- a/data/mapObjects/CeladonPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CELADON_POKECENTER_WIDTH - warp_to 4, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/mapObjects/CeruleanBadgeHouse.asm deleted file mode 100755 index 62a6873b..00000000 --- a/data/mapObjects/CeruleanBadgeHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanBadgeHouse_Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 9, -1 - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH - warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm deleted file mode 100755 index a7f72b34..00000000 --- a/data/mapObjects/CeruleanCave1F.asm +++ /dev/null @@ -1,32 +0,0 @@ -CeruleanCave1F_Object: - db $7d ; border block - - db 9 ; warps - warp 24, 17, 6, -1 - warp 25, 17, 6, -1 - warp 27, 1, 0, CERULEAN_CAVE_2F - warp 23, 7, 1, CERULEAN_CAVE_2F - warp 18, 9, 2, CERULEAN_CAVE_2F - warp 7, 1, 3, CERULEAN_CAVE_2F - warp 1, 3, 4, CERULEAN_CAVE_2F - warp 3, 11, 5, CERULEAN_CAVE_2F - warp 0, 6, 0, CERULEAN_CAVE_B1F - - db 0 ; signs - - db 4 ; objects - object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY - object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER - object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE - object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL - - ; warp-to - warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH - warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH - warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm deleted file mode 100755 index 9a15eef8..00000000 --- a/data/mapObjects/CeruleanCave2F.asm +++ /dev/null @@ -1,26 +0,0 @@ -CeruleanCave2F_Object: - db $7d ; border block - - db 6 ; warps - warp 29, 1, 2, CERULEAN_CAVE_1F - warp 22, 6, 3, CERULEAN_CAVE_1F - warp 19, 7, 4, CERULEAN_CAVE_1F - warp 9, 1, 5, CERULEAN_CAVE_1F - warp 1, 3, 6, CERULEAN_CAVE_1F - warp 3, 11, 7, CERULEAN_CAVE_1F - - db 0 ; signs - - db 4 ; objects - object SPRITE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY - object SPRITE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE - object SPRITE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE - - ; warp-to - warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/mapObjects/CeruleanCaveB1F.asm deleted file mode 100755 index 193d674b..00000000 --- a/data/mapObjects/CeruleanCaveB1F.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanCaveB1F_Object: - db $7d ; border block - - db 1 ; warps - warp 3, 6, 8, CERULEAN_CAVE_1F - - db 0 ; signs - - db 5 ; objects - object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_BALL, 26, 1, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 2, 13, STAY, NONE, 3, ULTRA_BALL - object SPRITE_BALL, 3, 13, STAY, NONE, 4, MAX_REVIVE - object SPRITE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER - - ; warp-to - warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCity.asm b/data/mapObjects/CeruleanCity.asm deleted file mode 100755 index ca05e65f..00000000 --- a/data/mapObjects/CeruleanCity.asm +++ /dev/null @@ -1,47 +0,0 @@ -CeruleanCity_Object: - db $a ; border block - - db 10 ; warps - warp 27, 11, 0, CERULEAN_TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_TRADE_HOUSE - warp 19, 17, 0, CERULEAN_POKECENTER - warp 30, 19, 0, CERULEAN_GYM - warp 13, 25, 0, BIKE_SHOP - warp 25, 25, 0, CERULEAN_MART - warp 4, 11, 0, CERULEAN_CAVE_1F - warp 27, 9, 2, CERULEAN_TRASHED_HOUSE - warp 9, 11, 1, CERULEAN_BADGE_HOUSE - warp 9, 9, 0, CERULEAN_BADGE_HOUSE - - db 6 ; signs - sign 23, 19, 12 ; CeruleanCityText12 - sign 17, 29, 13 ; CeruleanCityText13 - sign 26, 25, 14 ; MartSignText - sign 20, 17, 15 ; PokeCenterSignText - sign 11, 25, 16 ; CeruleanCityText16 - sign 27, 21, 17 ; CeruleanCityText17 - - db 11 ; objects - object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 - object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person - object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person - object SPRITE_OFFICER_JENNY, 28, 12, STAY, DOWN, 6 ; person - object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_BALL, 28, 26, STAY, DOWN, 8 ; person - object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person - object SPRITE_OFFICER_JENNY, 27, 12, STAY, DOWN, 11 ; person - - ; warp-to - warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE - warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE - warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER - warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM - warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP - warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART - warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F - warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE - warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE - warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE diff --git a/data/mapObjects/CeruleanGym.asm b/data/mapObjects/CeruleanGym.asm deleted file mode 100755 index 96713648..00000000 --- a/data/mapObjects/CeruleanGym.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 3, -1 - warp 5, 13, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 - object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 - object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 4, 13, CERULEAN_GYM_WIDTH - warp_to 5, 13, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/CeruleanMart.asm b/data/mapObjects/CeruleanMart.asm deleted file mode 100755 index 4659375f..00000000 --- a/data/mapObjects/CeruleanMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person - object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_MART_WIDTH - warp_to 4, 7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm deleted file mode 100755 index 78b2330e..00000000 --- a/data/mapObjects/CeruleanPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 4, 3, STAY, UP, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_POKECENTER_WIDTH - warp_to 4, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/mapObjects/CeruleanTradeHouse.asm deleted file mode 100755 index e51f9544..00000000 --- a/data/mapObjects/CeruleanTradeHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanTradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 4 ; objects - 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 - - ; warp-to - warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/mapObjects/CeruleanTrashedHouse.asm deleted file mode 100755 index 44b7cf20..00000000 --- a/data/mapObjects/CeruleanTrashedHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanTrashedHouse_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 3, 0, 7, -1 - - db 1 ; signs - sign 3, 0, 3 ; CeruleanHouseTrashedText3 - - db 2 ; objects - object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person - object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH - warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ChampionsRoom.asm b/data/mapObjects/ChampionsRoom.asm deleted file mode 100755 index 1e0cb7f4..00000000 --- a/data/mapObjects/ChampionsRoom.asm +++ /dev/null @@ -1,20 +0,0 @@ -ChampionsRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 3, 7, 1, LANCES_ROOM - warp 4, 7, 2, LANCES_ROOM - warp 3, 0, 0, HALL_OF_FAME - warp 4, 0, 0, HALL_OF_FAME - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person - - ; warp-to - warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm deleted file mode 100755 index 1a6e96cd..00000000 --- a/data/mapObjects/CinnabarGym.asm +++ /dev/null @@ -1,23 +0,0 @@ -CinnabarGym_Object: - db $2e ; border block - - db 2 ; warps - warp 16, 17, 1, -1 - warp 17, 17, 1, -1 - - db 0 ; signs - - db 9 ; objects - object SPRITE_MR_MASTERBALL, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 - object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 - object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 - object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 - object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 - object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 - object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 - object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 16, 17, CINNABAR_GYM_WIDTH - warp_to 17, 17, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/CinnabarIsland.asm b/data/mapObjects/CinnabarIsland.asm deleted file mode 100755 index 1932e134..00000000 --- a/data/mapObjects/CinnabarIsland.asm +++ /dev/null @@ -1,27 +0,0 @@ -CinnabarIsland_Object: - db $43 ; border block - - db 5 ; warps - warp 6, 3, 1, POKEMON_MANSION_1F - warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB - warp 11, 11, 0, CINNABAR_POKECENTER - warp 15, 11, 0, CINNABAR_MART - - db 5 ; signs - sign 9, 5, 3 ; CinnabarIslandText3 - sign 16, 11, 4 ; MartSignText - sign 12, 11, 5 ; PokeCenterSignText - sign 9, 11, 6 ; CinnabarIslandText6 - sign 13, 3, 7 ; CinnabarIslandText7 - - db 2 ; objects - object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F - warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB - warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER - warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm deleted file mode 100755 index deb5d8ed..00000000 --- a/data/mapObjects/CinnabarLab.asm +++ /dev/null @@ -1,25 +0,0 @@ -CinnabarLab_Object: - db $17 ; border block - - db 5 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM - warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM - warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM - - db 4 ; signs - sign 3, 2, 2 ; Lab1Text2 - sign 9, 4, 3 ; Lab1Text3 - sign 13, 4, 4 ; Lab1Text4 - sign 17, 4, 5 ; Lab1Text5 - - db 1 ; objects - object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_WIDTH - warp_to 3, 7, CINNABAR_LAB_WIDTH - warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM - warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM - warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm deleted file mode 100755 index d31502e6..00000000 --- a/data/mapObjects/CinnabarLabFossilRoom.asm +++ /dev/null @@ -1,16 +0,0 @@ -CinnabarLabFossilRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 4, CINNABAR_LAB - warp 3, 7, 4, CINNABAR_LAB - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm deleted file mode 100755 index 37f93d43..00000000 --- a/data/mapObjects/CinnabarLabMetronomeRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -CinnabarLabMetronomeRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 3, CINNABAR_LAB - warp 3, 7, 3, CINNABAR_LAB - - db 3 ; signs - sign 0, 4, 3 ; Lab3Text3 - sign 1, 4, 4 ; Lab3Text4 - sign 2, 1, 5 ; Lab3Text5 - - db 2 ; objects - object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/mapObjects/CinnabarLabTradeRoom.asm deleted file mode 100755 index 449cc914..00000000 --- a/data/mapObjects/CinnabarLabTradeRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarLabTradeRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 2, CINNABAR_LAB - warp 3, 7, 2, CINNABAR_LAB - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarMart.asm b/data/mapObjects/CinnabarMart.asm deleted file mode 100755 index af88ddf0..00000000 --- a/data/mapObjects/CinnabarMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_MART_WIDTH - warp_to 4, 7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm deleted file mode 100755 index 3c9efb34..00000000 --- a/data/mapObjects/CinnabarPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -CinnabarPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_POKECENTER_WIDTH - warp_to 4, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/Colosseum.asm b/data/mapObjects/Colosseum.asm deleted file mode 100644 index 18762584..00000000 --- a/data/mapObjects/Colosseum.asm +++ /dev/null @@ -1,9 +0,0 @@ -Colosseum_Object: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/mapObjects/CopycatsHouse1F.asm deleted file mode 100755 index 8bde12fe..00000000 --- a/data/mapObjects/CopycatsHouse1F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse1F_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 7, 1, 0, COPYCATS_HOUSE_2F - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_CHANSEY, 1, 4, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/mapObjects/CopycatsHouse2F.asm deleted file mode 100755 index 18b56419..00000000 --- a/data/mapObjects/CopycatsHouse2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, COPYCATS_HOUSE_1F - - db 2 ; signs - sign 3, 5, 6 ; CopycatsHouse2FText6 - sign 0, 1, 7 ; CopycatsHouse2FText7 - - db 5 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person - object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person - object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person - object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person - - ; warp-to - warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/Daycare.asm b/data/mapObjects/Daycare.asm deleted file mode 100755 index c58c83e4..00000000 --- a/data/mapObjects/Daycare.asm +++ /dev/null @@ -1,15 +0,0 @@ -Daycare_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, DAYCARE_WIDTH - warp_to 3, 7, DAYCARE_WIDTH diff --git a/data/mapObjects/DiglettsCave.asm b/data/mapObjects/DiglettsCave.asm deleted file mode 100755 index b4fd0af8..00000000 --- a/data/mapObjects/DiglettsCave.asm +++ /dev/null @@ -1,14 +0,0 @@ -DiglettsCave_Object: - db $19 ; border block - - db 2 ; warps - warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 - warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2 - warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm deleted file mode 100755 index a4c70f06..00000000 --- a/data/mapObjects/DiglettsCaveRoute11.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveRoute11_Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - warp 4, 4, 1, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm deleted file mode 100755 index 0567fee6..00000000 --- a/data/mapObjects/DiglettsCaveRoute2.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveRoute2_Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 4, 4, 0, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/FightingDojo.asm b/data/mapObjects/FightingDojo.asm deleted file mode 100755 index fdc7b838..00000000 --- a/data/mapObjects/FightingDojo.asm +++ /dev/null @@ -1,21 +0,0 @@ -FightingDojo_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 1, -1 - warp 5, 11, 1, -1 - - db 0 ; signs - - db 7 ; objects - object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 - object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 - object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 - object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 - object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person - object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person - - ; warp-to - warp_to 4, 11, FIGHTING_DOJO_WIDTH - warp_to 5, 11, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm deleted file mode 100755 index 363b56f9..00000000 --- a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaBillsGrandpasHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person - object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH - warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaCity.asm b/data/mapObjects/FuchsiaCity.asm deleted file mode 100755 index 0368905c..00000000 --- a/data/mapObjects/FuchsiaCity.asm +++ /dev/null @@ -1,52 +0,0 @@ -FuchsiaCity_Object: - db $f ; border block - - db 9 ; warps - warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE - warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, WARDENS_HOUSE - warp 18, 3, 0, SAFARI_ZONE_GATE - warp 5, 27, 0, FUCHSIA_GYM - warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE - warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE - - db 14 ; signs - sign 15, 23, 11 ; FuchsiaCityText11 - sign 25, 15, 12 ; FuchsiaCityText12 - sign 17, 5, 13 ; FuchsiaCityText13 - sign 6, 13, 14 ; MartSignText - sign 20, 27, 15 ; PokeCenterSignText - sign 27, 29, 16 ; FuchsiaCityText16 - sign 21, 15, 17 ; FuchsiaCityText17 - sign 5, 29, 18 ; FuchsiaCityText18 - sign 33, 7, 19 ; FuchsiaCityText19 - sign 27, 7, 20 ; FuchsiaCityText20 - sign 13, 7, 21 ; FuchsiaCityText21 - sign 31, 13, 22 ; FuchsiaCityText22 - sign 13, 15, 23 ; FuchsiaCityText23 - sign 7, 7, 24 ; FuchsiaCityText24 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person - object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person - object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CHANSEY, 31, 5, STAY, DOWN, 5 ; person - object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person - object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person - object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person - object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person - object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person - - ; warp-to - warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE - warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE - warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM - warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm deleted file mode 100755 index 390447c8..00000000 --- a/data/mapObjects/FuchsiaGoodRodHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaGoodRodHouse_Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 8, -1 - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH - warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH - warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaGym.asm b/data/mapObjects/FuchsiaGym.asm deleted file mode 100755 index 4e717086..00000000 --- a/data/mapObjects/FuchsiaGym.asm +++ /dev/null @@ -1,22 +0,0 @@ -FuchsiaGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 5, -1 - warp 5, 17, 5, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_LAPRAS_GIVER, 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 - object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 - object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 - object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 - object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person - - ; warp-to - warp_to 4, 17, FUCHSIA_GYM_WIDTH - warp_to 5, 17, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/FuchsiaMart.asm b/data/mapObjects/FuchsiaMart.asm deleted file mode 100755 index cfa71d8d..00000000 --- a/data/mapObjects/FuchsiaMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_MART_WIDTH - warp_to 4, 7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm deleted file mode 100755 index 9130d920..00000000 --- a/data/mapObjects/FuchsiaMeetingRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMeetingRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 6, -1 - warp 5, 7, 6, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person - object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person - object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH - warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm deleted file mode 100755 index b0056acd..00000000 --- a/data/mapObjects/FuchsiaPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -FuchsiaPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_ROCKER, 4, 3, STAY, UP, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH - warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/GameCorner.asm b/data/mapObjects/GameCorner.asm deleted file mode 100755 index afac025e..00000000 --- a/data/mapObjects/GameCorner.asm +++ /dev/null @@ -1,28 +0,0 @@ -GameCorner_Object: - db $f ; border block - - db 3 ; warps - warp 15, 17, 7, -1 - warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_B1F - - db 1 ; signs - sign 9, 4, 12 ; CeladonGameCornerText12 - - db 11 ; objects - object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person - object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person - object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person - object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person - object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person - object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_FAT_BALD_GUY, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_FISHER, 17, 13, STAY, RIGHT, 10 ; person - object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 - - ; warp-to - warp_to 15, 17, GAME_CORNER_WIDTH - warp_to 16, 17, GAME_CORNER_WIDTH - warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/mapObjects/GameCornerPrizeRoom.asm deleted file mode 100755 index 35cd3ac8..00000000 --- a/data/mapObjects/GameCornerPrizeRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -GameCornerPrizeRoom_Object: - db $f ; border block - - db 2 ; warps - warp 4, 7, 9, -1 - warp 5, 7, 9, -1 - - db 3 ; signs - sign 2, 2, 3 ; CeladonPrizeRoomText3 - sign 4, 2, 4 ; CeladonPrizeRoomText4 - sign 6, 2, 5 ; CeladonPrizeRoomText5 - - db 2 ; objects - object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person - object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH - warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/HallOfFame.asm b/data/mapObjects/HallOfFame.asm deleted file mode 100755 index 3762d871..00000000 --- a/data/mapObjects/HallOfFame.asm +++ /dev/null @@ -1,15 +0,0 @@ -HallOfFame_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 7, 2, CHAMPIONS_ROOM - warp 5, 7, 3, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM - warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/IndigoPlateau.asm b/data/mapObjects/IndigoPlateau.asm deleted file mode 100755 index 1447be11..00000000 --- a/data/mapObjects/IndigoPlateau.asm +++ /dev/null @@ -1,14 +0,0 @@ -IndigoPlateau_Object: - db $e ; border block - - db 2 ; warps - warp 9, 5, 0, INDIGO_PLATEAU_LOBBY - warp 10, 5, 0, INDIGO_PLATEAU_LOBBY - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/mapObjects/IndigoPlateauLobby.asm deleted file mode 100755 index d7de23a7..00000000 --- a/data/mapObjects/IndigoPlateauLobby.asm +++ /dev/null @@ -1,22 +0,0 @@ -IndigoPlateauLobby_Object: - db $0 ; border block - - db 3 ; warps - warp 7, 11, 0, -1 - warp 8, 11, 1, -1 - warp 8, 0, 0, LORELEIS_ROOM - - db 0 ; signs - - db 6 ; objects - object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person - object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person - object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person - object SPRITE_CHANSEY, 8, 5, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/LancesRoom.asm b/data/mapObjects/LancesRoom.asm deleted file mode 100755 index 6f22631a..00000000 --- a/data/mapObjects/LancesRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -LancesRoom_Object: - db $3 ; border block - - db 3 ; warps - warp 24, 16, 2, AGATHAS_ROOM - warp 5, 0, 0, CHAMPIONS_ROOM - warp 6, 0, 0, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 - - ; warp-to - warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM - warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/mapObjects/LavenderCuboneHouse.asm deleted file mode 100755 index 96f1b3ba..00000000 --- a/data/mapObjects/LavenderCuboneHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -LavenderCuboneHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person - object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH - warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH diff --git a/data/mapObjects/LavenderMart.asm b/data/mapObjects/LavenderMart.asm deleted file mode 100755 index df14ad39..00000000 --- a/data/mapObjects/LavenderMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -LavenderMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_MART_WIDTH - warp_to 4, 7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/mapObjects/LavenderPokecenter.asm deleted file mode 100755 index 6e38a8e9..00000000 --- a/data/mapObjects/LavenderPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -LavenderPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person - object SPRITE_LITTLE_GIRL, 10, 5, WALK, 2, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_POKECENTER_WIDTH - warp_to 4, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/LavenderTown.asm b/data/mapObjects/LavenderTown.asm deleted file mode 100755 index 4aead666..00000000 --- a/data/mapObjects/LavenderTown.asm +++ /dev/null @@ -1,31 +0,0 @@ -LavenderTown_Object: - db $2c ; border block - - db 6 ; warps - warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMON_TOWER_1F - warp 7, 9, 0, MR_FUJIS_HOUSE - warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_CUBONE_HOUSE - warp 7, 13, 0, NAME_RATERS_HOUSE - - db 6 ; signs - sign 11, 9, 4 ; LavenderTownText4 - sign 9, 3, 5 ; LavenderTownText5 - sign 16, 13, 6 ; MartSignText - sign 4, 5, 7 ; PokeCenterSignText - sign 5, 9, 8 ; LavenderTownText8 - sign 17, 7, 9 ; LavenderTownText9 - - db 3 ; objects - object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER - warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F - warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE - warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART - warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE - warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/LoreleisRoom.asm b/data/mapObjects/LoreleisRoom.asm deleted file mode 100755 index 06450bb4..00000000 --- a/data/mapObjects/LoreleisRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -LoreleisRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, INDIGO_PLATEAU_LOBBY - warp 5, 11, 2, INDIGO_PLATEAU_LOBBY - warp 4, 0, 0, BRUNOS_ROOM - warp 5, 0, 1, BRUNOS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 - - ; warp-to - warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/MrFujisHouse.asm b/data/mapObjects/MrFujisHouse.asm deleted file mode 100755 index 5b6ca2a6..00000000 --- a/data/mapObjects/MrFujisHouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -MrFujisHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person - object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person - object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person - - ; warp-to - warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH - warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/mapObjects/MrPsychicsHouse.asm deleted file mode 100755 index 01f9e11c..00000000 --- a/data/mapObjects/MrPsychicsHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -MrPsychicsHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH - warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH diff --git a/data/mapObjects/MtMoon1F.asm b/data/mapObjects/MtMoon1F.asm deleted file mode 100755 index 56820161..00000000 --- a/data/mapObjects/MtMoon1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -MtMoon1F_Object: - db $3 ; border block - - db 5 ; warps - warp 14, 35, 1, -1 - warp 15, 35, 1, -1 - warp 5, 5, 0, MT_MOON_B1F - warp 17, 11, 2, MT_MOON_B1F - warp 25, 15, 3, MT_MOON_B1F - - db 1 ; signs - sign 15, 23, 14 ; MtMoon1Text14 - - db 13 ; objects - object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 - object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 - object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 - object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 - object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION - object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE - object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY - object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE - object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION - object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 - - ; warp-to - warp_to 14, 35, MT_MOON_1F_WIDTH - warp_to 15, 35, MT_MOON_1F_WIDTH - warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F - warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F - warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm deleted file mode 100755 index a8365ba7..00000000 --- a/data/mapObjects/MtMoonB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -MtMoonB1F_Object: - db $3 ; border block - - db 8 ; warps - warp 5, 5, 2, MT_MOON_1F - warp 17, 11, 0, MT_MOON_B2F - warp 25, 9, 3, MT_MOON_1F - warp 25, 15, 4, MT_MOON_1F - warp 21, 17, 1, MT_MOON_B2F - warp 13, 27, 2, MT_MOON_B2F - warp 23, 3, 3, MT_MOON_B2F - warp 27, 3, 2, -1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 27, 3, MT_MOON_B1F_WIDTH diff --git a/data/mapObjects/MtMoonB2F.asm b/data/mapObjects/MtMoonB2F.asm deleted file mode 100755 index a4c9869a..00000000 --- a/data/mapObjects/MtMoonB2F.asm +++ /dev/null @@ -1,28 +0,0 @@ -MtMoonB2F_Object: - db $3 ; border block - - db 4 ; warps - warp 25, 9, 1, MT_MOON_B1F - warp 21, 17, 4, MT_MOON_B1F - warp 15, 27, 5, MT_MOON_B1F - warp 5, 7, 6, MT_MOON_B1F - - db 0 ; signs - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - 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, 1 - object SPRITE_JAMES, 9, 4, STAY, LEFT, 6 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 7 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 8 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 10, TM_01 - - ; warp-to - warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm deleted file mode 100755 index 1027f88a..00000000 --- a/data/mapObjects/MtMoonPokecenter.asm +++ /dev/null @@ -1,21 +0,0 @@ -MtMoonPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 7 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person - object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person - object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person - object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 3, 7, MT_MOON_POKECENTER_WIDTH - warp_to 4, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/Museum1F.asm b/data/mapObjects/Museum1F.asm deleted file mode 100755 index 1cfd2c68..00000000 --- a/data/mapObjects/Museum1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -Museum1F_Object: - db $a ; border block - - db 5 ; warps - warp 10, 7, 0, -1 - warp 11, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 7, 7, 0, MUSEUM_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person - object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person - object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person - - ; warp-to - warp_to 10, 7, MUSEUM_1F_WIDTH - warp_to 11, 7, MUSEUM_1F_WIDTH - warp_to 16, 7, MUSEUM_1F_WIDTH - warp_to 17, 7, MUSEUM_1F_WIDTH - warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/Museum2F.asm b/data/mapObjects/Museum2F.asm deleted file mode 100755 index 80815820..00000000 --- a/data/mapObjects/Museum2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -Museum2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, MUSEUM_1F - - db 2 ; signs - sign 11, 2, 6 ; Museum2FText6 - sign 2, 5, 7 ; Museum2FText7 - - db 5 ; objects - object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person - object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person - object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person - object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person - object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/NameRatersHouse.asm b/data/mapObjects/NameRatersHouse.asm deleted file mode 100755 index da95bc43..00000000 --- a/data/mapObjects/NameRatersHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -NameRatersHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH - warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/OaksLab.asm b/data/mapObjects/OaksLab.asm deleted file mode 100755 index cf48bec9..00000000 --- a/data/mapObjects/OaksLab.asm +++ /dev/null @@ -1,23 +0,0 @@ -OaksLab_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - - db 0 ; signs - - db 9 ; objects - object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 - object SPRITE_BALL, 7, 3, STAY, NONE, 2 ; person - object SPRITE_OAK, 5, 2, STAY, DOWN, 3 ; person - object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 4 ; person - object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 5 ; person - object SPRITE_OAK, 5, 10, STAY, UP, 6 ; person - object SPRITE_GIRL, 1, 9, WALK, 1, 7 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 8 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 9 ; person - - ; warp-to - warp_to 4, 11, OAKS_LAB_WIDTH - warp_to 5, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/PalletTown.asm b/data/mapObjects/PalletTown.asm deleted file mode 100755 index 93807688..00000000 --- a/data/mapObjects/PalletTown.asm +++ /dev/null @@ -1,23 +0,0 @@ -PalletTown_Object: - db $b ; border block - - db 3 ; warps - warp 5, 5, 0, REDS_HOUSE_1F - warp 13, 5, 0, BLUES_HOUSE - warp 12, 11, 1, OAKS_LAB - - db 4 ; signs - sign 13, 13, 4 ; PalletTownText4 - sign 7, 9, 5 ; PalletTownText5 - sign 3, 5, 6 ; PalletTownText6 - sign 11, 5, 7 ; PalletTownText7 - - db 3 ; objects - object SPRITE_OAK, 10, 4, STAY, NONE, 1 ; person - object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person - object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person - - ; warp-to - warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F - warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE - warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/PewterCity.asm b/data/mapObjects/PewterCity.asm deleted file mode 100755 index e1a3eecb..00000000 --- a/data/mapObjects/PewterCity.asm +++ /dev/null @@ -1,36 +0,0 @@ -PewterCity_Object: - db $a ; border block - - db 7 ; warps - warp 14, 7, 0, MUSEUM_1F - warp 19, 5, 2, MUSEUM_1F - warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_NIDORAN_HOUSE - warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_SPEECH_HOUSE - warp 13, 25, 0, PEWTER_POKECENTER - - db 7 ; signs - sign 19, 29, 6 ; PewterCityText6 - sign 33, 19, 7 ; PewterCityText7 - sign 24, 17, 8 ; MartSignText - sign 14, 25, 9 ; PokeCenterSignText - sign 15, 9, 10 ; PewterCityText10 - sign 11, 17, 11 ; PewterCityText11 - sign 25, 23, 12 ; PewterCityText12 - - db 5 ; objects - object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person - object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM - warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE - warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART - warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE - warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/PewterGym.asm b/data/mapObjects/PewterGym.asm deleted file mode 100755 index 538c3923..00000000 --- a/data/mapObjects/PewterGym.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 2, -1 - warp 5, 13, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 13, PEWTER_GYM_WIDTH - warp_to 5, 13, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/PewterMart.asm b/data/mapObjects/PewterMart.asm deleted file mode 100755 index 9b983316..00000000 --- a/data/mapObjects/PewterMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, PEWTER_MART_WIDTH - warp_to 4, 7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/mapObjects/PewterNidoranHouse.asm deleted file mode 100755 index f00317d1..00000000 --- a/data/mapObjects/PewterNidoranHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterNidoranHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person - object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH - warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH diff --git a/data/mapObjects/PewterPokecenter.asm b/data/mapObjects/PewterPokecenter.asm deleted file mode 100755 index 4d460747..00000000 --- a/data/mapObjects/PewterPokecenter.asm +++ /dev/null @@ -1,20 +0,0 @@ -PewterPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_JIGGLYPUFF, 1, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_LASS, 4, 3, STAY, UP, 5 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 3, 7, PEWTER_POKECENTER_WIDTH - warp_to 4, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/mapObjects/PewterSpeechHouse.asm deleted file mode 100755 index e7134cb5..00000000 --- a/data/mapObjects/PewterSpeechHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -PewterSpeechHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH - warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH diff --git a/data/mapObjects/PokemonFanClub.asm b/data/mapObjects/PokemonFanClub.asm deleted file mode 100755 index 588ebdc2..00000000 --- a/data/mapObjects/PokemonFanClub.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonFanClub_Object: - db $d ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person - object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_CLEFAIRY_2, 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_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH - warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm deleted file mode 100755 index 109b5b8e..00000000 --- a/data/mapObjects/PokemonMansion1F.asm +++ /dev/null @@ -1,29 +0,0 @@ -PokemonMansion1F_Object: - db $2e ; border block - - db 8 ; warps - warp 4, 27, 0, -1 - warp 5, 27, 0, -1 - warp 6, 27, 0, -1 - warp 7, 27, 0, -1 - warp 5, 10, 0, POKEMON_MANSION_2F - warp 21, 23, 0, POKEMON_MANSION_B1F - warp 26, 27, 0, -1 - warp 27, 27, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS - - ; warp-to - warp_to 4, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 27, POKEMON_MANSION_1F_WIDTH - warp_to 6, 27, POKEMON_MANSION_1F_WIDTH - warp_to 7, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F - warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F - warp_to 26, 27, POKEMON_MANSION_1F_WIDTH - warp_to 27, 27, POKEMON_MANSION_1F_WIDTH diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm deleted file mode 100755 index 6c0cc5f8..00000000 --- a/data/mapObjects/PokemonMansion2F.asm +++ /dev/null @@ -1,22 +0,0 @@ -PokemonMansion2F_Object: - db $1 ; border block - - db 4 ; warps - warp 5, 10, 4, POKEMON_MANSION_1F - warp 7, 10, 0, POKEMON_MANSION_3F - warp 25, 14, 2, POKEMON_MANSION_3F - warp 6, 1, 1, POKEMON_MANSION_3F - - db 0 ; signs - - db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person - - ; warp-to - warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F - warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F - warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F - warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/mapObjects/PokemonMansion3F.asm deleted file mode 100755 index 7c8c9c22..00000000 --- a/data/mapObjects/PokemonMansion3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -PokemonMansion3F_Object: - db $1 ; border block - - db 3 ; warps - warp 7, 10, 1, POKEMON_MANSION_2F - warp 6, 1, 3, POKEMON_MANSION_2F - warp 25, 14, 2, POKEMON_MANSION_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 - object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION - object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON - object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person - - ; warp-to - warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F - warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F - warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/mapObjects/PokemonMansionB1F.asm deleted file mode 100755 index ac232799..00000000 --- a/data/mapObjects/PokemonMansionB1F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonMansionB1F_Object: - db $1 ; border block - - db 1 ; warps - warp 23, 22, 5, POKEMON_MANSION_1F - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 - object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY - object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE - object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 - object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 - object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person - object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY - - ; warp-to - warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/mapObjects/PokemonTower1F.asm b/data/mapObjects/PokemonTower1F.asm deleted file mode 100755 index cf62836b..00000000 --- a/data/mapObjects/PokemonTower1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -PokemonTower1F_Object: - db $1 ; border block - - db 3 ; warps - warp 10, 17, 1, -1 - warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMON_TOWER_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person - object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person - object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person - object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person - - ; warp-to - warp_to 10, 17, POKEMON_TOWER_1F_WIDTH - warp_to 11, 17, POKEMON_TOWER_1F_WIDTH - warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm deleted file mode 100755 index 5ce437d1..00000000 --- a/data/mapObjects/PokemonTower2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower2F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_3F - warp 18, 9, 2, POKEMON_TOWER_1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F - warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F diff --git a/data/mapObjects/PokemonTower3F.asm b/data/mapObjects/PokemonTower3F.asm deleted file mode 100755 index 79b83f88..00000000 --- a/data/mapObjects/PokemonTower3F.asm +++ /dev/null @@ -1,18 +0,0 @@ -PokemonTower3F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_2F - warp 18, 9, 1, POKEMON_TOWER_4F - - db 0 ; signs - - db 4 ; objects - object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 - object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 - object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 - object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F - warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F diff --git a/data/mapObjects/PokemonTower4F.asm b/data/mapObjects/PokemonTower4F.asm deleted file mode 100755 index db86c02c..00000000 --- a/data/mapObjects/PokemonTower4F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower4F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_5F - warp 18, 9, 1, POKEMON_TOWER_3F - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 - object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 - object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 - object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER - object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING - object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F - warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F diff --git a/data/mapObjects/PokemonTower5F.asm b/data/mapObjects/PokemonTower5F.asm deleted file mode 100755 index b482871f..00000000 --- a/data/mapObjects/PokemonTower5F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower5F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_4F - warp 18, 9, 0, POKEMON_TOWER_6F - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 - object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 - object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 - object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 - object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F - warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PokemonTower6F.asm b/data/mapObjects/PokemonTower6F.asm deleted file mode 100755 index 823fe78a..00000000 --- a/data/mapObjects/PokemonTower6F.asm +++ /dev/null @@ -1,19 +0,0 @@ -PokemonTower6F_Object: - db $1 ; border block - - db 2 ; warps - warp 18, 9, 1, POKEMON_TOWER_5F - warp 9, 16, 0, POKEMON_TOWER_7F - - db 0 ; signs - - db 5 ; objects - object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 - object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 - object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY - object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY - - ; warp-to - warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F - warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F diff --git a/data/mapObjects/PokemonTower7F.asm b/data/mapObjects/PokemonTower7F.asm deleted file mode 100755 index ccd4f23c..00000000 --- a/data/mapObjects/PokemonTower7F.asm +++ /dev/null @@ -1,15 +0,0 @@ -PokemonTower7F_Object: - db $1 ; border block - - db 1 ; warps - warp 9, 16, 1, POKEMON_TOWER_6F - - db 0 ; signs - - db 3 ; objects - 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 - - ; warp-to - warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PowerPlant.asm b/data/mapObjects/PowerPlant.asm deleted file mode 100755 index a8548b1c..00000000 --- a/data/mapObjects/PowerPlant.asm +++ /dev/null @@ -1,30 +0,0 @@ -PowerPlant_Object: - db $2e ; border block - - db 3 ; warps - warp 4, 35, 3, -1 - warp 5, 35, 3, -1 - warp 0, 11, 3, -1 - - db 0 ; signs - - db 14 ; objects - object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 - object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 - object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 - object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 - object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 - object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 - object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 - object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 - object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 - object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS - object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP - object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY - object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25 - object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33 - - ; warp-to - warp_to 4, 35, POWER_PLANT_WIDTH - warp_to 5, 35, POWER_PLANT_WIDTH - warp_to 0, 11, POWER_PLANT_WIDTH diff --git a/data/mapObjects/RedsHouse1F.asm b/data/mapObjects/RedsHouse1F.asm deleted file mode 100755 index a54b5411..00000000 --- a/data/mapObjects/RedsHouse1F.asm +++ /dev/null @@ -1,18 +0,0 @@ -RedsHouse1F_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 ; exit1 - warp 3, 7, 0, -1 ; exit2 - warp 7, 1, 0, REDS_HOUSE_2F ; staircase - - db 1 ; signs - sign 3, 1, 2 ; TV - - db 1 ; objects - object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom - - ; warp-to - warp_to 2, 7, REDS_HOUSE_1F_WIDTH - warp_to 3, 7, REDS_HOUSE_1F_WIDTH - warp_to 7, 1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/RedsHouse2F.asm b/data/mapObjects/RedsHouse2F.asm deleted file mode 100755 index 98e9c236..00000000 --- a/data/mapObjects/RedsHouse2F.asm +++ /dev/null @@ -1,12 +0,0 @@ -RedsHouse2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, REDS_HOUSE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 7, 1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/RockTunnel1F.asm b/data/mapObjects/RockTunnel1F.asm deleted file mode 100755 index 1cf5a12f..00000000 --- a/data/mapObjects/RockTunnel1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -RockTunnel1F_Object: - db $3 ; border block - - db 8 ; warps - warp 15, 3, 1, -1 - warp 15, 0, 1, -1 - warp 15, 33, 2, -1 - warp 15, 35, 2, -1 - warp 37, 3, 0, ROCK_TUNNEL_B1F - warp 5, 3, 1, ROCK_TUNNEL_B1F - warp 17, 11, 2, ROCK_TUNNEL_B1F - warp 37, 17, 3, ROCK_TUNNEL_B1F - - db 1 ; signs - sign 11, 29, 8 ; RockTunnel1Text8 - - db 7 ; objects - object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 - object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 - object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 - object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 - - ; warp-to - warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH - warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/mapObjects/RockTunnelB1F.asm deleted file mode 100755 index f562168e..00000000 --- a/data/mapObjects/RockTunnelB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -RockTunnelB1F_Object: - db $3 ; border block - - db 4 ; warps - warp 33, 25, 4, ROCK_TUNNEL_1F - warp 27, 3, 5, ROCK_TUNNEL_1F - warp 23, 11, 6, ROCK_TUNNEL_1F - warp 3, 3, 7, ROCK_TUNNEL_1F - - db 0 ; signs - - db 8 ; objects - object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 - object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 - object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 - object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 - object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 - object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 - - ; warp-to - warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm deleted file mode 100755 index dfd08017..00000000 --- a/data/mapObjects/RockTunnelPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -RockTunnelPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person - object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH - warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/mapObjects/RocketHideoutB1F.asm deleted file mode 100755 index 99537510..00000000 --- a/data/mapObjects/RocketHideoutB1F.asm +++ /dev/null @@ -1,27 +0,0 @@ -RocketHideoutB1F_Object: - db $2e ; border block - - db 5 ; warps - warp 23, 2, 0, ROCKET_HIDEOUT_B2F - warp 21, 2, 2, GAME_CORNER - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 24, 3, ROCKET_HIDEOUT_B2F - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 7 ; objects - object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 - object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 - object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 - object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 - object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 - object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE - object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION - - ; warp-to - warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER - warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm deleted file mode 100755 index 36fe9289..00000000 --- a/data/mapObjects/RocketHideoutB2F.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideoutB2F_Object: - db $2e ; border block - - db 5 ; warps - warp 27, 8, 0, ROCKET_HIDEOUT_B1F - warp 21, 8, 0, ROCKET_HIDEOUT_B3F - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 22, 3, ROCKET_HIDEOUT_B1F - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 - object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE - object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET - object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 - object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION - - ; warp-to - warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F - warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/mapObjects/RocketHideoutB3F.asm deleted file mode 100755 index 6169dbed..00000000 --- a/data/mapObjects/RocketHideoutB3F.asm +++ /dev/null @@ -1,18 +0,0 @@ -RocketHideoutB3F_Object: - db $2e ; border block - - db 2 ; warps - warp 25, 6, 1, ROCKET_HIDEOUT_B2F - warp 19, 18, 0, ROCKET_HIDEOUT_B4F - - db 0 ; signs - - db 4 ; objects - object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 - object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 - object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 - object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY - - ; warp-to - warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/mapObjects/RocketHideoutB4F.asm deleted file mode 100755 index ba746951..00000000 --- a/data/mapObjects/RocketHideoutB4F.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideoutB4F_Object: - db $2e ; border block - - db 3 ; warps - warp 19, 10, 1, ROCKET_HIDEOUT_B3F - warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR - warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 9 ; objects - object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - 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_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 - object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY - - ; warp-to - warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F - warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/mapObjects/RocketHideoutElevator.asm deleted file mode 100755 index bc4fd7ff..00000000 --- a/data/mapObjects/RocketHideoutElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -RocketHideoutElevator_Object: - db $f ; border block - - db 2 ; warps - warp 2, 1, 2, ROCKET_HIDEOUT_B1F - warp 3, 1, 4, ROCKET_HIDEOUT_B1F - - db 1 ; signs - sign 1, 1, 1 ; RocketHideoutElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/Route1.asm b/data/mapObjects/Route1.asm deleted file mode 100755 index 0815fe67..00000000 --- a/data/mapObjects/Route1.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route1_Object: - db $b ; border block - - db 0 ; warps - - db 1 ; signs - sign 9, 27, 3 ; Route1Text3 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person - object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person - - ; warp-to (unused) - warp_to 2, 7, 4 diff --git a/data/mapObjects/Route10.asm b/data/mapObjects/Route10.asm deleted file mode 100755 index 12850577..00000000 --- a/data/mapObjects/Route10.asm +++ /dev/null @@ -1,28 +0,0 @@ -Route10_Object: - db $2c ; border block - - db 4 ; warps - warp 11, 19, 0, ROCK_TUNNEL_POKECENTER - warp 8, 17, 0, ROCK_TUNNEL_1F - warp 8, 53, 2, ROCK_TUNNEL_1F - warp 6, 39, 0, POWER_PLANT - - db 4 ; signs - sign 7, 19, 7 ; Route10Text7 - sign 12, 19, 8 ; PokeCenterSignText - sign 9, 55, 9 ; Route10Text9 - sign 5, 41, 10 ; Route10Text10 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 - object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 - object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 - - ; warp-to - warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F - warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F - warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/Route11.asm b/data/mapObjects/Route11.asm deleted file mode 100755 index a72bf347..00000000 --- a/data/mapObjects/Route11.asm +++ /dev/null @@ -1,31 +0,0 @@ -Route11_Object: - db $f ; border block - - db 5 ; warps - warp 49, 8, 0, ROUTE_11_GATE_1F - warp 49, 9, 0, ROUTE_11_GATE_1F - warp 58, 8, 2, ROUTE_11_GATE_1F - warp 58, 9, 2, ROUTE_11_GATE_1F - warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 - - db 1 ; signs - sign 1, 5, 11 ; Route11Text11 - - db 10 ; objects - object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 - object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 - object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 - object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 - object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 - object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 - object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 - object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 - - ; warp-to - warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/Route11Gate1F.asm b/data/mapObjects/Route11Gate1F.asm deleted file mode 100755 index 5c4a120c..00000000 --- a/data/mapObjects/Route11Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route11Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_11_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/Route11Gate2F.asm b/data/mapObjects/Route11Gate2F.asm deleted file mode 100755 index bf305bba..00000000 --- a/data/mapObjects/Route11Gate2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route11Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_11_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route11GateUpstairsText3 - sign 6, 2, 4 ; Route11GateUpstairsText4 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/Route12.asm b/data/mapObjects/Route12.asm deleted file mode 100755 index 8043b5db..00000000 --- a/data/mapObjects/Route12.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route12_Object: - db $43 ; border block - - db 4 ; warps - warp 10, 15, 0, 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 - - db 2 ; signs - sign 13, 13, 11 ; Route12Text11 - sign 11, 63, 12 ; Route12Text12 - - db 10 ; objects - object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person - object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 - object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 - object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 - object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 - object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 - object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16 - object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON - - ; warp-to - warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/mapObjects/Route12Gate1F.asm b/data/mapObjects/Route12Gate1F.asm deleted file mode 100755 index 94f6b91a..00000000 --- a/data/mapObjects/Route12Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route12Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 4, 0, 0, -1 - warp 5, 0, 1, -1 - warp 4, 7, 2, -1 - warp 5, 7, 2, -1 - warp 8, 6, 0, ROUTE_12_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/Route12Gate2F.asm b/data/mapObjects/Route12Gate2F.asm deleted file mode 100755 index cc6c1c19..00000000 --- a/data/mapObjects/Route12Gate2F.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_12_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route12GateUpstairsText2 - sign 6, 2, 3 ; Route12GateUpstairsText3 - - db 1 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/mapObjects/Route12SuperRodHouse.asm deleted file mode 100755 index 458378a2..00000000 --- a/data/mapObjects/Route12SuperRodHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12SuperRodHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH - warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/Route13.asm b/data/mapObjects/Route13.asm deleted file mode 100755 index 3f460901..00000000 --- a/data/mapObjects/Route13.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route13_Object: - db $43 ; border block - - db 0 ; warps - - db 3 ; signs - sign 15, 13, 11 ; Route13Text11 - sign 33, 5, 12 ; Route13Text12 - sign 31, 11, 13 ; Route13Text13 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 - object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 - object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 - object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 - object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 - object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/mapObjects/Route14.asm b/data/mapObjects/Route14.asm deleted file mode 100755 index 565e587f..00000000 --- a/data/mapObjects/Route14.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route14_Object: - db $43 ; border block - - db 0 ; warps - - db 1 ; signs - sign 17, 13, 11 ; Route14Text11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 - object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 - object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 - object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 diff --git a/data/mapObjects/Route15.asm b/data/mapObjects/Route15.asm deleted file mode 100755 index 10cd8090..00000000 --- a/data/mapObjects/Route15.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route15_Object: - db $43 ; border block - - db 4 ; warps - warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 0, ROUTE_15_GATE_1F - warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 2, ROUTE_15_GATE_1F - - db 1 ; signs - sign 39, 9, 12 ; Route15Text12 - - db 11 ; objects - object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 - object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 - object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 - object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 - object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 - - ; warp-to - warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route15Gate1F.asm b/data/mapObjects/Route15Gate1F.asm deleted file mode 100755 index 23b1f5a7..00000000 --- a/data/mapObjects/Route15Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route15Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_15_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/Route15Gate2F.asm b/data/mapObjects/Route15Gate2F.asm deleted file mode 100755 index 162f2b1f..00000000 --- a/data/mapObjects/Route15Gate2F.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route15Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_15_GATE_1F - - db 1 ; signs - sign 6, 2, 2 ; Route15GateUpstairsText2 - - db 1 ; objects - object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 - - ; warp-to - warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route16.asm b/data/mapObjects/Route16.asm deleted file mode 100755 index 93531d13..00000000 --- a/data/mapObjects/Route16.asm +++ /dev/null @@ -1,37 +0,0 @@ -Route16_Object: - db $f ; border block - - db 9 ; warps - warp 17, 10, 0, ROUTE_16_GATE_1F - warp 17, 11, 0, ROUTE_16_GATE_1F - warp 24, 10, 2, ROUTE_16_GATE_1F - warp 24, 11, 2, ROUTE_16_GATE_1F - warp 17, 4, 4, ROUTE_16_GATE_1F - warp 17, 5, 4, ROUTE_16_GATE_1F - warp 24, 4, 6, ROUTE_16_GATE_1F - warp 24, 5, 6, ROUTE_16_GATE_1F - warp 7, 5, 0, ROUTE_16_FLY_HOUSE - - db 2 ; signs - sign 27, 11, 8 ; Route16Text8 - sign 5, 17, 9 ; Route16Text9 - - db 7 ; objects - object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 - object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 - object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 - object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 - object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 - object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/mapObjects/Route16FlyHouse.asm deleted file mode 100755 index ec493fef..00000000 --- a/data/mapObjects/Route16FlyHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16FlyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH - warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH diff --git a/data/mapObjects/Route16Gate1F.asm b/data/mapObjects/Route16Gate1F.asm deleted file mode 100755 index 1d5baa1d..00000000 --- a/data/mapObjects/Route16Gate1F.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route16Gate1F_Object: - db $a ; border block - - db 9 ; warps - warp 0, 8, 0, -1 - warp 0, 9, 1, -1 - warp 7, 8, 2, -1 - warp 7, 9, 2, -1 - warp 0, 2, 4, -1 - warp 0, 3, 5, -1 - warp 7, 2, 6, -1 - warp 7, 3, 7, -1 - warp 6, 12, 0, ROUTE_16_GATE_2F - - db 0 ; signs - - db 2 ; objects - object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person - object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/Route16Gate2F.asm b/data/mapObjects/Route16Gate2F.asm deleted file mode 100755 index 5914f854..00000000 --- a/data/mapObjects/Route16Gate2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 8, ROUTE_16_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route16GateUpstairsText3 - sign 6, 2, 4 ; Route16GateUpstairsText4 - - db 2 ; objects - object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/Route17.asm b/data/mapObjects/Route17.asm deleted file mode 100755 index f5bc4307..00000000 --- a/data/mapObjects/Route17.asm +++ /dev/null @@ -1,24 +0,0 @@ -Route17_Object: - db $43 ; border block - - db 0 ; warps - - db 6 ; signs - sign 9, 51, 11 ; Route17Text11 - sign 9, 63, 12 ; Route17Text12 - sign 9, 75, 13 ; Route17Text13 - sign 9, 87, 14 ; Route17Text14 - sign 9, 111, 15 ; Route17Text15 - sign 9, 141, 16 ; Route17Text16 - - db 10 ; objects - object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 - object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 - object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 - object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 - object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 - object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 - object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 - object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 - object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 - object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 diff --git a/data/mapObjects/Route18.asm b/data/mapObjects/Route18.asm deleted file mode 100755 index dc6cc6b6..00000000 --- a/data/mapObjects/Route18.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route18_Object: - db $43 ; border block - - db 4 ; warps - warp 33, 8, 0, ROUTE_18_GATE_1F - warp 33, 9, 0, ROUTE_18_GATE_1F - warp 40, 8, 2, ROUTE_18_GATE_1F - warp 40, 9, 2, ROUTE_18_GATE_1F - - db 2 ; signs - sign 43, 7, 4 ; Route18Text4 - sign 33, 5, 5 ; Route18Text5 - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 - - ; warp-to - warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route18Gate1F.asm b/data/mapObjects/Route18Gate1F.asm deleted file mode 100755 index 83cb386a..00000000 --- a/data/mapObjects/Route18Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route18Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_18_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/Route18Gate2F.asm b/data/mapObjects/Route18Gate2F.asm deleted file mode 100755 index 1981a7f0..00000000 --- a/data/mapObjects/Route18Gate2F.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route18Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_18_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route18GateUpstairsText2 - sign 6, 2, 3 ; Route18GateUpstairsText3 - - db 1 ; objects - object SPRITE_COOK, 4, 2, WALK, 2, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route19.asm b/data/mapObjects/Route19.asm deleted file mode 100755 index d1b3034b..00000000 --- a/data/mapObjects/Route19.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route19_Object: - db $43 ; border block - - db 1 ; warps - warp 5, 9, 0, BEACH_HOUSE - - db 1 ; signs - sign 11, 11, 11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 9, 7, STAY, RIGHT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 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, 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 - object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 - - ; warp-to - warp_to 5, 9, ROUTE_19_WIDTH ; BEACH_HOUSE diff --git a/data/mapObjects/Route2.asm b/data/mapObjects/Route2.asm deleted file mode 100755 index 9595fec0..00000000 --- a/data/mapObjects/Route2.asm +++ /dev/null @@ -1,36 +0,0 @@ -Route2_Object: - db $f ; border block - - db 7 ; warps - warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 - warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE - warp 15, 19, 0, ROUTE_2_TRADE_HOUSE - 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 - - db 2 ; signs - sign 5, 65, 3 ; Route2Text3 - sign 11, 11, 4 ; Route2Text4 - - db 2 ; objects - object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE - object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP - - ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE - warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 17, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE - - ; unused - warp_to 2, 7, 4 - dw $c712 - db $9, $7 - warp_to 2, 7, 4 - warp_to 2, 7, 4 - warp_to 2, 7, 4 diff --git a/data/mapObjects/Route20.asm b/data/mapObjects/Route20.asm deleted file mode 100755 index 7bceef97..00000000 --- a/data/mapObjects/Route20.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route20_Object: - db $43 ; border block - - db 2 ; warps - warp 48, 5, 0, SEAFOAM_ISLANDS_1F - warp 58, 9, 2, SEAFOAM_ISLANDS_1F - - db 2 ; signs - sign 51, 7, 11 ; Route20Text11 - sign 57, 11, 12 ; Route20Text12 - - db 10 ; objects - object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 - object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 - object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 - object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 - object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 - object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 - object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 - object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 - object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 - object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 - - ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/Route21.asm b/data/mapObjects/Route21.asm deleted file mode 100755 index b7759b59..00000000 --- a/data/mapObjects/Route21.asm +++ /dev/null @@ -1,17 +0,0 @@ -Route21_Object: - db $43 ; border block - - db 0 ; warps - - db 0 ; signs - - db 9 ; objects - object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 - object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 - object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 - object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 - object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 - object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 - object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 - object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 - object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/mapObjects/Route22.asm b/data/mapObjects/Route22.asm deleted file mode 100755 index 56e759fd..00000000 --- a/data/mapObjects/Route22.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route22_Object: - db $2c ; border block - - db 1 ; warps - warp 8, 5, 0, ROUTE_22_GATE - - db 1 ; signs - sign 7, 11, 3 ; Route22FrontGateText - - db 2 ; objects - object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person - object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/Route22Gate.asm b/data/mapObjects/Route22Gate.asm deleted file mode 100755 index e59ca6cf..00000000 --- a/data/mapObjects/Route22Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route22Gate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 7, 0, -1 - warp 5, 7, 0, -1 - warp 4, 0, 0, -1 - warp 5, 0, 0, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 4, 7, ROUTE_22_GATE_WIDTH - warp_to 5, 7, ROUTE_22_GATE_WIDTH - warp_to 4, 0, ROUTE_22_GATE_WIDTH - warp_to 5, 0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/Route23.asm b/data/mapObjects/Route23.asm deleted file mode 100755 index b510c285..00000000 --- a/data/mapObjects/Route23.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route23_Object: - db $f ; border block - - db 4 ; warps - warp 7, 139, 2, ROUTE_22_GATE - warp 8, 139, 3, ROUTE_22_GATE - warp 4, 31, 0, VICTORY_ROAD_1F - warp 14, 31, 1, VICTORY_ROAD_2F - - db 1 ; signs - sign 3, 33, 8 ; Route23Text8 - - db 7 ; objects - object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person - object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person - object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person - object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person - object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person - object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person - object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/Route24.asm b/data/mapObjects/Route24.asm deleted file mode 100755 index 5f41c519..00000000 --- a/data/mapObjects/Route24.asm +++ /dev/null @@ -1,17 +0,0 @@ -Route24_Object: - db $2c ; border block - - db 0 ; warps - - db 0 ; signs - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 - object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 - object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 - object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 - object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9 diff --git a/data/mapObjects/Route25.asm b/data/mapObjects/Route25.asm deleted file mode 100755 index a85f85ca..00000000 --- a/data/mapObjects/Route25.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route25_Object: - db $2c ; border block - - db 1 ; warps - warp 45, 3, 0, BILLS_HOUSE - - db 1 ; signs - sign 43, 3, 11 ; Route25Text11 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 - object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 - object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 - object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 - object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 - object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19 - - ; warp-to - warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/Route2Gate.asm b/data/mapObjects/Route2Gate.asm deleted file mode 100755 index a7feb780..00000000 --- a/data/mapObjects/Route2Gate.asm +++ /dev/null @@ -1,20 +0,0 @@ -Route2Gate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, -1 - warp 5, 0, 3, -1 - warp 4, 7, 4, -1 - warp 5, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 0, ROUTE_2_GATE_WIDTH - warp_to 5, 0, ROUTE_2_GATE_WIDTH - warp_to 4, 7, ROUTE_2_GATE_WIDTH - warp_to 5, 7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/mapObjects/Route2TradeHouse.asm deleted file mode 100755 index 29948d6b..00000000 --- a/data/mapObjects/Route2TradeHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route2TradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person - object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/Route3.asm b/data/mapObjects/Route3.asm deleted file mode 100755 index 372ea6cf..00000000 --- a/data/mapObjects/Route3.asm +++ /dev/null @@ -1,18 +0,0 @@ -Route3_Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 59, 9, 10 ; Route3Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 - object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 - object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/mapObjects/Route4.asm b/data/mapObjects/Route4.asm deleted file mode 100755 index 4ab88f8f..00000000 --- a/data/mapObjects/Route4.asm +++ /dev/null @@ -1,22 +0,0 @@ -Route4_Object: - db $2c ; border block - - db 3 ; warps - warp 11, 5, 0, MT_MOON_POKECENTER - warp 18, 5, 0, MT_MOON_1F - warp 24, 5, 7, MT_MOON_B1F - - db 3 ; signs - sign 12, 5, 4 ; PokeCenterSignText - sign 17, 7, 5 ; Route4Text5 - sign 27, 7, 6 ; Route4Text6 - - db 3 ; objects - object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person - object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 - object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04 - - ; warp-to - warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER - warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F - warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/Route5.asm b/data/mapObjects/Route5.asm deleted file mode 100755 index fd74edf6..00000000 --- a/data/mapObjects/Route5.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route5_Object: - db $a ; border block - - db 5 ; warps - 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 - warp 10, 21, 0, DAYCARE - - db 1 ; signs - sign 17, 29, 1 ; Route5Text1 - - db 0 ; objects - - ; warp-to - warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5 - warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE diff --git a/data/mapObjects/Route5Gate.asm b/data/mapObjects/Route5Gate.asm deleted file mode 100755 index e0e06a1d..00000000 --- a/data/mapObjects/Route5Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route5Gate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 0, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_5_GATE_WIDTH - warp_to 4, 5, ROUTE_5_GATE_WIDTH - warp_to 3, 0, ROUTE_5_GATE_WIDTH - warp_to 4, 0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/Route6.asm b/data/mapObjects/Route6.asm deleted file mode 100755 index 13825be1..00000000 --- a/data/mapObjects/Route6.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route6_Object: - db $f ; border block - - db 4 ; warps - warp 9, 1, 2, ROUTE_6_GATE - warp 10, 1, 2, ROUTE_6_GATE - warp 10, 7, 0, ROUTE_6_GATE - warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 - - db 1 ; signs - sign 19, 15, 7 ; Route6Text7 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 10 - object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 25 - object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 - - ; warp-to - warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/Route6Gate.asm b/data/mapObjects/Route6Gate.asm deleted file mode 100755 index 8ed96d04..00000000 --- a/data/mapObjects/Route6Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route6Gate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_6_GATE_WIDTH - warp_to 4, 5, ROUTE_6_GATE_WIDTH - warp_to 3, 0, ROUTE_6_GATE_WIDTH - warp_to 4, 0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/Route7.asm b/data/mapObjects/Route7.asm deleted file mode 100755 index 3da2fd4b..00000000 --- a/data/mapObjects/Route7.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route7_Object: - db $f ; border block - - db 5 ; warps - warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 2, ROUTE_7_GATE - warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 0, ROUTE_7_GATE - warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 - - db 1 ; signs - sign 3, 13, 1 ; Route7Text1 - - db 0 ; objects - - ; warp-to - warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7 diff --git a/data/mapObjects/Route7Gate.asm b/data/mapObjects/Route7Gate.asm deleted file mode 100755 index c9dc8dca..00000000 --- a/data/mapObjects/Route7Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route7Gate_Object: - db $a ; border block - - db 4 ; warps - warp 0, 3, 3, -1 - warp 0, 4, 3, -1 - warp 5, 3, 1, -1 - warp 5, 4, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_7_GATE_WIDTH - warp_to 0, 4, ROUTE_7_GATE_WIDTH - warp_to 5, 3, ROUTE_7_GATE_WIDTH - warp_to 5, 4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/Route8.asm b/data/mapObjects/Route8.asm deleted file mode 100755 index 2fc0045c..00000000 --- a/data/mapObjects/Route8.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route8_Object: - db $2c ; border block - - db 5 ; warps - warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 0, ROUTE_8_GATE - warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 2, ROUTE_8_GATE - warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 - - db 1 ; signs - sign 17, 3, 10 ; Route8Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 - object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 - object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 - object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 - object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 - object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 - - ; warp-to - warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/Route8Gate.asm b/data/mapObjects/Route8Gate.asm deleted file mode 100755 index 008a0fcb..00000000 --- a/data/mapObjects/Route8Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route8Gate_Object: - db $a ; border block - - db 4 ; warps - warp 0, 3, 1, -1 - warp 0, 4, 1, -1 - warp 5, 3, 3, -1 - warp 5, 4, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_8_GATE_WIDTH - warp_to 0, 4, ROUTE_8_GATE_WIDTH - warp_to 5, 3, ROUTE_8_GATE_WIDTH - warp_to 5, 4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/Route9.asm b/data/mapObjects/Route9.asm deleted file mode 100755 index c531cf7a..00000000 --- a/data/mapObjects/Route9.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route9_Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 25, 7, 11 ; Route9Text11 - - db 10 ; objects - object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_YOUNGSTER, 14 - object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 - object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 - object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 - object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 - object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 - object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 - object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30 diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm deleted file mode 100755 index 3e454f06..00000000 --- a/data/mapObjects/SSAnne1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -SSAnne1F_Object: - db $c ; border block - - db 11 ; warps - warp 26, 0, 1, VERMILION_DOCK - warp 27, 0, 1, VERMILION_DOCK - warp 31, 8, 0, SS_ANNE_1F_ROOMS - warp 23, 8, 1, SS_ANNE_1F_ROOMS - warp 19, 8, 2, SS_ANNE_1F_ROOMS - warp 15, 8, 3, SS_ANNE_1F_ROOMS - warp 11, 8, 4, SS_ANNE_1F_ROOMS - warp 7, 8, 5, SS_ANNE_1F_ROOMS - warp 2, 6, 6, SS_ANNE_2F - warp 37, 15, 5, SS_ANNE_B1F - warp 3, 16, 0, SS_ANNE_KITCHEN - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person - object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F - warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F - warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/mapObjects/SSAnne1FRooms.asm deleted file mode 100755 index fcd36532..00000000 --- a/data/mapObjects/SSAnne1FRooms.asm +++ /dev/null @@ -1,33 +0,0 @@ -SSAnne1FRooms_Object: - db $c ; border block - - db 6 ; warps - warp 0, 0, 2, SS_ANNE_1F - warp 10, 0, 3, SS_ANNE_1F - warp 20, 0, 4, SS_ANNE_1F - warp 0, 10, 5, SS_ANNE_1F - warp 10, 10, 6, SS_ANNE_1F - warp 20, 10, 7, SS_ANNE_1F - - db 0 ; signs - - db 11 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 - object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 - object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 - object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person - object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person - object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_JIGGLYPUFF, 3, 11, STAY, DOWN, 8 ; person - object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person - object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 - object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person - - ; warp-to - warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm deleted file mode 100755 index 6abd5ac4..00000000 --- a/data/mapObjects/SSAnne2F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SSAnne2F_Object: - db $c ; border block - - db 9 ; warps - warp 9, 11, 0, SS_ANNE_2F_ROOMS - warp 13, 11, 2, SS_ANNE_2F_ROOMS - warp 17, 11, 4, SS_ANNE_2F_ROOMS - warp 21, 11, 6, SS_ANNE_2F_ROOMS - warp 25, 11, 8, SS_ANNE_2F_ROOMS - warp 29, 11, 10, SS_ANNE_2F_ROOMS - warp 2, 4, 8, SS_ANNE_1F - warp 2, 12, 1, SS_ANNE_3F - warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person - object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 - - ; warp-to - warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F - warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F - warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm deleted file mode 100755 index ebb053a8..00000000 --- a/data/mapObjects/SSAnne2FRooms.asm +++ /dev/null @@ -1,47 +0,0 @@ -SSAnne2FRooms_Object: - db $c ; border block - - db 12 ; warps - warp 2, 5, 0, SS_ANNE_2F - warp 3, 5, 0, SS_ANNE_2F - warp 12, 5, 1, SS_ANNE_2F - warp 13, 5, 1, SS_ANNE_2F - warp 22, 5, 2, SS_ANNE_2F - warp 23, 5, 2, SS_ANNE_2F - warp 2, 15, 3, SS_ANNE_2F - warp 3, 15, 3, SS_ANNE_2F - warp 12, 15, 4, SS_ANNE_2F - warp 13, 15, 4, SS_ANNE_2F - warp 22, 15, 5, SS_ANNE_2F - warp 23, 15, 5, SS_ANNE_2F - - db 0 ; signs - - db 13 ; objects - object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 - object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 - object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER - object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY - object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person - object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person - - ; warp-to - warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm deleted file mode 100755 index f0bfc17b..00000000 --- a/data/mapObjects/SSAnne3F.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne3F_Object: - db $c ; border block - - db 2 ; warps - warp 0, 3, 0, SS_ANNE_BOW - warp 19, 3, 7, SS_ANNE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person - - ; warp-to - warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW - warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm deleted file mode 100755 index fe54ea24..00000000 --- a/data/mapObjects/SSAnneB1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -SSAnneB1F_Object: - db $c ; border block - - db 6 ; warps - warp 23, 3, 8, SS_ANNE_B1F_ROOMS - warp 19, 3, 6, SS_ANNE_B1F_ROOMS - warp 15, 3, 4, SS_ANNE_B1F_ROOMS - warp 11, 3, 2, SS_ANNE_B1F_ROOMS - warp 7, 3, 0, SS_ANNE_B1F_ROOMS - warp 27, 5, 9, SS_ANNE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm deleted file mode 100755 index 1d31b89c..00000000 --- a/data/mapObjects/SSAnneB1FRooms.asm +++ /dev/null @@ -1,41 +0,0 @@ -SSAnneB1FRooms_Object: - db $c ; border block - - db 10 ; warps - warp 2, 5, 4, SS_ANNE_B1F - warp 3, 5, 4, SS_ANNE_B1F - warp 12, 5, 3, SS_ANNE_B1F - warp 13, 5, 3, SS_ANNE_B1F - warp 22, 5, 2, SS_ANNE_B1F - warp 23, 5, 2, SS_ANNE_B1F - warp 2, 15, 1, SS_ANNE_B1F - warp 3, 15, 1, SS_ANNE_B1F - warp 12, 15, 0, SS_ANNE_B1F - warp 13, 15, 0, SS_ANNE_B1F - - db 0 ; signs - - db 11 ; objects - object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 - object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 - object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 - object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 - object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 - object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 - object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person - object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person - object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 - object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION - - ; warp-to - warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F diff --git a/data/mapObjects/SSAnneBow.asm b/data/mapObjects/SSAnneBow.asm deleted file mode 100755 index 8873c8f8..00000000 --- a/data/mapObjects/SSAnneBow.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnneBow_Object: - db $23 ; border block - - db 2 ; warps - warp 13, 6, 0, SS_ANNE_3F - warp 13, 7, 0, SS_ANNE_3F - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person - object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person - object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 - object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 - - ; warp-to - warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F - warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/mapObjects/SSAnneCaptainsRoom.asm deleted file mode 100755 index 545656cc..00000000 --- a/data/mapObjects/SSAnneCaptainsRoom.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnneCaptainsRoom_Object: - db $c ; border block - - db 1 ; warps - warp 0, 7, 8, SS_ANNE_2F - - db 2 ; signs - sign 4, 1, 2 ; SSAnne7Text2 - sign 1, 2, 3 ; SSAnne7Text3 - - db 1 ; objects - object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person - - ; warp-to - warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/mapObjects/SSAnneKitchen.asm deleted file mode 100755 index b5771e68..00000000 --- a/data/mapObjects/SSAnneKitchen.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnneKitchen_Object: - db $c ; border block - - db 1 ; warps - warp 6, 0, 10, SS_ANNE_1F - - db 0 ; signs - - db 7 ; objects - object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person - object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person - object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person - object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person - object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person - object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person - object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person - - ; warp-to - warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/mapObjects/SafariZoneCenter.asm deleted file mode 100755 index e54cec74..00000000 --- a/data/mapObjects/SafariZoneCenter.asm +++ /dev/null @@ -1,31 +0,0 @@ -SafariZoneCenter_Object: - db $0 ; border block - - db 9 ; warps - warp 14, 25, 2, SAFARI_ZONE_GATE - warp 15, 25, 3, SAFARI_ZONE_GATE - warp 0, 10, 4, SAFARI_ZONE_WEST - warp 0, 11, 5, SAFARI_ZONE_WEST - warp 14, 0, 4, SAFARI_ZONE_NORTH - warp 15, 0, 5, SAFARI_ZONE_NORTH - warp 29, 10, 2, SAFARI_ZONE_EAST - warp 29, 11, 3, SAFARI_ZONE_EAST - warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE - - db 2 ; signs - sign 18, 20, 2 ; SafariZoneCenterText2 - sign 14, 22, 3 ; SafariZoneCenterText3 - - db 1 ; objects - object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET - - ; warp-to - warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE - warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE - warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm deleted file mode 100755 index 9eda9970..00000000 --- a/data/mapObjects/SafariZoneCenterRestHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -SafariZoneCenterRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_CENTER - warp 3, 7, 8, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneEast.asm b/data/mapObjects/SafariZoneEast.asm deleted file mode 100755 index df612ea9..00000000 --- a/data/mapObjects/SafariZoneEast.asm +++ /dev/null @@ -1,27 +0,0 @@ -SafariZoneEast_Object: - db $0 ; border block - - db 5 ; warps - warp 0, 4, 6, SAFARI_ZONE_NORTH - warp 0, 5, 7, SAFARI_ZONE_NORTH - warp 0, 22, 6, SAFARI_ZONE_CENTER - warp 0, 23, 6, SAFARI_ZONE_CENTER - warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE - - db 3 ; signs - sign 26, 10, 5 ; SafariZoneEastText5 - sign 6, 4, 6 ; SafariZoneEastText6 - sign 5, 23, 7 ; SafariZoneEastText7 - - db 4 ; objects - object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION - object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS - object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37 - - ; warp-to - warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/mapObjects/SafariZoneEastRestHouse.asm deleted file mode 100755 index e7c68343..00000000 --- a/data/mapObjects/SafariZoneEastRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneEastRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, SAFARI_ZONE_EAST - warp 3, 7, 4, SAFARI_ZONE_EAST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person - object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST - warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/SafariZoneGate.asm b/data/mapObjects/SafariZoneGate.asm deleted file mode 100755 index 6749b45b..00000000 --- a/data/mapObjects/SafariZoneGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneGate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 4, -1 - warp 4, 5, 4, -1 - warp 3, 0, 0, SAFARI_ZONE_CENTER - warp 4, 0, 1, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person - object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH - warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH - warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/mapObjects/SafariZoneNorth.asm deleted file mode 100755 index 9eda7b4b..00000000 --- a/data/mapObjects/SafariZoneNorth.asm +++ /dev/null @@ -1,35 +0,0 @@ -SafariZoneNorth_Object: - db $0 ; border block - - db 9 ; warps - warp 2, 35, 0, SAFARI_ZONE_WEST - warp 3, 35, 1, SAFARI_ZONE_WEST - warp 8, 35, 2, SAFARI_ZONE_WEST - warp 9, 35, 3, SAFARI_ZONE_WEST - warp 20, 35, 4, SAFARI_ZONE_CENTER - warp 21, 35, 5, SAFARI_ZONE_CENTER - warp 39, 30, 0, SAFARI_ZONE_EAST - warp 39, 31, 1, SAFARI_ZONE_EAST - warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE - - db 5 ; signs - sign 36, 4, 3 ; SafariZoneNorthText3 - sign 4, 25, 4 ; SafariZoneNorthText4 - sign 13, 31, 5 ; SafariZoneNorthText5 - sign 19, 33, 6 ; SafariZoneNorthText6 - sign 26, 28, 7 ; SafariZoneNorthText7 - - db 2 ; objects - object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN - object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40 - - ; warp-to - warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm deleted file mode 100755 index 34b3ab4f..00000000 --- a/data/mapObjects/SafariZoneNorthRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneNorthRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_NORTH - warp 3, 7, 8, SAFARI_ZONE_NORTH - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person - object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH - warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm deleted file mode 100755 index 2a5fc22d..00000000 --- a/data/mapObjects/SafariZoneSecretHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -SafariZoneSecretHouse_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 6, SAFARI_ZONE_WEST - warp 3, 7, 6, SAFARI_ZONE_WEST - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SafariZoneWest.asm b/data/mapObjects/SafariZoneWest.asm deleted file mode 100755 index 7faced72..00000000 --- a/data/mapObjects/SafariZoneWest.asm +++ /dev/null @@ -1,34 +0,0 @@ -SafariZoneWest_Object: - db $0 ; border block - - db 8 ; warps - warp 20, 0, 0, SAFARI_ZONE_NORTH - warp 21, 0, 1, SAFARI_ZONE_NORTH - warp 26, 0, 2, SAFARI_ZONE_NORTH - warp 27, 0, 3, SAFARI_ZONE_NORTH - warp 29, 22, 2, SAFARI_ZONE_CENTER - warp 29, 23, 3, SAFARI_ZONE_CENTER - warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE - warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE - - db 4 ; signs - sign 12, 12, 5 ; SafariZoneWestText5 - sign 17, 3, 6 ; SafariZoneWestText6 - sign 26, 4, 7 ; SafariZoneWestText7 - sign 24, 22, 8 ; SafariZoneWestText8 - - db 4 ; objects - object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION - object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32 - object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE - object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH - - ; warp-to - warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/mapObjects/SafariZoneWestRestHouse.asm deleted file mode 100755 index 9f1bc0ed..00000000 --- a/data/mapObjects/SafariZoneWestRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneWestRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, SAFARI_ZONE_WEST - warp 3, 7, 7, SAFARI_ZONE_WEST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person - object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SaffronCity.asm b/data/mapObjects/SaffronCity.asm deleted file mode 100755 index fd8ed6b1..00000000 --- a/data/mapObjects/SaffronCity.asm +++ /dev/null @@ -1,50 +0,0 @@ -SaffronCity_Object: - db $f ; border block - - db 8 ; warps - warp 7, 5, 0, COPYCATS_HOUSE_1F - warp 26, 3, 0, FIGHTING_DOJO - warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE - warp 25, 11, 0, SAFFRON_MART - warp 18, 21, 0, SILPH_CO_1F - warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, MR_PSYCHICS_HOUSE - - db 10 ; signs - sign 17, 5, 16 ; SaffronCityText16 - sign 27, 5, 17 ; SaffronCityText17 - sign 35, 5, 18 ; SaffronCityText18 - sign 26, 11, 19 ; MartSignText - sign 39, 19, 20 ; SaffronCityText20 - sign 5, 21, 21 ; SaffronCityText21 - sign 15, 21, 22 ; SaffronCityText22 - sign 10, 29, 23 ; PokeCenterSignText - sign 27, 29, 24 ; SaffronCityText24 - sign 1, 19, 25 ; SaffronCityText25 - - db 14 ; objects - object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person - object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person - object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person - object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person - object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person - object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person - object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person - object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person - object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person - 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 - - ; warp-to - warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F - warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO - warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM - warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE - warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART - warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F - warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER - warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE diff --git a/data/mapObjects/SaffronGym.asm b/data/mapObjects/SaffronGym.asm deleted file mode 100755 index 4cb80bcd..00000000 --- a/data/mapObjects/SaffronGym.asm +++ /dev/null @@ -1,83 +0,0 @@ -SaffronGym_Object: - db $2e ; border block - - db 32 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 3, 22, SAFFRON_GYM - warp 5, 3, 15, SAFFRON_GYM - warp 1, 5, 18, SAFFRON_GYM - warp 5, 5, 8, SAFFRON_GYM - warp 1, 9, 27, SAFFRON_GYM - warp 5, 9, 16, SAFFRON_GYM - warp 1, 11, 5, SAFFRON_GYM - warp 5, 11, 13, SAFFRON_GYM - warp 1, 15, 23, SAFFRON_GYM - warp 5, 15, 30, SAFFRON_GYM - warp 1, 17, 17, SAFFRON_GYM - warp 5, 17, 9, SAFFRON_GYM - warp 9, 3, 26, SAFFRON_GYM - warp 11, 3, 3, SAFFRON_GYM - warp 9, 5, 7, SAFFRON_GYM - warp 11, 5, 12, SAFFRON_GYM - warp 11, 11, 4, SAFFRON_GYM - warp 11, 15, 31, SAFFRON_GYM - warp 15, 3, 24, SAFFRON_GYM - warp 19, 3, 28, SAFFRON_GYM - warp 15, 5, 2, SAFFRON_GYM - warp 19, 5, 10, SAFFRON_GYM - warp 15, 9, 20, SAFFRON_GYM - warp 19, 9, 29, SAFFRON_GYM - warp 15, 11, 14, SAFFRON_GYM - warp 19, 11, 6, SAFFRON_GYM - warp 15, 15, 21, SAFFRON_GYM - warp 19, 15, 25, SAFFRON_GYM - warp 15, 17, 11, SAFFRON_GYM - warp 19, 17, 19, SAFFRON_GYM - - db 0 ; signs - - db 9 ; objects - object SPRITE_LASS, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 - object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 - object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 - object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 - object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 8, 17, SAFFRON_GYM_WIDTH - warp_to 9, 17, SAFFRON_GYM_WIDTH - warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/SaffronMart.asm b/data/mapObjects/SaffronMart.asm deleted file mode 100755 index c376f2de..00000000 --- a/data/mapObjects/SaffronMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -SaffronMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_MART_WIDTH - warp_to 4, 7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/mapObjects/SaffronPidgeyHouse.asm deleted file mode 100755 index 65a851bf..00000000 --- a/data/mapObjects/SaffronPidgeyHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -SaffronPidgeyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person - object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH - warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/mapObjects/SaffronPokecenter.asm deleted file mode 100755 index db28f048..00000000 --- a/data/mapObjects/SaffronPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -SaffronPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_POKECENTER_WIDTH - warp_to 4, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm deleted file mode 100755 index 67b3f0e5..00000000 --- a/data/mapObjects/SeafoamIslands1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslands1F_Object: - db $7d ; border block - - db 7 ; warps - warp 4, 17, 0, -1 - warp 5, 17, 0, -1 - warp 26, 17, 1, -1 - warp 27, 17, 1, -1 - warp 7, 5, 1, SEAFOAM_ISLANDS_B1F - warp 25, 3, 6, SEAFOAM_ISLANDS_B1F - warp 23, 15, 4, SEAFOAM_ISLANDS_B1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm deleted file mode 100755 index 426ca0c3..00000000 --- a/data/mapObjects/SeafoamIslandsB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslandsB1F_Object: - db $7d ; border block - - db 7 ; warps - warp 4, 2, 0, SEAFOAM_ISLANDS_B2F - warp 7, 5, 4, SEAFOAM_ISLANDS_1F - warp 13, 7, 2, SEAFOAM_ISLANDS_B2F - warp 19, 15, 3, SEAFOAM_ISLANDS_B2F - warp 23, 15, 6, SEAFOAM_ISLANDS_1F - warp 25, 11, 5, SEAFOAM_ISLANDS_B2F - warp 25, 3, 5, SEAFOAM_ISLANDS_1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm deleted file mode 100755 index 9c1a7898..00000000 --- a/data/mapObjects/SeafoamIslandsB2F.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslandsB2F_Object: - db $7d ; border block - - db 7 ; warps - warp 5, 3, 0, SEAFOAM_ISLANDS_B1F - warp 5, 13, 0, SEAFOAM_ISLANDS_B3F - warp 13, 7, 2, SEAFOAM_ISLANDS_B1F - warp 19, 15, 3, SEAFOAM_ISLANDS_B1F - warp 25, 3, 3, SEAFOAM_ISLANDS_B3F - warp 25, 11, 5, SEAFOAM_ISLANDS_B1F - warp 25, 14, 4, SEAFOAM_ISLANDS_B3F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm deleted file mode 100755 index d194e1cd..00000000 --- a/data/mapObjects/SeafoamIslandsB3F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslandsB3F_Object: - db $7d ; border block - - db 7 ; warps - warp 5, 12, 1, SEAFOAM_ISLANDS_B2F - warp 8, 6, 2, SEAFOAM_ISLANDS_B4F - warp 25, 4, 3, SEAFOAM_ISLANDS_B4F - warp 25, 3, 4, SEAFOAM_ISLANDS_B2F - warp 25, 14, 6, SEAFOAM_ISLANDS_B2F - warp 20, 17, 0, SEAFOAM_ISLANDS_B4F - warp 21, 17, 1, SEAFOAM_ISLANDS_B4F - - db 0 ; signs - - db 6 ; objects - object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person - object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person - - ; warp-to - warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm deleted file mode 100755 index 62d88b0c..00000000 --- a/data/mapObjects/SeafoamIslandsB4F.asm +++ /dev/null @@ -1,23 +0,0 @@ -SeafoamIslandsB4F_Object: - db $7d ; border block - - db 4 ; warps - warp 20, 17, 5, SEAFOAM_ISLANDS_B3F - warp 21, 17, 6, SEAFOAM_ISLANDS_B3F - warp 11, 7, 1, SEAFOAM_ISLANDS_B3F - warp 25, 4, 2, SEAFOAM_ISLANDS_B3F - - db 2 ; signs - sign 9, 15, 4 ; SeafoamIslands5Text4 - sign 23, 1, 5 ; SeafoamIslands5Text5 - - db 3 ; objects - object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person - object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person - object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 - - ; warp-to - warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SilphCo10F.asm b/data/mapObjects/SilphCo10F.asm deleted file mode 100755 index 1c8948d3..00000000 --- a/data/mapObjects/SilphCo10F.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo10F_Object: - db $2e ; border block - - db 6 ; warps - warp 8, 0, 0, SILPH_CO_9F - warp 10, 0, 0, SILPH_CO_11F - warp 12, 0, 0, SILPH_CO_ELEVATOR - warp 9, 11, 3, SILPH_CO_4F - warp 13, 15, 5, SILPH_CO_4F - warp 13, 7, 6, SILPH_CO_4F - - db 0 ; signs - - db 6 ; objects - object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 - object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 - object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person - object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 - object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY - object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS - - ; warp-to - warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F - warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F - warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/SilphCo11F.asm b/data/mapObjects/SilphCo11F.asm deleted file mode 100755 index ec6331b2..00000000 --- a/data/mapObjects/SilphCo11F.asm +++ /dev/null @@ -1,24 +0,0 @@ -SilphCo11F_Object: - db $d ; border block - - db 4 ; warps - warp 9, 0, 1, SILPH_CO_10F - warp 13, 0, 0, SILPH_CO_ELEVATOR - warp 5, 5, 9, -1 - warp 3, 2, 3, SILPH_CO_7F - - db 0 ; signs - - db 6 ; objects - object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person - object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - 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 - - ; warp-to - warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F - warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 5, SILPH_CO_11F_WIDTH - warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/SilphCo1F.asm b/data/mapObjects/SilphCo1F.asm deleted file mode 100755 index fc040091..00000000 --- a/data/mapObjects/SilphCo1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -SilphCo1F_Object: - db $2e ; border block - - db 5 ; warps - warp 10, 17, 5, -1 - warp 11, 17, 5, -1 - warp 26, 0, 0, SILPH_CO_2F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 16, 10, 6, SILPH_CO_3F - - db 0 ; signs - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 10, 17, SILPH_CO_1F_WIDTH - warp_to 11, 17, SILPH_CO_1F_WIDTH - warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo2F.asm b/data/mapObjects/SilphCo2F.asm deleted file mode 100755 index bc30d78d..00000000 --- a/data/mapObjects/SilphCo2F.asm +++ /dev/null @@ -1,29 +0,0 @@ -SilphCo2F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 2, SILPH_CO_1F - warp 26, 0, 0, SILPH_CO_3F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 6, SILPH_CO_3F - warp 13, 3, 4, SILPH_CO_8F - warp 27, 15, 5, SILPH_CO_8F - warp 9, 15, 4, SILPH_CO_6F - - db 0 ; signs - - db 5 ; objects - object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person - object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 - object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 - object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 - - ; warp-to - warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F - warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/SilphCo3F.asm b/data/mapObjects/SilphCo3F.asm deleted file mode 100755 index f45cdf81..00000000 --- a/data/mapObjects/SilphCo3F.asm +++ /dev/null @@ -1,34 +0,0 @@ -SilphCo3F_Object: - db $2e ; border block - - db 10 ; warps - warp 26, 0, 1, SILPH_CO_2F - warp 24, 0, 0, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 23, 11, 9, SILPH_CO_3F - warp 3, 3, 5, SILPH_CO_5F - warp 3, 15, 6, SILPH_CO_5F - warp 27, 3, 3, SILPH_CO_2F - warp 3, 11, 3, SILPH_CO_9F - warp 11, 11, 4, SILPH_CO_7F - warp 27, 15, 3, SILPH_CO_3F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 - object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION - - ; warp-to - warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F - warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F - warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F - warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo4F.asm b/data/mapObjects/SilphCo4F.asm deleted file mode 100755 index 3d865bbc..00000000 --- a/data/mapObjects/SilphCo4F.asm +++ /dev/null @@ -1,31 +0,0 @@ -SilphCo4F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_3F - warp 26, 0, 1, SILPH_CO_5F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 11, 7, 3, SILPH_CO_10F - warp 17, 3, 3, SILPH_CO_6F - warp 3, 15, 4, SILPH_CO_10F - warp 17, 11, 5, SILPH_CO_10F - - db 0 ; signs - - db 7 ; objects - object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 - object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 - object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 - object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL - object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE - object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE - - ; warp-to - warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F - warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F - warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F - warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/SilphCo5F.asm b/data/mapObjects/SilphCo5F.asm deleted file mode 100755 index c10f17c8..00000000 --- a/data/mapObjects/SilphCo5F.asm +++ /dev/null @@ -1,35 +0,0 @@ -SilphCo5F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_6F - warp 26, 0, 1, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 27, 3, 5, SILPH_CO_7F - warp 9, 15, 4, SILPH_CO_9F - warp 11, 5, 4, SILPH_CO_3F - warp 3, 15, 5, SILPH_CO_3F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 - object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 - object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 - object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 - object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 - object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN - object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY - object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person - object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person - object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person - - ; warp-to - warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F - warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F - warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F - warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F - warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo6F.asm b/data/mapObjects/SilphCo6F.asm deleted file mode 100755 index ad2ac32f..00000000 --- a/data/mapObjects/SilphCo6F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SilphCo6F_Object: - db $2e ; border block - - db 5 ; warps - warp 16, 0, 1, SILPH_CO_7F - warp 14, 0, 0, SILPH_CO_5F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 4, SILPH_CO_4F - warp 23, 3, 6, SILPH_CO_2F - - db 0 ; signs - - db 10 ; objects - object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person - object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person - object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person - object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person - object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 - object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 - object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 - object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY - - ; warp-to - warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F - warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F - warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F - warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/SilphCo7F.asm b/data/mapObjects/SilphCo7F.asm deleted file mode 100755 index 255f4b33..00000000 --- a/data/mapObjects/SilphCo7F.asm +++ /dev/null @@ -1,33 +0,0 @@ -SilphCo7F_Object: - db $2e ; border block - - db 6 ; warps - warp 16, 0, 1, SILPH_CO_8F - warp 22, 0, 0, SILPH_CO_6F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 5, 7, 3, SILPH_CO_11F - warp 5, 3, 8, SILPH_CO_3F - warp 21, 15, 3, SILPH_CO_5F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person - object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person - object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 - object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 - object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 - object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person - object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM - object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03 - - ; warp-to - warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F - warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F - warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F - warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F - warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCo8F.asm b/data/mapObjects/SilphCo8F.asm deleted file mode 100755 index d05c7844..00000000 --- a/data/mapObjects/SilphCo8F.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo8F_Object: - db $2e ; border block - - db 7 ; warps - warp 16, 0, 1, SILPH_CO_9F - warp 14, 0, 0, SILPH_CO_7F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 11, 6, SILPH_CO_8F - warp 3, 15, 4, SILPH_CO_2F - warp 11, 5, 5, SILPH_CO_2F - warp 11, 9, 3, SILPH_CO_8F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 - object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 - object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 - - ; warp-to - warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F - warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F - warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F - warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/SilphCo9F.asm b/data/mapObjects/SilphCo9F.asm deleted file mode 100755 index 28ef5f10..00000000 --- a/data/mapObjects/SilphCo9F.asm +++ /dev/null @@ -1,24 +0,0 @@ -SilphCo9F_Object: - db $2e ; border block - - db 5 ; warps - warp 14, 0, 0, SILPH_CO_10F - warp 16, 0, 0, SILPH_CO_8F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 9, 3, 7, SILPH_CO_3F - warp 17, 15, 4, SILPH_CO_5F - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 - object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 - - ; warp-to - warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F - warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F - warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F - warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCoElevator.asm b/data/mapObjects/SilphCoElevator.asm deleted file mode 100755 index 9c4b5a79..00000000 --- a/data/mapObjects/SilphCoElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -SilphCoElevator_Object: - db $f ; border block - - db 2 ; warps - warp 1, 3, 0, 237 - warp 2, 3, 0, 237 - - db 1 ; signs - sign 3, 0, 1 ; SilphCoElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH - warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/TradeCenter.asm b/data/mapObjects/TradeCenter.asm deleted file mode 100644 index e6df8087..00000000 --- a/data/mapObjects/TradeCenter.asm +++ /dev/null @@ -1,9 +0,0 @@ -TradeCenter_Object: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm deleted file mode 100755 index 35e21cca..00000000 --- a/data/mapObjects/UndergroundPathNorthSouth.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathNorthSouth_Object: - db $1 ; border block - - db 2 ; warps - warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 - warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5 - warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm deleted file mode 100755 index af71ebb4..00000000 --- a/data/mapObjects/UndergroundPathRoute5.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute5_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm deleted file mode 100755 index 5a40ade2..00000000 --- a/data/mapObjects/UndergroundPathRoute6.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute6_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm deleted file mode 100755 index 4666e0c9..00000000 --- a/data/mapObjects/UndergroundPathRoute7.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute7_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm deleted file mode 100755 index c020646e..00000000 --- a/data/mapObjects/UndergroundPathRoute7Copy.asm +++ /dev/null @@ -1,18 +0,0 @@ -UndergroundPathRoute7Copy_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm deleted file mode 100755 index 8be0d474..00000000 --- a/data/mapObjects/UndergroundPathRoute8.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute8_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm deleted file mode 100755 index fa064aca..00000000 --- a/data/mapObjects/UndergroundPathWestEast.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathWestEast_Object: - db $1 ; border block - - db 2 ; warps - warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 - warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7 - warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/VermilionCity.asm b/data/mapObjects/VermilionCity.asm deleted file mode 100755 index 646f126a..00000000 --- a/data/mapObjects/VermilionCity.asm +++ /dev/null @@ -1,42 +0,0 @@ -VermilionCity_Object: - db $43 ; border block - - db 9 ; warps - warp 11, 3, 0, VERMILION_POKECENTER - warp 9, 13, 0, POKEMON_FAN_CLUB - warp 23, 13, 0, VERMILION_MART - warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_PIDGEY_HOUSE - warp 18, 31, 0, VERMILION_DOCK - warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_TRADE_HOUSE - warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE - - db 7 ; signs - 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 - - db 7 ; objects - object SPRITE_LASS, 19, 7, WALK, 2, 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_SLOWBRO, 29, 9, WALK, 1, 5 ; person - object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person - object SPRITE_OFFICER_JENNY, 19, 15, STAY, NONE, 7 ; person - - ; warp-to - warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER - warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB - warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART - warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM - warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE - warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE - warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE diff --git a/data/mapObjects/VermilionDock.asm b/data/mapObjects/VermilionDock.asm deleted file mode 100755 index 6f07554a..00000000 --- a/data/mapObjects/VermilionDock.asm +++ /dev/null @@ -1,14 +0,0 @@ -VermilionDock_Object: - db $f ; border block - - db 2 ; warps - warp 14, 0, 5, -1 - warp 14, 2, 1, SS_ANNE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 14, 0, VERMILION_DOCK_WIDTH - warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/VermilionGym.asm b/data/mapObjects/VermilionGym.asm deleted file mode 100755 index 4ace83be..00000000 --- a/data/mapObjects/VermilionGym.asm +++ /dev/null @@ -1,19 +0,0 @@ -VermilionGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 3, -1 - warp 5, 17, 3, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 - object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 - object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 4, 17, VERMILION_GYM_WIDTH - warp_to 5, 17, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/VermilionMart.asm b/data/mapObjects/VermilionMart.asm deleted file mode 100755 index 74bcf35f..00000000 --- a/data/mapObjects/VermilionMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person - object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, VERMILION_MART_WIDTH - warp_to 4, 7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/mapObjects/VermilionOldRodHouse.asm deleted file mode 100755 index f5b4b96a..00000000 --- a/data/mapObjects/VermilionOldRodHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionOldRodHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH - warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/mapObjects/VermilionPidgeyHouse.asm deleted file mode 100755 index 0e820f86..00000000 --- a/data/mapObjects/VermilionPidgeyHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionPidgeyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person - object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person - object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH - warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/mapObjects/VermilionPokecenter.asm deleted file mode 100755 index a99bdf28..00000000 --- a/data/mapObjects/VermilionPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -VermilionPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, VERMILION_POKECENTER_WIDTH - warp_to 4, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/mapObjects/VermilionTradeHouse.asm deleted file mode 100755 index fcf8a8e9..00000000 --- a/data/mapObjects/VermilionTradeHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionTradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GENTLEMAN, 3, 5, STAY, UP, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH - warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/mapObjects/VictoryRoad1F.asm deleted file mode 100755 index cc0c47ce..00000000 --- a/data/mapObjects/VictoryRoad1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -VictoryRoad1F_Object: - db $7d ; border block - - db 3 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 1, 0, VICTORY_ROAD_2F - - db 0 ; signs - - db 7 ; objects - object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43 - object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY - object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - - ; warp-to - warp_to 8, 17, VICTORY_ROAD_1F_WIDTH - warp_to 9, 17, VICTORY_ROAD_1F_WIDTH - warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/mapObjects/VictoryRoad2F.asm deleted file mode 100755 index 55559bca..00000000 --- a/data/mapObjects/VictoryRoad2F.asm +++ /dev/null @@ -1,37 +0,0 @@ -VictoryRoad2F_Object: - db $7d ; border block - - db 7 ; warps - warp 0, 8, 2, VICTORY_ROAD_1F - warp 29, 7, 3, -1 - warp 29, 8, 3, -1 - warp 23, 7, 0, VICTORY_ROAD_3F - warp 25, 14, 2, VICTORY_ROAD_3F - warp 27, 7, 1, VICTORY_ROAD_3F - warp 1, 1, 3, VICTORY_ROAD_3F - - db 0 ; signs - - db 13 ; objects - object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 - object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 - object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17 - object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL - object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05 - object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC - object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person - - ; warp-to - warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F - warp_to 29, 7, VICTORY_ROAD_2F_WIDTH - warp_to 29, 8, VICTORY_ROAD_2F_WIDTH - warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/mapObjects/VictoryRoad3F.asm deleted file mode 100755 index 2eb42417..00000000 --- a/data/mapObjects/VictoryRoad3F.asm +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad3F_Object: - db $7d ; border block - - db 4 ; warps - warp 23, 7, 3, VICTORY_ROAD_2F - warp 26, 8, 5, VICTORY_ROAD_2F - warp 27, 15, 4, VICTORY_ROAD_2F - warp 2, 0, 6, VICTORY_ROAD_2F - - db 0 ; signs - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE - object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47 - object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person - object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person - object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person - - ; warp-to - warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/ViridianCity.asm b/data/mapObjects/ViridianCity.asm deleted file mode 100755 index 9a2a554d..00000000 --- a/data/mapObjects/ViridianCity.asm +++ /dev/null @@ -1,34 +0,0 @@ -ViridianCity_Object: - db $f ; border block - - db 5 ; warps - warp 23, 25, 0, VIRIDIAN_POKECENTER - warp 29, 19, 0, VIRIDIAN_MART - warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE - warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE - warp 32, 7, 0, VIRIDIAN_GYM - - db 6 ; signs - 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 - - db 8 ; objects - object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person - object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person - object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person - object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person - object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person - object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person - object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person - object SPRITE_GAMBLER, 18, 9, STAY, NONE, 8 - - ; warp-to - warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER - warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART - warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE - warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE - warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/ViridianForest.asm b/data/mapObjects/ViridianForest.asm deleted file mode 100755 index 94f74b96..00000000 --- a/data/mapObjects/ViridianForest.asm +++ /dev/null @@ -1,38 +0,0 @@ -ViridianForest_Object: - db $3 ; border block - - db 6 ; warps - warp 1, 0, 2, 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 - - db 6 ; signs - 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 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_LASS, 2, 41, STAY, NONE, 5, OPP_LASS, 19 - object SPRITE_BUG_CATCHER, 13, 17, STAY, RIGHT, 6, OPP_BUG_CATCHER, 15 - object SPRITE_BALL, 25, 11, STAY, NONE, 7, POTION - object SPRITE_BALL, 12, 29, STAY, NONE, 8, POTION - object SPRITE_BALL, 1, 31, STAY, NONE, 9, POKE_BALL - object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 10 ; person - - ; warp-to - warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/mapObjects/ViridianForestNorthGate.asm deleted file mode 100755 index 81e7fece..00000000 --- a/data/mapObjects/ViridianForestNorthGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestNorthGate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 1, -1 - warp 5, 0, 1, -1 - warp 4, 7, 0, VIRIDIAN_FOREST - warp 5, 7, 0, VIRIDIAN_FOREST - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person - object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH - warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH - warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/mapObjects/ViridianForestSouthGate.asm deleted file mode 100755 index 47432513..00000000 --- a/data/mapObjects/ViridianForestSouthGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestSouthGate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 3, VIRIDIAN_FOREST - warp 4, 7, 5, -1 - warp 5, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH - warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH diff --git a/data/mapObjects/ViridianGym.asm b/data/mapObjects/ViridianGym.asm deleted file mode 100755 index e3fd17bd..00000000 --- a/data/mapObjects/ViridianGym.asm +++ /dev/null @@ -1,25 +0,0 @@ -ViridianGym_Object: - db $3 ; border block - - db 2 ; warps - warp 16, 17, 4, -1 - warp 17, 17, 4, -1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 - object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 - object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 - object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 - object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 - object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person - object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE - - ; warp-to - warp_to 16, 17, VIRIDIAN_GYM_WIDTH - warp_to 17, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/ViridianMart.asm b/data/mapObjects/ViridianMart.asm deleted file mode 100755 index b3e7fee5..00000000 --- a/data/mapObjects/ViridianMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -ViridianMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 1, -1 - warp 4, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_MART_WIDTH - warp_to 4, 7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/mapObjects/ViridianNicknameHouse.asm deleted file mode 100755 index aaf20a91..00000000 --- a/data/mapObjects/ViridianNicknameHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -ViridianNicknameHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person - object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person - object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/mapObjects/ViridianPokecenter.asm deleted file mode 100755 index 70024ede..00000000 --- a/data/mapObjects/ViridianPokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -ViridianPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, UP, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH - warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/mapObjects/ViridianSchoolHouse.asm deleted file mode 100755 index 29b0614c..00000000 --- a/data/mapObjects/ViridianSchoolHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -ViridianSchoolHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person - object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person - object SPRITE_LITTLE_GIRL, 4, 5, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH diff --git a/data/mapObjects/WardensHouse.asm b/data/mapObjects/WardensHouse.asm deleted file mode 100755 index d8445738..00000000 --- a/data/mapObjects/WardensHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -WardensHouse_Object: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 3, -1 - warp 5, 7, 3, -1 - - db 2 ; signs - sign 4, 3, 4 ; FuchsiaHouse2Text4 - sign 5, 3, 5 ; FuchsiaHouse2Text5 - - db 3 ; objects - object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY - object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - - ; warp-to - warp_to 4, 7, WARDENS_HOUSE_WIDTH - warp_to 5, 7, WARDENS_HOUSE_WIDTH diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm deleted file mode 100644 index f52f0d5f..00000000 --- a/data/map_header_banks.asm +++ /dev/null @@ -1,251 +0,0 @@ -; see also MapHeaderPointers -MapHeaderBanks: - db BANK(PalletTown_h) - db BANK(ViridianCity_h) - db BANK(PewterCity_h) - db BANK(CeruleanCity_h) - db BANK(LavenderTown_h) - db BANK(VermilionCity_h) - db BANK(CeladonCity_h) - db BANK(FuchsiaCity_h) - db BANK(CinnabarIsland_h) - db BANK(IndigoPlateau_h) - db BANK(SaffronCity_h) - db $01 ; UNUSED_MAP_0B - db BANK(Route1_h) - db BANK(Route2_h) - db BANK(Route3_h) - db BANK(Route4_h) - db BANK(Route5_h) - db BANK(Route6_h) - db BANK(Route7_h) - db BANK(Route8_h) - db BANK(Route9_h) - db BANK(Route10_h) - db BANK(Route11_h) - db BANK(Route12_h) - db BANK(Route13_h) - db BANK(Route14_h) - db BANK(Route15_h) - db BANK(Route16_h) - db BANK(Route17_h) - db BANK(Route18_h) - db BANK(Route19_h) - db BANK(Route20_h) - db BANK(Route21_h) - db BANK(Route22_h) - db BANK(Route23_h) - db BANK(Route24_h) - db BANK(Route25_h) - db BANK(RedsHouse1F_h) - db BANK(RedsHouse2F_h) - db BANK(BluesHouse_h) - db BANK(OaksLab_h) - db BANK(ViridianPokecenter_h) - db BANK(ViridianMart_h) - db BANK(ViridianSchoolHouse_h) - db BANK(ViridianNicknameHouse_h) - db BANK(ViridianGym_h) - db BANK(DiglettsCaveRoute2_h) - db BANK(ViridianForestNorthGate_h) - db BANK(Route2TradeHouse_h) - db BANK(Route2Gate_h) - db BANK(ViridianForestSouthGate_h) - db BANK(ViridianForest_h) - db BANK(Museum1F_h) - db BANK(Museum2F_h) - db BANK(PewterGym_h) - db BANK(PewterNidoranHouse_h) - db BANK(PewterMart_h) - db BANK(PewterSpeechHouse_h) - db BANK(PewterPokecenter_h) - db BANK(MtMoon1F_h) - db BANK(MtMoonB1F_h) - db BANK(MtMoonB2F_h) - db BANK(CeruleanTrashedHouse_h) - db BANK(CeruleanTradeHouse_h) - db BANK(CeruleanPokecenter_h) - db BANK(CeruleanGym_h) - db BANK(BikeShop_h) - db BANK(CeruleanMart_h) - db BANK(MtMoonPokecenter_h) - db BANK(CeruleanTrashedHouse_h) - db BANK(Route5Gate_h) - db BANK(UndergroundPathRoute5_h) - db BANK(Daycare_h) - db BANK(Route6Gate_h) - db BANK(UndergroundPathRoute6_h) - db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY - db BANK(Route7Gate_h) - db BANK(UndergroundPathRoute7_h) - db BANK(UndergroundPathRoute7Copy_h) - db BANK(Route8Gate_h) - db BANK(UndergroundPathRoute8_h) - db BANK(RockTunnelPokecenter_h) - db BANK(RockTunnel1F_h) - db BANK(PowerPlant_h) - db BANK(Route11Gate1F_h) - db BANK(DiglettsCaveRoute11_h) - db BANK(Route11Gate2F_h) - db BANK(Route12Gate1F_h) - db BANK(BillsHouse_h) - db BANK(VermilionPokecenter_h) - db BANK(PokemonFanClub_h) - db BANK(VermilionMart_h) - db BANK(VermilionGym_h) - db BANK(VermilionPidgeyHouse_h) - db BANK(VermilionDock_h) - db BANK(SSAnne1F_h) - db BANK(SSAnne2F_h) - db BANK(SSAnne3F_h) - db BANK(SSAnneB1F_h) - db BANK(SSAnneBow_h) - db BANK(SSAnneKitchen_h) - db BANK(SSAnneCaptainsRoom_h) - db BANK(SSAnne1FRooms_h) - db BANK(SSAnne2FRooms_h) - db BANK(SSAnneB1FRooms_h) - db $1D ; UNUSED_MAP_69 - db $1D ; UNUSED_MAP_6A - db $1D ; UNUSED_MAP_6B - db BANK(VictoryRoad1F_h) - db $1D ; UNUSED_MAP_6D - db $1D ; UNUSED_MAP_6E - db $1D ; UNUSED_MAP_6F - db $1D ; UNUSED_MAP_70 - db BANK(LancesRoom_h) - db $1D ; UNUSED_MAP_72 - db $1D ; UNUSED_MAP_73 - db $1D ; UNUSED_MAP_74 - db $1D ; UNUSED_MAP_75 - db BANK(HallOfFame_h) - db BANK(UndergroundPathNorthSouth_h) - db BANK(ChampionsRoom_h) - db BANK(UndergroundPathWestEast_h) - db BANK(CeladonMart1F_h) - db BANK(CeladonMart2F_h) - db BANK(CeladonMart3F_h) - db BANK(CeladonMart4F_h) - db BANK(CeladonMartRoof_h) - db BANK(CeladonMartElevator_h) - db BANK(CeladonMansion1F_h) - db BANK(CeladonMansion2F_h) - db BANK(CeladonMansion3F_h) - db BANK(CeladonMansionRoof_h) - db BANK(CeladonMansionRoofHouse_h) - db BANK(CeladonPokecenter_h) - db BANK(CeladonGym_h) - db BANK(GameCorner_h) - db BANK(CeladonMart5F_h) - db BANK(GameCornerPrizeRoom_h) - db BANK(CeladonDiner_h) - db BANK(CeladonChiefHouse_h) - db BANK(CeladonHotel_h) - db BANK(LavenderPokecenter_h) - db BANK(PokemonTower1F_h) - db BANK(PokemonTower2F_h) - db BANK(PokemonTower3F_h) - db BANK(PokemonTower4F_h) - db BANK(PokemonTower5F_h) - db BANK(PokemonTower6F_h) - db BANK(PokemonTower7F_h) - db BANK(MrFujisHouse_h) - db BANK(LavenderMart_h) - db BANK(LavenderCuboneHouse_h) - db BANK(FuchsiaMart_h) - db BANK(FuchsiaBillsGrandpasHouse_h) - db BANK(FuchsiaPokecenter_h) - db BANK(WardensHouse_h) - db BANK(SafariZoneGate_h) - db BANK(FuchsiaGym_h) - db BANK(FuchsiaMeetingRoom_h) - db BANK(SeafoamIslandsB1F_h) - db BANK(SeafoamIslandsB2F_h) - db BANK(SeafoamIslandsB3F_h) - db BANK(SeafoamIslandsB4F_h) - db BANK(VermilionOldRodHouse_h) - db BANK(FuchsiaGoodRodHouse_h) - db BANK(PokemonMansion1F_h) - db BANK(CinnabarGym_h) - db BANK(CinnabarLab_h) - db BANK(CinnabarLabTradeRoom_h) - db BANK(CinnabarLabMetronomeRoom_h) - db BANK(CinnabarLabFossilRoom_h) - db BANK(CinnabarPokecenter_h) - db BANK(CinnabarMart_h) - db BANK(CinnabarMart_h) - db BANK(IndigoPlateauLobby_h) - db BANK(CopycatsHouse1F_h) - db BANK(CopycatsHouse2F_h) - db BANK(FightingDojo_h) - db BANK(SaffronGym_h) - db BANK(SaffronPidgeyHouse_h) - db BANK(SaffronMart_h) - db BANK(SilphCo1F_h) - db BANK(SaffronPokecenter_h) - db BANK(MrPsychicsHouse_h) - db BANK(Route15Gate1F_h) - db BANK(Route15Gate2F_h) - db BANK(Route16Gate1F_h) - db BANK(Route16Gate2F_h) - db BANK(Route16FlyHouse_h) - db BANK(Route12SuperRodHouse_h) - db BANK(Route18Gate1F_h) - db BANK(Route18Gate2F_h) - db BANK(SeafoamIslands1F_h) - db BANK(Route22Gate_h) - db BANK(VictoryRoad2F_h) - db BANK(Route12Gate2F_h) - db BANK(VermilionTradeHouse_h) - db BANK(DiglettsCave_h) - db BANK(VictoryRoad3F_h) - db BANK(RocketHideoutB1F_h) - db BANK(RocketHideoutB2F_h) - db BANK(RocketHideoutB3F_h) - db BANK(RocketHideoutB4F_h) - db BANK(RocketHideoutElevator_h) - db $01 ; UNUSED_MAP_CC - db $01 ; UNUSED_MAP_CD - db $01 ; UNUSED_MAP_CE - db BANK(SilphCo2F_h) - db BANK(SilphCo3F_h) - db BANK(SilphCo4F_h) - db BANK(SilphCo5F_h) - db BANK(SilphCo6F_h) - db BANK(SilphCo7F_h) - db BANK(SilphCo8F_h) - db BANK(PokemonMansion2F_h) - db BANK(PokemonMansion3F_h) - db BANK(PokemonMansionB1F_h) - db BANK(SafariZoneEast_h) - db BANK(SafariZoneNorth_h) - db BANK(SafariZoneWest_h) - db BANK(SafariZoneCenter_h) - db BANK(SafariZoneCenterRestHouse_h) - db BANK(SafariZoneSecretHouse_h) - db BANK(SafariZoneWestRestHouse_h) - db BANK(SafariZoneEastRestHouse_h) - db BANK(SafariZoneNorthRestHouse_h) - db BANK(CeruleanCave2F_h) - db BANK(CeruleanCaveB1F_h) - db BANK(CeruleanCave1F_h) - db BANK(NameRatersHouse_h) - db BANK(CeruleanBadgeHouse_h) - db $01 ; UNUSED_MAP_E7 - db BANK(RockTunnelB1F_h) - db BANK(SilphCo9F_h) - db BANK(SilphCo10F_h) - db BANK(SilphCo11F_h) - db BANK(SilphCoElevator_h) - db $11 ; UNUSED_MAP_ED - db $11 ; UNUSED_MAP_EE - db BANK(TradeCenter_h) - db BANK(Colosseum_h) - db $11 ; UNUSED_MAP_F1 - db $11 ; UNUSED_MAP_F2 - db $11 ; UNUSED_MAP_F3 - db $11 ; UNUSED_MAP_F4 - db BANK(LoreleisRoom_h) - db BANK(BrunosRoom_h) - db BANK(AgathasRoom_h) - db BANK(BeachHouse_h) diff --git a/data/map_songs.asm b/data/map_songs.asm deleted file mode 100644 index 63417ade..00000000 --- a/data/map_songs.asm +++ /dev/null @@ -1,250 +0,0 @@ -MapSongBanks: - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY - db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY - db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU - db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B - db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 - db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_4 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_5 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_6 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_7 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_8 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_9 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_10 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_11 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_12 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_13 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_14 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_15 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_16 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_17 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_18 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_19 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_20 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_21 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_22 - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 - db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 - db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_1F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_2F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BLUES_HOUSE - db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OAKS_LAB - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_POKECENTER - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_MART - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_SCHOOL_HOUSE - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_NICKNAME_HOUSE - db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_GYM - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_NORTH_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_TRADE_HOUSE - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_SOUTH_GATE - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; VIRIDIAN_FOREST - db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_2F - db MUSIC_GYM, BANK(Music_Gym) ; PEWTER_GYM - db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_NIDORAN_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_MART - db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_SPEECH_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_POKECENTER - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_1F - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F - db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE - db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER - db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM - db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5 - db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7 - db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_8_GATE - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_8 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ROCK_TUNNEL_POKECENTER - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_1F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; POWER_PLANT - db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_1F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_11 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_1F - db MUSIC_CITIES2, BANK(Music_Cities2) ; BILLS_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_POKECENTER - db MUSIC_VERMILION, BANK(Music_Vermilion) ; POKEMON_FAN_CLUB - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_MART - db MUSIC_GYM, BANK(Music_Gym) ; VERMILION_GYM - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_PIDGEY_HOUSE - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VERMILION_DOCK - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_3F - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_BOW - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_KITCHEN - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_CAPTAINS_ROOM - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70 - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_WEST_EAST - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_1F - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_2F - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_3F - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_4F - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ROOF - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ELEVATOR - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_1F - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_2F - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_3F - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_POKECENTER - db MUSIC_GYM, BANK(Music_Gym) ; CELADON_GYM - db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; GAME_CORNER - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_5F - db MUSIC_CELADON, BANK(Music_Celadon) ; GAME_CORNER_PRIZE_ROOM - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_DINER - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CHIEF_HOUSE - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_HOTEL - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_POKECENTER - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_1F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_2F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_3F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_4F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_5F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_6F - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_7F - db MUSIC_LAVENDER, BANK(Music_Lavender) ; MR_FUJIS_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_MART - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_CUBONE_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_MART - db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_BILLS_GRANDPAS_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_POKECENTER - db MUSIC_CITIES2, BANK(Music_Cities2) ; WARDENS_HOUSE - db MUSIC_CITIES2, BANK(Music_Cities2) ; SAFARI_ZONE_GATE - db MUSIC_GYM, BANK(Music_Gym) ; FUCHSIA_GYM - db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_MEETING_ROOM - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B1F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B2F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B3F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B4F - db MUSIC_CITIES2, BANK(Music_Cities2) ; VERMILION_OLD_ROD_HOUSE - db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_GOOD_ROD_HOUSE - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_1F - db MUSIC_GYM, BANK(Music_Gym) ; CINNABAR_GYM - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_TRADE_ROOM - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_METRONOME_ROOM - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_FOSSIL_ROOM - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_POKECENTER - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_MART - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_MART_COPY - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU_LOBBY - db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; FIGHTING_DOJO - db MUSIC_GYM, BANK(Music_Gym) ; SAFFRON_GYM - db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_PIDGEY_HOUSE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_MART - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_1F - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_POKECENTER - db MUSIC_CITIES1, BANK(Music_Cities1) ; MR_PSYCHICS_HOUSE - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F - db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE - db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ROUTE_22_GATE - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_2F - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_TRADE_HOUSE - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_3F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B1F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B2F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B3F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B4F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_ELEVATOR - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CC - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CD - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CE - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_2F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_3F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_4F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_5F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_6F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_7F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_8F - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_2F - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_3F - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_B1F - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER_REST_HOUSE - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_SECRET_HOUSE - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST_REST_HOUSE - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST_REST_HOUSE - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH_REST_HOUSE - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_2F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_B1F - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F - db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE - db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE - db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER - db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 - 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/badge_maps.asm b/data/maps/badge_maps.asm new file mode 100644 index 00000000..6b68be02 --- /dev/null +++ b/data/maps/badge_maps.asm @@ -0,0 +1,10 @@ +MapBadgeFlags: + db PEWTER_GYM, 1 << BIT_BOULDERBADGE + db CERULEAN_GYM, 1 << BIT_CASCADEBADGE + db VERMILION_GYM, 1 << BIT_THUNDERBADGE + db CELADON_GYM, 1 << BIT_RAINBOWBADGE + db FUCHSIA_GYM, 1 << BIT_SOULBADGE + db SAFFRON_GYM, 1 << BIT_MARSHBADGE + db CINNABAR_GYM, 1 << BIT_VOLCANOBADGE + db VIRIDIAN_GYM, 1 << BIT_EARTHBADGE + db -1 ; end diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm new file mode 100644 index 00000000..d647923c --- /dev/null +++ b/data/maps/dungeon_maps.asm @@ -0,0 +1,27 @@ +; GetBattleTransitionID_IsDungeonMap fails to recognize +; VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, +; DIGLETTS_CAVE, and SILPH_CO_[9-11]F as dungeon maps + +; GetBattleTransitionID_IsDungeonMap checks if wCurMap +; is equal to one of these maps +DungeonMaps1: + db VIRIDIAN_FOREST + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F + db -1 ; end + +; GetBattleTransitionID_IsDungeonMap checks if wCurMap +; is in between or equal to each pair of maps +DungeonMaps2: + ; all MT_MOON maps + db MT_MOON_1F, MT_MOON_B2F + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F, HALL_OF_FAME + ; all POKEMON_TOWER maps and Lavender Town buildings + db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F + db SILPH_CO_2F, CERULEAN_CAVE_1F + db -1 ; end diff --git a/data/maps/force_bike_surf.asm b/data/maps/force_bike_surf.asm new file mode 100755 index 00000000..74eba325 --- /dev/null +++ b/data/maps/force_bike_surf.asm @@ -0,0 +1,15 @@ +force_bike_surf: MACRO + db \1, \3, \2 +ENDM + +ForcedBikeOrSurfMaps: + ; map id, x, y + force_bike_surf ROUTE_16, 17, 10 + force_bike_surf ROUTE_16, 17, 11 + force_bike_surf ROUTE_18, 33, 8 + force_bike_surf ROUTE_18, 33, 9 + force_bike_surf SEAFOAM_ISLANDS_B3F, 18, 7 + force_bike_surf SEAFOAM_ISLANDS_B3F, 19, 7 + force_bike_surf SEAFOAM_ISLANDS_B4F, 4, 14 + force_bike_surf SEAFOAM_ISLANDS_B4F, 5, 14 + db -1 ; end diff --git a/data/maps/headers/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm new file mode 100755 index 00000000..d04e0cfd --- /dev/null +++ b/data/maps/headers/AgathasRoom.asm @@ -0,0 +1,3 @@ + + map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0 + end_map_header diff --git a/data/mapHeaders/BeachHouse.asm b/data/maps/headers/BeachHouse.asm index b1b69e5a..b1b69e5a 100644 --- a/data/mapHeaders/BeachHouse.asm +++ b/data/maps/headers/BeachHouse.asm diff --git a/data/maps/headers/BikeShop.asm b/data/maps/headers/BikeShop.asm new file mode 100755 index 00000000..b4b520e2 --- /dev/null +++ b/data/maps/headers/BikeShop.asm @@ -0,0 +1,3 @@ + + map_header BikeShop, BIKE_SHOP, CLUB, 0 + end_map_header diff --git a/data/maps/headers/BillsHouse.asm b/data/maps/headers/BillsHouse.asm new file mode 100755 index 00000000..6063175d --- /dev/null +++ b/data/maps/headers/BillsHouse.asm @@ -0,0 +1,3 @@ + + map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/BluesHouse.asm b/data/maps/headers/BluesHouse.asm new file mode 100755 index 00000000..33cee254 --- /dev/null +++ b/data/maps/headers/BluesHouse.asm @@ -0,0 +1,3 @@ + + map_header BluesHouse, BLUES_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm new file mode 100755 index 00000000..a0b2d4fd --- /dev/null +++ b/data/maps/headers/BrunosRoom.asm @@ -0,0 +1,3 @@ + + map_header BrunosRoom, BRUNOS_ROOM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm new file mode 100755 index 00000000..34f17273 --- /dev/null +++ b/data/maps/headers/CeladonChiefHouse.asm @@ -0,0 +1,3 @@ + + map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm new file mode 100755 index 00000000..6faa6f48 --- /dev/null +++ b/data/maps/headers/CeladonCity.asm @@ -0,0 +1,5 @@ + + map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST + connection west, Route16, ROUTE_16, 4 + connection east, Route7, ROUTE_7, 4 + end_map_header diff --git a/data/maps/headers/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm new file mode 100755 index 00000000..b18d9633 --- /dev/null +++ b/data/maps/headers/CeladonDiner.asm @@ -0,0 +1,3 @@ + + map_header CeladonDiner, CELADON_DINER, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonGym.asm b/data/maps/headers/CeladonGym.asm new file mode 100755 index 00000000..2302c65a --- /dev/null +++ b/data/maps/headers/CeladonGym.asm @@ -0,0 +1,3 @@ + + map_header CeladonGym, CELADON_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm new file mode 100755 index 00000000..2339c14d --- /dev/null +++ b/data/maps/headers/CeladonHotel.asm @@ -0,0 +1,3 @@ + + map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm new file mode 100755 index 00000000..45970028 --- /dev/null +++ b/data/maps/headers/CeladonMansion1F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm new file mode 100755 index 00000000..d5e3e77b --- /dev/null +++ b/data/maps/headers/CeladonMansion2F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm new file mode 100755 index 00000000..7566caad --- /dev/null +++ b/data/maps/headers/CeladonMansion3F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm new file mode 100755 index 00000000..9cbae6f6 --- /dev/null +++ b/data/maps/headers/CeladonMansionRoof.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..cb80fac8 --- /dev/null +++ b/data/maps/headers/CeladonMansionRoofHouse.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm new file mode 100755 index 00000000..30bd9ba9 --- /dev/null +++ b/data/maps/headers/CeladonMart1F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm new file mode 100755 index 00000000..d78dfe28 --- /dev/null +++ b/data/maps/headers/CeladonMart2F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm new file mode 100755 index 00000000..ad415eee --- /dev/null +++ b/data/maps/headers/CeladonMart3F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm new file mode 100755 index 00000000..b9ce5b34 --- /dev/null +++ b/data/maps/headers/CeladonMart4F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm new file mode 100755 index 00000000..04d65b2b --- /dev/null +++ b/data/maps/headers/CeladonMart5F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm new file mode 100755 index 00000000..2a98ccb0 --- /dev/null +++ b/data/maps/headers/CeladonMartElevator.asm @@ -0,0 +1,3 @@ + + map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm new file mode 100755 index 00000000..823ff25f --- /dev/null +++ b/data/maps/headers/CeladonMartRoof.asm @@ -0,0 +1,3 @@ + + map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm new file mode 100755 index 00000000..378a41ec --- /dev/null +++ b/data/maps/headers/CeladonPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..47a97b14 --- /dev/null +++ b/data/maps/headers/CeruleanBadgeHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm new file mode 100755 index 00000000..7c80bbeb --- /dev/null +++ b/data/maps/headers/CeruleanCave1F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm new file mode 100755 index 00000000..353e265b --- /dev/null +++ b/data/maps/headers/CeruleanCave2F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm new file mode 100755 index 00000000..d759aa6b --- /dev/null +++ b/data/maps/headers/CeruleanCaveB1F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm new file mode 100755 index 00000000..c925713c --- /dev/null +++ b/data/maps/headers/CeruleanCity.asm @@ -0,0 +1,7 @@ + + map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + connection north, Route24, ROUTE_24, 5 + connection south, Route5, ROUTE_5, 5 + connection west, Route4, ROUTE_4, 4 + connection east, Route9, ROUTE_9, 4 + end_map_header diff --git a/data/maps/headers/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm new file mode 100755 index 00000000..b1010ac3 --- /dev/null +++ b/data/maps/headers/CeruleanGym.asm @@ -0,0 +1,3 @@ + + map_header CeruleanGym, CERULEAN_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm new file mode 100755 index 00000000..2ee31666 --- /dev/null +++ b/data/maps/headers/CeruleanMart.asm @@ -0,0 +1,3 @@ + + map_header CeruleanMart, CERULEAN_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm new file mode 100755 index 00000000..b79e7aff --- /dev/null +++ b/data/maps/headers/CeruleanPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm new file mode 100755 index 00000000..20970b77 --- /dev/null +++ b/data/maps/headers/CeruleanTradeHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..192a4195 --- /dev/null +++ b/data/maps/headers/CeruleanTrashedHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm new file mode 100755 index 00000000..aadc70a6 --- /dev/null +++ b/data/maps/headers/ChampionsRoom.asm @@ -0,0 +1,3 @@ + + map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0 + end_map_header diff --git a/data/maps/headers/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm new file mode 100755 index 00000000..cc6dc1d7 --- /dev/null +++ b/data/maps/headers/CinnabarGym.asm @@ -0,0 +1,3 @@ + + map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm new file mode 100755 index 00000000..a94498be --- /dev/null +++ b/data/maps/headers/CinnabarIsland.asm @@ -0,0 +1,5 @@ + + map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST + connection north, Route21, ROUTE_21, 0 + connection east, Route20, ROUTE_20, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm new file mode 100755 index 00000000..e8081e75 --- /dev/null +++ b/data/maps/headers/CinnabarLab.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLab, CINNABAR_LAB, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..3cb88437 --- /dev/null +++ b/data/maps/headers/CinnabarLabFossilRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..d77338c8 --- /dev/null +++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..c23d9c15 --- /dev/null +++ b/data/maps/headers/CinnabarLabTradeRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm new file mode 100755 index 00000000..c68d582a --- /dev/null +++ b/data/maps/headers/CinnabarMart.asm @@ -0,0 +1,3 @@ + + map_header CinnabarMart, CINNABAR_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm new file mode 100755 index 00000000..d910133b --- /dev/null +++ b/data/maps/headers/CinnabarPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/Colosseum.asm b/data/maps/headers/Colosseum.asm new file mode 100755 index 00000000..faf03eb4 --- /dev/null +++ b/data/maps/headers/Colosseum.asm @@ -0,0 +1,3 @@ + + map_header Colosseum, COLOSSEUM, CLUB, 0 + end_map_header diff --git a/data/maps/headers/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm new file mode 100755 index 00000000..532cef93 --- /dev/null +++ b/data/maps/headers/CopycatsHouse1F.asm @@ -0,0 +1,3 @@ + + map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0 + end_map_header diff --git a/data/maps/headers/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm new file mode 100755 index 00000000..38b1fbbb --- /dev/null +++ b/data/maps/headers/CopycatsHouse2F.asm @@ -0,0 +1,3 @@ + + map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0 + end_map_header diff --git a/data/maps/headers/Daycare.asm b/data/maps/headers/Daycare.asm new file mode 100755 index 00000000..dabeedd9 --- /dev/null +++ b/data/maps/headers/Daycare.asm @@ -0,0 +1,3 @@ + + map_header Daycare, DAYCARE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm new file mode 100755 index 00000000..d3777d31 --- /dev/null +++ b/data/maps/headers/DiglettsCave.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..d8bdd704 --- /dev/null +++ b/data/maps/headers/DiglettsCaveRoute11.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..86f5ae35 --- /dev/null +++ b/data/maps/headers/DiglettsCaveRoute2.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm new file mode 100755 index 00000000..7ecadc57 --- /dev/null +++ b/data/maps/headers/FightingDojo.asm @@ -0,0 +1,3 @@ + + map_header FightingDojo, FIGHTING_DOJO, DOJO, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..10ba48e9 --- /dev/null +++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm new file mode 100755 index 00000000..6028bce0 --- /dev/null +++ b/data/maps/headers/FuchsiaCity.asm @@ -0,0 +1,6 @@ + + map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST + connection south, Route19, ROUTE_19, 5 + connection west, Route18, ROUTE_18, 4 + connection east, Route15, ROUTE_15, 4 + end_map_header diff --git a/data/maps/headers/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..d21611c1 --- /dev/null +++ b/data/maps/headers/FuchsiaGoodRodHouse.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm new file mode 100755 index 00000000..44be2971 --- /dev/null +++ b/data/maps/headers/FuchsiaGym.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm new file mode 100755 index 00000000..120fe305 --- /dev/null +++ b/data/maps/headers/FuchsiaMart.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaMart, FUCHSIA_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..a5ab4f04 --- /dev/null +++ b/data/maps/headers/FuchsiaMeetingRoom.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm new file mode 100755 index 00000000..c1c683bd --- /dev/null +++ b/data/maps/headers/FuchsiaPokecenter.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/GameCorner.asm b/data/maps/headers/GameCorner.asm new file mode 100755 index 00000000..ad367b93 --- /dev/null +++ b/data/maps/headers/GameCorner.asm @@ -0,0 +1,3 @@ + + map_header GameCorner, GAME_CORNER, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..4668cbb8 --- /dev/null +++ b/data/maps/headers/GameCornerPrizeRoom.asm @@ -0,0 +1,3 @@ + + map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/HallOfFame.asm b/data/maps/headers/HallOfFame.asm new file mode 100755 index 00000000..e2dc3fb3 --- /dev/null +++ b/data/maps/headers/HallOfFame.asm @@ -0,0 +1,3 @@ + + map_header HallOfFame, HALL_OF_FAME, GYM, 0 + end_map_header diff --git a/data/maps/headers/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm new file mode 100755 index 00000000..ff394dfe --- /dev/null +++ b/data/maps/headers/IndigoPlateau.asm @@ -0,0 +1,4 @@ + + map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH + connection south, Route23, ROUTE_23, 0 + end_map_header diff --git a/data/maps/headers/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm new file mode 100755 index 00000000..b13afa12 --- /dev/null +++ b/data/maps/headers/IndigoPlateauLobby.asm @@ -0,0 +1,3 @@ + + map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0 + end_map_header diff --git a/data/maps/headers/LancesRoom.asm b/data/maps/headers/LancesRoom.asm new file mode 100755 index 00000000..0b69970e --- /dev/null +++ b/data/maps/headers/LancesRoom.asm @@ -0,0 +1,3 @@ + + map_header LancesRoom, LANCES_ROOM, DOJO, 0 + end_map_header diff --git a/data/maps/headers/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm new file mode 100755 index 00000000..dfd38ff1 --- /dev/null +++ b/data/maps/headers/LavenderCuboneHouse.asm @@ -0,0 +1,3 @@ + + map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/LavenderMart.asm b/data/maps/headers/LavenderMart.asm new file mode 100755 index 00000000..82c239e6 --- /dev/null +++ b/data/maps/headers/LavenderMart.asm @@ -0,0 +1,3 @@ + + map_header LavenderMart, LAVENDER_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm new file mode 100755 index 00000000..c0cd0adf --- /dev/null +++ b/data/maps/headers/LavenderPokecenter.asm @@ -0,0 +1,3 @@ + + map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/LavenderTown.asm b/data/maps/headers/LavenderTown.asm new file mode 100755 index 00000000..7c1c9c46 --- /dev/null +++ b/data/maps/headers/LavenderTown.asm @@ -0,0 +1,6 @@ + + map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST + connection north, Route10, ROUTE_10, 0 + connection south, Route12, ROUTE_12, 0 + connection west, Route8, ROUTE_8, 0 + end_map_header diff --git a/data/maps/headers/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm new file mode 100755 index 00000000..feff946c --- /dev/null +++ b/data/maps/headers/LoreleisRoom.asm @@ -0,0 +1,3 @@ + + map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0 + end_map_header diff --git a/data/maps/headers/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm new file mode 100755 index 00000000..023cb501 --- /dev/null +++ b/data/maps/headers/MrFujisHouse.asm @@ -0,0 +1,3 @@ + + map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm new file mode 100755 index 00000000..628db044 --- /dev/null +++ b/data/maps/headers/MrPsychicsHouse.asm @@ -0,0 +1,3 @@ + + map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm new file mode 100755 index 00000000..8de2be3e --- /dev/null +++ b/data/maps/headers/MtMoon1F.asm @@ -0,0 +1,3 @@ + + map_header MtMoon1F, MT_MOON_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm new file mode 100755 index 00000000..9c97b5c7 --- /dev/null +++ b/data/maps/headers/MtMoonB1F.asm @@ -0,0 +1,3 @@ + + map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm new file mode 100755 index 00000000..0ed1f96e --- /dev/null +++ b/data/maps/headers/MtMoonB2F.asm @@ -0,0 +1,3 @@ + + map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm new file mode 100755 index 00000000..0425eae7 --- /dev/null +++ b/data/maps/headers/MtMoonPokecenter.asm @@ -0,0 +1,3 @@ + + map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/Museum1F.asm b/data/maps/headers/Museum1F.asm new file mode 100755 index 00000000..d92176d2 --- /dev/null +++ b/data/maps/headers/Museum1F.asm @@ -0,0 +1,3 @@ + + map_header Museum1F, MUSEUM_1F, MUSEUM, 0 + end_map_header diff --git a/data/maps/headers/Museum2F.asm b/data/maps/headers/Museum2F.asm new file mode 100755 index 00000000..d5bf8918 --- /dev/null +++ b/data/maps/headers/Museum2F.asm @@ -0,0 +1,3 @@ + + map_header Museum2F, MUSEUM_2F, MUSEUM, 0 + end_map_header diff --git a/data/maps/headers/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm new file mode 100755 index 00000000..3f9010f0 --- /dev/null +++ b/data/maps/headers/NameRatersHouse.asm @@ -0,0 +1,3 @@ + + map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm new file mode 100755 index 00000000..42bb76e8 --- /dev/null +++ b/data/maps/headers/OaksLab.asm @@ -0,0 +1,3 @@ + + map_header OaksLab, OAKS_LAB, DOJO, 0 + end_map_header diff --git a/data/maps/headers/PalletTown.asm b/data/maps/headers/PalletTown.asm new file mode 100755 index 00000000..2745bdc1 --- /dev/null +++ b/data/maps/headers/PalletTown.asm @@ -0,0 +1,5 @@ + + map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH + connection north, Route1, ROUTE_1, 0 + connection south, Route21, ROUTE_21, 0 + end_map_header diff --git a/data/maps/headers/PewterCity.asm b/data/maps/headers/PewterCity.asm new file mode 100755 index 00000000..268adb7a --- /dev/null +++ b/data/maps/headers/PewterCity.asm @@ -0,0 +1,5 @@ + + map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST + connection south, Route2, ROUTE_2, 5 + connection east, Route3, ROUTE_3, 4 + end_map_header diff --git a/data/maps/headers/PewterGym.asm b/data/maps/headers/PewterGym.asm new file mode 100755 index 00000000..a1659e42 --- /dev/null +++ b/data/maps/headers/PewterGym.asm @@ -0,0 +1,3 @@ + + map_header PewterGym, PEWTER_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/PewterMart.asm b/data/maps/headers/PewterMart.asm new file mode 100755 index 00000000..c9b24eb2 --- /dev/null +++ b/data/maps/headers/PewterMart.asm @@ -0,0 +1,3 @@ + + map_header PewterMart, PEWTER_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm new file mode 100755 index 00000000..ee2e46ca --- /dev/null +++ b/data/maps/headers/PewterNidoranHouse.asm @@ -0,0 +1,3 @@ + + map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm new file mode 100755 index 00000000..4e420bf8 --- /dev/null +++ b/data/maps/headers/PewterPokecenter.asm @@ -0,0 +1,3 @@ + + map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm new file mode 100755 index 00000000..a378d61e --- /dev/null +++ b/data/maps/headers/PewterSpeechHouse.asm @@ -0,0 +1,3 @@ + + map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm new file mode 100755 index 00000000..b4ff8e1c --- /dev/null +++ b/data/maps/headers/PokemonFanClub.asm @@ -0,0 +1,3 @@ + + map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm new file mode 100755 index 00000000..9407f956 --- /dev/null +++ b/data/maps/headers/PokemonMansion1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm new file mode 100755 index 00000000..deb7c84f --- /dev/null +++ b/data/maps/headers/PokemonMansion2F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm new file mode 100755 index 00000000..e4baa709 --- /dev/null +++ b/data/maps/headers/PokemonMansion3F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm new file mode 100755 index 00000000..0aae67e6 --- /dev/null +++ b/data/maps/headers/PokemonMansionB1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm new file mode 100755 index 00000000..185fd2c0 --- /dev/null +++ b/data/maps/headers/PokemonTower1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm new file mode 100755 index 00000000..5a6046c8 --- /dev/null +++ b/data/maps/headers/PokemonTower2F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm new file mode 100755 index 00000000..49ebc4e7 --- /dev/null +++ b/data/maps/headers/PokemonTower3F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm new file mode 100755 index 00000000..0eb9a0d6 --- /dev/null +++ b/data/maps/headers/PokemonTower4F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm new file mode 100755 index 00000000..e58c63c6 --- /dev/null +++ b/data/maps/headers/PokemonTower5F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm new file mode 100755 index 00000000..ba53347b --- /dev/null +++ b/data/maps/headers/PokemonTower6F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm new file mode 100755 index 00000000..bd9f839b --- /dev/null +++ b/data/maps/headers/PokemonTower7F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PowerPlant.asm b/data/maps/headers/PowerPlant.asm new file mode 100755 index 00000000..88d82ae2 --- /dev/null +++ b/data/maps/headers/PowerPlant.asm @@ -0,0 +1,3 @@ + + map_header PowerPlant, POWER_PLANT, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm new file mode 100755 index 00000000..018bdc80 --- /dev/null +++ b/data/maps/headers/RedsHouse1F.asm @@ -0,0 +1,3 @@ + + map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0 + end_map_header diff --git a/data/maps/headers/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm new file mode 100755 index 00000000..10332e2c --- /dev/null +++ b/data/maps/headers/RedsHouse2F.asm @@ -0,0 +1,3 @@ + + map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00 + end_map_header diff --git a/data/maps/headers/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm new file mode 100755 index 00000000..268ee645 --- /dev/null +++ b/data/maps/headers/RockTunnel1F.asm @@ -0,0 +1,3 @@ + + map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm new file mode 100755 index 00000000..7b13f647 --- /dev/null +++ b/data/maps/headers/RockTunnelB1F.asm @@ -0,0 +1,3 @@ + + map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm new file mode 100755 index 00000000..a873854b --- /dev/null +++ b/data/maps/headers/RockTunnelPokecenter.asm @@ -0,0 +1,3 @@ + + map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm new file mode 100755 index 00000000..521a6693 --- /dev/null +++ b/data/maps/headers/RocketHideoutB1F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm new file mode 100755 index 00000000..ab2a965d --- /dev/null +++ b/data/maps/headers/RocketHideoutB2F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm new file mode 100755 index 00000000..0a04b00e --- /dev/null +++ b/data/maps/headers/RocketHideoutB3F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm new file mode 100755 index 00000000..11512c01 --- /dev/null +++ b/data/maps/headers/RocketHideoutB4F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm new file mode 100755 index 00000000..90ece237 --- /dev/null +++ b/data/maps/headers/RocketHideoutElevator.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/Route1.asm b/data/maps/headers/Route1.asm new file mode 100755 index 00000000..6eeb0347 --- /dev/null +++ b/data/maps/headers/Route1.asm @@ -0,0 +1,5 @@ + + map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH + connection north, ViridianCity, VIRIDIAN_CITY, -5 + connection south, PalletTown, PALLET_TOWN, 0 + end_map_header diff --git a/data/maps/headers/Route10.asm b/data/maps/headers/Route10.asm new file mode 100755 index 00000000..ba498b0a --- /dev/null +++ b/data/maps/headers/Route10.asm @@ -0,0 +1,5 @@ + + map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST + connection south, LavenderTown, LAVENDER_TOWN, 0 + connection west, Route9, ROUTE_9, 0 + end_map_header diff --git a/data/maps/headers/Route11.asm b/data/maps/headers/Route11.asm new file mode 100755 index 00000000..d8f2e72f --- /dev/null +++ b/data/maps/headers/Route11.asm @@ -0,0 +1,5 @@ + + map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST + connection west, VermilionCity, VERMILION_CITY, -4 + connection east, Route12, ROUTE_12, -27 + end_map_header diff --git a/data/maps/headers/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm new file mode 100755 index 00000000..aa97b791 --- /dev/null +++ b/data/maps/headers/Route11Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm new file mode 100755 index 00000000..560d38db --- /dev/null +++ b/data/maps/headers/Route11Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12.asm b/data/maps/headers/Route12.asm new file mode 100755 index 00000000..931ddf1d --- /dev/null +++ b/data/maps/headers/Route12.asm @@ -0,0 +1,6 @@ + + map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST + connection north, LavenderTown, LAVENDER_TOWN, 0 + connection south, Route13, ROUTE_13, -20 + connection west, Route11, ROUTE_11, 27 + end_map_header diff --git a/data/maps/headers/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm new file mode 100755 index 00000000..047a670c --- /dev/null +++ b/data/maps/headers/Route12Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm new file mode 100755 index 00000000..e1366736 --- /dev/null +++ b/data/maps/headers/Route12Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm new file mode 100755 index 00000000..2195a9b1 --- /dev/null +++ b/data/maps/headers/Route12SuperRodHouse.asm @@ -0,0 +1,3 @@ + + map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route13.asm b/data/maps/headers/Route13.asm new file mode 100755 index 00000000..242aaa02 --- /dev/null +++ b/data/maps/headers/Route13.asm @@ -0,0 +1,5 @@ + + map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST + connection north, Route12, ROUTE_12, 20 + connection west, Route14, ROUTE_14, 0 + end_map_header diff --git a/data/maps/headers/Route14.asm b/data/maps/headers/Route14.asm new file mode 100755 index 00000000..c0c39c56 --- /dev/null +++ b/data/maps/headers/Route14.asm @@ -0,0 +1,5 @@ + + map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST + connection west, Route15, ROUTE_15, 18 + connection east, Route13, ROUTE_13, 0 + end_map_header diff --git a/data/maps/headers/Route15.asm b/data/maps/headers/Route15.asm new file mode 100755 index 00000000..28a811d2 --- /dev/null +++ b/data/maps/headers/Route15.asm @@ -0,0 +1,5 @@ + + map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST + connection west, FuchsiaCity, FUCHSIA_CITY, -4 + connection east, Route14, ROUTE_14, -18 + end_map_header diff --git a/data/maps/headers/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm new file mode 100755 index 00000000..a23d15a0 --- /dev/null +++ b/data/maps/headers/Route15Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm new file mode 100755 index 00000000..8ca89872 --- /dev/null +++ b/data/maps/headers/Route15Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route16.asm b/data/maps/headers/Route16.asm new file mode 100755 index 00000000..423c7af2 --- /dev/null +++ b/data/maps/headers/Route16.asm @@ -0,0 +1,5 @@ + + map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST + connection south, Route17, ROUTE_17, 0 + connection east, CeladonCity, CELADON_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm new file mode 100755 index 00000000..240b6df4 --- /dev/null +++ b/data/maps/headers/Route16FlyHouse.asm @@ -0,0 +1,3 @@ + + map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm new file mode 100755 index 00000000..74fd1b7f --- /dev/null +++ b/data/maps/headers/Route16Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm new file mode 100755 index 00000000..ed889f4b --- /dev/null +++ b/data/maps/headers/Route16Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route17.asm b/data/maps/headers/Route17.asm new file mode 100755 index 00000000..5e853299 --- /dev/null +++ b/data/maps/headers/Route17.asm @@ -0,0 +1,5 @@ + + map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH + connection north, Route16, ROUTE_16, 0 + connection south, Route18, ROUTE_18, 0 + end_map_header diff --git a/data/maps/headers/Route18.asm b/data/maps/headers/Route18.asm new file mode 100755 index 00000000..34573051 --- /dev/null +++ b/data/maps/headers/Route18.asm @@ -0,0 +1,5 @@ + + map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST + connection north, Route17, ROUTE_17, 0 + connection east, FuchsiaCity, FUCHSIA_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm new file mode 100755 index 00000000..2847e0e3 --- /dev/null +++ b/data/maps/headers/Route18Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm new file mode 100755 index 00000000..f25fa700 --- /dev/null +++ b/data/maps/headers/Route18Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm new file mode 100755 index 00000000..7f01c804 --- /dev/null +++ b/data/maps/headers/Route19.asm @@ -0,0 +1,5 @@ + + map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST + connection north, FuchsiaCity, FUCHSIA_CITY, -5 + connection west, Route20, ROUTE_20, 18 + end_map_header diff --git a/data/maps/headers/Route2.asm b/data/maps/headers/Route2.asm new file mode 100755 index 00000000..521eef69 --- /dev/null +++ b/data/maps/headers/Route2.asm @@ -0,0 +1,5 @@ + + map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH + connection north, PewterCity, PEWTER_CITY, -5 + connection south, ViridianCity, VIRIDIAN_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm new file mode 100755 index 00000000..3495b785 --- /dev/null +++ b/data/maps/headers/Route20.asm @@ -0,0 +1,5 @@ + + map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST + connection west, CinnabarIsland, CINNABAR_ISLAND, 0 + connection east, Route19, ROUTE_19, -18 + end_map_header diff --git a/data/maps/headers/Route21.asm b/data/maps/headers/Route21.asm new file mode 100755 index 00000000..803bf217 --- /dev/null +++ b/data/maps/headers/Route21.asm @@ -0,0 +1,5 @@ + + map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH + connection north, PalletTown, PALLET_TOWN, 0 + connection south, CinnabarIsland, CINNABAR_ISLAND, 0 + end_map_header diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm new file mode 100755 index 00000000..e235efa1 --- /dev/null +++ b/data/maps/headers/Route22.asm @@ -0,0 +1,5 @@ + + map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST + connection north, Route23, ROUTE_23, 0 + connection east, ViridianCity, VIRIDIAN_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route22Gate.asm b/data/maps/headers/Route22Gate.asm new file mode 100755 index 00000000..a9d1dd37 --- /dev/null +++ b/data/maps/headers/Route22Gate.asm @@ -0,0 +1,3 @@ + + map_header Route22Gate, ROUTE_22_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm new file mode 100755 index 00000000..e1535c9d --- /dev/null +++ b/data/maps/headers/Route23.asm @@ -0,0 +1,5 @@ + + map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH + connection north, IndigoPlateau, INDIGO_PLATEAU, 0 + connection south, Route22, ROUTE_22, 0 + end_map_header diff --git a/data/maps/headers/Route24.asm b/data/maps/headers/Route24.asm new file mode 100755 index 00000000..faf53660 --- /dev/null +++ b/data/maps/headers/Route24.asm @@ -0,0 +1,5 @@ + + map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST + connection south, CeruleanCity, CERULEAN_CITY, -5 + connection east, Route25, ROUTE_25, 0 + end_map_header diff --git a/data/maps/headers/Route25.asm b/data/maps/headers/Route25.asm new file mode 100755 index 00000000..1873d19b --- /dev/null +++ b/data/maps/headers/Route25.asm @@ -0,0 +1,4 @@ + + map_header Route25, ROUTE_25, OVERWORLD, WEST + connection west, Route24, ROUTE_24, 0 + end_map_header diff --git a/data/maps/headers/Route2Gate.asm b/data/maps/headers/Route2Gate.asm new file mode 100755 index 00000000..730d8f2d --- /dev/null +++ b/data/maps/headers/Route2Gate.asm @@ -0,0 +1,3 @@ + + map_header Route2Gate, ROUTE_2_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm new file mode 100755 index 00000000..b9937dad --- /dev/null +++ b/data/maps/headers/Route2TradeHouse.asm @@ -0,0 +1,3 @@ + + map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route3.asm b/data/maps/headers/Route3.asm new file mode 100755 index 00000000..ddbd7783 --- /dev/null +++ b/data/maps/headers/Route3.asm @@ -0,0 +1,5 @@ + + map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST + connection north, Route4, ROUTE_4, 25 + connection west, PewterCity, PEWTER_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route4.asm b/data/maps/headers/Route4.asm new file mode 100755 index 00000000..6c43171a --- /dev/null +++ b/data/maps/headers/Route4.asm @@ -0,0 +1,5 @@ + + map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST + connection south, Route3, ROUTE_3, -25 + connection east, CeruleanCity, CERULEAN_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route5.asm b/data/maps/headers/Route5.asm new file mode 100755 index 00000000..ea84090c --- /dev/null +++ b/data/maps/headers/Route5.asm @@ -0,0 +1,5 @@ + + map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH + connection north, CeruleanCity, CERULEAN_CITY, -5 + connection south, SaffronCity, SAFFRON_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route5Gate.asm b/data/maps/headers/Route5Gate.asm new file mode 100755 index 00000000..a0115533 --- /dev/null +++ b/data/maps/headers/Route5Gate.asm @@ -0,0 +1,3 @@ + + map_header Route5Gate, ROUTE_5_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route6.asm b/data/maps/headers/Route6.asm new file mode 100755 index 00000000..956aa4d6 --- /dev/null +++ b/data/maps/headers/Route6.asm @@ -0,0 +1,5 @@ + + map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH + connection north, SaffronCity, SAFFRON_CITY, -5 + connection south, VermilionCity, VERMILION_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route6Gate.asm b/data/maps/headers/Route6Gate.asm new file mode 100755 index 00000000..f80b57c8 --- /dev/null +++ b/data/maps/headers/Route6Gate.asm @@ -0,0 +1,3 @@ + + map_header Route6Gate, ROUTE_6_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route7.asm b/data/maps/headers/Route7.asm new file mode 100755 index 00000000..8368c3fe --- /dev/null +++ b/data/maps/headers/Route7.asm @@ -0,0 +1,5 @@ + + map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST + connection west, CeladonCity, CELADON_CITY, -4 + connection east, SaffronCity, SAFFRON_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route7Gate.asm b/data/maps/headers/Route7Gate.asm new file mode 100755 index 00000000..e9b9b16d --- /dev/null +++ b/data/maps/headers/Route7Gate.asm @@ -0,0 +1,3 @@ + + map_header Route7Gate, ROUTE_7_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route8.asm b/data/maps/headers/Route8.asm new file mode 100755 index 00000000..8df9e023 --- /dev/null +++ b/data/maps/headers/Route8.asm @@ -0,0 +1,5 @@ + + map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST + connection west, SaffronCity, SAFFRON_CITY, -4 + connection east, LavenderTown, LAVENDER_TOWN, 0 + end_map_header diff --git a/data/maps/headers/Route8Gate.asm b/data/maps/headers/Route8Gate.asm new file mode 100755 index 00000000..f6a320a4 --- /dev/null +++ b/data/maps/headers/Route8Gate.asm @@ -0,0 +1,3 @@ + + map_header Route8Gate, ROUTE_8_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm new file mode 100755 index 00000000..c1ed9225 --- /dev/null +++ b/data/maps/headers/Route9.asm @@ -0,0 +1,5 @@ + + map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST + connection west, CeruleanCity, CERULEAN_CITY, -4 + connection east, Route10, ROUTE_10, 0 + end_map_header diff --git a/data/maps/headers/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm new file mode 100755 index 00000000..80d25e2d --- /dev/null +++ b/data/maps/headers/SSAnne1F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne1F, SS_ANNE_1F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm new file mode 100755 index 00000000..8bdd8d00 --- /dev/null +++ b/data/maps/headers/SSAnne1FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm new file mode 100755 index 00000000..b2fe14d7 --- /dev/null +++ b/data/maps/headers/SSAnne2F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne2F, SS_ANNE_2F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm new file mode 100755 index 00000000..2d349e4c --- /dev/null +++ b/data/maps/headers/SSAnne2FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm new file mode 100755 index 00000000..f391a0cd --- /dev/null +++ b/data/maps/headers/SSAnne3F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne3F, SS_ANNE_3F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm new file mode 100755 index 00000000..c21d7cff --- /dev/null +++ b/data/maps/headers/SSAnneB1F.asm @@ -0,0 +1,3 @@ + + map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm new file mode 100755 index 00000000..1b8b4620 --- /dev/null +++ b/data/maps/headers/SSAnneB1FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm new file mode 100755 index 00000000..2195e970 --- /dev/null +++ b/data/maps/headers/SSAnneBow.asm @@ -0,0 +1,3 @@ + + map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..a24f930d --- /dev/null +++ b/data/maps/headers/SSAnneCaptainsRoom.asm @@ -0,0 +1,3 @@ + + map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm new file mode 100755 index 00000000..47e84fbe --- /dev/null +++ b/data/maps/headers/SSAnneKitchen.asm @@ -0,0 +1,3 @@ + + map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm new file mode 100755 index 00000000..ccc58ed1 --- /dev/null +++ b/data/maps/headers/SafariZoneCenter.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..a866003f --- /dev/null +++ b/data/maps/headers/SafariZoneCenterRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm new file mode 100755 index 00000000..c23e9334 --- /dev/null +++ b/data/maps/headers/SafariZoneEast.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..1f8d76c6 --- /dev/null +++ b/data/maps/headers/SafariZoneEastRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm new file mode 100755 index 00000000..7816460d --- /dev/null +++ b/data/maps/headers/SafariZoneGate.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm new file mode 100755 index 00000000..32639d22 --- /dev/null +++ b/data/maps/headers/SafariZoneNorth.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..ec083803 --- /dev/null +++ b/data/maps/headers/SafariZoneNorthRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..630577c4 --- /dev/null +++ b/data/maps/headers/SafariZoneSecretHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm new file mode 100755 index 00000000..a1117d09 --- /dev/null +++ b/data/maps/headers/SafariZoneWest.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..e4618e1d --- /dev/null +++ b/data/maps/headers/SafariZoneWestRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SaffronCity.asm b/data/maps/headers/SaffronCity.asm new file mode 100755 index 00000000..ee1f71e4 --- /dev/null +++ b/data/maps/headers/SaffronCity.asm @@ -0,0 +1,7 @@ + + map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + connection north, Route5, ROUTE_5, 5 + connection south, Route6, ROUTE_6, 5 + connection west, Route7, ROUTE_7, 4 + connection east, Route8, ROUTE_8, 4 + end_map_header diff --git a/data/maps/headers/SaffronGym.asm b/data/maps/headers/SaffronGym.asm new file mode 100755 index 00000000..14ee3323 --- /dev/null +++ b/data/maps/headers/SaffronGym.asm @@ -0,0 +1,3 @@ + + map_header SaffronGym, SAFFRON_GYM, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SaffronMart.asm b/data/maps/headers/SaffronMart.asm new file mode 100755 index 00000000..f03132d2 --- /dev/null +++ b/data/maps/headers/SaffronMart.asm @@ -0,0 +1,3 @@ + + map_header SaffronMart, SAFFRON_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..e9f8dde7 --- /dev/null +++ b/data/maps/headers/SaffronPidgeyHouse.asm @@ -0,0 +1,3 @@ + + map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm new file mode 100755 index 00000000..9b250050 --- /dev/null +++ b/data/maps/headers/SaffronPokecenter.asm @@ -0,0 +1,3 @@ + + map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm new file mode 100755 index 00000000..db530549 --- /dev/null +++ b/data/maps/headers/SeafoamIslands1F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..589eef93 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB1F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..f7e624ed --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB2F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..b57da3c0 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB3F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..bae1e3a2 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB4F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm new file mode 100755 index 00000000..7a6786e7 --- /dev/null +++ b/data/maps/headers/SilphCo10F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm new file mode 100755 index 00000000..72eaaca2 --- /dev/null +++ b/data/maps/headers/SilphCo11F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm new file mode 100755 index 00000000..4c4ac97d --- /dev/null +++ b/data/maps/headers/SilphCo1F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm new file mode 100755 index 00000000..7dc44a55 --- /dev/null +++ b/data/maps/headers/SilphCo2F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm new file mode 100755 index 00000000..99e4aa15 --- /dev/null +++ b/data/maps/headers/SilphCo3F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm new file mode 100755 index 00000000..8eed0f9a --- /dev/null +++ b/data/maps/headers/SilphCo4F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm new file mode 100755 index 00000000..3b40c360 --- /dev/null +++ b/data/maps/headers/SilphCo5F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm new file mode 100755 index 00000000..3d2b3b8c --- /dev/null +++ b/data/maps/headers/SilphCo6F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm new file mode 100755 index 00000000..1591837a --- /dev/null +++ b/data/maps/headers/SilphCo7F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm new file mode 100755 index 00000000..e676fa86 --- /dev/null +++ b/data/maps/headers/SilphCo8F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm new file mode 100755 index 00000000..89f0300a --- /dev/null +++ b/data/maps/headers/SilphCo9F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm new file mode 100755 index 00000000..4dd9cd9f --- /dev/null +++ b/data/maps/headers/SilphCoElevator.asm @@ -0,0 +1,3 @@ + + map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/TradeCenter.asm b/data/maps/headers/TradeCenter.asm new file mode 100755 index 00000000..268d76b2 --- /dev/null +++ b/data/maps/headers/TradeCenter.asm @@ -0,0 +1,3 @@ + + map_header TradeCenter, TRADE_CENTER, CLUB, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..4bb03c79 --- /dev/null +++ b/data/maps/headers/UndergroundPathNorthSouth.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm new file mode 100755 index 00000000..18287254 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute5.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm new file mode 100755 index 00000000..67772543 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute6.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm new file mode 100755 index 00000000..d70548ed --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute7.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..30bb70a8 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute7Copy.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm new file mode 100755 index 00000000..102d8413 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute8.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm new file mode 100755 index 00000000..05976e87 --- /dev/null +++ b/data/maps/headers/UndergroundPathWestEast.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0 + end_map_header diff --git a/data/maps/headers/VermilionCity.asm b/data/maps/headers/VermilionCity.asm new file mode 100755 index 00000000..e211562c --- /dev/null +++ b/data/maps/headers/VermilionCity.asm @@ -0,0 +1,5 @@ + + map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST + connection north, Route6, ROUTE_6, 5 + connection east, Route11, ROUTE_11, 4 + end_map_header diff --git a/data/maps/headers/VermilionDock.asm b/data/maps/headers/VermilionDock.asm new file mode 100755 index 00000000..9a9b61c2 --- /dev/null +++ b/data/maps/headers/VermilionDock.asm @@ -0,0 +1,3 @@ + + map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0 + end_map_header diff --git a/data/maps/headers/VermilionGym.asm b/data/maps/headers/VermilionGym.asm new file mode 100755 index 00000000..ca75b8c1 --- /dev/null +++ b/data/maps/headers/VermilionGym.asm @@ -0,0 +1,3 @@ + + map_header VermilionGym, VERMILION_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/VermilionMart.asm b/data/maps/headers/VermilionMart.asm new file mode 100755 index 00000000..5777db4b --- /dev/null +++ b/data/maps/headers/VermilionMart.asm @@ -0,0 +1,3 @@ + + map_header VermilionMart, VERMILION_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm new file mode 100755 index 00000000..f9c890e0 --- /dev/null +++ b/data/maps/headers/VermilionOldRodHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..afb81784 --- /dev/null +++ b/data/maps/headers/VermilionPidgeyHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm new file mode 100755 index 00000000..af9827ac --- /dev/null +++ b/data/maps/headers/VermilionPokecenter.asm @@ -0,0 +1,3 @@ + + map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm new file mode 100755 index 00000000..3cb82c47 --- /dev/null +++ b/data/maps/headers/VermilionTradeHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm new file mode 100755 index 00000000..dae95f16 --- /dev/null +++ b/data/maps/headers/VictoryRoad1F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm new file mode 100755 index 00000000..99079ad3 --- /dev/null +++ b/data/maps/headers/VictoryRoad2F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm new file mode 100755 index 00000000..bc15cad7 --- /dev/null +++ b/data/maps/headers/VictoryRoad3F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/ViridianCity.asm b/data/maps/headers/ViridianCity.asm new file mode 100755 index 00000000..0771cc81 --- /dev/null +++ b/data/maps/headers/ViridianCity.asm @@ -0,0 +1,6 @@ + + map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST + connection north, Route2, ROUTE_2, 5 + connection south, Route1, ROUTE_1, 5 + connection west, Route22, ROUTE_22, 4 + end_map_header diff --git a/data/maps/headers/ViridianForest.asm b/data/maps/headers/ViridianForest.asm new file mode 100755 index 00000000..d531ec86 --- /dev/null +++ b/data/maps/headers/ViridianForest.asm @@ -0,0 +1,3 @@ + + map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm new file mode 100755 index 00000000..5bfcd6ed --- /dev/null +++ b/data/maps/headers/ViridianForestNorthGate.asm @@ -0,0 +1,3 @@ + + map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/headers/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm new file mode 100755 index 00000000..87a49284 --- /dev/null +++ b/data/maps/headers/ViridianForestSouthGate.asm @@ -0,0 +1,3 @@ + + map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/headers/ViridianGym.asm b/data/maps/headers/ViridianGym.asm new file mode 100755 index 00000000..640a71b6 --- /dev/null +++ b/data/maps/headers/ViridianGym.asm @@ -0,0 +1,3 @@ + + map_header ViridianGym, VIRIDIAN_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/ViridianMart.asm b/data/maps/headers/ViridianMart.asm new file mode 100755 index 00000000..817b5265 --- /dev/null +++ b/data/maps/headers/ViridianMart.asm @@ -0,0 +1,3 @@ + + map_header ViridianMart, VIRIDIAN_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm new file mode 100755 index 00000000..5a7c272f --- /dev/null +++ b/data/maps/headers/ViridianNicknameHouse.asm @@ -0,0 +1,3 @@ + + map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm new file mode 100755 index 00000000..daac19f3 --- /dev/null +++ b/data/maps/headers/ViridianPokecenter.asm @@ -0,0 +1,3 @@ + + map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm new file mode 100755 index 00000000..f5b77212 --- /dev/null +++ b/data/maps/headers/ViridianSchoolHouse.asm @@ -0,0 +1,3 @@ + + map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/WardensHouse.asm b/data/maps/headers/WardensHouse.asm new file mode 100755 index 00000000..08216f59 --- /dev/null +++ b/data/maps/headers/WardensHouse.asm @@ -0,0 +1,3 @@ + + map_header WardensHouse, WARDENS_HOUSE, LAB, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm new file mode 100755 index 00000000..0e26900f --- /dev/null +++ b/data/maps/hide_show_data.asm @@ -0,0 +1,581 @@ +; default hidden/shown objects for each map + +MapHSPointers: +; entries correspond to map ids + dw PalletTownHS + dw ViridianCityHS + dw PewterCityHS + dw CeruleanCityHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SaffronCityHS + dw NoHS + dw NoHS + dw Route2HS + dw NoHS + dw Route4HS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw Route9HS + dw NoHS + dw NoHS + dw Route12HS + dw NoHS + dw NoHS + dw Route15HS + dw Route16HS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw Route22HS + dw NoHS + dw Route24HS + dw Route25HS + dw NoHS + dw NoHS + dw BluesHouseHS + dw OaksLabHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ViridianGymHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ViridianForestHS + dw Museum1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw MtMoon1FHS + dw NoHS + dw MtMoonB2FHS + dw NoHS + dw CeruleanTradeHouseHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw PowerPlantHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw BillsHouseHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SSAnne2FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SSAnne1FRoomsHS + dw SSAnne2FRoomsHS + dw SSAnneB1FRoomsHS + dw NoHS + dw NoHS + dw NoHS + dw VictoryRoad1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ChampionsRoomHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw CeladonMansionRoofHouseHS + dw NoHS + dw NoHS + dw GameCornerHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw PokemonTower2FHS + dw PokemonTower3FHS + dw PokemonTower4FHS + dw PokemonTower5FHS + dw PokemonTower6FHS + dw PokemonTower7FHS + dw MrFujisHouseHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw WardensHouseHS + dw NoHS + dw NoHS + dw NoHS + dw SeafoamIslandsB1FHS + dw SeafoamIslandsB2FHS + dw SeafoamIslandsB3FHS + dw SeafoamIslandsB4FHS + dw NoHS + dw NoHS + dw PokemonMansion1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw FightingDojoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SeafoamIslands1FHS + dw NoHS + dw VictoryRoad2FHS + dw NoHS + dw NoHS + dw NoHS + dw VictoryRoad3FHS + dw RocketHideoutB1FHS + dw RocketHideoutB2FHS + dw RocketHideoutB3FHS + dw RocketHideoutB4FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo2FHS + dw SilphCo3FHS + dw SilphCo4FHS + dw SilphCo5FHS + dw SilphCo6FHS + dw SilphCo7FHS + dw SilphCo8FHS + dw PokemonMansion2FHS + dw PokemonMansion3FHS + dw PokemonMansionB1FHS + dw SafariZoneEastHS + dw SafariZoneNorthHS + dw SafariZoneWestHS + dw SafariZoneCenterHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw CeruleanCave2FHS + dw CeruleanCaveB1FHS + dw CeruleanCaveHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo9FHS + dw SilphCo10FHS + dw SilphCo11FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw UnusedMapF4HS + dw NoHS + dw NoHS + dw NoHS + dw NoHS ; beach house + dw -1 ; end + +NoHS: + db $FF, $FF, $FF + +MissableObjects: +; entries correspond to HS_* constants (see constants/hide_show_constants) +; format: map id, object id, HIDE/SHOW + +PalletTownHS: + db PALLET_TOWN, $01, HIDE +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 +CeruleanCityHS: + db CERULEAN_CITY, $01, HIDE + db CERULEAN_CITY, $02, SHOW + db CERULEAN_CITY, $06, HIDE + db CERULEAN_CITY, $0A, SHOW + db CERULEAN_CITY, $0B, SHOW +SaffronCityHS: + db SAFFRON_CITY, $01, SHOW + db SAFFRON_CITY, $02, SHOW + db SAFFRON_CITY, $03, SHOW + db SAFFRON_CITY, $04, SHOW + db SAFFRON_CITY, $05, SHOW + db SAFFRON_CITY, $06, SHOW + db SAFFRON_CITY, $07, SHOW + db SAFFRON_CITY, $08, HIDE + db SAFFRON_CITY, $09, HIDE + db SAFFRON_CITY, $0A, HIDE + db SAFFRON_CITY, $0B, HIDE + db SAFFRON_CITY, $0C, HIDE + db SAFFRON_CITY, $0D, HIDE + db SAFFRON_CITY, $0E, SHOW + db SAFFRON_CITY, $0F, HIDE +Route2HS: + db ROUTE_2, $01, SHOW + db ROUTE_2, $02, SHOW +Route4HS: + db ROUTE_4, $03, SHOW +Route9HS: + db ROUTE_9, $0A, SHOW +Route12HS: + db ROUTE_12, $01, SHOW + db ROUTE_12, $09, SHOW + db ROUTE_12, $0A, SHOW +Route15HS: + db ROUTE_15, $0B, SHOW +Route16HS: + db ROUTE_16, $07, SHOW +Route22HS: + db ROUTE_22, $01, HIDE + db ROUTE_22, $02, HIDE +Route24HS: + db ROUTE_24, $01, SHOW + db ROUTE_24, $08, SHOW +Route25HS: + db ROUTE_25, $0A, SHOW +BluesHouseHS: + db BLUES_HOUSE, $01, SHOW + db BLUES_HOUSE, $02, HIDE + db BLUES_HOUSE, $03, SHOW +OaksLabHS: + db OAKS_LAB, $01, SHOW + db OAKS_LAB, $02, SHOW + db OAKS_LAB, $03, HIDE + db OAKS_LAB, $04, SHOW + 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: + db POKEMON_TOWER_3F, $04, SHOW +PokemonTower4FHS: + db POKEMON_TOWER_4F, $04, SHOW + db POKEMON_TOWER_4F, $05, SHOW + db POKEMON_TOWER_4F, $06, SHOW +PokemonTower5FHS: + db POKEMON_TOWER_5F, $06, SHOW +PokemonTower6FHS: + db POKEMON_TOWER_6F, $04, SHOW + db POKEMON_TOWER_6F, $05, SHOW +PokemonTower7FHS: + db POKEMON_TOWER_7F, $01, HIDE ; jessie & james? + db POKEMON_TOWER_7F, $02, HIDE + db POKEMON_TOWER_7F, $03, SHOW +MrFujisHouseHS: + db MR_FUJIS_HOUSE, $05, HIDE +CeladonMansionRoofHouseHS: + db CELADON_MANSION_ROOF_HOUSE, $02, SHOW +GameCornerHS: + db GAME_CORNER, $0B, SHOW +WardensHouseHS: + db WARDENS_HOUSE, $02, SHOW +PokemonMansion1FHS: + db POKEMON_MANSION_1F, $02, SHOW + db POKEMON_MANSION_1F, $03, SHOW +FightingDojoHS: + db FIGHTING_DOJO, $06, SHOW + db FIGHTING_DOJO, $07, SHOW +SilphCo1FHS: + db SILPH_CO_1F, $01, HIDE +PowerPlantHS: + db POWER_PLANT, $01, SHOW + db POWER_PLANT, $02, SHOW + db POWER_PLANT, $03, SHOW + db POWER_PLANT, $04, SHOW + db POWER_PLANT, $05, SHOW + db POWER_PLANT, $06, SHOW + db POWER_PLANT, $07, SHOW + db POWER_PLANT, $08, SHOW + db POWER_PLANT, $09, SHOW + db POWER_PLANT, $0A, SHOW + db POWER_PLANT, $0B, SHOW + db POWER_PLANT, $0C, SHOW + db POWER_PLANT, $0D, SHOW + db POWER_PLANT, $0E, SHOW +VictoryRoad2FHS: + db VICTORY_ROAD_2F, $06, SHOW + db VICTORY_ROAD_2F, $07, SHOW + db VICTORY_ROAD_2F, $08, SHOW + db VICTORY_ROAD_2F, $09, SHOW + db VICTORY_ROAD_2F, $0A, SHOW + db VICTORY_ROAD_2F, $0D, SHOW +BillsHouseHS: + db BILLS_HOUSE, $01, SHOW + db BILLS_HOUSE, $02, HIDE + db BILLS_HOUSE, $03, HIDE +ViridianForestHS: + 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 + db MT_MOON_1F, $0A, SHOW + db MT_MOON_1F, $0B, SHOW + db MT_MOON_1F, $0C, SHOW + db MT_MOON_1F, $0D, SHOW +MtMoonB2FHS: + 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: + db SS_ANNE_1F_ROOMS, $0A, SHOW +SSAnne2FRoomsHS: + db SS_ANNE_2F_ROOMS, $06, SHOW + db SS_ANNE_2F_ROOMS, $09, SHOW +SSAnneB1FRoomsHS: + db SS_ANNE_B1F_ROOMS, $09, SHOW + db SS_ANNE_B1F_ROOMS, $0A, SHOW + db SS_ANNE_B1F_ROOMS, $0B, SHOW +VictoryRoad3FHS: + db VICTORY_ROAD_3F, $05, SHOW + db VICTORY_ROAD_3F, $06, SHOW + db VICTORY_ROAD_3F, $0A, SHOW +RocketHideoutB1FHS: + db ROCKET_HIDEOUT_B1F, $06, SHOW + db ROCKET_HIDEOUT_B1F, $07, SHOW +RocketHideoutB2FHS: + db ROCKET_HIDEOUT_B2F, $02, SHOW + db ROCKET_HIDEOUT_B2F, $03, SHOW + db ROCKET_HIDEOUT_B2F, $04, SHOW + db ROCKET_HIDEOUT_B2F, $05, SHOW +RocketHideoutB3FHS: + db ROCKET_HIDEOUT_B3F, $03, SHOW + 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 + db ROCKET_HIDEOUT_B4F, $08, HIDE + db ROCKET_HIDEOUT_B4F, $09, HIDE +SilphCo2FHS: + db SILPH_CO_2F, $01, SHOW + db SILPH_CO_2F, $02, SHOW + db SILPH_CO_2F, $03, SHOW + db SILPH_CO_2F, $04, SHOW + db SILPH_CO_2F, $05, SHOW +SilphCo3FHS: + db SILPH_CO_3F, $02, SHOW + db SILPH_CO_3F, $03, SHOW + db SILPH_CO_3F, $04, SHOW +SilphCo4FHS: + db SILPH_CO_4F, $02, SHOW + db SILPH_CO_4F, $03, SHOW + db SILPH_CO_4F, $04, SHOW + db SILPH_CO_4F, $05, SHOW + db SILPH_CO_4F, $06, SHOW + db SILPH_CO_4F, $07, SHOW +SilphCo5FHS: + db SILPH_CO_5F, $02, SHOW + db SILPH_CO_5F, $03, SHOW + db SILPH_CO_5F, $04, SHOW + db SILPH_CO_5F, $05, SHOW + db SILPH_CO_5F, $06, SHOW + db SILPH_CO_5F, $07, SHOW + db SILPH_CO_5F, $08, SHOW +SilphCo6FHS: + db SILPH_CO_6F, $06, SHOW + db SILPH_CO_6F, $07, SHOW + db SILPH_CO_6F, $08, SHOW + db SILPH_CO_6F, $09, SHOW + db SILPH_CO_6F, $0A, SHOW +SilphCo7FHS: + db SILPH_CO_7F, $05, SHOW + db SILPH_CO_7F, $06, SHOW + db SILPH_CO_7F, $07, SHOW + db SILPH_CO_7F, $08, SHOW + db SILPH_CO_7F, $09, SHOW + db SILPH_CO_7F, $0A, SHOW + db SILPH_CO_7F, $0B, SHOW + db SILPH_CO_7F, $0C, SHOW +SilphCo8FHS: + db SILPH_CO_8F, $02, SHOW + db SILPH_CO_8F, $03, SHOW + db SILPH_CO_8F, $04, SHOW +SilphCo9FHS: + db SILPH_CO_9F, $02, SHOW + db SILPH_CO_9F, $03, SHOW + db SILPH_CO_9F, $04, SHOW +SilphCo10FHS: + db SILPH_CO_10F, $01, SHOW + db SILPH_CO_10F, $02, SHOW + db SILPH_CO_10F, $03, SHOW + db SILPH_CO_10F, $04, SHOW + db SILPH_CO_10F, $05, SHOW + db SILPH_CO_10F, $06, SHOW +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: + db POKEMON_MANSION_2F, $02, SHOW +PokemonMansion3FHS: + db POKEMON_MANSION_3F, $03, SHOW + db POKEMON_MANSION_3F, $04, SHOW +PokemonMansionB1FHS: + db POKEMON_MANSION_B1F, $03, SHOW + db POKEMON_MANSION_B1F, $04, SHOW + db POKEMON_MANSION_B1F, $05, SHOW + db POKEMON_MANSION_B1F, $06, SHOW + db POKEMON_MANSION_B1F, $08, SHOW +SafariZoneEastHS: + db SAFARI_ZONE_EAST, $01, SHOW + db SAFARI_ZONE_EAST, $02, SHOW + db SAFARI_ZONE_EAST, $03, SHOW + db SAFARI_ZONE_EAST, $04, SHOW +SafariZoneNorthHS: + db SAFARI_ZONE_NORTH, $01, SHOW + db SAFARI_ZONE_NORTH, $02, SHOW +SafariZoneWestHS: + db SAFARI_ZONE_WEST, $01, SHOW + db SAFARI_ZONE_WEST, $02, SHOW + db SAFARI_ZONE_WEST, $03, SHOW + db SAFARI_ZONE_WEST, $04, SHOW +SafariZoneCenterHS: + db SAFARI_ZONE_CENTER, $01, SHOW +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 +ChampionsRoomHS: + db CHAMPIONS_ROOM, $02, HIDE +SeafoamIslands1FHS: + db SEAFOAM_ISLANDS_1F, $01, SHOW + db SEAFOAM_ISLANDS_1F, $02, SHOW +SeafoamIslandsB1FHS: + db SEAFOAM_ISLANDS_B1F, $01, HIDE + db SEAFOAM_ISLANDS_B1F, $02, HIDE +SeafoamIslandsB2FHS: + db SEAFOAM_ISLANDS_B2F, $01, HIDE + db SEAFOAM_ISLANDS_B2F, $02, HIDE +SeafoamIslandsB3FHS: + db SEAFOAM_ISLANDS_B3F, $02, SHOW + db SEAFOAM_ISLANDS_B3F, $03, SHOW + db SEAFOAM_ISLANDS_B3F, $05, HIDE + db SEAFOAM_ISLANDS_B3F, $06, HIDE +SeafoamIslandsB4FHS: + db SEAFOAM_ISLANDS_B4F, $01, HIDE + db SEAFOAM_ISLANDS_B4F, $02, HIDE + db SEAFOAM_ISLANDS_B4F, $03, SHOW + +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 new file mode 100644 index 00000000..98e5b5f5 --- /dev/null +++ b/data/maps/map_header_banks.asm @@ -0,0 +1,251 @@ +; see also MapHeaderPointers +MapHeaderBanks:: + db BANK(PalletTown_h) + db BANK(ViridianCity_h) + db BANK(PewterCity_h) + db BANK(CeruleanCity_h) + db BANK(LavenderTown_h) + db BANK(VermilionCity_h) + db BANK(CeladonCity_h) + db BANK(FuchsiaCity_h) + db BANK(CinnabarIsland_h) + db BANK(IndigoPlateau_h) + db BANK(SaffronCity_h) + db $01 ; UNUSED_MAP_0B + db BANK(Route1_h) + db BANK(Route2_h) + db BANK(Route3_h) + db BANK(Route4_h) + db BANK(Route5_h) + db BANK(Route6_h) + db BANK(Route7_h) + db BANK(Route8_h) + db BANK(Route9_h) + db BANK(Route10_h) + db BANK(Route11_h) + db BANK(Route12_h) + db BANK(Route13_h) + db BANK(Route14_h) + db BANK(Route15_h) + db BANK(Route16_h) + db BANK(Route17_h) + db BANK(Route18_h) + db BANK(Route19_h) + db BANK(Route20_h) + db BANK(Route21_h) + db BANK(Route22_h) + db BANK(Route23_h) + db BANK(Route24_h) + db BANK(Route25_h) + db BANK(RedsHouse1F_h) + db BANK(RedsHouse2F_h) + db BANK(BluesHouse_h) + db BANK(OaksLab_h) + db BANK(ViridianPokecenter_h) + db BANK(ViridianMart_h) + db BANK(ViridianSchoolHouse_h) + db BANK(ViridianNicknameHouse_h) + db BANK(ViridianGym_h) + db BANK(DiglettsCaveRoute2_h) + db BANK(ViridianForestNorthGate_h) + db BANK(Route2TradeHouse_h) + db BANK(Route2Gate_h) + db BANK(ViridianForestSouthGate_h) + db BANK(ViridianForest_h) + db BANK(Museum1F_h) + db BANK(Museum2F_h) + db BANK(PewterGym_h) + db BANK(PewterNidoranHouse_h) + db BANK(PewterMart_h) + db BANK(PewterSpeechHouse_h) + db BANK(PewterPokecenter_h) + db BANK(MtMoon1F_h) + db BANK(MtMoonB1F_h) + db BANK(MtMoonB2F_h) + db BANK(CeruleanTrashedHouse_h) + db BANK(CeruleanTradeHouse_h) + db BANK(CeruleanPokecenter_h) + db BANK(CeruleanGym_h) + db BANK(BikeShop_h) + db BANK(CeruleanMart_h) + db BANK(MtMoonPokecenter_h) + db BANK(CeruleanTrashedHouse_h) + db BANK(Route5Gate_h) + db BANK(UndergroundPathRoute5_h) + db BANK(Daycare_h) + db BANK(Route6Gate_h) + db BANK(UndergroundPathRoute6_h) + db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY + db BANK(Route7Gate_h) + db BANK(UndergroundPathRoute7_h) + db BANK(UndergroundPathRoute7Copy_h) + db BANK(Route8Gate_h) + db BANK(UndergroundPathRoute8_h) + db BANK(RockTunnelPokecenter_h) + db BANK(RockTunnel1F_h) + db BANK(PowerPlant_h) + db BANK(Route11Gate1F_h) + db BANK(DiglettsCaveRoute11_h) + db BANK(Route11Gate2F_h) + db BANK(Route12Gate1F_h) + db BANK(BillsHouse_h) + db BANK(VermilionPokecenter_h) + db BANK(PokemonFanClub_h) + db BANK(VermilionMart_h) + db BANK(VermilionGym_h) + db BANK(VermilionPidgeyHouse_h) + db BANK(VermilionDock_h) + db BANK(SSAnne1F_h) + db BANK(SSAnne2F_h) + db BANK(SSAnne3F_h) + db BANK(SSAnneB1F_h) + db BANK(SSAnneBow_h) + db BANK(SSAnneKitchen_h) + db BANK(SSAnneCaptainsRoom_h) + db BANK(SSAnne1FRooms_h) + db BANK(SSAnne2FRooms_h) + db BANK(SSAnneB1FRooms_h) + db $1D ; UNUSED_MAP_69 + db $1D ; UNUSED_MAP_6A + db $1D ; UNUSED_MAP_6B + db BANK(VictoryRoad1F_h) + db $1D ; UNUSED_MAP_6D + db $1D ; UNUSED_MAP_6E + db $1D ; UNUSED_MAP_6F + db $1D ; UNUSED_MAP_70 + db BANK(LancesRoom_h) + db $1D ; UNUSED_MAP_72 + db $1D ; UNUSED_MAP_73 + db $1D ; UNUSED_MAP_74 + db $1D ; UNUSED_MAP_75 + db BANK(HallOfFame_h) + db BANK(UndergroundPathNorthSouth_h) + db BANK(ChampionsRoom_h) + db BANK(UndergroundPathWestEast_h) + db BANK(CeladonMart1F_h) + db BANK(CeladonMart2F_h) + db BANK(CeladonMart3F_h) + db BANK(CeladonMart4F_h) + db BANK(CeladonMartRoof_h) + db BANK(CeladonMartElevator_h) + db BANK(CeladonMansion1F_h) + db BANK(CeladonMansion2F_h) + db BANK(CeladonMansion3F_h) + db BANK(CeladonMansionRoof_h) + db BANK(CeladonMansionRoofHouse_h) + db BANK(CeladonPokecenter_h) + db BANK(CeladonGym_h) + db BANK(GameCorner_h) + db BANK(CeladonMart5F_h) + db BANK(GameCornerPrizeRoom_h) + db BANK(CeladonDiner_h) + db BANK(CeladonChiefHouse_h) + db BANK(CeladonHotel_h) + db BANK(LavenderPokecenter_h) + db BANK(PokemonTower1F_h) + db BANK(PokemonTower2F_h) + db BANK(PokemonTower3F_h) + db BANK(PokemonTower4F_h) + db BANK(PokemonTower5F_h) + db BANK(PokemonTower6F_h) + db BANK(PokemonTower7F_h) + db BANK(MrFujisHouse_h) + db BANK(LavenderMart_h) + db BANK(LavenderCuboneHouse_h) + db BANK(FuchsiaMart_h) + db BANK(FuchsiaBillsGrandpasHouse_h) + db BANK(FuchsiaPokecenter_h) + db BANK(WardensHouse_h) + db BANK(SafariZoneGate_h) + db BANK(FuchsiaGym_h) + db BANK(FuchsiaMeetingRoom_h) + db BANK(SeafoamIslandsB1F_h) + db BANK(SeafoamIslandsB2F_h) + db BANK(SeafoamIslandsB3F_h) + db BANK(SeafoamIslandsB4F_h) + db BANK(VermilionOldRodHouse_h) + db BANK(FuchsiaGoodRodHouse_h) + db BANK(PokemonMansion1F_h) + db BANK(CinnabarGym_h) + db BANK(CinnabarLab_h) + db BANK(CinnabarLabTradeRoom_h) + db BANK(CinnabarLabMetronomeRoom_h) + db BANK(CinnabarLabFossilRoom_h) + db BANK(CinnabarPokecenter_h) + db BANK(CinnabarMart_h) + db BANK(CinnabarMart_h) + db BANK(IndigoPlateauLobby_h) + db BANK(CopycatsHouse1F_h) + db BANK(CopycatsHouse2F_h) + db BANK(FightingDojo_h) + db BANK(SaffronGym_h) + db BANK(SaffronPidgeyHouse_h) + db BANK(SaffronMart_h) + db BANK(SilphCo1F_h) + db BANK(SaffronPokecenter_h) + db BANK(MrPsychicsHouse_h) + db BANK(Route15Gate1F_h) + db BANK(Route15Gate2F_h) + db BANK(Route16Gate1F_h) + db BANK(Route16Gate2F_h) + db BANK(Route16FlyHouse_h) + db BANK(Route12SuperRodHouse_h) + db BANK(Route18Gate1F_h) + db BANK(Route18Gate2F_h) + db BANK(SeafoamIslands1F_h) + db BANK(Route22Gate_h) + db BANK(VictoryRoad2F_h) + db BANK(Route12Gate2F_h) + db BANK(VermilionTradeHouse_h) + db BANK(DiglettsCave_h) + db BANK(VictoryRoad3F_h) + db BANK(RocketHideoutB1F_h) + db BANK(RocketHideoutB2F_h) + db BANK(RocketHideoutB3F_h) + db BANK(RocketHideoutB4F_h) + db BANK(RocketHideoutElevator_h) + db $01 ; UNUSED_MAP_CC + db $01 ; UNUSED_MAP_CD + db $01 ; UNUSED_MAP_CE + db BANK(SilphCo2F_h) + db BANK(SilphCo3F_h) + db BANK(SilphCo4F_h) + db BANK(SilphCo5F_h) + db BANK(SilphCo6F_h) + db BANK(SilphCo7F_h) + db BANK(SilphCo8F_h) + db BANK(PokemonMansion2F_h) + db BANK(PokemonMansion3F_h) + db BANK(PokemonMansionB1F_h) + db BANK(SafariZoneEast_h) + db BANK(SafariZoneNorth_h) + db BANK(SafariZoneWest_h) + db BANK(SafariZoneCenter_h) + db BANK(SafariZoneCenterRestHouse_h) + db BANK(SafariZoneSecretHouse_h) + db BANK(SafariZoneWestRestHouse_h) + db BANK(SafariZoneEastRestHouse_h) + db BANK(SafariZoneNorthRestHouse_h) + db BANK(CeruleanCave2F_h) + db BANK(CeruleanCaveB1F_h) + db BANK(CeruleanCave1F_h) + db BANK(NameRatersHouse_h) + db BANK(CeruleanBadgeHouse_h) + db $01 ; UNUSED_MAP_E7 + db BANK(RockTunnelB1F_h) + db BANK(SilphCo9F_h) + db BANK(SilphCo10F_h) + db BANK(SilphCo11F_h) + db BANK(SilphCoElevator_h) + db $11 ; UNUSED_MAP_ED + db $11 ; UNUSED_MAP_EE + db BANK(TradeCenter_h) + db BANK(Colosseum_h) + db $11 ; UNUSED_MAP_F1 + db $11 ; UNUSED_MAP_F2 + db $11 ; UNUSED_MAP_F3 + db $11 ; UNUSED_MAP_F4 + db BANK(LoreleisRoom_h) + db BANK(BrunosRoom_h) + db BANK(AgathasRoom_h) + db BANK(BeachHouse_h) diff --git a/data/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 6ea31795..6ea31795 100644 --- a/data/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm diff --git a/data/maps/names.asm b/data/maps/names.asm new file mode 100755 index 00000000..6bdb66d5 --- /dev/null +++ b/data/maps/names.asm @@ -0,0 +1,54 @@ +MapNames: +PalletTownName: db "PALLET TOWN@" +ViridianCityName: db "VIRIDIAN CITY@" +PewterCityName: db "PEWTER CITY@" +CeruleanCityName: db "CERULEAN CITY@" +LavenderTownName: db "LAVENDER TOWN@" +VermilionCityName: db "VERMILION CITY@" +CeladonCityName: db "CELADON CITY@" +FuchsiaCityName: db "FUCHSIA CITY@" +CinnabarIslandName: db "CINNABAR ISLAND@" +IndigoPlateauName: db "INDIGO PLATEAU@" +SaffronCityName: db "SAFFRON CITY@" +Route1Name: db "ROUTE 1@" +Route2Name: db "ROUTE 2@" +Route3Name: db "ROUTE 3@" +Route4Name: db "ROUTE 4@" +Route5Name: db "ROUTE 5@" +Route6Name: db "ROUTE 6@" +Route7Name: db "ROUTE 7@" +Route8Name: db "ROUTE 8@" +Route9Name: db "ROUTE 9@" +Route10Name: db "ROUTE 10@" +Route11Name: db "ROUTE 11@" +Route12Name: db "ROUTE 12@" +Route13Name: db "ROUTE 13@" +Route14Name: db "ROUTE 14@" +Route15Name: db "ROUTE 15@" +Route16Name: db "ROUTE 16@" +Route17Name: db "ROUTE 17@" +Route18Name: db "ROUTE 18@" +Route19Name: db "SEA ROUTE 19@" +Route20Name: db "SEA ROUTE 20@" +Route21Name: db "SEA ROUTE 21@" +Route22Name: db "ROUTE 22@" +Route23Name: db "ROUTE 23@" +Route24Name: db "ROUTE 24@" +Route25Name: db "ROUTE 25@" +ViridianForestName: db "VIRIDIAN FOREST@" +MountMoonName: db "MT.MOON@" +RockTunnelName: db "ROCK TUNNEL@" +SeaCottageName: db "SEA COTTAGE@" +SSAnneName: db "S.S.ANNE@" +PokemonLeagueName: db "#MON LEAGUE@" +UndergroundPathName: db "UNDERGROUND PATH@" +PokemonTowerName: db "#MON TOWER@" +SeafoamIslandsName: db "SEAFOAM ISLANDS@" +VictoryRoadName: db "VICTORY ROAD@" +DiglettsCaveName: db "DIGLETT's CAVE@" +RocketHQName: db "ROCKET HQ@" +SilphCoName: db "SILPH CO.@" +PokemonMansionName: db "<PKMN> MANSION@" +SafariZoneName: db "SAFARI ZONE@" +CeruleanCaveName: db "CERULEAN CAVE@" +PowerPlantName: db "POWER PLANT@" diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm new file mode 100755 index 00000000..0f00ea20 --- /dev/null +++ b/data/maps/objects/AgathasRoom.asm @@ -0,0 +1,15 @@ +AgathasRoom_Object: + db $0 ; border block + + def_warps + warp 4, 11, 2, BRUNOS_ROOM + warp 5, 11, 3, BRUNOS_ROOM + warp 4, 0, 0, LANCES_ROOM + warp 5, 0, 0, LANCES_ROOM + + def_signs + + def_objects + object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 + + def_warps_to AGATHAS_ROOM 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/BikeShop.asm b/data/maps/objects/BikeShop.asm new file mode 100755 index 00000000..6a6fe6d6 --- /dev/null +++ b/data/maps/objects/BikeShop.asm @@ -0,0 +1,15 @@ +BikeShop_Object: + db $e ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person + object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person + + def_warps_to BIKE_SHOP diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm new file mode 100755 index 00000000..fad8df05 --- /dev/null +++ b/data/maps/objects/BillsHouse.asm @@ -0,0 +1,15 @@ +BillsHouse_Object: + db $d ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person + + def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm new file mode 100755 index 00000000..f4931a47 --- /dev/null +++ b/data/maps/objects/BluesHouse.asm @@ -0,0 +1,15 @@ +BluesHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + 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 + + def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm new file mode 100755 index 00000000..f5399874 --- /dev/null +++ b/data/maps/objects/BrunosRoom.asm @@ -0,0 +1,15 @@ +BrunosRoom_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM + + def_signs + + def_objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 + + def_warps_to BRUNOS_ROOM diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm new file mode 100755 index 00000000..97b9e4c9 --- /dev/null +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -0,0 +1,15 @@ +CeladonChiefHouse_Object: + db $f ; border block + + def_warps + warp 2, 7, 11, LAST_MAP + warp 3, 7, 11, LAST_MAP + + def_signs + + def_objects + object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person + object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person + + def_warps_to CELADON_CHIEF_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm new file mode 100755 index 00000000..ddf0afdb --- /dev/null +++ b/data/maps/objects/CeladonCity.asm @@ -0,0 +1,41 @@ +CeladonCity_Object: + db $f ; border block + + def_warps + warp 8, 13, 0, CELADON_MART_1F + warp 10, 13, 2, CELADON_MART_1F + warp 24, 9, 0, CELADON_MANSION_1F + warp 24, 3, 2, CELADON_MANSION_1F + warp 25, 3, 2, CELADON_MANSION_1F + warp 41, 9, 0, CELADON_POKECENTER + warp 12, 27, 0, CELADON_GYM + warp 28, 19, 0, GAME_CORNER + warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used + warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM + warp 31, 27, 0, CELADON_DINER + warp 35, 27, 0, CELADON_CHIEF_HOUSE + warp 43, 27, 0, CELADON_HOTEL + + def_signs + sign 27, 15, 10 ; CeladonCityText10 + sign 19, 15, 11 ; CeladonCityText11 + sign 42, 9, 12 ; PokeCenterSignText + sign 13, 29, 13 ; CeladonCityText13 + sign 21, 9, 14 ; CeladonCityText14 + sign 12, 13, 15 ; CeladonCityText15 + sign 39, 21, 16 ; CeladonCityText16 + sign 33, 21, 17 ; CeladonCityText17 + sign 27, 21, 18 ; CeladonCityText18 + + def_objects + object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person + object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person + object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person + object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person + object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person + object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person + object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person + object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person + object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person + + def_warps_to CELADON_CITY diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm new file mode 100755 index 00000000..37c8c876 --- /dev/null +++ b/data/maps/objects/CeladonDiner.asm @@ -0,0 +1,17 @@ +CeladonDiner_Object: + db $f ; border block + + def_warps + warp 3, 7, 10, LAST_MAP + warp 4, 7, 10, LAST_MAP + + def_signs + + def_objects + object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person + + def_warps_to CELADON_DINER diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm new file mode 100755 index 00000000..197a254b --- /dev/null +++ b/data/maps/objects/CeladonGym.asm @@ -0,0 +1,20 @@ +CeladonGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 6, LAST_MAP + warp 5, 17, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + + def_warps_to CELADON_GYM diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm new file mode 100755 index 00000000..a516f141 --- /dev/null +++ b/data/maps/objects/CeladonHotel.asm @@ -0,0 +1,15 @@ +CeladonHotel_Object: + db $0 ; border block + + def_warps + warp 3, 7, 12, LAST_MAP + warp 4, 7, 12, LAST_MAP + + def_signs + + def_objects + object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CELADON_HOTEL diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm new file mode 100755 index 00000000..63eb686c --- /dev/null +++ b/data/maps/objects/CeladonMansion1F.asm @@ -0,0 +1,20 @@ +CeladonMansion1F_Object: + db $f ; border block + + def_warps + warp 4, 11, 2, LAST_MAP + warp 5, 11, 2, LAST_MAP + warp 4, 0, 4, LAST_MAP + warp 7, 1, 1, CELADON_MANSION_2F + warp 2, 1, 2, CELADON_MANSION_2F + + def_signs + sign 4, 9, 5 ; CeladonMansion1Text5 + + def_objects + object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person + object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person + object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person + + def_warps_to CELADON_MANSION_1F diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm new file mode 100755 index 00000000..211abbda --- /dev/null +++ b/data/maps/objects/CeladonMansion2F.asm @@ -0,0 +1,15 @@ +CeladonMansion2F_Object: + db $f ; border block + + def_warps + warp 6, 1, 0, CELADON_MANSION_3F + warp 7, 1, 3, CELADON_MANSION_1F + warp 2, 1, 4, CELADON_MANSION_1F + warp 4, 1, 3, CELADON_MANSION_3F + + def_signs + sign 4, 9, 1 ; CeladonMansion2Text1 + + def_objects + + def_warps_to CELADON_MANSION_2F diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm new file mode 100755 index 00000000..442f3c23 --- /dev/null +++ b/data/maps/objects/CeladonMansion3F.asm @@ -0,0 +1,22 @@ +CeladonMansion3F_Object: + db $f ; border block + + def_warps + warp 6, 1, 0, CELADON_MANSION_2F + warp 7, 1, 0, CELADON_MANSION_ROOF + warp 2, 1, 1, CELADON_MANSION_ROOF + warp 4, 1, 3, CELADON_MANSION_2F + + def_signs + sign 1, 3, 5 ; CeladonMansion3Text5 + sign 4, 3, 6 ; CeladonMansion3Text6 + sign 1, 6, 7 ; CeladonMansion3Text7 + sign 4, 9, 8 ; CeladonMansion3Text8 + + def_objects + object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person + object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person + object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person + object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person + + def_warps_to CELADON_MANSION_3F diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm new file mode 100755 index 00000000..e3eb8aa7 --- /dev/null +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -0,0 +1,14 @@ +CeladonMansionRoof_Object: + db $9 ; border block + + def_warps + warp 6, 1, 1, CELADON_MANSION_3F + warp 2, 1, 2, CELADON_MANSION_3F + warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE + + def_signs + sign 3, 7, 1 ; CeladonMansion4Text1 + + def_objects + + def_warps_to CELADON_MANSION_ROOF diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..1656bdcf --- /dev/null +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -0,0 +1,14 @@ +CeladonMansionRoofHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, CELADON_MANSION_ROOF + warp 3, 7, 2, CELADON_MANSION_ROOF + + def_signs + + def_objects + object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person + + def_warps_to CELADON_MANSION_ROOF_HOUSE diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm new file mode 100755 index 00000000..3edcbe3f --- /dev/null +++ b/data/maps/objects/CeladonMart1F.asm @@ -0,0 +1,19 @@ +CeladonMart1F_Object: + db $f ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 16, 7, 1, LAST_MAP + warp 17, 7, 1, LAST_MAP + warp 12, 1, 0, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 11, 4, 2 ; CeladonMart1Text2 + sign 14, 1, 3 ; CeladonMart1Text3 + + def_objects + object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person + + def_warps_to CELADON_MART_1F diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm new file mode 100755 index 00000000..19b2aa59 --- /dev/null +++ b/data/maps/objects/CeladonMart2F.asm @@ -0,0 +1,18 @@ +CeladonMart2F_Object: + db $f ; border block + + def_warps + warp 12, 1, 4, CELADON_MART_1F + warp 16, 1, 1, CELADON_MART_3F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 5 ; CeladonMart2Text5 + + def_objects + object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person + + def_warps_to CELADON_MART_2F diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm new file mode 100755 index 00000000..e1e8c8f2 --- /dev/null +++ b/data/maps/objects/CeladonMart3F.asm @@ -0,0 +1,30 @@ +CeladonMart3F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_4F + warp 16, 1, 1, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 2, 4, 6 ; CeladonMart3Text6 + sign 3, 4, 7 ; CeladonMart3Text7 + sign 5, 4, 8 ; CeladonMart3Text8 + sign 6, 4, 9 ; CeladonMart3Text9 + sign 2, 6, 10 ; CeladonMart3Text10 + sign 3, 6, 11 ; CeladonMart3Text11 + sign 5, 6, 12 ; CeladonMart3Text12 + sign 6, 6, 13 ; CeladonMart3Text13 + sign 14, 1, 14 ; CeladonMart3Text14 + sign 4, 1, 15 ; CeladonMart3Text15 + sign 6, 1, 16 ; CeladonMart3Text16 + sign 10, 1, 17 ; CeladonMart3Text17 + + def_objects + object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person + object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person + object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person + object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person + object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person + + def_warps_to CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm new file mode 100755 index 00000000..72ed0338 --- /dev/null +++ b/data/maps/objects/CeladonMart4F.asm @@ -0,0 +1,17 @@ +CeladonMart4F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_3F + warp 16, 1, 1, CELADON_MART_5F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 4 ; CeladonMart4Text4 + + def_objects + object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm new file mode 100755 index 00000000..2583526c --- /dev/null +++ b/data/maps/objects/CeladonMart5F.asm @@ -0,0 +1,18 @@ +CeladonMart5F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_ROOF + warp 16, 1, 1, CELADON_MART_4F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 5 ; CeladonMart5Text5 + + def_objects + object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person + object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person + object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person + + def_warps_to CELADON_MART_5F diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm new file mode 100755 index 00000000..d03984a6 --- /dev/null +++ b/data/maps/objects/CeladonMartElevator.asm @@ -0,0 +1,13 @@ +CeladonMartElevator_Object: + db $f ; border block + + def_warps + warp 1, 3, 5, CELADON_MART_1F + warp 2, 3, 5, CELADON_MART_1F + + def_signs + sign 3, 0, 1 ; CeladonMartElevatorText1 + + def_objects + + def_warps_to CELADON_MART_ELEVATOR diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm new file mode 100755 index 00000000..49b5ab6f --- /dev/null +++ b/data/maps/objects/CeladonMartRoof.asm @@ -0,0 +1,17 @@ +CeladonMartRoof_Object: + db $42 ; border block + + def_warps + warp 15, 2, 0, CELADON_MART_5F + + def_signs + sign 10, 1, 3 ; CeladonMartRoofText3 + sign 11, 1, 4 ; CeladonMartRoofText4 + sign 12, 2, 5 ; CeladonMartRoofText5 + sign 13, 2, 6 ; CeladonMartRoofText6 + + def_objects + object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person + + def_warps_to CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm new file mode 100755 index 00000000..0a298fd0 --- /dev/null +++ b/data/maps/objects/CeladonPokecenter.asm @@ -0,0 +1,17 @@ +CeladonPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; 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/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..50d2087a --- /dev/null +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -0,0 +1,14 @@ +CeruleanBadgeHouse_Object: + db $c ; border block + + def_warps + warp 2, 0, 9, LAST_MAP + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person + + def_warps_to CERULEAN_BADGE_HOUSE diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm new file mode 100755 index 00000000..8c3d260e --- /dev/null +++ b/data/maps/objects/CeruleanCave1F.asm @@ -0,0 +1,23 @@ +CeruleanCave1F_Object: + db $7d ; border block + + def_warps + warp 24, 17, 6, LAST_MAP + warp 25, 17, 6, LAST_MAP + warp 27, 1, 0, CERULEAN_CAVE_2F + warp 23, 7, 1, CERULEAN_CAVE_2F + warp 18, 9, 2, CERULEAN_CAVE_2F + warp 7, 1, 3, CERULEAN_CAVE_2F + warp 1, 3, 4, CERULEAN_CAVE_2F + warp 3, 11, 5, CERULEAN_CAVE_2F + warp 0, 6, 0, CERULEAN_CAVE_B1F + + def_signs + + def_objects + 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 new file mode 100755 index 00000000..787ae539 --- /dev/null +++ b/data/maps/objects/CeruleanCave2F.asm @@ -0,0 +1,20 @@ +CeruleanCave2F_Object: + db $7d ; border block + + def_warps + warp 29, 1, 2, CERULEAN_CAVE_1F + warp 22, 6, 3, CERULEAN_CAVE_1F + warp 19, 7, 4, CERULEAN_CAVE_1F + warp 9, 1, 5, CERULEAN_CAVE_1F + warp 1, 3, 6, CERULEAN_CAVE_1F + warp 3, 11, 7, CERULEAN_CAVE_1F + + def_signs + + def_objects + 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 new file mode 100755 index 00000000..3493ab7e --- /dev/null +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -0,0 +1,16 @@ +CeruleanCaveB1F_Object: + db $7d ; border block + + def_warps + warp 3, 6, 8, CERULEAN_CAVE_1F + + def_signs + + def_objects + object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 + 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 new file mode 100755 index 00000000..fae56fc1 --- /dev/null +++ b/data/maps/objects/CeruleanCity.asm @@ -0,0 +1,37 @@ +CeruleanCity_Object: + db $a ; border block + + def_warps + warp 27, 11, 0, CERULEAN_TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 19, 17, 0, CERULEAN_POKECENTER + warp 30, 19, 0, CERULEAN_GYM + warp 13, 25, 0, BIKE_SHOP + warp 25, 25, 0, CERULEAN_MART + warp 4, 11, 0, CERULEAN_CAVE_1F + warp 27, 9, 2, CERULEAN_TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_BADGE_HOUSE + warp 9, 9, 0, CERULEAN_BADGE_HOUSE + + def_signs + sign 23, 19, 12 ; CeruleanCityText12 + sign 17, 29, 13 ; CeruleanCityText13 + sign 26, 25, 14 ; MartSignText + sign 20, 17, 15 ; PokeCenterSignText + sign 11, 25, 16 ; CeruleanCityText16 + sign 27, 21, 17 ; CeruleanCityText17 + + def_objects + object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 + 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_OFFICER_JENNY, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; 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_OFFICER_JENNY, 27, 12, STAY, DOWN, 11 ; person + + def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm new file mode 100755 index 00000000..26709cae --- /dev/null +++ b/data/maps/objects/CeruleanGym.asm @@ -0,0 +1,16 @@ +CeruleanGym_Object: + db $3 ; border block + + def_warps + warp 4, 13, 3, LAST_MAP + warp 5, 13, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 + object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person + + def_warps_to CERULEAN_GYM diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm new file mode 100755 index 00000000..144edd80 --- /dev/null +++ b/data/maps/objects/CeruleanMart.asm @@ -0,0 +1,15 @@ +CeruleanMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 3, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 2, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CERULEAN_MART diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm new file mode 100755 index 00000000..b90db6a5 --- /dev/null +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -0,0 +1,17 @@ +CeruleanPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + 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, 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 new file mode 100755 index 00000000..a52548fe --- /dev/null +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -0,0 +1,16 @@ +CeruleanTradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + 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/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..9f502319 --- /dev/null +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -0,0 +1,16 @@ +CeruleanTrashedHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 3, 0, 7, LAST_MAP + + def_signs + sign 3, 0, 3 ; CeruleanHouseTrashedText3 + + def_objects + object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_GIRL, 5, 6, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to CERULEAN_TRASHED_HOUSE diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm new file mode 100755 index 00000000..2380fd04 --- /dev/null +++ b/data/maps/objects/ChampionsRoom.asm @@ -0,0 +1,16 @@ +ChampionsRoom_Object: + db $3 ; border block + + def_warps + warp 3, 7, 1, LANCES_ROOM + warp 4, 7, 2, LANCES_ROOM + warp 3, 0, 0, HALL_OF_FAME + warp 4, 0, 0, HALL_OF_FAME + + def_signs + + def_objects + object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person + + def_warps_to CHAMPIONS_ROOM diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm new file mode 100755 index 00000000..a680d3fd --- /dev/null +++ b/data/maps/objects/CinnabarGym.asm @@ -0,0 +1,21 @@ +CinnabarGym_Object: + db $2e ; border block + + def_warps + warp 16, 17, 1, LAST_MAP + warp 17, 17, 1, LAST_MAP + + def_signs + + def_objects + 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 + object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 + object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 + object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 + object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 + object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person + + def_warps_to CINNABAR_GYM diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm new file mode 100755 index 00000000..1dd11a43 --- /dev/null +++ b/data/maps/objects/CinnabarIsland.asm @@ -0,0 +1,22 @@ +CinnabarIsland_Object: + db $43 ; border block + + def_warps + warp 6, 3, 1, POKEMON_MANSION_1F + warp 18, 3, 0, CINNABAR_GYM + warp 6, 9, 0, CINNABAR_LAB + warp 11, 11, 0, CINNABAR_POKECENTER + warp 15, 11, 0, CINNABAR_MART + + def_signs + sign 9, 5, 3 ; CinnabarIslandText3 + sign 16, 11, 4 ; MartSignText + sign 12, 11, 5 ; PokeCenterSignText + sign 9, 11, 6 ; CinnabarIslandText6 + sign 13, 3, 7 ; CinnabarIslandText7 + + def_objects + object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + + def_warps_to CINNABAR_ISLAND diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm new file mode 100755 index 00000000..0e007e3a --- /dev/null +++ b/data/maps/objects/CinnabarLab.asm @@ -0,0 +1,20 @@ +CinnabarLab_Object: + db $17 ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM + warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM + warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM + + def_signs + sign 3, 2, 2 ; Lab1Text2 + sign 9, 4, 3 ; Lab1Text3 + sign 13, 4, 4 ; Lab1Text4 + sign 17, 4, 5 ; Lab1Text5 + + def_objects + object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person + + def_warps_to CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..8269eaeb --- /dev/null +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -0,0 +1,14 @@ +CinnabarLabFossilRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 4, CINNABAR_LAB + warp 3, 7, 4, CINNABAR_LAB + + def_signs + + def_objects + object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person + + def_warps_to CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..b5969dfa --- /dev/null +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,17 @@ +CinnabarLabMetronomeRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 3, CINNABAR_LAB + warp 3, 7, 3, CINNABAR_LAB + + def_signs + sign 0, 4, 3 ; Lab3Text3 + sign 1, 4, 4 ; Lab3Text4 + sign 2, 1, 5 ; Lab3Text5 + + def_objects + object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person + object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to CINNABAR_LAB_METRONOME_ROOM diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..e23a19cf --- /dev/null +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -0,0 +1,15 @@ +CinnabarLabTradeRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 2, CINNABAR_LAB + warp 3, 7, 2, CINNABAR_LAB + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person + object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person + + def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm new file mode 100755 index 00000000..2413d993 --- /dev/null +++ b/data/maps/objects/CinnabarMart.asm @@ -0,0 +1,15 @@ +CinnabarMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person + object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person + + def_warps_to CINNABAR_MART diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm new file mode 100755 index 00000000..0a2a11aa --- /dev/null +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -0,0 +1,17 @@ +CinnabarPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + 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 new file mode 100644 index 00000000..dac9bc09 --- /dev/null +++ b/data/maps/objects/Colosseum.asm @@ -0,0 +1,11 @@ +Colosseum_Object: + db $e ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person + + def_warps_to COLOSSEUM diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm new file mode 100755 index 00000000..bc635385 --- /dev/null +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -0,0 +1,16 @@ +CopycatsHouse1F_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 7, 1, 0, COPYCATS_HOUSE_2F + + def_signs + + 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_CHANSEY, 1, 4, STAY, NONE, 3 ; person + + def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm new file mode 100755 index 00000000..e04edee7 --- /dev/null +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -0,0 +1,18 @@ +CopycatsHouse2F_Object: + db $a ; border block + + def_warps + warp 7, 1, 2, COPYCATS_HOUSE_1F + + def_signs + sign 3, 5, 6 ; CopycatsHouse2FText6 + sign 0, 1, 7 ; CopycatsHouse2FText7 + + def_objects + object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person + object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person + object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person + + def_warps_to COPYCATS_HOUSE_2F diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm new file mode 100755 index 00000000..2feecff3 --- /dev/null +++ b/data/maps/objects/Daycare.asm @@ -0,0 +1,13 @@ +Daycare_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person + + def_warps_to DAYCARE diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm new file mode 100755 index 00000000..dc4889e5 --- /dev/null +++ b/data/maps/objects/DiglettsCave.asm @@ -0,0 +1,12 @@ +DiglettsCave_Object: + db $19 ; border block + + def_warps + warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 + warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 + + def_signs + + def_objects + + def_warps_to DIGLETTS_CAVE diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..f6c884d9 --- /dev/null +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -0,0 +1,14 @@ +DiglettsCaveRoute11_Object: + db $7d ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + warp 4, 4, 1, DIGLETTS_CAVE + + def_signs + + def_objects + object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person + + def_warps_to DIGLETTS_CAVE_ROUTE_11 diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..948a82e3 --- /dev/null +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -0,0 +1,14 @@ +DiglettsCaveRoute2_Object: + db $7d ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 4, 4, 0, DIGLETTS_CAVE + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person + + def_warps_to DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm new file mode 100755 index 00000000..5345a7aa --- /dev/null +++ b/data/maps/objects/FightingDojo.asm @@ -0,0 +1,19 @@ +FightingDojo_Object: + db $3 ; border block + + def_warps + warp 4, 11, 1, LAST_MAP + warp 5, 11, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 + object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 + object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 + object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 + object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 + object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person + object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person + + def_warps_to FIGHTING_DOJO diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..30aff6c5 --- /dev/null +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,15 @@ +FuchsiaBillsGrandpasHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person + object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person + + def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm new file mode 100755 index 00000000..a601a896 --- /dev/null +++ b/data/maps/objects/FuchsiaCity.asm @@ -0,0 +1,43 @@ +FuchsiaCity_Object: + db $f ; border block + + def_warps + warp 5, 13, 0, FUCHSIA_MART + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE + warp 19, 27, 0, FUCHSIA_POKECENTER + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE + warp 5, 27, 0, FUCHSIA_GYM + warp 22, 13, 0, FUCHSIA_MEETING_ROOM + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE + + def_signs + sign 15, 23, 11 ; FuchsiaCityText11 + sign 25, 15, 12 ; FuchsiaCityText12 + sign 17, 5, 13 ; FuchsiaCityText13 + sign 6, 13, 14 ; MartSignText + sign 20, 27, 15 ; PokeCenterSignText + sign 27, 29, 16 ; FuchsiaCityText16 + sign 21, 15, 17 ; FuchsiaCityText17 + sign 5, 29, 18 ; FuchsiaCityText18 + sign 33, 7, 19 ; FuchsiaCityText19 + sign 27, 7, 20 ; FuchsiaCityText20 + sign 13, 7, 21 ; FuchsiaCityText21 + sign 31, 13, 22 ; FuchsiaCityText22 + sign 13, 15, 23 ; FuchsiaCityText23 + sign 7, 7, 24 ; FuchsiaCityText24 + + def_objects + object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person + 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_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 + object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person + object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person + + def_warps_to FUCHSIA_CITY diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..434cec8b --- /dev/null +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -0,0 +1,14 @@ +FuchsiaGoodRodHouse_Object: + db $c ; border block + + def_warps + warp 2, 0, 8, LAST_MAP + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person + + def_warps_to FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm new file mode 100755 index 00000000..95b2e42e --- /dev/null +++ b/data/maps/objects/FuchsiaGym.asm @@ -0,0 +1,20 @@ +FuchsiaGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 5, LAST_MAP + warp 5, 17, 5, LAST_MAP + + def_signs + + def_objects + 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 + object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 + object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 + object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 + object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person + + def_warps_to FUCHSIA_GYM diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm new file mode 100755 index 00000000..0a238a87 --- /dev/null +++ b/data/maps/objects/FuchsiaMart.asm @@ -0,0 +1,15 @@ +FuchsiaMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person + + def_warps_to FUCHSIA_MART diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..e4c2a83b --- /dev/null +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -0,0 +1,15 @@ +FuchsiaMeetingRoom_Object: + db $17 ; border block + + def_warps + warp 4, 7, 6, LAST_MAP + warp 5, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person + object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person + + def_warps_to FUCHSIA_MEETING_ROOM diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm new file mode 100755 index 00000000..4eb9d196 --- /dev/null +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -0,0 +1,17 @@ +FuchsiaPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; 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 new file mode 100755 index 00000000..4e425e86 --- /dev/null +++ b/data/maps/objects/GameCorner.asm @@ -0,0 +1,25 @@ +GameCorner_Object: + db $f ; border block + + def_warps + warp 15, 17, 7, LAST_MAP + warp 16, 17, 7, LAST_MAP + warp 17, 4, 1, ROCKET_HIDEOUT_B1F + + def_signs + sign 9, 4, 12 ; CeladonGameCornerText12 + + def_objects + object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person + object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person + object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person + 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_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/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..d55decf1 --- /dev/null +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -0,0 +1,17 @@ +GameCornerPrizeRoom_Object: + db $f ; border block + + def_warps + warp 4, 7, 9, LAST_MAP + warp 5, 7, 9, LAST_MAP + + def_signs + sign 2, 2, 3 ; CeladonPrizeRoomText3 + sign 4, 2, 4 ; CeladonPrizeRoomText4 + sign 6, 2, 5 ; CeladonPrizeRoomText5 + + def_objects + object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person + object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to GAME_CORNER_PRIZE_ROOM diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm new file mode 100755 index 00000000..caa55bf6 --- /dev/null +++ b/data/maps/objects/HallOfFame.asm @@ -0,0 +1,13 @@ +HallOfFame_Object: + db $3 ; border block + + def_warps + warp 4, 7, 2, CHAMPIONS_ROOM + warp 5, 7, 3, CHAMPIONS_ROOM + + def_signs + + def_objects + object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person + + def_warps_to HALL_OF_FAME diff --git a/data/maps/objects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm new file mode 100755 index 00000000..d67c9f8a --- /dev/null +++ b/data/maps/objects/IndigoPlateau.asm @@ -0,0 +1,12 @@ +IndigoPlateau_Object: + db $e ; border block + + def_warps + warp 9, 5, 0, INDIGO_PLATEAU_LOBBY + warp 10, 5, 0, INDIGO_PLATEAU_LOBBY + + def_signs + + def_objects + + def_warps_to INDIGO_PLATEAU diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm new file mode 100755 index 00000000..db101be0 --- /dev/null +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -0,0 +1,19 @@ +IndigoPlateauLobby_Object: + db $0 ; border block + + def_warps + warp 7, 11, 0, LAST_MAP + warp 8, 11, 1, LAST_MAP + warp 8, 0, 0, LORELEIS_ROOM + + def_signs + + def_objects + object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person + 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/LancesRoom.asm b/data/maps/objects/LancesRoom.asm new file mode 100755 index 00000000..a8dc4777 --- /dev/null +++ b/data/maps/objects/LancesRoom.asm @@ -0,0 +1,14 @@ +LancesRoom_Object: + db $3 ; border block + + def_warps + warp 24, 16, 2, AGATHAS_ROOM + warp 5, 0, 0, CHAMPIONS_ROOM + warp 6, 0, 0, CHAMPIONS_ROOM + + def_signs + + def_objects + object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 + + def_warps_to LANCES_ROOM diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm new file mode 100755 index 00000000..7e7443e2 --- /dev/null +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -0,0 +1,14 @@ +LavenderCuboneHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person + object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person + + def_warps_to LAVENDER_CUBONE_HOUSE diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm new file mode 100755 index 00000000..00d5a64b --- /dev/null +++ b/data/maps/objects/LavenderMart.asm @@ -0,0 +1,15 @@ +LavenderMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person + + def_warps_to LAVENDER_MART diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm new file mode 100755 index 00000000..667b584f --- /dev/null +++ b/data/maps/objects/LavenderPokecenter.asm @@ -0,0 +1,17 @@ +LavenderPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; 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/LavenderTown.asm b/data/maps/objects/LavenderTown.asm new file mode 100755 index 00000000..f34659c1 --- /dev/null +++ b/data/maps/objects/LavenderTown.asm @@ -0,0 +1,25 @@ +LavenderTown_Object: + db $2c ; border block + + def_warps + warp 3, 5, 0, LAVENDER_POKECENTER + warp 14, 5, 0, POKEMON_TOWER_1F + warp 7, 9, 0, MR_FUJIS_HOUSE + warp 15, 13, 0, LAVENDER_MART + warp 3, 13, 0, LAVENDER_CUBONE_HOUSE + warp 7, 13, 0, NAME_RATERS_HOUSE + + def_signs + sign 11, 9, 4 ; LavenderTownText4 + sign 9, 3, 5 ; LavenderTownText5 + sign 16, 13, 6 ; MartSignText + sign 4, 5, 7 ; PokeCenterSignText + sign 5, 9, 8 ; LavenderTownText8 + sign 17, 7, 9 ; LavenderTownText9 + + def_objects + object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to LAVENDER_TOWN diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm new file mode 100755 index 00000000..91a306b8 --- /dev/null +++ b/data/maps/objects/LoreleisRoom.asm @@ -0,0 +1,15 @@ +LoreleisRoom_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, INDIGO_PLATEAU_LOBBY + warp 5, 11, 2, INDIGO_PLATEAU_LOBBY + warp 4, 0, 0, BRUNOS_ROOM + warp 5, 0, 1, BRUNOS_ROOM + + def_signs + + def_objects + object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 + + def_warps_to LORELEIS_ROOM diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm new file mode 100755 index 00000000..6ec762f6 --- /dev/null +++ b/data/maps/objects/MrFujisHouse.asm @@ -0,0 +1,18 @@ +MrFujisHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person + object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person + object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person + object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person + + def_warps_to MR_FUJIS_HOUSE diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm new file mode 100755 index 00000000..44367b20 --- /dev/null +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -0,0 +1,13 @@ +MrPsychicsHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person + + def_warps_to MR_PSYCHICS_HOUSE diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm new file mode 100755 index 00000000..8b40ac4f --- /dev/null +++ b/data/maps/objects/MtMoon1F.asm @@ -0,0 +1,29 @@ +MtMoon1F_Object: + db $3 ; border block + + def_warps + warp 14, 35, 1, LAST_MAP + warp 15, 35, 1, LAST_MAP + warp 5, 5, 0, MT_MOON_B1F + warp 17, 11, 2, MT_MOON_B1F + warp 25, 15, 3, MT_MOON_B1F + + def_signs + sign 15, 23, 14 ; MtMoon1Text14 + + def_objects + object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 + object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 + object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 + object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 + object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION + object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE + object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY + object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE + object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION + object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN + + def_warps_to MT_MOON_1F diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm new file mode 100755 index 00000000..69fa3c17 --- /dev/null +++ b/data/maps/objects/MtMoonB1F.asm @@ -0,0 +1,18 @@ +MtMoonB1F_Object: + db $3 ; border block + + def_warps + warp 5, 5, 2, MT_MOON_1F + warp 17, 11, 0, MT_MOON_B2F + warp 25, 9, 3, MT_MOON_1F + warp 25, 15, 4, MT_MOON_1F + warp 21, 17, 1, MT_MOON_B2F + warp 13, 27, 2, MT_MOON_B2F + warp 23, 3, 3, MT_MOON_B2F + warp 27, 3, 2, LAST_MAP + + def_signs + + def_objects + + def_warps_to MT_MOON_B1F diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm new file mode 100755 index 00000000..b2c1ff1d --- /dev/null +++ b/data/maps/objects/MtMoonB2F.asm @@ -0,0 +1,24 @@ +MtMoonB2F_Object: + db $3 ; border block + + def_warps + warp 25, 9, 1, MT_MOON_B1F + warp 21, 17, 4, MT_MOON_B1F + warp 15, 27, 5, MT_MOON_B1F + warp 5, 7, 6, MT_MOON_B1F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + 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, 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 new file mode 100755 index 00000000..e94dd27d --- /dev/null +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -0,0 +1,19 @@ +MtMoonPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person + 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/Museum1F.asm b/data/maps/objects/Museum1F.asm new file mode 100755 index 00000000..3628173c --- /dev/null +++ b/data/maps/objects/Museum1F.asm @@ -0,0 +1,20 @@ +Museum1F_Object: + db $a ; border block + + def_warps + warp 10, 7, 0, LAST_MAP + warp 11, 7, 0, LAST_MAP + warp 16, 7, 1, LAST_MAP + warp 17, 7, 1, LAST_MAP + warp 7, 7, 0, MUSEUM_2F + + def_signs + + def_objects + object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person + object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person + object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person + + def_warps_to MUSEUM_1F diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm new file mode 100755 index 00000000..72f98f9b --- /dev/null +++ b/data/maps/objects/Museum2F.asm @@ -0,0 +1,18 @@ +Museum2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, MUSEUM_1F + + def_signs + sign 11, 2, 6 ; Museum2FText6 + sign 2, 5, 7 ; Museum2FText7 + + def_objects + object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person + object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person + + def_warps_to MUSEUM_2F diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm new file mode 100755 index 00000000..935a6887 --- /dev/null +++ b/data/maps/objects/NameRatersHouse.asm @@ -0,0 +1,13 @@ +NameRatersHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 5, LAST_MAP + warp 3, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person + + def_warps_to NAME_RATERS_HOUSE diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm new file mode 100755 index 00000000..366fc894 --- /dev/null +++ b/data/maps/objects/OaksLab.asm @@ -0,0 +1,21 @@ +OaksLab_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, LAST_MAP + warp 5, 11, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 + 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 new file mode 100755 index 00000000..c84dc921 --- /dev/null +++ b/data/maps/objects/PalletTown.asm @@ -0,0 +1,20 @@ +PalletTown_Object: + db $b ; border block + + def_warps + warp 5, 5, 0, REDS_HOUSE_1F + warp 13, 5, 0, BLUES_HOUSE + warp 12, 11, 1, OAKS_LAB + + def_signs + sign 13, 13, 4 ; PalletTownText4 + sign 7, 9, 5 ; PalletTownText5 + sign 3, 5, 6 ; PalletTownText6 + sign 11, 5, 7 ; PalletTownText7 + + def_objects + 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 + + def_warps_to PALLET_TOWN diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm new file mode 100755 index 00000000..13d228f2 --- /dev/null +++ b/data/maps/objects/PewterCity.asm @@ -0,0 +1,29 @@ +PewterCity_Object: + db $a ; border block + + def_warps + warp 14, 7, 0, MUSEUM_1F + warp 19, 5, 2, MUSEUM_1F + warp 16, 17, 0, PEWTER_GYM + warp 29, 13, 0, PEWTER_NIDORAN_HOUSE + warp 23, 17, 0, PEWTER_MART + warp 7, 29, 0, PEWTER_SPEECH_HOUSE + warp 13, 25, 0, PEWTER_POKECENTER + + def_signs + sign 19, 29, 6 ; PewterCityText6 + sign 33, 19, 7 ; PewterCityText7 + sign 24, 17, 8 ; MartSignText + sign 14, 25, 9 ; PokeCenterSignText + sign 15, 9, 10 ; PewterCityText10 + sign 11, 17, 11 ; PewterCityText11 + sign 25, 23, 12 ; PewterCityText12 + + def_objects + object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person + object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person + object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person + object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person + + def_warps_to PEWTER_CITY diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm new file mode 100755 index 00000000..9c21701a --- /dev/null +++ b/data/maps/objects/PewterGym.asm @@ -0,0 +1,15 @@ +PewterGym_Object: + db $3 ; border block + + def_warps + warp 4, 13, 2, LAST_MAP + warp 5, 13, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person + + def_warps_to PEWTER_GYM diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm new file mode 100755 index 00000000..9685d5c7 --- /dev/null +++ b/data/maps/objects/PewterMart.asm @@ -0,0 +1,15 @@ +PewterMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 3, 3, WALK, UP_DOWN, 2 ; person + object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person + + def_warps_to PEWTER_MART diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm new file mode 100755 index 00000000..b1fd0a74 --- /dev/null +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -0,0 +1,15 @@ +PewterNidoranHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person + + def_warps_to PEWTER_NIDORAN_HOUSE diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm new file mode 100755 index 00000000..e9a40d20 --- /dev/null +++ b/data/maps/objects/PewterPokecenter.asm @@ -0,0 +1,18 @@ +PewterPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 6, LAST_MAP + warp 4, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; 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/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm new file mode 100755 index 00000000..4dafb7be --- /dev/null +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -0,0 +1,14 @@ +PewterSpeechHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 5, LAST_MAP + warp 3, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person + + def_warps_to PEWTER_SPEECH_HOUSE diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm new file mode 100755 index 00000000..eb3e945e --- /dev/null +++ b/data/maps/objects/PokemonFanClub.asm @@ -0,0 +1,18 @@ +PokemonFanClub_Object: + db $d ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; 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 + + def_warps_to POKEMON_FAN_CLUB diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm new file mode 100755 index 00000000..70eef1a1 --- /dev/null +++ b/data/maps/objects/PokemonMansion1F.asm @@ -0,0 +1,21 @@ +PokemonMansion1F_Object: + db $2e ; border block + + def_warps + warp 4, 27, 0, LAST_MAP + warp 5, 27, 0, LAST_MAP + warp 6, 27, 0, LAST_MAP + warp 7, 27, 0, LAST_MAP + warp 5, 10, 0, POKEMON_MANSION_2F + warp 21, 23, 0, POKEMON_MANSION_B1F + warp 26, 27, 0, LAST_MAP + warp 27, 27, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS + + def_warps_to POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm new file mode 100755 index 00000000..8d504eef --- /dev/null +++ b/data/maps/objects/PokemonMansion2F.asm @@ -0,0 +1,18 @@ +PokemonMansion2F_Object: + db $1 ; border block + + def_warps + warp 5, 10, 4, POKEMON_MANSION_1F + warp 7, 10, 0, POKEMON_MANSION_3F + warp 25, 14, 2, POKEMON_MANSION_3F + warp 6, 1, 1, POKEMON_MANSION_3F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 + object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person + + def_warps_to POKEMON_MANSION_2F diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm new file mode 100755 index 00000000..fdf16a8d --- /dev/null +++ b/data/maps/objects/PokemonMansion3F.asm @@ -0,0 +1,18 @@ +PokemonMansion3F_Object: + db $1 ; border block + + def_warps + warp 7, 10, 1, POKEMON_MANSION_2F + warp 6, 1, 3, POKEMON_MANSION_2F + warp 25, 14, 2, POKEMON_MANSION_2F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 + object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION + object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON + object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person + + def_warps_to POKEMON_MANSION_3F diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm new file mode 100755 index 00000000..bf0ea0a4 --- /dev/null +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -0,0 +1,19 @@ +PokemonMansionB1F_Object: + db $1 ; border block + + def_warps + warp 23, 22, 5, POKEMON_MANSION_1F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD + object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM + object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY + + def_warps_to POKEMON_MANSION_B1F diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm new file mode 100755 index 00000000..b73c7562 --- /dev/null +++ b/data/maps/objects/PokemonTower1F.asm @@ -0,0 +1,18 @@ +PokemonTower1F_Object: + db $1 ; border block + + def_warps + warp 10, 17, 1, LAST_MAP + warp 11, 17, 1, LAST_MAP + warp 18, 9, 1, POKEMON_TOWER_2F + + def_signs + + def_objects + object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person + object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person + object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person + + def_warps_to POKEMON_TOWER_1F diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm new file mode 100755 index 00000000..27bd2f1b --- /dev/null +++ b/data/maps/objects/PokemonTower2F.asm @@ -0,0 +1,14 @@ +PokemonTower2F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_3F + warp 18, 9, 2, POKEMON_TOWER_1F + + def_signs + + def_objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person + + def_warps_to POKEMON_TOWER_2F diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm new file mode 100755 index 00000000..af1b17dc --- /dev/null +++ b/data/maps/objects/PokemonTower3F.asm @@ -0,0 +1,16 @@ +PokemonTower3F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_2F + warp 18, 9, 1, POKEMON_TOWER_4F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE + + def_warps_to POKEMON_TOWER_3F diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm new file mode 100755 index 00000000..64801e23 --- /dev/null +++ b/data/maps/objects/PokemonTower4F.asm @@ -0,0 +1,18 @@ +PokemonTower4F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_5F + warp 18, 9, 1, POKEMON_TOWER_3F + + def_signs + + def_objects + object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 + object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 + object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 + object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER + object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING + object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP + + def_warps_to POKEMON_TOWER_4F diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm new file mode 100755 index 00000000..33482ed5 --- /dev/null +++ b/data/maps/objects/PokemonTower5F.asm @@ -0,0 +1,18 @@ +PokemonTower5F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_4F + warp 18, 9, 0, POKEMON_TOWER_6F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 + object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 + object SPRITE_CHANNELER, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 + object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 + object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET + + def_warps_to POKEMON_TOWER_5F diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm new file mode 100755 index 00000000..8e7b276c --- /dev/null +++ b/data/maps/objects/PokemonTower6F.asm @@ -0,0 +1,17 @@ +PokemonTower6F_Object: + db $1 ; border block + + def_warps + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY + + def_warps_to POKEMON_TOWER_6F diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm new file mode 100755 index 00000000..e5fe486b --- /dev/null +++ b/data/maps/objects/PokemonTower7F.asm @@ -0,0 +1,14 @@ +PokemonTower7F_Object: + db $1 ; border block + + def_warps + warp 9, 16, 1, POKEMON_TOWER_6F + + def_signs + + def_objects + 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/PowerPlant.asm b/data/maps/objects/PowerPlant.asm new file mode 100755 index 00000000..6802ce4f --- /dev/null +++ b/data/maps/objects/PowerPlant.asm @@ -0,0 +1,27 @@ +PowerPlant_Object: + db $2e ; border block + + def_warps + warp 4, 35, 3, LAST_MAP + warp 5, 35, 3, LAST_MAP + warp 0, 11, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 + object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 + object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 + object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 + object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 + object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 + object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 + object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS + object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP + object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY + object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER + object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT + + def_warps_to POWER_PLANT diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm new file mode 100755 index 00000000..f7cd0819 --- /dev/null +++ b/data/maps/objects/RedsHouse1F.asm @@ -0,0 +1,15 @@ +RedsHouse1F_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP ; exit1 + warp 3, 7, 0, LAST_MAP ; exit2 + warp 7, 1, 0, REDS_HOUSE_2F ; staircase + + def_signs + sign 3, 1, 2 ; TV + + def_objects + object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom + + def_warps_to REDS_HOUSE_1F diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm new file mode 100755 index 00000000..826e68fd --- /dev/null +++ b/data/maps/objects/RedsHouse2F.asm @@ -0,0 +1,11 @@ +RedsHouse2F_Object: + db $a ; border block + + def_warps + warp 7, 1, 2, REDS_HOUSE_1F + + def_signs + + def_objects + + def_warps_to REDS_HOUSE_2F diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm new file mode 100755 index 00000000..b3d4da48 --- /dev/null +++ b/data/maps/objects/RockTunnel1F.asm @@ -0,0 +1,26 @@ +RockTunnel1F_Object: + db $3 ; border block + + def_warps + warp 15, 3, 1, LAST_MAP + warp 15, 0, 1, LAST_MAP + warp 15, 33, 2, LAST_MAP + warp 15, 35, 2, LAST_MAP + warp 37, 3, 0, ROCK_TUNNEL_B1F + warp 5, 3, 1, ROCK_TUNNEL_B1F + warp 17, 11, 2, ROCK_TUNNEL_B1F + warp 37, 17, 3, ROCK_TUNNEL_B1F + + def_signs + sign 11, 29, 8 ; RockTunnel1Text8 + + def_objects + object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 + object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 + object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 + object SPRITE_SUPER_NERD, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object SPRITE_COOLTRAINER_F, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 + object SPRITE_COOLTRAINER_F, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 + object SPRITE_COOLTRAINER_F, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + + def_warps_to ROCK_TUNNEL_1F diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm new file mode 100755 index 00000000..3fadaa5b --- /dev/null +++ b/data/maps/objects/RockTunnelB1F.asm @@ -0,0 +1,22 @@ +RockTunnelB1F_Object: + db $3 ; border block + + def_warps + warp 33, 25, 4, ROCK_TUNNEL_1F + warp 27, 3, 5, ROCK_TUNNEL_1F + warp 23, 11, 6, ROCK_TUNNEL_1F + warp 3, 3, 7, ROCK_TUNNEL_1F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_F, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 + object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 + object SPRITE_SUPER_NERD, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 + object SPRITE_SUPER_NERD, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 + object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 + object SPRITE_COOLTRAINER_F, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 + object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 + object SPRITE_SUPER_NERD, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + + def_warps_to ROCK_TUNNEL_B1F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm new file mode 100755 index 00000000..7b99d491 --- /dev/null +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -0,0 +1,17 @@ +RockTunnelPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; 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/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm new file mode 100755 index 00000000..81049d63 --- /dev/null +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -0,0 +1,22 @@ +RocketHideoutB1F_Object: + db $2e ; border block + + def_warps + warp 23, 2, 0, ROCKET_HIDEOUT_B2F + warp 21, 2, 2, GAME_CORNER + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 24, 3, ROCKET_HIDEOUT_B2F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 + object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 + object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 + object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 + object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 + object SPRITE_POKE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE + object SPRITE_POKE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION + + def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm new file mode 100755 index 00000000..f6ce5113 --- /dev/null +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -0,0 +1,20 @@ +RocketHideoutB2F_Object: + db $2e ; border block + + def_warps + warp 27, 8, 0, ROCKET_HIDEOUT_B1F + warp 21, 8, 0, ROCKET_HIDEOUT_B3F + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 22, 3, ROCKET_HIDEOUT_B1F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 + object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL + object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION + + def_warps_to ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm new file mode 100755 index 00000000..4cba5422 --- /dev/null +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -0,0 +1,16 @@ +RocketHideoutB3F_Object: + db $2e ; border block + + def_warps + warp 25, 6, 1, ROCKET_HIDEOUT_B2F + warp 19, 18, 0, ROCKET_HIDEOUT_B4F + + def_signs + + def_objects + object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 + object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 + object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE + object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY + + def_warps_to ROCKET_HIDEOUT_B3F diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm new file mode 100755 index 00000000..3541befc --- /dev/null +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -0,0 +1,22 @@ +RocketHideoutB4F_Object: + db $2e ; border block + + def_warps + warp 19, 10, 1, ROCKET_HIDEOUT_B3F + warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR + warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 + 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 + object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON + object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + + def_warps_to ROCKET_HIDEOUT_B4F diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm new file mode 100755 index 00000000..20ab4956 --- /dev/null +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -0,0 +1,13 @@ +RocketHideoutElevator_Object: + db $f ; border block + + def_warps + warp 2, 1, 2, ROCKET_HIDEOUT_B1F + warp 3, 1, 4, ROCKET_HIDEOUT_B1F + + def_signs + sign 1, 1, 1 ; RocketHideoutElevatorText1 + + def_objects + + def_warps_to ROCKET_HIDEOUT_ELEVATOR diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm new file mode 100755 index 00000000..ee1b03a5 --- /dev/null +++ b/data/maps/objects/Route1.asm @@ -0,0 +1,16 @@ +Route1_Object: + db $b ; border block + + def_warps + + def_signs + sign 9, 27, 3 ; Route1Text3 + + def_objects + object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person + object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_1 + + ; unused + warp_to 2, 7, 4 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm new file mode 100755 index 00000000..54a0936e --- /dev/null +++ b/data/maps/objects/Route10.asm @@ -0,0 +1,24 @@ +Route10_Object: + db $2c ; border block + + def_warps + warp 11, 19, 0, ROCK_TUNNEL_POKECENTER + warp 8, 17, 0, ROCK_TUNNEL_1F + warp 8, 53, 2, ROCK_TUNNEL_1F + warp 6, 39, 0, POWER_PLANT + + def_signs + sign 7, 19, 7 ; Route10Text7 + sign 12, 19, 8 ; PokeCenterSignText + sign 9, 55, 9 ; Route10Text9 + sign 5, 41, 10 ; Route10Text10 + + def_objects + object SPRITE_SUPER_NERD, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 + object SPRITE_SUPER_NERD, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 + object SPRITE_COOLTRAINER_F, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 + object SPRITE_COOLTRAINER_F, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + + def_warps_to ROUTE_10 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm new file mode 100755 index 00000000..0814aeb1 --- /dev/null +++ b/data/maps/objects/Route11.asm @@ -0,0 +1,26 @@ +Route11_Object: + db $f ; border block + + def_warps + warp 49, 8, 0, ROUTE_11_GATE_1F + warp 49, 9, 0, ROUTE_11_GATE_1F + warp 58, 8, 2, ROUTE_11_GATE_1F + warp 58, 9, 2, ROUTE_11_GATE_1F + warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 + + def_signs + sign 1, 5, 11 ; Route11Text11 + + def_objects + object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 + object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 + object SPRITE_YOUNGSTER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_SUPER_NERD, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_YOUNGSTER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 + object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 + object SPRITE_YOUNGSTER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_SUPER_NERD, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_YOUNGSTER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 + + def_warps_to ROUTE_11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm new file mode 100755 index 00000000..d0c9c461 --- /dev/null +++ b/data/maps/objects/Route11Gate1F.asm @@ -0,0 +1,16 @@ +Route11Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_11_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + def_warps_to ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm new file mode 100755 index 00000000..fa48409c --- /dev/null +++ b/data/maps/objects/Route11Gate2F.asm @@ -0,0 +1,15 @@ +Route11Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_11_GATE_1F + + def_signs + sign 1, 2, 3 ; Route11GateUpstairsText3 + sign 6, 2, 4 ; Route11GateUpstairsText4 + + def_objects + object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person + + def_warps_to ROUTE_11_GATE_2F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm new file mode 100755 index 00000000..bdb74d68 --- /dev/null +++ b/data/maps/objects/Route12.asm @@ -0,0 +1,26 @@ +Route12_Object: + db $43 ; border block + + def_warps + warp 10, 15, 0, 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 + + def_signs + sign 13, 13, 11 ; Route12Text11 + sign 11, 63, 12 ; Route12Text12 + + def_objects + object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person + object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 + object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4 + object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 + object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 + object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 + object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 + object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY + object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON + + def_warps_to ROUTE_12 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm new file mode 100755 index 00000000..356bf67a --- /dev/null +++ b/data/maps/objects/Route12Gate1F.asm @@ -0,0 +1,16 @@ +Route12Gate1F_Object: + db $a ; border block + + def_warps + warp 4, 0, 0, LAST_MAP + warp 5, 0, 1, LAST_MAP + warp 4, 7, 2, LAST_MAP + warp 5, 7, 2, LAST_MAP + warp 8, 6, 0, ROUTE_12_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person + + def_warps_to ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm new file mode 100755 index 00000000..413adf25 --- /dev/null +++ b/data/maps/objects/Route12Gate2F.asm @@ -0,0 +1,14 @@ +Route12Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_12_GATE_1F + + def_signs + sign 1, 2, 2 ; Route12GateUpstairsText2 + sign 6, 2, 3 ; Route12GateUpstairsText3 + + def_objects + object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, UP_DOWN, 1 ; person + + def_warps_to ROUTE_12_GATE_2F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm new file mode 100755 index 00000000..4cd43639 --- /dev/null +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -0,0 +1,13 @@ +Route12SuperRodHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person + + def_warps_to ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm new file mode 100755 index 00000000..365eea7d --- /dev/null +++ b/data/maps/objects/Route13.asm @@ -0,0 +1,23 @@ +Route13_Object: + db $43 ; border block + + def_warps + + def_signs + sign 15, 13, 11 ; Route13Text11 + sign 33, 5, 12 ; Route13Text12 + sign 31, 11, 13 ; Route13Text13 + + def_objects + object SPRITE_COOLTRAINER_M, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 + object SPRITE_COOLTRAINER_F, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 + object SPRITE_COOLTRAINER_F, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object SPRITE_COOLTRAINER_F, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 + object SPRITE_COOLTRAINER_F, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object SPRITE_COOLTRAINER_M, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object SPRITE_BEAUTY, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 + object SPRITE_BEAUTY, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 + object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 + object SPRITE_COOLTRAINER_M, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 + + def_warps_to ROUTE_13 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm new file mode 100755 index 00000000..4a2240e6 --- /dev/null +++ b/data/maps/objects/Route14.asm @@ -0,0 +1,21 @@ +Route14_Object: + db $43 ; border block + + def_warps + + def_signs + sign 17, 13, 11 ; Route14Text11 + + def_objects + object SPRITE_COOLTRAINER_M, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object SPRITE_COOLTRAINER_M, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object SPRITE_COOLTRAINER_M, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object SPRITE_COOLTRAINER_M, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object SPRITE_COOLTRAINER_M, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object SPRITE_COOLTRAINER_M, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 + object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 + object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 + object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 + + def_warps_to ROUTE_14 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm new file mode 100755 index 00000000..884e1704 --- /dev/null +++ b/data/maps/objects/Route15.asm @@ -0,0 +1,26 @@ +Route15_Object: + db $43 ; border block + + def_warps + warp 7, 8, 0, ROUTE_15_GATE_1F + warp 7, 9, 0, ROUTE_15_GATE_1F + warp 14, 8, 2, ROUTE_15_GATE_1F + warp 14, 9, 2, ROUTE_15_GATE_1F + + def_signs + sign 39, 9, 12 ; Route15Text12 + + def_objects + object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 + object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 + object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE + + def_warps_to ROUTE_15 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm new file mode 100755 index 00000000..e611e98b --- /dev/null +++ b/data/maps/objects/Route15Gate1F.asm @@ -0,0 +1,16 @@ +Route15Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_15_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + def_warps_to ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm new file mode 100755 index 00000000..608b69e5 --- /dev/null +++ b/data/maps/objects/Route15Gate2F.asm @@ -0,0 +1,13 @@ +Route15Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_15_GATE_1F + + def_signs + sign 6, 2, 2 ; Route15GateUpstairsText2 + + def_objects + object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1 + + def_warps_to ROUTE_15_GATE_2F diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm new file mode 100755 index 00000000..50a8a4bf --- /dev/null +++ b/data/maps/objects/Route16.asm @@ -0,0 +1,28 @@ +Route16_Object: + db $f ; border block + + def_warps + warp 17, 10, 0, ROUTE_16_GATE_1F + warp 17, 11, 0, ROUTE_16_GATE_1F + warp 24, 10, 2, ROUTE_16_GATE_1F + warp 24, 11, 2, ROUTE_16_GATE_1F + warp 17, 4, 4, ROUTE_16_GATE_1F + warp 17, 5, 4, ROUTE_16_GATE_1F + warp 24, 4, 6, ROUTE_16_GATE_1F + warp 24, 5, 6, ROUTE_16_GATE_1F + warp 7, 5, 0, ROUTE_16_FLY_HOUSE + + def_signs + sign 27, 11, 8 ; Route16Text8 + sign 5, 17, 9 ; Route16Text9 + + def_objects + object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 + object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 + object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 + object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 + object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 + object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 + object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person + + def_warps_to ROUTE_16 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm new file mode 100755 index 00000000..be6cdc61 --- /dev/null +++ b/data/maps/objects/Route16FlyHouse.asm @@ -0,0 +1,14 @@ +Route16FlyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 6, 4, WALK, ANY_DIR, 2 ; person + + def_warps_to ROUTE_16_FLY_HOUSE diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm new file mode 100755 index 00000000..4f876e7f --- /dev/null +++ b/data/maps/objects/Route16Gate1F.asm @@ -0,0 +1,21 @@ +Route16Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 8, 0, LAST_MAP + warp 0, 9, 1, LAST_MAP + warp 7, 8, 2, LAST_MAP + warp 7, 9, 2, LAST_MAP + warp 0, 2, 4, LAST_MAP + warp 0, 3, 5, LAST_MAP + warp 7, 2, 6, LAST_MAP + warp 7, 3, 7, LAST_MAP + warp 6, 12, 0, ROUTE_16_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person + object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person + + def_warps_to ROUTE_16_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm new file mode 100755 index 00000000..53511ae5 --- /dev/null +++ b/data/maps/objects/Route16Gate2F.asm @@ -0,0 +1,15 @@ +Route16Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 8, ROUTE_16_GATE_1F + + def_signs + sign 1, 2, 3 ; Route16GateUpstairsText3 + sign 6, 2, 4 ; Route16GateUpstairsText4 + + def_objects + object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 5, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_16_GATE_2F diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm new file mode 100755 index 00000000..f170b695 --- /dev/null +++ b/data/maps/objects/Route17.asm @@ -0,0 +1,26 @@ +Route17_Object: + db $43 ; border block + + def_warps + + def_signs + sign 9, 51, 11 ; Route17Text11 + sign 9, 63, 12 ; Route17Text12 + sign 9, 75, 13 ; Route17Text13 + sign 9, 87, 14 ; Route17Text14 + sign 9, 111, 15 ; Route17Text15 + sign 9, 141, 16 ; Route17Text16 + + def_objects + object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 + object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 + object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 + object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 + object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 + object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 + object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 + object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 + object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 + object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 + + def_warps_to ROUTE_17 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm new file mode 100755 index 00000000..cbb881fe --- /dev/null +++ b/data/maps/objects/Route18.asm @@ -0,0 +1,19 @@ +Route18_Object: + db $43 ; border block + + def_warps + warp 33, 8, 0, ROUTE_18_GATE_1F + warp 33, 9, 0, ROUTE_18_GATE_1F + warp 40, 8, 2, ROUTE_18_GATE_1F + warp 40, 9, 2, ROUTE_18_GATE_1F + + def_signs + sign 43, 7, 4 ; Route18Text4 + sign 33, 5, 5 ; Route18Text5 + + def_objects + object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_COOLTRAINER_M, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_COOLTRAINER_M, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + + def_warps_to ROUTE_18 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm new file mode 100755 index 00000000..3bfdefaa --- /dev/null +++ b/data/maps/objects/Route18Gate1F.asm @@ -0,0 +1,16 @@ +Route18Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_18_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm new file mode 100755 index 00000000..a2080d46 --- /dev/null +++ b/data/maps/objects/Route18Gate2F.asm @@ -0,0 +1,14 @@ +Route18Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_18_GATE_1F + + def_signs + sign 1, 2, 2 ; Route18GateUpstairsText2 + sign 6, 2, 3 ; Route18GateUpstairsText3 + + def_objects + 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 new file mode 100755 index 00000000..340c48f0 --- /dev/null +++ b/data/maps/objects/Route19.asm @@ -0,0 +1,22 @@ +Route19_Object: + db $43 ; border block + + def_warps + warp 5, 9, 0, BEACH_HOUSE + + def_signs + sign 11, 11, 11 + + def_objects + 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, 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 + object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 + + def_warps_to ROUTE_19 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm new file mode 100755 index 00000000..e939b0dd --- /dev/null +++ b/data/maps/objects/Route2.asm @@ -0,0 +1,29 @@ +Route2_Object: + db $f ; border block + + def_warps + warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 + warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 19, 0, ROUTE_2_TRADE_HOUSE + 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 + sign 11, 11, 4 ; Route2Text4 + + def_objects + object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP + + def_warps_to ROUTE_2 + + ; unused + warp_to 2, 7, 4 + 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/Route20.asm b/data/maps/objects/Route20.asm new file mode 100755 index 00000000..19e7cce7 --- /dev/null +++ b/data/maps/objects/Route20.asm @@ -0,0 +1,24 @@ +Route20_Object: + db $43 ; border block + + def_warps + warp 48, 5, 0, SEAFOAM_ISLANDS_1F + warp 58, 9, 2, SEAFOAM_ISLANDS_1F + + def_signs + sign 51, 7, 11 ; Route20Text11 + sign 57, 11, 12 ; Route20Text12 + + def_objects + object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 + object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 + object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 + object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 + object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 + object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 + object SPRITE_COOLTRAINER_M, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 + object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 + object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 + + def_warps_to ROUTE_20 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm new file mode 100755 index 00000000..71817640 --- /dev/null +++ b/data/maps/objects/Route21.asm @@ -0,0 +1,19 @@ +Route21_Object: + db $43 ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_FISHER, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 + object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 + object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 + object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 + object SPRITE_FISHER, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 + + def_warps_to ROUTE_21 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm new file mode 100755 index 00000000..857b8a86 --- /dev/null +++ b/data/maps/objects/Route22.asm @@ -0,0 +1,14 @@ +Route22_Object: + db $2c ; border block + + def_warps + warp 8, 5, 0, ROUTE_22_GATE + + def_signs + sign 7, 11, 3 ; Route22FrontGateText + + def_objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person + + def_warps_to ROUTE_22 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm new file mode 100755 index 00000000..53944c52 --- /dev/null +++ b/data/maps/objects/Route22Gate.asm @@ -0,0 +1,15 @@ +Route22Gate_Object: + db $a ; border block + + def_warps + warp 4, 7, 0, LAST_MAP + warp 5, 7, 0, LAST_MAP + warp 4, 0, 0, LAST_MAP + warp 5, 0, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_22_GATE diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm new file mode 100755 index 00000000..bd74afb4 --- /dev/null +++ b/data/maps/objects/Route23.asm @@ -0,0 +1,22 @@ +Route23_Object: + db $f ; border block + + def_warps + warp 7, 139, 2, ROUTE_22_GATE + warp 8, 139, 3, ROUTE_22_GATE + warp 4, 31, 0, VICTORY_ROAD_1F + warp 14, 31, 1, VICTORY_ROAD_2F + + def_signs + sign 3, 33, 8 ; Route23Text8 + + def_objects + object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person + object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person + object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person + object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person + object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person + object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person + object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person + + def_warps_to ROUTE_23 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm new file mode 100755 index 00000000..b3cf1298 --- /dev/null +++ b/data/maps/objects/Route24.asm @@ -0,0 +1,19 @@ +Route24_Object: + db $2c ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_COOLTRAINER_M, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 + object SPRITE_COOLTRAINER_M, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_M, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 + object SPRITE_YOUNGSTER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 + 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/Route25.asm b/data/maps/objects/Route25.asm new file mode 100755 index 00000000..4f0be4d4 --- /dev/null +++ b/data/maps/objects/Route25.asm @@ -0,0 +1,22 @@ +Route25_Object: + db $2c ; border block + + def_warps + warp 45, 3, 0, BILLS_HOUSE + + def_signs + sign 43, 3, 11 ; Route25Text11 + + def_objects + object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 + object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 + object SPRITE_YOUNGSTER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object SPRITE_COOLTRAINER_F, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 + object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 + object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 + object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 + object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS + + def_warps_to ROUTE_25 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm new file mode 100755 index 00000000..3151ce79 --- /dev/null +++ b/data/maps/objects/Route2Gate.asm @@ -0,0 +1,16 @@ +Route2Gate_Object: + db $a ; border block + + def_warps + warp 4, 0, 3, LAST_MAP + warp 5, 0, 3, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 5, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_YOUNGSTER, 5, 4, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_2_GATE diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm new file mode 100755 index 00000000..d14df485 --- /dev/null +++ b/data/maps/objects/Route2TradeHouse.asm @@ -0,0 +1,14 @@ +Route2TradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person + + def_warps_to ROUTE_2_TRADE_HOUSE diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm new file mode 100755 index 00000000..153fa795 --- /dev/null +++ b/data/maps/objects/Route3.asm @@ -0,0 +1,20 @@ +Route3_Object: + db $2c ; border block + + def_warps + + def_signs + sign 59, 9, 10 ; Route3Text10 + + def_objects + object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person + object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 + object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 + object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3 + + def_warps_to ROUTE_3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm new file mode 100755 index 00000000..79e79b79 --- /dev/null +++ b/data/maps/objects/Route4.asm @@ -0,0 +1,19 @@ +Route4_Object: + db $2c ; border block + + def_warps + warp 11, 5, 0, MT_MOON_POKECENTER + warp 18, 5, 0, MT_MOON_1F + warp 24, 5, 7, MT_MOON_B1F + + def_signs + sign 12, 5, 4 ; PokeCenterSignText + sign 17, 7, 5 ; Route4Text5 + sign 27, 7, 6 ; Route4Text6 + + def_objects + object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 + object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND + + def_warps_to ROUTE_4 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm new file mode 100755 index 00000000..98f76683 --- /dev/null +++ b/data/maps/objects/Route5.asm @@ -0,0 +1,16 @@ +Route5_Object: + db $a ; border block + + def_warps + 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 + warp 10, 21, 0, DAYCARE + + def_signs + sign 17, 29, 1 ; Route5Text1 + + def_objects + + def_warps_to ROUTE_5 diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm new file mode 100755 index 00000000..81c8c43e --- /dev/null +++ b/data/maps/objects/Route5Gate.asm @@ -0,0 +1,15 @@ +Route5Gate_Object: + db $a ; border block + + def_warps + warp 3, 5, 2, LAST_MAP + warp 4, 5, 2, LAST_MAP + warp 3, 0, 1, LAST_MAP + warp 4, 0, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person + + def_warps_to ROUTE_5_GATE diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm new file mode 100755 index 00000000..f18c66f5 --- /dev/null +++ b/data/maps/objects/Route6.asm @@ -0,0 +1,21 @@ +Route6_Object: + db $f ; border block + + def_warps + warp 9, 1, 2, ROUTE_6_GATE + warp 10, 1, 2, ROUTE_6_GATE + warp 10, 7, 0, ROUTE_6_GATE + warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 + + def_signs + sign 19, 15, 7 ; Route6Text7 + + def_objects + 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 + object SPRITE_YOUNGSTER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + + def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm new file mode 100755 index 00000000..2ef5a8b5 --- /dev/null +++ b/data/maps/objects/Route6Gate.asm @@ -0,0 +1,15 @@ +Route6Gate_Object: + db $a ; border block + + def_warps + warp 3, 5, 2, LAST_MAP + warp 4, 5, 2, LAST_MAP + warp 3, 0, 1, LAST_MAP + warp 4, 0, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_6_GATE diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm new file mode 100755 index 00000000..64b0387f --- /dev/null +++ b/data/maps/objects/Route7.asm @@ -0,0 +1,16 @@ +Route7_Object: + db $f ; border block + + def_warps + warp 18, 9, 2, ROUTE_7_GATE + warp 18, 10, 2, ROUTE_7_GATE + warp 11, 9, 0, ROUTE_7_GATE + warp 11, 10, 0, ROUTE_7_GATE + warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 + + def_signs + sign 3, 13, 1 ; Route7Text1 + + def_objects + + def_warps_to ROUTE_7 diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm new file mode 100755 index 00000000..85064914 --- /dev/null +++ b/data/maps/objects/Route7Gate.asm @@ -0,0 +1,15 @@ +Route7Gate_Object: + db $a ; border block + + def_warps + warp 0, 3, 3, LAST_MAP + warp 0, 4, 3, LAST_MAP + warp 5, 3, 1, LAST_MAP + warp 5, 4, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_7_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm new file mode 100755 index 00000000..aaa69ea2 --- /dev/null +++ b/data/maps/objects/Route8.asm @@ -0,0 +1,25 @@ +Route8_Object: + db $2c ; border block + + def_warps + warp 1, 9, 0, ROUTE_8_GATE + warp 1, 10, 0, ROUTE_8_GATE + warp 8, 9, 2, ROUTE_8_GATE + warp 8, 10, 2, ROUTE_8_GATE + warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 + + def_signs + sign 17, 3, 10 ; Route8Text10 + + def_objects + object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 + object SPRITE_SUPER_NERD, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_COOLTRAINER_F, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_SUPER_NERD, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_COOLTRAINER_F, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_COOLTRAINER_F, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 + object SPRITE_COOLTRAINER_F, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 + + def_warps_to ROUTE_8 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm new file mode 100755 index 00000000..64b935da --- /dev/null +++ b/data/maps/objects/Route8Gate.asm @@ -0,0 +1,15 @@ +Route8Gate_Object: + db $a ; border block + + def_warps + warp 0, 3, 1, LAST_MAP + warp 0, 4, 1, LAST_MAP + warp 5, 3, 3, LAST_MAP + warp 5, 4, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm new file mode 100755 index 00000000..f67f337b --- /dev/null +++ b/data/maps/objects/Route9.asm @@ -0,0 +1,21 @@ +Route9_Object: + db $2c ; border block + + def_warps + + def_signs + sign 25, 7, 11 ; Route9Text11 + + 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_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 + object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 + object SPRITE_YOUNGSTER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 + object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT + + def_warps_to ROUTE_9 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm new file mode 100755 index 00000000..bf4e7292 --- /dev/null +++ b/data/maps/objects/SSAnne1F.asm @@ -0,0 +1,23 @@ +SSAnne1F_Object: + db $c ; border block + + def_warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_1F_ROOMS + warp 23, 8, 1, SS_ANNE_1F_ROOMS + warp 19, 8, 2, SS_ANNE_1F_ROOMS + warp 15, 8, 3, SS_ANNE_1F_ROOMS + warp 11, 8, 4, SS_ANNE_1F_ROOMS + warp 7, 8, 5, SS_ANNE_1F_ROOMS + warp 2, 6, 6, SS_ANNE_2F + warp 37, 15, 5, SS_ANNE_B1F + warp 3, 16, 0, SS_ANNE_KITCHEN + + def_signs + + def_objects + object SPRITE_WAITER, 12, 6, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person + + def_warps_to SS_ANNE_1F diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm new file mode 100755 index 00000000..afb30af4 --- /dev/null +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -0,0 +1,27 @@ +SSAnne1FRooms_Object: + db $c ; border block + + def_warps + warp 0, 0, 2, SS_ANNE_1F + warp 10, 0, 3, SS_ANNE_1F + warp 20, 0, 4, SS_ANNE_1F + warp 0, 10, 5, SS_ANNE_1F + warp 10, 10, 6, SS_ANNE_1F + warp 20, 10, 7, SS_ANNE_1F + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 + object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 + object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 + 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_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 + + def_warps_to SS_ANNE_1F_ROOMS diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm new file mode 100755 index 00000000..dda0fee6 --- /dev/null +++ b/data/maps/objects/SSAnne2F.asm @@ -0,0 +1,21 @@ +SSAnne2F_Object: + db $c ; border block + + def_warps + warp 9, 11, 0, SS_ANNE_2F_ROOMS + warp 13, 11, 2, SS_ANNE_2F_ROOMS + warp 17, 11, 4, SS_ANNE_2F_ROOMS + warp 21, 11, 6, SS_ANNE_2F_ROOMS + warp 25, 11, 8, SS_ANNE_2F_ROOMS + warp 29, 11, 10, SS_ANNE_2F_ROOMS + warp 2, 4, 8, SS_ANNE_1F + warp 2, 12, 1, SS_ANNE_3F + warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM + + def_signs + + def_objects + object SPRITE_WAITER, 3, 7, WALK, UP_DOWN, 1 ; person + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1 + + def_warps_to SS_ANNE_2F diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm new file mode 100755 index 00000000..78a2dd38 --- /dev/null +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -0,0 +1,35 @@ +SSAnne2FRooms_Object: + db $c ; border block + + def_warps + warp 2, 5, 0, SS_ANNE_2F + warp 3, 5, 0, SS_ANNE_2F + warp 12, 5, 1, SS_ANNE_2F + warp 13, 5, 1, SS_ANNE_2F + warp 22, 5, 2, SS_ANNE_2F + warp 23, 5, 2, SS_ANNE_2F + warp 2, 15, 3, SS_ANNE_2F + warp 3, 15, 3, SS_ANNE_2F + warp 12, 15, 4, SS_ANNE_2F + warp 13, 15, 4, SS_ANNE_2F + warp 22, 15, 5, SS_ANNE_2F + warp 23, 15, 5, SS_ANNE_2F + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person + object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person + object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person + object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person + + def_warps_to SS_ANNE_2F_ROOMS diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm new file mode 100755 index 00000000..f230aeb9 --- /dev/null +++ b/data/maps/objects/SSAnne3F.asm @@ -0,0 +1,13 @@ +SSAnne3F_Object: + db $c ; border block + + def_warps + warp 0, 3, 0, SS_ANNE_BOW + warp 19, 3, 7, SS_ANNE_2F + + def_signs + + def_objects + object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person + + def_warps_to SS_ANNE_3F diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm new file mode 100755 index 00000000..619dd33c --- /dev/null +++ b/data/maps/objects/SSAnneB1F.asm @@ -0,0 +1,16 @@ +SSAnneB1F_Object: + db $c ; border block + + def_warps + warp 23, 3, 8, SS_ANNE_B1F_ROOMS + warp 19, 3, 6, SS_ANNE_B1F_ROOMS + warp 15, 3, 4, SS_ANNE_B1F_ROOMS + warp 11, 3, 2, SS_ANNE_B1F_ROOMS + warp 7, 3, 0, SS_ANNE_B1F_ROOMS + warp 27, 5, 9, SS_ANNE_1F + + def_signs + + def_objects + + def_warps_to SS_ANNE_B1F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm new file mode 100755 index 00000000..c7540482 --- /dev/null +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -0,0 +1,31 @@ +SSAnneB1FRooms_Object: + db $c ; border block + + def_warps + warp 2, 5, 4, SS_ANNE_B1F + warp 3, 5, 4, SS_ANNE_B1F + warp 12, 5, 3, SS_ANNE_B1F + warp 13, 5, 3, SS_ANNE_B1F + warp 22, 5, 2, SS_ANNE_B1F + warp 23, 5, 2, SS_ANNE_B1F + warp 2, 15, 1, SS_ANNE_B1F + warp 3, 15, 1, SS_ANNE_B1F + warp 12, 15, 0, SS_ANNE_B1F + warp 13, 15, 0, SS_ANNE_B1F + + def_signs + + def_objects + object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 + object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 + object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 + object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 + object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 + object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person + object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST + object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION + + def_warps_to SS_ANNE_B1F_ROOMS diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm new file mode 100755 index 00000000..080fe623 --- /dev/null +++ b/data/maps/objects/SSAnneBow.asm @@ -0,0 +1,17 @@ +SSAnneBow_Object: + db $23 ; border block + + def_warps + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person + object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person + object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 + object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 + + def_warps_to SS_ANNE_BOW diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..c07be59e --- /dev/null +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -0,0 +1,14 @@ +SSAnneCaptainsRoom_Object: + db $c ; border block + + def_warps + warp 0, 7, 8, SS_ANNE_2F + + def_signs + sign 4, 1, 2 ; SSAnne7Text2 + sign 1, 2, 3 ; SSAnne7Text3 + + def_objects + object SPRITE_CAPTAIN, 4, 2, STAY, UP, 1 ; person + + def_warps_to SS_ANNE_CAPTAINS_ROOM diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm new file mode 100755 index 00000000..75fc497f --- /dev/null +++ b/data/maps/objects/SSAnneKitchen.asm @@ -0,0 +1,18 @@ +SSAnneKitchen_Object: + db $c ; border block + + def_warps + warp 6, 0, 10, SS_ANNE_1F + + def_signs + + def_objects + object SPRITE_COOK, 1, 8, WALK, UP_DOWN, 1 ; person + object SPRITE_COOK, 5, 8, WALK, UP_DOWN, 2 ; person + object SPRITE_COOK, 9, 7, WALK, UP_DOWN, 3 ; person + object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person + object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person + object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person + object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person + + def_warps_to SS_ANNE_KITCHEN diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm new file mode 100755 index 00000000..59f4e2a4 --- /dev/null +++ b/data/maps/objects/SafariZoneCenter.asm @@ -0,0 +1,22 @@ +SafariZoneCenter_Object: + db $0 ; border block + + def_warps + warp 14, 25, 2, SAFARI_ZONE_GATE + warp 15, 25, 3, SAFARI_ZONE_GATE + warp 0, 10, 4, SAFARI_ZONE_WEST + warp 0, 11, 5, SAFARI_ZONE_WEST + warp 14, 0, 4, SAFARI_ZONE_NORTH + warp 15, 0, 5, SAFARI_ZONE_NORTH + warp 29, 10, 2, SAFARI_ZONE_EAST + warp 29, 11, 3, SAFARI_ZONE_EAST + warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE + + def_signs + sign 18, 20, 2 ; SafariZoneCenterText2 + sign 14, 22, 3 ; SafariZoneCenterText3 + + def_objects + object SPRITE_POKE_BALL, 14, 10, STAY, NONE, 1, NUGGET + + def_warps_to SAFARI_ZONE_CENTER diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..5b256347 --- /dev/null +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -0,0 +1,14 @@ +SafariZoneCenterRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, SAFARI_ZONE_CENTER + warp 3, 7, 8, SAFARI_ZONE_CENTER + + def_signs + + def_objects + object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_SCIENTIST, 1, 4, WALK, UP_DOWN, 2 ; person + + def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm new file mode 100755 index 00000000..999c51b0 --- /dev/null +++ b/data/maps/objects/SafariZoneEast.asm @@ -0,0 +1,22 @@ +SafariZoneEast_Object: + db $0 ; border block + + def_warps + warp 0, 4, 6, SAFARI_ZONE_NORTH + warp 0, 5, 7, SAFARI_ZONE_NORTH + warp 0, 22, 6, SAFARI_ZONE_CENTER + warp 0, 23, 6, SAFARI_ZONE_CENTER + warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE + + def_signs + sign 26, 10, 5 ; SafariZoneEastText5 + sign 6, 4, 6 ; SafariZoneEastText6 + sign 5, 23, 7 ; SafariZoneEastText7 + + def_objects + object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE + object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION + object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS + object SPRITE_POKE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB + + def_warps_to SAFARI_ZONE_EAST diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..31940542 --- /dev/null +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneEastRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, SAFARI_ZONE_EAST + warp 3, 7, 4, SAFARI_ZONE_EAST + + def_signs + + def_objects + object SPRITE_SCIENTIST, 1, 3, WALK, UP_DOWN, 1 ; person + object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person + object SPRITE_SILPH_WORKER, 5, 2, STAY, NONE, 3 ; person + + def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm new file mode 100755 index 00000000..2423ae8a --- /dev/null +++ b/data/maps/objects/SafariZoneGate.asm @@ -0,0 +1,16 @@ +SafariZoneGate_Object: + db $a ; border block + + def_warps + warp 3, 5, 4, LAST_MAP + warp 4, 5, 4, LAST_MAP + warp 3, 0, 0, SAFARI_ZONE_CENTER + warp 4, 0, 1, SAFARI_ZONE_CENTER + + def_signs + + def_objects + object SPRITE_SAFARI_ZONE_WORKER, 6, 2, STAY, LEFT, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 1, 4, STAY, RIGHT, 2 ; person + + def_warps_to SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm new file mode 100755 index 00000000..2094e742 --- /dev/null +++ b/data/maps/objects/SafariZoneNorth.asm @@ -0,0 +1,26 @@ +SafariZoneNorth_Object: + db $0 ; border block + + def_warps + warp 2, 35, 0, SAFARI_ZONE_WEST + warp 3, 35, 1, SAFARI_ZONE_WEST + warp 8, 35, 2, SAFARI_ZONE_WEST + warp 9, 35, 3, SAFARI_ZONE_WEST + warp 20, 35, 4, SAFARI_ZONE_CENTER + warp 21, 35, 5, SAFARI_ZONE_CENTER + warp 39, 30, 0, SAFARI_ZONE_EAST + warp 39, 31, 1, SAFARI_ZONE_EAST + warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE + + def_signs + sign 36, 4, 3 ; SafariZoneNorthText3 + sign 4, 25, 4 ; SafariZoneNorthText4 + sign 13, 31, 5 ; SafariZoneNorthText5 + sign 19, 33, 6 ; SafariZoneNorthText6 + sign 26, 28, 7 ; SafariZoneNorthText7 + + def_objects + object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH + + def_warps_to SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..38087622 --- /dev/null +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneNorthRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, SAFARI_ZONE_NORTH + warp 3, 7, 8, SAFARI_ZONE_NORTH + + def_signs + + def_objects + object SPRITE_SCIENTIST, 6, 3, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 3, 4, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 1, 5, WALK, UP_DOWN, 3 ; person + + def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..1431d711 --- /dev/null +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -0,0 +1,13 @@ +SafariZoneSecretHouse_Object: + db $17 ; border block + + def_warps + warp 2, 7, 6, SAFARI_ZONE_WEST + warp 3, 7, 6, SAFARI_ZONE_WEST + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 3, 3, STAY, DOWN, 1 ; person + + def_warps_to SAFARI_ZONE_SECRET_HOUSE diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm new file mode 100755 index 00000000..d53ee37b --- /dev/null +++ b/data/maps/objects/SafariZoneWest.asm @@ -0,0 +1,26 @@ +SafariZoneWest_Object: + db $0 ; border block + + def_warps + warp 20, 0, 0, SAFARI_ZONE_NORTH + warp 21, 0, 1, SAFARI_ZONE_NORTH + warp 26, 0, 2, SAFARI_ZONE_NORTH + warp 27, 0, 3, SAFARI_ZONE_NORTH + warp 29, 22, 2, SAFARI_ZONE_CENTER + warp 29, 23, 3, SAFARI_ZONE_CENTER + warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE + warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE + + def_signs + sign 12, 12, 5 ; SafariZoneWestText5 + sign 17, 3, 6 ; SafariZoneWestText6 + sign 26, 4, 7 ; SafariZoneWestText7 + sign 24, 22, 8 ; SafariZoneWestText8 + + def_objects + object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION + object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM + object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH + + def_warps_to SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..26bb481e --- /dev/null +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneWestRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, SAFARI_ZONE_WEST + warp 3, 7, 7, SAFARI_ZONE_WEST + + def_signs + + def_objects + object SPRITE_SCIENTIST, 4, 4, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person + + def_warps_to SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm new file mode 100755 index 00000000..49f94706 --- /dev/null +++ b/data/maps/objects/SaffronCity.asm @@ -0,0 +1,42 @@ +SaffronCity_Object: + db $f ; border block + + def_warps + warp 7, 5, 0, COPYCATS_HOUSE_1F + warp 26, 3, 0, FIGHTING_DOJO + warp 34, 3, 0, SAFFRON_GYM + warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE + warp 25, 11, 0, SAFFRON_MART + warp 18, 21, 0, SILPH_CO_1F + warp 9, 29, 0, SAFFRON_POKECENTER + warp 29, 29, 0, MR_PSYCHICS_HOUSE + + def_signs + sign 17, 5, 16 ; SaffronCityText16 + sign 27, 5, 17 ; SaffronCityText17 + sign 35, 5, 18 ; SaffronCityText18 + sign 26, 11, 19 ; MartSignText + sign 39, 19, 20 ; SaffronCityText20 + sign 5, 21, 21 ; SaffronCityText21 + sign 15, 21, 22 ; SaffronCityText22 + sign 10, 29, 23 ; PokeCenterSignText + sign 27, 29, 24 ; SaffronCityText24 + sign 1, 19, 25 ; SaffronCityText25 + + def_objects + object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 8, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person + object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 11, 25, WALK, LEFT_RIGHT, 5 ; person + object SPRITE_ROCKET, 32, 13, WALK, LEFT_RIGHT, 6 ; person + object SPRITE_ROCKET, 18, 30, WALK, LEFT_RIGHT, 7 ; person + object SPRITE_SCIENTIST, 8, 14, WALK, ANY_DIR, 8 ; person + object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_ERIKA, 17, 30, WALK, LEFT_RIGHT, 10 ; person + object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person + 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 + + def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm new file mode 100755 index 00000000..8cec0421 --- /dev/null +++ b/data/maps/objects/SaffronGym.asm @@ -0,0 +1,51 @@ +SaffronGym_Object: + db $2e ; border block + + def_warps + warp 8, 17, 2, LAST_MAP + warp 9, 17, 2, LAST_MAP + warp 1, 3, 22, SAFFRON_GYM + warp 5, 3, 15, SAFFRON_GYM + warp 1, 5, 18, SAFFRON_GYM + warp 5, 5, 8, SAFFRON_GYM + warp 1, 9, 27, SAFFRON_GYM + warp 5, 9, 16, SAFFRON_GYM + warp 1, 11, 5, SAFFRON_GYM + warp 5, 11, 13, SAFFRON_GYM + warp 1, 15, 23, SAFFRON_GYM + warp 5, 15, 30, SAFFRON_GYM + warp 1, 17, 17, SAFFRON_GYM + warp 5, 17, 9, SAFFRON_GYM + warp 9, 3, 26, SAFFRON_GYM + warp 11, 3, 3, SAFFRON_GYM + warp 9, 5, 7, SAFFRON_GYM + warp 11, 5, 12, SAFFRON_GYM + warp 11, 11, 4, SAFFRON_GYM + warp 11, 15, 31, SAFFRON_GYM + warp 15, 3, 24, SAFFRON_GYM + warp 19, 3, 28, SAFFRON_GYM + warp 15, 5, 2, SAFFRON_GYM + warp 19, 5, 10, SAFFRON_GYM + warp 15, 9, 20, SAFFRON_GYM + warp 19, 9, 29, SAFFRON_GYM + warp 15, 11, 14, SAFFRON_GYM + warp 19, 11, 6, SAFFRON_GYM + warp 15, 15, 21, SAFFRON_GYM + warp 19, 15, 25, SAFFRON_GYM + warp 15, 17, 11, SAFFRON_GYM + warp 19, 17, 19, SAFFRON_GYM + + def_signs + + def_objects + 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 + object SPRITE_YOUNGSTER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_CHANNELER, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_YOUNGSTER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_YOUNGSTER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_GUIDE, 10, 15, STAY, DOWN, 9 ; person + + def_warps_to SAFFRON_GYM diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm new file mode 100755 index 00000000..0a9aed7a --- /dev/null +++ b/data/maps/objects/SaffronMart.asm @@ -0,0 +1,15 @@ +SaffronMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, ANY_DIR, 3 ; person + + def_warps_to SAFFRON_MART diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..59af6fc0 --- /dev/null +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -0,0 +1,16 @@ +SaffronPidgeyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 0, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_YOUNGSTER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER, 3, 3, STAY, NONE, 4 ; person + + def_warps_to SAFFRON_PIDGEY_HOUSE diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm new file mode 100755 index 00000000..ab52a72c --- /dev/null +++ b/data/maps/objects/SaffronPokecenter.asm @@ -0,0 +1,17 @@ +SaffronPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 6, LAST_MAP + warp 4, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + 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 new file mode 100755 index 00000000..913ca7c7 --- /dev/null +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -0,0 +1,19 @@ +SeafoamIslands1F_Object: + db $7d ; border block + + def_warps + warp 4, 17, 0, LAST_MAP + warp 5, 17, 0, LAST_MAP + warp 26, 17, 1, LAST_MAP + warp 27, 17, 1, LAST_MAP + warp 7, 5, 1, SEAFOAM_ISLANDS_B1F + warp 25, 3, 6, SEAFOAM_ISLANDS_B1F + warp 23, 15, 4, SEAFOAM_ISLANDS_B1F + + def_signs + + def_objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_1F diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..c9a4d235 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB1F_Object: + db $7d ; border block + + def_warps + warp 4, 2, 0, SEAFOAM_ISLANDS_B2F + warp 7, 5, 4, SEAFOAM_ISLANDS_1F + warp 13, 7, 2, SEAFOAM_ISLANDS_B2F + warp 19, 15, 3, SEAFOAM_ISLANDS_B2F + warp 23, 15, 6, SEAFOAM_ISLANDS_1F + warp 25, 11, 5, SEAFOAM_ISLANDS_B2F + warp 25, 3, 5, SEAFOAM_ISLANDS_1F + + def_signs + + def_objects + object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_B1F diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..ff9e55fd --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB2F_Object: + db $7d ; border block + + def_warps + warp 5, 3, 0, SEAFOAM_ISLANDS_B1F + warp 5, 13, 0, SEAFOAM_ISLANDS_B3F + warp 13, 7, 2, SEAFOAM_ISLANDS_B1F + warp 19, 15, 3, SEAFOAM_ISLANDS_B1F + warp 25, 3, 3, SEAFOAM_ISLANDS_B3F + warp 25, 11, 5, SEAFOAM_ISLANDS_B1F + warp 25, 14, 4, SEAFOAM_ISLANDS_B3F + + def_signs + + def_objects + object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_B2F diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..418cdde6 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -0,0 +1,23 @@ +SeafoamIslandsB3F_Object: + db $7d ; border block + + def_warps + warp 5, 12, 1, SEAFOAM_ISLANDS_B2F + warp 8, 6, 2, SEAFOAM_ISLANDS_B4F + warp 25, 4, 3, SEAFOAM_ISLANDS_B4F + warp 25, 3, 4, SEAFOAM_ISLANDS_B2F + warp 25, 14, 6, SEAFOAM_ISLANDS_B2F + warp 20, 17, 0, SEAFOAM_ISLANDS_B4F + warp 21, 17, 1, SEAFOAM_ISLANDS_B4F + + def_signs + + def_objects + object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person + object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person + + def_warps_to SEAFOAM_ISLANDS_B3F diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..f2d35831 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB4F_Object: + db $7d ; border block + + def_warps + warp 20, 17, 5, SEAFOAM_ISLANDS_B3F + warp 21, 17, 6, SEAFOAM_ISLANDS_B3F + warp 11, 7, 1, SEAFOAM_ISLANDS_B3F + warp 25, 4, 2, SEAFOAM_ISLANDS_B3F + + def_signs + sign 9, 15, 4 ; SeafoamIslands5Text4 + sign 23, 1, 5 ; SeafoamIslands5Text5 + + def_objects + object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person + object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person + object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 + + def_warps_to SEAFOAM_ISLANDS_B4F diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm new file mode 100755 index 00000000..6840c13a --- /dev/null +++ b/data/maps/objects/SilphCo10F.asm @@ -0,0 +1,22 @@ +SilphCo10F_Object: + db $2e ; border block + + def_warps + warp 8, 0, 0, SILPH_CO_9F + warp 10, 0, 0, SILPH_CO_11F + warp 12, 0, 0, SILPH_CO_ELEVATOR + warp 9, 11, 3, SILPH_CO_4F + warp 13, 15, 5, SILPH_CO_4F + warp 13, 7, 6, SILPH_CO_4F + + def_signs + + def_objects + object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 + object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object SPRITE_ERIKA, 9, 15, WALK, ANY_DIR, 3 ; person + object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE + object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY + object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS + + def_warps_to SILPH_CO_10F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm new file mode 100755 index 00000000..dab1144c --- /dev/null +++ b/data/maps/objects/SilphCo11F.asm @@ -0,0 +1,20 @@ +SilphCo11F_Object: + db $d ; border block + + def_warps + warp 9, 0, 1, SILPH_CO_10F + warp 13, 0, 0, SILPH_CO_ELEVATOR + warp 5, 5, 9, LAST_MAP + warp 3, 2, 3, SILPH_CO_7F + + def_signs + + def_objects + 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_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/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm new file mode 100755 index 00000000..7a9bdb61 --- /dev/null +++ b/data/maps/objects/SilphCo1F.asm @@ -0,0 +1,16 @@ +SilphCo1F_Object: + db $2e ; border block + + def_warps + warp 10, 17, 5, LAST_MAP + warp 11, 17, 5, LAST_MAP + warp 26, 0, 0, SILPH_CO_2F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 16, 10, 6, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person + + def_warps_to SILPH_CO_1F diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm new file mode 100755 index 00000000..186d1581 --- /dev/null +++ b/data/maps/objects/SilphCo2F.asm @@ -0,0 +1,22 @@ +SilphCo2F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 2, SILPH_CO_1F + warp 26, 0, 0, SILPH_CO_3F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 6, SILPH_CO_3F + warp 13, 3, 4, SILPH_CO_8F + warp 27, 15, 5, SILPH_CO_8F + warp 9, 15, 4, SILPH_CO_6F + + def_signs + + def_objects + object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person + object SPRITE_SCIENTIST, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object SPRITE_SCIENTIST, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 + object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 + object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 + + def_warps_to SILPH_CO_2F diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm new file mode 100755 index 00000000..e9ea1cce --- /dev/null +++ b/data/maps/objects/SilphCo3F.asm @@ -0,0 +1,24 @@ +SilphCo3F_Object: + db $2e ; border block + + def_warps + warp 26, 0, 1, SILPH_CO_2F + warp 24, 0, 0, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 23, 11, 9, SILPH_CO_3F + warp 3, 3, 5, SILPH_CO_5F + warp 3, 15, 6, SILPH_CO_5F + warp 27, 3, 3, SILPH_CO_2F + warp 3, 11, 3, SILPH_CO_9F + warp 11, 11, 4, SILPH_CO_7F + warp 27, 15, 3, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 24, 8, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 + object SPRITE_SCIENTIST, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION + + def_warps_to SILPH_CO_3F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm new file mode 100755 index 00000000..6c30b526 --- /dev/null +++ b/data/maps/objects/SilphCo4F.asm @@ -0,0 +1,24 @@ +SilphCo4F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 1, SILPH_CO_3F + warp 26, 0, 1, SILPH_CO_5F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 11, 7, 3, SILPH_CO_10F + warp 17, 3, 3, SILPH_CO_6F + warp 3, 15, 4, SILPH_CO_10F + warp 17, 11, 5, SILPH_CO_10F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 + object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 + object SPRITE_POKE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL + object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE + object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE + + def_warps_to SILPH_CO_4F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm new file mode 100755 index 00000000..553ec0c3 --- /dev/null +++ b/data/maps/objects/SilphCo5F.asm @@ -0,0 +1,28 @@ +SilphCo5F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 1, SILPH_CO_6F + warp 26, 0, 1, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 27, 3, 5, SILPH_CO_7F + warp 9, 15, 4, SILPH_CO_9F + warp 11, 5, 4, SILPH_CO_3F + warp 3, 15, 5, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 + object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 + object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 + object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN + object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN + object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY + object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person + object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person + object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person + + def_warps_to SILPH_CO_5F diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm new file mode 100755 index 00000000..3dba7414 --- /dev/null +++ b/data/maps/objects/SilphCo6F.asm @@ -0,0 +1,25 @@ +SilphCo6F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_7F + warp 14, 0, 0, SILPH_CO_5F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 4, SILPH_CO_4F + warp 23, 3, 6, SILPH_CO_2F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person + object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person + object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person + object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 + object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 + object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY + + def_warps_to SILPH_CO_6F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm new file mode 100755 index 00000000..55f2ade6 --- /dev/null +++ b/data/maps/objects/SilphCo7F.asm @@ -0,0 +1,27 @@ +SilphCo7F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_8F + warp 22, 0, 0, SILPH_CO_6F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 5, 7, 3, SILPH_CO_11F + warp 5, 3, 8, SILPH_CO_3F + warp 21, 15, 3, SILPH_CO_5F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person + object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person + object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 + object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 + object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 + object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person + object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM + object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE + + def_warps_to SILPH_CO_7F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm new file mode 100755 index 00000000..1a50df07 --- /dev/null +++ b/data/maps/objects/SilphCo8F.asm @@ -0,0 +1,21 @@ +SilphCo8F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_9F + warp 14, 0, 0, SILPH_CO_7F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 11, 6, SILPH_CO_8F + warp 3, 15, 4, SILPH_CO_2F + warp 11, 5, 5, SILPH_CO_2F + warp 11, 9, 3, SILPH_CO_8F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 + object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 + + def_warps_to SILPH_CO_8F diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm new file mode 100755 index 00000000..e6de70fd --- /dev/null +++ b/data/maps/objects/SilphCo9F.asm @@ -0,0 +1,19 @@ +SilphCo9F_Object: + db $2e ; border block + + def_warps + warp 14, 0, 0, SILPH_CO_10F + warp 16, 0, 0, SILPH_CO_8F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 9, 3, 7, SILPH_CO_3F + warp 17, 15, 4, SILPH_CO_5F + + def_signs + + def_objects + object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 + object SPRITE_SCIENTIST, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 + object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 + + def_warps_to SILPH_CO_9F diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm new file mode 100755 index 00000000..d894ba65 --- /dev/null +++ b/data/maps/objects/SilphCoElevator.asm @@ -0,0 +1,13 @@ +SilphCoElevator_Object: + db $f ; border block + + def_warps + warp 1, 3, 0, UNUSED_MAP_ED + warp 2, 3, 0, UNUSED_MAP_ED + + def_signs + sign 3, 0, 1 ; SilphCoElevatorText1 + + def_objects + + def_warps_to SILPH_CO_ELEVATOR diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm new file mode 100644 index 00000000..ff74a4fa --- /dev/null +++ b/data/maps/objects/TradeCenter.asm @@ -0,0 +1,11 @@ +TradeCenter_Object: + db $e ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person + + def_warps_to TRADE_CENTER diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..abf2d715 --- /dev/null +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -0,0 +1,12 @@ +UndergroundPathNorthSouth_Object: + db $1 ; border block + + def_warps + warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 + warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 + + def_signs + + def_objects + + def_warps_to UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm new file mode 100755 index 00000000..0e0f64e0 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute5_Object: + db $a ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH + + def_signs + + def_objects + object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm new file mode 100755 index 00000000..ff4d66b3 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute6_Object: + db $a ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH + + def_signs + + def_objects + object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_6 diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm new file mode 100755 index 00000000..2532c380 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute7_Object: + db $a ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..57e6d093 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -0,0 +1,15 @@ +UndergroundPathRoute7Copy_Object: + db $a ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 2 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm new file mode 100755 index 00000000..d84188ab --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute8_Object: + db $a ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_8 diff --git a/data/maps/objects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm new file mode 100755 index 00000000..15141e93 --- /dev/null +++ b/data/maps/objects/UndergroundPathWestEast.asm @@ -0,0 +1,12 @@ +UndergroundPathWestEast_Object: + db $1 ; border block + + def_warps + warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 + warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 + + def_signs + + def_objects + + def_warps_to UNDERGROUND_PATH_WEST_EAST diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm new file mode 100755 index 00000000..3ea219c3 --- /dev/null +++ b/data/maps/objects/VermilionCity.asm @@ -0,0 +1,33 @@ +VermilionCity_Object: + db $43 ; border block + + def_warps + warp 11, 3, 0, VERMILION_POKECENTER + warp 9, 13, 0, POKEMON_FAN_CLUB + warp 23, 13, 0, VERMILION_MART + warp 12, 19, 0, VERMILION_GYM + warp 23, 19, 0, VERMILION_PIDGEY_HOUSE + warp 18, 31, 0, VERMILION_DOCK + warp 19, 31, 0, VERMILION_DOCK + warp 15, 13, 0, VERMILION_TRADE_HOUSE + warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE + + def_signs + 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_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/VermilionDock.asm b/data/maps/objects/VermilionDock.asm new file mode 100755 index 00000000..f8143aaa --- /dev/null +++ b/data/maps/objects/VermilionDock.asm @@ -0,0 +1,12 @@ +VermilionDock_Object: + db $f ; border block + + def_warps + warp 14, 0, 5, LAST_MAP + warp 14, 2, 1, SS_ANNE_1F + + def_signs + + def_objects + + def_warps_to VERMILION_DOCK diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm new file mode 100755 index 00000000..ce0fd9f0 --- /dev/null +++ b/data/maps/objects/VermilionGym.asm @@ -0,0 +1,17 @@ +VermilionGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 3, LAST_MAP + warp 5, 17, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 + object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 + object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person + + def_warps_to VERMILION_GYM diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm new file mode 100755 index 00000000..c473b5d1 --- /dev/null +++ b/data/maps/objects/VermilionMart.asm @@ -0,0 +1,15 @@ +VermilionMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 3, 3, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to VERMILION_MART diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm new file mode 100755 index 00000000..878262f2 --- /dev/null +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -0,0 +1,13 @@ +VermilionOldRodHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person + + def_warps_to VERMILION_OLD_ROD_HOUSE diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..0a357409 --- /dev/null +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -0,0 +1,15 @@ +VermilionPidgeyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_YOUNGSTER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_BIRD, 3, 5, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_PAPER, 4, 3, STAY, NONE, 3 ; person + + def_warps_to VERMILION_PIDGEY_HOUSE diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm new file mode 100755 index 00000000..f52bf24e --- /dev/null +++ b/data/maps/objects/VermilionPokecenter.asm @@ -0,0 +1,17 @@ +VermilionPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + 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 new file mode 100755 index 00000000..5eace66e --- /dev/null +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -0,0 +1,13 @@ +VermilionTradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 3, 5, STAY, UP, 1 ; person + + def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm new file mode 100755 index 00000000..e3798128 --- /dev/null +++ b/data/maps/objects/VictoryRoad1F.asm @@ -0,0 +1,20 @@ +VictoryRoad1F_Object: + db $7d ; border block + + def_warps + warp 8, 17, 2, LAST_MAP + warp 9, 17, 2, LAST_MAP + warp 1, 1, 0, VICTORY_ROAD_2F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK + object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY + object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + + def_warps_to VICTORY_ROAD_1F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm new file mode 100755 index 00000000..84a32fa2 --- /dev/null +++ b/data/maps/objects/VictoryRoad2F.asm @@ -0,0 +1,30 @@ +VictoryRoad2F_Object: + db $7d ; border block + + def_warps + warp 0, 8, 2, VICTORY_ROAD_1F + warp 29, 7, 3, LAST_MAP + warp 29, 8, 3, LAST_MAP + warp 23, 7, 0, VICTORY_ROAD_3F + warp 25, 14, 2, VICTORY_ROAD_3F + warp 27, 7, 1, VICTORY_ROAD_3F + warp 1, 1, 3, VICTORY_ROAD_3F + + def_signs + + def_objects + object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 + object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 + object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 + object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 + object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION + object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL + object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC + object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + + def_warps_to VICTORY_ROAD_2F diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm new file mode 100755 index 00000000..fcab3e74 --- /dev/null +++ b/data/maps/objects/VictoryRoad3F.asm @@ -0,0 +1,24 @@ +VictoryRoad3F_Object: + db $7d ; border block + + def_warps + warp 23, 7, 3, VICTORY_ROAD_2F + warp 26, 8, 5, VICTORY_ROAD_2F + warp 27, 15, 4, VICTORY_ROAD_2F + warp 2, 0, 6, VICTORY_ROAD_2F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION + object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person + object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person + object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person + + def_warps_to VICTORY_ROAD_3F diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm new file mode 100755 index 00000000..9e3e30bb --- /dev/null +++ b/data/maps/objects/ViridianCity.asm @@ -0,0 +1,29 @@ +ViridianCity_Object: + db $f ; border block + + def_warps + warp 23, 25, 0, VIRIDIAN_POKECENTER + warp 29, 19, 0, VIRIDIAN_MART + warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE + warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE + warp 32, 7, 0, VIRIDIAN_GYM + + def_signs + 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 + object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person + object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person + object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person + 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 new file mode 100755 index 00000000..56d48f6d --- /dev/null +++ b/data/maps/objects/ViridianForest.asm @@ -0,0 +1,32 @@ +ViridianForest_Object: + db $3 ; border block + + def_warps + warp 1, 0, 2, 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, 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_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/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm new file mode 100755 index 00000000..137b8b3b --- /dev/null +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -0,0 +1,16 @@ +ViridianForestNorthGate_Object: + db $a ; border block + + def_warps + warp 4, 0, 1, LAST_MAP + warp 5, 0, 1, LAST_MAP + warp 4, 7, 0, VIRIDIAN_FOREST + warp 5, 7, 0, VIRIDIAN_FOREST + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 2, STAY, NONE, 1 ; person + object SPRITE_GRAMPS, 2, 5, STAY, NONE, 2 ; person + + def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm new file mode 100755 index 00000000..c73205cd --- /dev/null +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -0,0 +1,16 @@ +ViridianForestSouthGate_Object: + db $a ; border block + + def_warps + warp 4, 0, 3, VIRIDIAN_FOREST + warp 5, 0, 3, VIRIDIAN_FOREST + warp 4, 7, 5, LAST_MAP + warp 5, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 4, WALK, UP_DOWN, 2 ; person + + def_warps_to VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm new file mode 100755 index 00000000..cc158928 --- /dev/null +++ b/data/maps/objects/ViridianGym.asm @@ -0,0 +1,23 @@ +ViridianGym_Object: + db $3 ; border block + + def_warps + warp 16, 17, 4, LAST_MAP + warp 17, 17, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 + object SPRITE_COOLTRAINER_M, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 + object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 + object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 + object SPRITE_COOLTRAINER_M, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 + object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 + object SPRITE_COOLTRAINER_M, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object SPRITE_GYM_GUIDE, 16, 15, STAY, DOWN, 10 ; person + object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 11, REVIVE + + def_warps_to VIRIDIAN_GYM diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm new file mode 100755 index 00000000..cbb5a4a3 --- /dev/null +++ b/data/maps/objects/ViridianMart.asm @@ -0,0 +1,15 @@ +ViridianMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 1, LAST_MAP + warp 4, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 5, 5, WALK, UP_DOWN, 2 ; person + object SPRITE_COOLTRAINER_M, 3, 3, STAY, NONE, 3 ; person + + def_warps_to VIRIDIAN_MART diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm new file mode 100755 index 00000000..c2e6b70f --- /dev/null +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -0,0 +1,16 @@ +ViridianNicknameHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 1, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_BIRD, 5, 5, WALK, LEFT_RIGHT, 3 ; person + object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person + + def_warps_to VIRIDIAN_NICKNAME_HOUSE diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm new file mode 100755 index 00000000..ef510f72 --- /dev/null +++ b/data/maps/objects/ViridianPokecenter.asm @@ -0,0 +1,17 @@ +ViridianPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + 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, 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 new file mode 100755 index 00000000..632baaba --- /dev/null +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -0,0 +1,15 @@ +ViridianSchoolHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + 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/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm new file mode 100755 index 00000000..68210d65 --- /dev/null +++ b/data/maps/objects/WardensHouse.asm @@ -0,0 +1,17 @@ +WardensHouse_Object: + db $17 ; border block + + def_warps + warp 4, 7, 3, LAST_MAP + warp 5, 7, 3, LAST_MAP + + def_signs + sign 4, 3, 4 ; FuchsiaHouse2Text4 + sign 5, 3, 5 ; FuchsiaHouse2Text5 + + def_objects + object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + + def_warps_to WARDENS_HOUSE diff --git a/data/maps/rest_house_maps.asm b/data/maps/rest_house_maps.asm new file mode 100644 index 00000000..88f0845a --- /dev/null +++ b/data/maps/rest_house_maps.asm @@ -0,0 +1,5 @@ +SafariZoneRestHouses: + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE + db -1 ; end diff --git a/data/maps/songs.asm b/data/maps/songs.asm new file mode 100644 index 00000000..1b043bfa --- /dev/null +++ b/data/maps/songs.asm @@ -0,0 +1,250 @@ +MapSongBanks:: + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU + db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B + db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 + db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_4 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_5 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_6 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_7 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_8 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_9 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_10 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_11 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_12 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_13 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_14 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_15 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_16 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_17 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_18 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_19 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_20 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_21 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_22 + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 + db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 + db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_1F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_2F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BLUES_HOUSE + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OAKS_LAB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_SCHOOL_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_NICKNAME_HOUSE + db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_GYM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_NORTH_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_TRADE_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_SOUTH_GATE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; VIRIDIAN_FOREST + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_2F + db MUSIC_GYM, BANK(Music_Gym) ; PEWTER_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_NIDORAN_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_SPEECH_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5 + db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7 + db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_8_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_8 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ROCK_TUNNEL_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; POWER_PLANT + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_11 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; BILLS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_POKECENTER + db MUSIC_VERMILION, BANK(Music_Vermilion) ; POKEMON_FAN_CLUB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_MART + db MUSIC_GYM, BANK(Music_Gym) ; VERMILION_GYM + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_PIDGEY_HOUSE + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VERMILION_DOCK + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_3F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_BOW + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_KITCHEN + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_CAPTAINS_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70 + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_WEST_EAST + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_2F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_3F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_4F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ROOF + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ELEVATOR + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_1F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_3F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CELADON_GYM + db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; GAME_CORNER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_5F + db MUSIC_CELADON, BANK(Music_Celadon) ; GAME_CORNER_PRIZE_ROOM + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_DINER + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CHIEF_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_HOTEL + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_POKECENTER + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_2F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_3F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_4F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_5F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_6F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_7F + db MUSIC_LAVENDER, BANK(Music_Lavender) ; MR_FUJIS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_MART + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_CUBONE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_MART + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_BILLS_GRANDPAS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_POKECENTER + db MUSIC_CITIES2, BANK(Music_Cities2) ; WARDENS_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; SAFARI_ZONE_GATE + db MUSIC_GYM, BANK(Music_Gym) ; FUCHSIA_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_MEETING_ROOM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B3F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B4F + db MUSIC_CITIES2, BANK(Music_Cities2) ; VERMILION_OLD_ROD_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_GOOD_ROD_HOUSE + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_1F + db MUSIC_GYM, BANK(Music_Gym) ; CINNABAR_GYM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_TRADE_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_METRONOME_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_FOSSIL_ROOM + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_MART + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_MART_COPY + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU_LOBBY + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; FIGHTING_DOJO + db MUSIC_GYM, BANK(Music_Gym) ; SAFFRON_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_PIDGEY_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_MART + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_POKECENTER + db MUSIC_CITIES1, BANK(Music_Cities1) ; MR_PSYCHICS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ROUTE_22_GATE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_2F + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_TRADE_HOUSE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B4F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_ELEVATOR + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CC + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CD + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CE + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_2F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_3F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_4F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_5F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_7F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_8F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_2F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_3F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_B1F + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_SECRET_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH_REST_HOUSE + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE + db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER + db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 + 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/special_warps.asm b/data/maps/special_warps.asm new file mode 100755 index 00000000..80f88cc4 --- /dev/null +++ b/data/maps/special_warps.asm @@ -0,0 +1,91 @@ +; Format: (size 2 bytes) +; 00: target map ID +; 01: which dungeon warp in the source map was used +DungeonWarpList: + db SEAFOAM_ISLANDS_B1F, 1 + db SEAFOAM_ISLANDS_B1F, 2 + db SEAFOAM_ISLANDS_B2F, 1 + db SEAFOAM_ISLANDS_B2F, 2 + db SEAFOAM_ISLANDS_B3F, 1 + db SEAFOAM_ISLANDS_B3F, 2 + db SEAFOAM_ISLANDS_B4F, 1 + db SEAFOAM_ISLANDS_B4F, 2 + db VICTORY_ROAD_2F, 2 + db POKEMON_MANSION_1F, 1 + db POKEMON_MANSION_1F, 2 + db POKEMON_MANSION_2F, 3 + db -1 ; end + + +fly_warp: MACRO + event_displacement \1_WIDTH, \2, \3 + db ((\3) & $01) ;sub-block Y + db ((\2) & $01) ;sub-block X +ENDM + +DungeonWarpData: + fly_warp SEAFOAM_ISLANDS_B1F, 18, 7 + fly_warp SEAFOAM_ISLANDS_B1F, 23, 7 + fly_warp SEAFOAM_ISLANDS_B2F, 19, 7 + fly_warp SEAFOAM_ISLANDS_B2F, 22, 7 + fly_warp SEAFOAM_ISLANDS_B3F, 18, 7 + fly_warp SEAFOAM_ISLANDS_B3F, 19, 7 + fly_warp SEAFOAM_ISLANDS_B4F, 4, 14 + fly_warp SEAFOAM_ISLANDS_B4F, 5, 14 + fly_warp VICTORY_ROAD_2F, 22, 16 + fly_warp POKEMON_MANSION_1F, 16, 14 + fly_warp POKEMON_MANSION_1F, 16, 14 + fly_warp POKEMON_MANSION_2F, 18, 14 + + +special_warp_spec: MACRO + db \1 + fly_warp \1, \2, \3 + db \4 +ENDM + +FirstMapSpec: + special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 +TradeCenterSpec1: + special_warp_spec TRADE_CENTER, 3, 4, CLUB +TradeCenterSpec2: + special_warp_spec TRADE_CENTER, 6, 4, CLUB +ColosseumSpec1: + special_warp_spec COLOSSEUM, 3, 4, CLUB +ColosseumSpec2: + special_warp_spec COLOSSEUM, 6, 4, CLUB + + +fly_warp_spec: MACRO + db \1, 0 + dw \2 +ENDM + +FlyWarpDataPtr: + fly_warp_spec PALLET_TOWN, .PalletTown + fly_warp_spec VIRIDIAN_CITY, .ViridianCity + fly_warp_spec PEWTER_CITY, .PewterCity + fly_warp_spec CERULEAN_CITY, .CeruleanCity + fly_warp_spec LAVENDER_TOWN, .LavenderTown + fly_warp_spec VERMILION_CITY, .VermilionCity + fly_warp_spec CELADON_CITY, .CeladonCity + fly_warp_spec FUCHSIA_CITY, .FuchsiaCity + fly_warp_spec CINNABAR_ISLAND, .CinnabarIsland + fly_warp_spec INDIGO_PLATEAU, .IndigoPlateau + fly_warp_spec SAFFRON_CITY, .SaffronCity + fly_warp_spec ROUTE_4, .Route4 + fly_warp_spec ROUTE_10, .Route10 + +.PalletTown: fly_warp PALLET_TOWN, 5, 6 +.ViridianCity: fly_warp VIRIDIAN_CITY, 23, 26 +.PewterCity: fly_warp PEWTER_CITY, 13, 26 +.CeruleanCity: fly_warp CERULEAN_CITY, 19, 18 +.LavenderTown: fly_warp LAVENDER_TOWN, 3, 6 +.VermilionCity: fly_warp VERMILION_CITY, 11, 4 +.CeladonCity: fly_warp CELADON_CITY, 41, 10 +.FuchsiaCity: fly_warp FUCHSIA_CITY, 19, 28 +.CinnabarIsland: fly_warp CINNABAR_ISLAND, 11, 12 +.IndigoPlateau: fly_warp INDIGO_PLATEAU, 9, 6 +.SaffronCity: fly_warp SAFFRON_CITY, 9, 30 +.Route4: fly_warp ROUTE_4, 11, 6 +.Route10: fly_warp ROUTE_10, 11, 20 diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm new file mode 100755 index 00000000..cce86d1a --- /dev/null +++ b/data/maps/sprite_sets.asm @@ -0,0 +1,191 @@ +MapSpriteSets: + db $01 ; PALLET_TOWN + db $01 ; VIRIDIAN_CITY + db $02 ; PEWTER_CITY + db $02 ; CERULEAN_CITY + db $03 ; LAVENDER_TOWN + db $04 ; VERMILION_CITY + db $05 ; CELADON_CITY + db $0a ; FUCHSIA_CITY + db $01 ; CINNABAR_ISLAND + db $06 ; INDIGO_PLATEAU + db $07 ; SAFFRON_CITY + db $01 ; unused map ID + db $01 ; ROUTE_1 + db $f1 ; ROUTE_2 + db $02 ; ROUTE_3 + db $02 ; ROUTE_4 + db $f9 ; ROUTE_5 + db $fa ; ROUTE_6 + db $fb ; ROUTE_7 + db $fc ; ROUTE_8 + db $02 ; ROUTE_9 + db $f2 ; ROUTE_10 + db $f3 ; ROUTE_11 + db $f4 ; ROUTE_12 + db $08 ; ROUTE_13 + db $08 ; ROUTE_14 + db $f5 ; ROUTE_15 + db $f6 ; ROUTE_16 + db $09 ; ROUTE_17 + db $f7 ; ROUTE_18 + db $0a ; ROUTE_19 + db $f8 ; ROUTE_20 + db $01 ; ROUTE_21 + db $01 ; ROUTE_22 + db $06 ; ROUTE_23 + db $02 ; ROUTE_24 + db $02 ; ROUTE_25 + +EAST_WEST EQU 1 +NORTH_SOUTH EQU 2 + +; Format: +; 00: determines whether the map is split EAST_WEST or NORTH_SOUTH +; 01: coordinate of dividing line +; 02: sprite set ID if in the West or North side +; 03: sprite set ID if in the East or South side +SplitMapSpriteSets: + db NORTH_SOUTH, 37, $02, $01 ; $f1 + db NORTH_SOUTH, 50, $02, $03 ; $f2 + db EAST_WEST, 57, $04, $08 ; $f3 + db NORTH_SOUTH, 21, $03, $08 ; $f4 + db EAST_WEST, 8, $0A, $08 ; $f5 + db EAST_WEST, 24, $09, $05 ; $f6 + db EAST_WEST, 34, $09, $0A ; $f7 + db EAST_WEST, 53, $01, $0A ; $f8 + db NORTH_SOUTH, 33, $02, $07 ; $f9 + db NORTH_SOUTH, 2, $07, $04 ; $fa + db EAST_WEST, 17, $05, $07 ; $fb + db EAST_WEST, 3, $07, $03 ; $fc + +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_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_BLUE + 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 + db SPRITE_HIKER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $04 + db SPRITE_PIKACHU + db SPRITE_OFFICER_JENNY + db SPRITE_SUPER_NERD + db SPRITE_YOUNGSTER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_SAILOR + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $05 + db SPRITE_PIKACHU + db SPRITE_LITTLE_GIRL + db SPRITE_LITTLE_BOY + db SPRITE_GIRL + db SPRITE_FISHER + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_GRAMPS + db SPRITE_MONSTER + db SPRITE_ROCKET + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $06 + db SPRITE_PIKACHU + db SPRITE_GYM_GUIDE + db SPRITE_MONSTER + db SPRITE_BLUE + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_SWIMMER + db SPRITE_GUARD + db SPRITE_GAMBLER + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $07 + db SPRITE_PIKACHU + db SPRITE_ROCKET + db SPRITE_SCIENTIST + db SPRITE_SILPH_WORKER + db SPRITE_ERIKA + db SPRITE_GENTLEMAN + db SPRITE_BIRD + db SPRITE_ROCKER + db SPRITE_COOLTRAINER_M + 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 + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_BEAUTY + db SPRITE_FISHER + db SPRITE_ROCKER + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $09 + db SPRITE_PIKACHU + db SPRITE_BIKER + db SPRITE_COOLTRAINER_M + db SPRITE_SILPH_WORKER + db SPRITE_FISHER + db SPRITE_ROCKER + db SPRITE_HIKER + db SPRITE_GAMBLER + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $0a + db SPRITE_PIKACHU + db SPRITE_COOLTRAINER_M + db SPRITE_CHANSEY + db SPRITE_FISHER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_SEEL + db SPRITE_SWIMMER + db SPRITE_YOUNGSTER + db SPRITE_POKE_BALL + db SPRITE_FOSSIL diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm new file mode 100755 index 00000000..6e754558 --- /dev/null +++ b/data/maps/town_map_entries.asm @@ -0,0 +1,118 @@ +external_map: MACRO + dn \2, \1 + dw \3 +ENDM + +; the appearance of towns and routes in the town map +ExternalMapEntries: + ; x, y, name + external_map 2, 11, PalletTownName + external_map 2, 8, ViridianCityName + external_map 2, 3, PewterCityName + external_map 10, 2, CeruleanCityName + external_map 14, 5, LavenderTownName + external_map 10, 9, VermilionCityName + external_map 7, 5, CeladonCityName + external_map 8, 13, FuchsiaCityName + external_map 2, 15, CinnabarIslandName + external_map 0, 2, IndigoPlateauName + external_map 10, 5, SaffronCityName + external_map 0, 0, PalletTownName ; unused + external_map 2, 10, Route1Name + external_map 2, 6, Route2Name + external_map 4, 3, Route3Name + external_map 8, 2, Route4Name + external_map 10, 3, Route5Name + external_map 10, 8, Route6Name + external_map 8, 5, Route7Name + external_map 13, 5, Route8Name + external_map 13, 2, Route9Name + external_map 14, 4, Route10Name + external_map 12, 9, Route11Name + external_map 14, 9, Route12Name + external_map 13, 11, Route13Name + external_map 11, 12, Route14Name + external_map 10, 13, Route15Name + external_map 5, 5, Route16Name + external_map 4, 8, Route17Name + external_map 6, 13, Route18Name + external_map 6, 15, Route19Name + external_map 4, 15, Route20Name + external_map 2, 13, Route21Name + external_map 0, 8, Route22Name + external_map 0, 6, Route23Name + external_map 10, 1, Route24Name + external_map 11, 0, Route25Name + + +internal_map: MACRO + db \1 + 1 + dn \3, \2 + dw \4 +ENDM + +; the appearance of buildings and dungeons in the town map +InternalMapEntries: + ; maximum map id subject to this rule, x, y, name + internal_map OAKS_LAB, 2, 11, PalletTownName + internal_map VIRIDIAN_GYM, 2, 8, ViridianCityName + internal_map VIRIDIAN_FOREST_SOUTH_GATE, 2, 6, Route2Name + internal_map VIRIDIAN_FOREST, 2, 4, ViridianForestName + internal_map PEWTER_POKECENTER, 2, 3, PewterCityName + internal_map MT_MOON_B2F, 6, 2, MountMoonName + internal_map CERULEAN_MART, 10, 2, CeruleanCityName + internal_map MT_MOON_POKECENTER, 5, 2, Route4Name + internal_map CERULEAN_TRASHED_HOUSE_COPY, 10, 2, CeruleanCityName + internal_map DAYCARE, 10, 4, Route5Name + internal_map UNDERGROUND_PATH_ROUTE_6_COPY, 10, 6, Route6Name + internal_map UNDERGROUND_PATH_ROUTE_7_COPY, 9, 5, Route7Name + internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name + internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName + internal_map POWER_PLANT, 15, 4, PowerPlantName + internal_map ROUTE_11_GATE_2F, 13, 9, Route11Name + internal_map ROUTE_12_GATE_1F, 14, 7, Route12Name + internal_map BILLS_HOUSE, 12, 0, SeaCottageName + internal_map VERMILION_DOCK, 10, 9, VermilionCityName + internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName + internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName + internal_map HALL_OF_FAME, 0, 2, PokemonLeagueName + internal_map UNDERGROUND_PATH_NORTH_SOUTH, 10, 5, UndergroundPathName + internal_map CHAMPIONS_ROOM, 0, 2, PokemonLeagueName + internal_map UNDERGROUND_PATH_WEST_EAST, 10, 5, UndergroundPathName + internal_map CELADON_HOTEL, 7, 5, CeladonCityName + internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName + internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName + internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName + internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName + internal_map SAFARI_ZONE_GATE, 8, 12, SafariZoneName + internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName + internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName + internal_map VERMILION_OLD_ROD_HOUSE, 10, 9, VermilionCityName + internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName + internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName + internal_map CINNABAR_MART_COPY, 2, 15, CinnabarIslandName + internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName + internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName + internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name + internal_map ROUTE_16_FLY_HOUSE, 4, 5, Route16Name + internal_map ROUTE_12_SUPER_ROD_HOUSE, 14, 10, Route12Name + internal_map ROUTE_18_GATE_2F, 7, 13, Route18Name + internal_map SEAFOAM_ISLANDS_1F, 5, 15, SeafoamIslandsName + internal_map ROUTE_22_GATE, 0, 7, Route22Name + internal_map VICTORY_ROAD_2F, 0, 4, VictoryRoadName + internal_map ROUTE_12_GATE_2F, 14, 7, Route12Name + internal_map VERMILION_TRADE_HOUSE, 10, 9, VermilionCityName + internal_map DIGLETTS_CAVE, 3, 4, DiglettsCaveName + internal_map VICTORY_ROAD_3F, 0, 4, VictoryRoadName + internal_map UNUSED_MAP_CE, 7, 5, RocketHQName + internal_map SILPH_CO_8F, 10, 5, SilphCoName + internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName + internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName + internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName + internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName + internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName + 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/town_map_order.asm b/data/maps/town_map_order.asm index a082c376..a082c376 100755 --- a/data/town_map_order.asm +++ b/data/maps/town_map_order.asm diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm deleted file mode 100755 index b821f4d7..00000000 --- a/data/mart_inventories.asm +++ /dev/null @@ -1,64 +0,0 @@ -; mart inventories are below -; they are texts - -; Viridian -ViridianCashierText:: - TX_MART POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL - -; Pewter -PewterCashierText:: - TX_MART POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL - -; Cerulean -CeruleanCashierText:: - TX_MART POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL - -; Bike shop - TX_MART BICYCLE - -; Vermilion -VermilionCashierText:: - TX_MART POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL - -; Lavender -LavenderCashierText:: - TX_MART GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL - -; Celadon Dept. Store 2F (1) -CeladonMart2Clerk1Text:: - TX_MART GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL - -; Celadon Dept. Store 2F (2) -CeladonMart2Clerk2Text:: - TX_MART TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17 - -; Celadon Dept. Store 4F -CeladonMart4ClerkText:: - TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE - -; Celadon Dept. Store 5F (1) -CeladonMart5Clerk1Text:: - TX_MART X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED,X_SPECIAL - -; Celadon Dept. Store 5F (2) -CeladonMart5Clerk2Text:: - TX_MART HP_UP,PROTEIN,IRON,CARBOS,CALCIUM - -; Fuchsia -FuchsiaCashierText:: - TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL,SUPER_REPEL - -; unused? - TX_MART GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE - -; Cinnabar -CinnabarCashierText:: - TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE - -; Saffron -SaffronCashierText:: - TX_MART GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE - -; Indigo -IndigoCashierText:: - TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm deleted file mode 100755 index b94fa0d3..00000000 --- a/data/mon_party_sprites.asm +++ /dev/null @@ -1,77 +0,0 @@ -MonPartyData: - dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur - dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander - dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard - dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle - dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie - dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree - dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna - dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow - dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok - dn SPRITE_PIKACHU_FAMILY, SPRITE_PIKACHU_FAMILY ;Pikachu/Raichu - dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash - dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina - dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM - dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking - dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales - dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff - dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat - dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom - dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras - dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat - dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett - dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth - dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck - dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey - dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe - dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag - dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath - dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra - dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop - dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp - dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell - dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool - dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude - dn SPRITE_MON, SPRITE_MON ;Graveler/Golem - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash - dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro - dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo - dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel - dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer - dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder - dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly - dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar - dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee - dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby - dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb - dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute - dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone - dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee - dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung - dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing - dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon - dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela - dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea - dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen - dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu - dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime - dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx - dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar - dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros - dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados - dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon - dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte - dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto - dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl - dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres - dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair - dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding diff --git a/data/moves.asm b/data/moves.asm deleted file mode 100755 index 44859681..00000000 --- a/data/moves.asm +++ /dev/null @@ -1,178 +0,0 @@ -Moves: -; Characteristics of each move. - -move: macro - db \1 ; animation (interchangeable with move id) - db \2 ; effect - db \3 ; power - db \4 ; type - db \5 percent ; accuracy - db \6 ; pp -endm - - move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 -MoveEnd: - move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 - move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 - move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 - move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20 - move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20 - move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15 - move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15 - move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15 - move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 - move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30 - move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5 - move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10 - move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30 - move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 - move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 - move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 - move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 - move FLY, FLY_EFFECT, 70, FLYING, 95, 15 - move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20 - move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 - move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10 - move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20 - move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30 - move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5 - move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25 - move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15 - move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15 - move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15 - move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25 - move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 - move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5 - move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35 - move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15 - move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20 - move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20 - move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20 - move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15 - move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 - move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35 - move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20 - move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20 - move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 - move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25 - move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40 - move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 - move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 - move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 - move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 - move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 - move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 - move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 - move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15 - move MIST, MIST_EFFECT, 0, ICE, 100, 30 - move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25 - move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5 - move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15 - move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10 - move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5 - move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC, 100, 20 - move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20 - move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20 - move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5 - move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 - move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20 - move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25 - move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20 - move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 - move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20 - move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15 - move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20 - move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10 - move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 - move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40 - move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 - move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 - move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 - move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 - move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 - move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20 - move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40 - move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10 - move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15 - move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 - move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15 - move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 - move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10 - move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15 - move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 - move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 - move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10 - move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 - move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25 - move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10 - move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC, 60, 20 - move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC, 100, 40 - move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC, 100, 30 - move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30 - move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20 - move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC, 100, 20 - move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15 - move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 - move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 - move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 - move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 - move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 - move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 - move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 - move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 - move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 - move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 - move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 30 - move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC, 100, 30 - move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 - move REFLECT, REFLECT_EFFECT, 0, PSYCHIC, 100, 20 - move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30 - move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10 - move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10 - move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20 - move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5 - move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10 - move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30 - move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20 - move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20 - move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20 - move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5 - move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15 - move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10 - move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20 - move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15 - move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15 - move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 - move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20 - move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15 - move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 - move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 - move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 - move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15 - move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40 - move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 - move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15 - move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 - move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 - move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 - move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30 - move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10 - move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 - move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 - move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 80, 15 - move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 - move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 - move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10 - move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 - move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 - move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 - move REST, HEAL_EFFECT, 0, PSYCHIC, 100, 10 - move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 - move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 - move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 - move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30 - move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10 - move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10 - move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 - move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 - move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 diff --git a/data/moves/animations.asm b/data/moves/animations.asm new file mode 100755 index 00000000..34191472 --- /dev/null +++ b/data/moves/animations.asm @@ -0,0 +1,1269 @@ +AttackAnimationPointers: + dw PoundAnim + dw KarateChopAnim + dw DoubleSlapAnim + dw CometPunchAnim + dw MegaPunchAnim + dw PayDayAnim + dw FirePunchAnim + dw IcePunchAnim + dw ThunderPunchAnim + dw ScratchAnim + dw VicegripAnim + dw GuillotineAnim + dw RazorWindAnim + dw SwordsDanceAnim + dw CutAnim + dw GustAnim + dw WingAttackAnim + dw WhirlwindAnim + dw FlyAnim + dw BindAnim + dw SlamAnim + dw VineWhipAnim + dw StompAnim + dw DoubleKickAnim + dw MegaKickAnim + dw JumpKickAnim + dw RollingKickAnim + dw SandAttackAnim + dw HeatButtAnim + dw HornAttackAnim + dw FuryAttackAnim + dw HornDrillAnim + dw TackleAnim + dw BodySlamAnim + dw WrapAnim + dw TakeDownAnim + dw ThrashAnim + dw DoubleEdgeAnim + dw TailWhipAnim + dw PoisonStingAnim + dw TwineedleAnim + dw PinMissileAnim + dw LeerAnim + dw BiteAnim + dw GrowlAnim + dw RoarAnim + dw SingAnim + dw SupersonicAnim + dw SonicBoomAnim + dw DisableAnim + dw AcidAnim + dw EmberAnim + dw FlamethrowerAnim + dw MistAnim + dw WaterGunAnim + dw HydroPumpAnim + dw SurfAnim + dw IceBeamAnim + dw BlizzardAnim + dw PsyBeamAnim + dw BubbleBeamAnim + dw AuroraBeamAnim + dw HyperBeamAnim + dw PeckAnim + dw DrillPeckAnim + dw SubmissionAnim + dw LowKickAnim + dw CounterAnim + dw SeismicTossAnim + dw StrengthAnim + dw AbsorbAnim + dw MegaDrainAnim + dw LeechSeedAnim + dw GrowthAnim + dw RazorLeafAnim + dw SolarBeamAnim + dw PoisonPowderAnim + dw StunSporeAnim + dw SleepPowderAnim + dw PetalDanceAnim + dw StringShotAnim + dw DragonRageAnim + dw FireSpinAnim + dw ThunderShockAnim + dw ThunderBoltAnim + dw ThunderWaveAnim + dw ThunderAnim + dw RockThrowAnim + dw EarthquakeAnim + dw FissureAnim + dw DigAnim + dw ToxicAnim + dw ConfusionAnim + dw PsychicAnim + dw HypnosisAnim + dw MeditateAnim + dw AgilityAnim + dw QuickAttackAnim + dw RageAnim + dw TeleportAnim + dw NightShadeAnim + dw MimicAnim + dw ScreechAnim + dw DoubleTeamAnim + dw RecoverAnim + dw HardenAnim + dw MinimizeAnim + dw SmokeScreenAnim + dw ConfuseRayAnim + dw WithdrawAnim + dw DefenseCurlAnim + dw BarrierAnim + dw LightScreenAnim + dw HazeAnim + dw ReflectAnim + dw FocusEnergyAnim + dw BideAnim + dw MetronomeAnim + dw MirrorMoveAnim + dw SelfdestructAnim + dw EggBombAnim + dw LickAnim + dw SmogAnim + dw SludgeAnim + dw BoneClubAnim + dw FireBlastAnim + dw WaterfallAnim + dw ClampAnim + dw SwiftAnim + dw SkullBashAnim + dw SpikeCannonAnim + dw ConstrictAnim + dw AmnesiaAnim + dw KinesisAnim + dw SoftboiledAnim + dw HiJumpKickAnim + dw GlareAnim + dw DreamEaterAnim + dw PoisonGasAnim + dw BarrageAnim + dw LeechLifeAnim + dw LovelyKissAnim + dw SkyAttackAnim + dw TransformAnim + dw BubbleAnim + dw DizzyPunchAnim + dw SporeAnim + dw FlashAnim + dw PsywaveAnim + dw SplashAnim + dw AcidArmorAnim + dw CrabHammerAnim + dw ExplosionAnim + dw FurySwipesAnim + dw BonemerangAnim + dw RestAnim + dw RockSlideAnim + dw HyperFangAnim + dw SharpenAnim + dw ConversionAnim + dw TriAttackAnim + dw SuperFangAnim + dw SlashAnim + dw SubstituteAnim + dw StruggleAnim + dw ShowPicAnim + dw EnemyFlashAnim + dw PlayerFlashAnim + dw EnemyHUDShakeAnim + dw TradeBallDropAnim + dw TradeBallAppear1Anim + dw TradeBallAppear2Anim + dw TradeBallPoofAnim + dw XStatItemAnim + dw XStatItemAnim + dw ShrinkingSquareAnim + dw ShrinkingSquareAnim + dw XStatItemBlackAnim + dw XStatItemBlackAnim + dw ShrinkingSquareBlackAnim + dw ShrinkingSquareBlackAnim + dw UnusedAnim + dw UnusedAnim + dw ParalyzeAnim + dw ParalyzeAnim + dw PoisonAnim + dw PoisonAnim + dw SleepPlayerAnim + dw SleepEnemyAnim + dw ConfusedPlayerAnim + dw ConfusedEnemyAnim + dw FaintAnim + dw BallTossAnim + dw BallShakeAnim + dw BallPoofAnim + dw BallBlockAnim + dw GreatTossAnim + dw UltraTossAnim + dw ShakeScreenAnim + dw HidePicAnim + dw ThrowRockAnim + dw ThrowBaitAnim + +; each animation is a list of subanimations +; and/or special effects, terminated by -1 + +;\1: sound_id +;\2: special_effect_id or subanimation_id +; if \2 is a subanimation_id: +;\3: tileset_id +;\4: delay +battle_anim: MACRO + IF _NARG == 4 + db (\3 << 6) | \4 + db \1 - 1 + db \2 + ELSE + db \2 + db \1 - 1 + ENDC +ENDM + +PoundAnim: +StruggleAnim: + battle_anim POUND, SUBANIM_01, 0, 8 + db -1 ; end + +KarateChopAnim: + battle_anim KARATE_CHOP, SUBANIM_03, 0, 8 + db -1 ; end + +DoubleSlapAnim: + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + db -1 ; end + +CometPunchAnim: + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + db -1 ; end + +MegaPunchAnim: + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end + +PayDayAnim: + battle_anim POUND, SUBANIM_01, 0, 8 + battle_anim PAY_DAY, SUBANIM_52, 0, 4 + db -1 ; end + +FirePunchAnim: + battle_anim FIRE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_11, 1, 6 + db -1 ; end + +IcePunchAnim: + battle_anim ICE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end + +ThunderPunchAnim: + battle_anim THUNDERPUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ScratchAnim: + battle_anim SCRATCH, SUBANIM_0F, 0, 6 + db -1 ; end + +VicegripAnim: + battle_anim VICEGRIP, SUBANIM_2A, 0, 8 + db -1 ; end + +GuillotineAnim: + battle_anim GUILLOTINE, SUBANIM_2A, 0, 6 + db -1 ; end + +RazorWindAnim: + battle_anim RAZOR_WIND, SUBANIM_16, 0, 4 + db -1 ; end + +SwordsDanceAnim: + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + db -1 ; end + +CutAnim: + battle_anim CUT, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_16, 0, 4 + db -1 ; end + +GustAnim: + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 6 + db -1 ; end + +WingAttackAnim: + battle_anim WING_ATTACK, SUBANIM_04, 1, 6 + db -1 ; end + +WhirlwindAnim: + battle_anim WHIRLWIND, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_ENEMY_MON_OFF + db -1 ; end + +FlyAnim: + battle_anim FLY, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +BindAnim: + battle_anim BIND, SUBANIM_23, 0, 4 + battle_anim BIND, SUBANIM_23, 0, 4 + db -1 ; end + +SlamAnim: + battle_anim SLAM, SUBANIM_02, 0, 6 + db -1 ; end + +VineWhipAnim: + battle_anim VINE_WHIP, SUBANIM_16, 0, 1 + battle_anim NO_MOVE, SUBANIM_01, 0, 8 + db -1 ; end + +StompAnim: + battle_anim STOMP, SUBANIM_05, 1, 8 + db -1 ; end + +DoubleKickAnim: + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + db -1 ; end + +MegaKickAnim: + battle_anim MEGA_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +JumpKickAnim: + battle_anim JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +RollingKickAnim: + battle_anim ROLLING_KICK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + db -1 ; end + +SandAttackAnim: + battle_anim SAND_ATTACK, SUBANIM_28, 1, 6 + db -1 ; end + +HeatButtAnim: + battle_anim HEADBUTT, SUBANIM_05, 1, 6 + db -1 ; end + +HornAttackAnim: + battle_anim HORN_ATTACK, SUBANIM_45, 0, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end + +FuryAttackAnim: + battle_anim FURY_ATTACK, SUBANIM_46, 0, 2 + battle_anim NO_MOVE, SUBANIM_46, 0, 2 + db -1 ; end + +HornDrillAnim: + battle_anim HORN_DRILL, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + db -1 ; end + +TackleAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +BodySlamAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +WrapAnim: + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + db -1 ; end + +TakeDownAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim TAKE_DOWN, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +ThrashAnim: + battle_anim THRASH, SUBANIM_04, 1, 6 + db -1 ; end + +DoubleEdgeAnim: + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2D, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY + battle_anim DOUBLE_EDGE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +TailWhipAnim: + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end + +PoisonStingAnim: + battle_anim POISON_STING, SUBANIM_00, 0, 6 + db -1 ; end + +TwineedleAnim: + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + db -1 ; end + +PinMissileAnim: + battle_anim PIN_MISSILE, SUBANIM_01, 0, 3 + db -1 ; end + +LeerAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +BiteAnim: + battle_anim BITE, SUBANIM_02, 0, 8 + db -1 ; end + +GrowlAnim: + battle_anim GROWL, SUBANIM_12, 1, 6 + db -1 ; end + +RoarAnim: + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + db -1 ; end + +SingAnim: + battle_anim SING, SUBANIM_12, 1, 6 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + db -1 ; end + +SupersonicAnim: + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + db -1 ; end + +SonicBoomAnim: + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end + +DisableAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +AcidAnim: + battle_anim ACID, SUBANIM_13, 1, 6 + battle_anim ACID, SUBANIM_14, 1, 6 + db -1 ; end + +EmberAnim: + battle_anim EMBER, SUBANIM_11, 1, 6 + db -1 ; end + +FlamethrowerAnim: + battle_anim FLAMETHROWER, SUBANIM_1F, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0C, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0D, 1, 6 + db -1 ; end + +MistAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +WaterGunAnim: + battle_anim WATER_GUN, SUBANIM_2C, 0, 6 + db -1 ; end + +HydroPumpAnim: + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end + +SurfAnim: + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end + +IceBeamAnim: + battle_anim ICE_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end + +BlizzardAnim: + battle_anim BLIZZARD, SUBANIM_38, 0, 4 + battle_anim HYDRO_PUMP, SUBANIM_38, 0, 4 + db -1 ; end + +PsyBeamAnim: + battle_anim PSYBEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_FLASH_SCREEN_LONG + db -1 ; end + +BubbleBeamAnim: + battle_anim BUBBLEBEAM, SUBANIM_35, 0, 18 + db -1 ; end + +AuroraBeamAnim: + battle_anim AURORA_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + db -1 ; end + +HyperBeamAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim HYPER_BEAM, SUBANIM_2E, 0, 2 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PeckAnim: + battle_anim PECK, SUBANIM_01, 0, 8 + db -1 ; end + +DrillPeckAnim: + battle_anim DRILL_PECK, SUBANIM_04, 1, 6 + db -1 ; end + +SubmissionAnim: + battle_anim SUBMISSION, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +LowKickAnim: + battle_anim LOW_KICK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +CounterAnim: + battle_anim COUNTER, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +SeismicTossAnim: + battle_anim NO_MOVE, SE_BLINK_ENEMY_MON + battle_anim BARRAGE, SUBANIM_4E, 1, 1 + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SLIDE_MON_OFF + battle_anim SEISMIC_TOSS, SUBANIM_4F, 1, 2 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim SEISMIC_TOSS, SUBANIM_50, 1, 1 + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +StrengthAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end + +AbsorbAnim: + battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +MegaDrainAnim: + battle_anim MEGA_DRAIN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +LeechSeedAnim: + battle_anim LEECH_SEED, SUBANIM_1B, 1, 6 + battle_anim STUN_SPORE, SUBANIM_1C, 1, 21 + db -1 ; end + +GrowthAnim: + battle_anim GROWTH, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +RazorLeafAnim: + battle_anim RAZOR_LEAF, SE_LEAVES_FALLING + battle_anim SWIFT, SUBANIM_44, 1, 1 + battle_anim RAZOR_WIND, SUBANIM_16, 0, 1 + db -1 ; end + +SolarBeamAnim: + battle_anim SOLARBEAM, SUBANIM_2E, 0, 6 + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + db -1 ; end + +PoisonPowderAnim: + battle_anim POISONPOWDER, SUBANIM_36, 0, 6 + db -1 ; end + +StunSporeAnim: + battle_anim STUN_SPORE, SUBANIM_36, 0, 6 + db -1 ; end + +SleepPowderAnim: + battle_anim SLEEP_POWDER, SUBANIM_36, 0, 6 + db -1 ; end + +PetalDanceAnim: + battle_anim PETAL_DANCE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_PETALS_FALLING + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +StringShotAnim: + battle_anim STRING_SHOT, SUBANIM_37, 0, 8 + db -1 ; end + +DragonRageAnim: + battle_anim DRAGON_RAGE, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end + +FireSpinAnim: + battle_anim FIRE_SPIN, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end + +ThunderShockAnim: + battle_anim THUNDERSHOCK, SUBANIM_29, 1, 2 + db -1 ; end + +ThunderBoltAnim: + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + db -1 ; end + +ThunderWaveAnim: + battle_anim THUNDER_WAVE, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 4 + db -1 ; end + +ThunderAnim: + battle_anim THUNDER, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim THUNDERBOLT, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +RockThrowAnim: + battle_anim ROCK_THROW, SUBANIM_30, 0, 4 + db -1 ; end + +EarthquakeAnim: + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + db -1 ; end + +FissureAnim: + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +DigAnim: + battle_anim DIG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end + +ToxicAnim: + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim TOXIC, SUBANIM_14, 1, 6 + db -1 ; end + +ConfusionAnim: + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + db -1 ; end + +PsychicAnim: + battle_anim PSYCHIC_M, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end + +HypnosisAnim: + battle_anim HYPNOSIS, SE_FLASH_SCREEN_LONG + db -1 ; end + +MeditateAnim: + battle_anim MEDITATE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +AgilityAnim: + battle_anim AGILITY, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +QuickAttackAnim: + battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +RageAnim: + battle_anim RAGE, SUBANIM_01, 0, 6 + db -1 ; end + +TeleportAnim: + battle_anim TELEPORT, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + db -1 ; end + +NightShadeAnim: + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end + +MimicAnim: + battle_anim MIMIC, SUBANIM_21, 1, 6 + battle_anim MIMIC, SUBANIM_22, 1, 6 + db -1 ; end + +ScreechAnim: + battle_anim SCREECH, SUBANIM_12, 1, 6 + db -1 ; end + +DoubleTeamAnim: + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim DOUBLE_TEAM, SE_SHAKE_BACK_AND_FORTH + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end + +RecoverAnim: + battle_anim RECOVER, SE_BLINK_MON + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +HardenAnim: + battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +MinimizeAnim: + battle_anim MINIMIZE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_MINIMIZE_MON + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SmokeScreenAnim: + battle_anim SMOKESCREEN, SUBANIM_28, 1, 6 + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ConfuseRayAnim: + battle_anim CONFUSE_RAY, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_3E, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +WithdrawAnim: + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SLIDE_MON_DOWN + battle_anim NO_MOVE, SUBANIM_51, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +DefenseCurlAnim: + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +BarrierAnim: + battle_anim BARRIER, SUBANIM_33, 1, 6 + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end + +LightScreenAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +HazeAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ReflectAnim: + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +FocusEnergyAnim: + battle_anim FOCUS_ENERGY, SE_SPIRAL_BALLS_INWARD + db -1 ; end + +BideAnim: + battle_anim BIDE, SUBANIM_04, 1, 6 + db -1 ; end + +MetronomeAnim: + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end + +MirrorMoveAnim: + battle_anim MIRROR_MOVE, SUBANIM_01, 0, 8 + db -1 ; end + +SelfdestructAnim: + battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3 + db -1 ; end + +EggBombAnim: + battle_anim EGG_BOMB, SUBANIM_41, 1, 4 + battle_anim EGG_BOMB, SUBANIM_42, 1, 4 + db -1 ; end + +LickAnim: + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end + +SmogAnim: + battle_anim LEECH_SEED, SE_DARKEN_MON_PALETTE + battle_anim SMOG, SUBANIM_19, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SludgeAnim: + battle_anim SLUDGE, SUBANIM_13, 1, 6 + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end + +BoneClubAnim: + battle_anim BONE_CLUB, SUBANIM_02, 0, 8 + db -1 ; end + +FireBlastAnim: + battle_anim FIRE_BLAST, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + db -1 ; end + +WaterfallAnim: + battle_anim LEECH_SEED, SE_SLIDE_MON_DOWN + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end + +ClampAnim: + battle_anim CLAMP, SUBANIM_2A, 0, 8 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end + +SwiftAnim: + battle_anim SWIFT, SUBANIM_3F, 1, 3 + db -1 ; end + +SkullBashAnim: + battle_anim SKULL_BASH, SUBANIM_05, 1, 6 + db -1 ; end + +SpikeCannonAnim: + battle_anim SPIKE_CANNON, SUBANIM_04, 1, 4 + db -1 ; end + +ConstrictAnim: + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end + +AmnesiaAnim: + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end + +KinesisAnim: + battle_anim KINESIS, SUBANIM_01, 0, 8 + db -1 ; end + +SoftboiledAnim: + battle_anim LEECH_SEED, SE_SLIDE_MON_HALF_OFF + battle_anim SOFTBOILED, SUBANIM_4C, 0, 8 + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +HiJumpKickAnim: + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +GlareAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +DreamEaterAnim: + battle_anim DREAM_EATER, SE_FLASH_SCREEN_LONG + battle_anim DREAM_EATER, SE_DARK_SCREEN_PALETTE + battle_anim DREAM_EATER, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PoisonGasAnim: + battle_anim POISON_GAS, SUBANIM_19, 1, 6 + db -1 ; end + +BarrageAnim: + battle_anim BARRAGE, SUBANIM_41, 1, 3 + battle_anim NO_MOVE, SUBANIM_55, 0, 5 + db -1 ; end + +LeechLifeAnim: + battle_anim LEECH_LIFE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +LovelyKissAnim: + battle_anim LOVELY_KISS, SUBANIM_12, 0, 6 + db -1 ; end + +SkyAttackAnim: + battle_anim SKY_ATTACK, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +TransformAnim: + battle_anim TRANSFORM, SUBANIM_21, 1, 6 + battle_anim TRANSFORM, SUBANIM_22, 1, 4 + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_TRANSFORM_MON + db -1 ; end + +BubbleAnim: + battle_anim BUBBLE, SUBANIM_35, 0, 22 + db -1 ; end + +DizzyPunchAnim: + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DOUBLESLAP, SUBANIM_02, 0, 6 + db -1 ; end + +SporeAnim: + battle_anim SPORE, SUBANIM_36, 0, 6 + db -1 ; end + +FlashAnim: + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PsywaveAnim: + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + battle_anim CONFUSION, SE_WAVY_SCREEN + db -1 ; end + +SplashAnim: + battle_anim SPLASH, SE_BOUNCE_UP_AND_DOWN + db -1 ; end + +AcidArmorAnim: + battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN_AND_HIDE + db -1 ; end + +CrabHammerAnim: + battle_anim CRABHAMMER, SUBANIM_05, 1, 6 + battle_anim NO_MOVE, SUBANIM_2A, 0, 6 + db -1 ; end + +ExplosionAnim: + battle_anim EXPLOSION, SUBANIM_34, 1, 3 + db -1 ; end + +FurySwipesAnim: + battle_anim FURY_SWIPES, SUBANIM_0F, 0, 4 + db -1 ; end + +BonemerangAnim: + battle_anim BONEMERANG, SUBANIM_02, 0, 6 + db -1 ; end + +RestAnim: + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end + +RockSlideAnim: + battle_anim ROCK_SLIDE, SUBANIM_1D, 0, 4 + battle_anim ROCK_SLIDE, SUBANIM_1E, 0, 3 + battle_anim HYPER_FANG, SUBANIM_04, 1, 6 + db -1 ; end + +HyperFangAnim: + battle_anim HYPER_FANG, SUBANIM_02, 0, 6 + db -1 ; end + +SharpenAnim: + battle_anim SHARPEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ConversionAnim: + battle_anim CONVERSION, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 1, 6 + battle_anim NO_MOVE, SUBANIM_22, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +TriAttackAnim: + battle_anim TRI_ATTACK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_4D, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +SuperFangAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim SUPER_FANG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SlashAnim: + battle_anim SLASH, SUBANIM_0F, 0, 6 + db -1 ; end + +SubstituteAnim: + battle_anim SUBSTITUTE, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_SUBSTITUTE_MON + db -1 ; end + +BallTossAnim: + battle_anim NO_MOVE, SUBANIM_06, 0, 3 + db -1 ; end + +GreatTossAnim: + battle_anim NO_MOVE, SUBANIM_07, 0, 3 + db -1 ; end + +UltraTossAnim: + battle_anim NO_MOVE, SUBANIM_08, 0, 2 + db -1 ; end + +BallShakeAnim: + battle_anim NO_MOVE, SUBANIM_09, 0, 4 + db -1 ; end + +BallPoofAnim: + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + db -1 ; end + +ShowPicAnim: + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + db -1 ; end + +HidePicAnim: + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + db -1 ; end + +EnemyFlashAnim: + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +PlayerFlashAnim: + battle_anim NO_MOVE, SE_FLASH_MON_PIC + db -1 ; end + +EnemyHUDShakeAnim: + battle_anim NO_MOVE, SE_SHAKE_ENEMY_HUD + db -1 ; end + +TradeBallDropAnim: + battle_anim NO_MOVE, SUBANIM_48, 2, 6 + db -1 ; end + +TradeBallAppear1Anim: + battle_anim NO_MOVE, SUBANIM_49, 2, 4 + db -1 ; end + +TradeBallAppear2Anim: + battle_anim NO_MOVE, SUBANIM_4A, 2, 6 + db -1 ; end + +TradeBallPoofAnim: + battle_anim NO_MOVE, SUBANIM_4B, 2, 6 + db -1 ; end + +XStatItemAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ShrinkingSquareAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +XStatItemBlackAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ShrinkingSquareBlackAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +UnusedAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOOT_MANY_BALLS_UPWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ParalyzeAnim: + battle_anim BIND, SUBANIM_24, 0, 4 + battle_anim BIND, SUBANIM_24, 0, 4 + db -1 ; end + +PoisonAnim: + battle_anim BIND, SUBANIM_27, 0, 8 + battle_anim BIND, SUBANIM_27, 0, 8 + db -1 ; end + +SleepPlayerAnim: + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end + +SleepEnemyAnim: + battle_anim REST, SUBANIM_3B, 0, 16 + battle_anim REST, SUBANIM_3B, 0, 16 + db -1 ; end + +ConfusedPlayerAnim: + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end + +ConfusedEnemyAnim: + battle_anim AMNESIA, SUBANIM_26, 0, 8 + battle_anim AMNESIA, SUBANIM_26, 0, 8 + db -1 ; end + +BallBlockAnim: + battle_anim NO_MOVE, SUBANIM_0B, 0, 3 + db -1 ; end + +FaintAnim: + battle_anim DIG, SE_SLIDE_MON_DOWN + db -1 ; end + +ShakeScreenAnim: + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +ThrowRockAnim: + battle_anim BARRAGE, SUBANIM_53, 0, 3 + db -1 ; end + +ThrowBaitAnim: + battle_anim BARRAGE, SUBANIM_54, 0, 3 + db -1 ; end diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm new file mode 100644 index 00000000..a5e3d852 --- /dev/null +++ b/data/moves/effects_pointers.asm @@ -0,0 +1,88 @@ +MoveEffectPointerTable: +; entries correspond to *_EFFECT constants + dw SleepEffect ; EFFECT_01 + dw PoisonEffect ; POISON_SIDE_EFFECT1 + dw DrainHPEffect ; DRAIN_HP_EFFECT + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT1 + dw FreezeBurnParalyzeEffect ; FREEZE_SIDE_EFFECT + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1 + dw ExplodeEffect ; EXPLODE_EFFECT + dw DrainHPEffect ; DREAM_EATER_EFFECT + dw NULL ; MIRROR_MOVE_EFFECT + dw StatModifierUpEffect ; ATTACK_UP1_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT + dw StatModifierUpEffect ; SPEED_UP1_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP1_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT + dw StatModifierUpEffect ; EVASION_UP1_EFFECT + dw PayDayEffect ; PAY_DAY_EFFECT + dw NULL ; SWIFT_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN1_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN1_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN1_EFFECT + dw ConversionEffect ; CONVERSION_EFFECT + dw HazeEffect ; HAZE_EFFECT + dw BideEffect ; BIDE_EFFECT + dw ThrashPetalDanceEffect ; THRASH_PETAL_DANCE_EFFECT + dw SwitchAndTeleportEffect ; SWITCH_AND_TELEPORT_EFFECT + dw TwoToFiveAttacksEffect ; TWO_TO_FIVE_ATTACKS_EFFECT + dw TwoToFiveAttacksEffect ; EFFECT_1E + dw FlinchSideEffect ; FLINCH_SIDE_EFFECT1 + dw SleepEffect ; SLEEP_EFFECT + dw PoisonEffect ; POISON_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; unused effect + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT2 + dw FlinchSideEffect ; FLINCH_SIDE_EFFECT2 + dw OneHitKOEffect ; OHKO_EFFECT + dw ChargeEffect ; CHARGE_EFFECT + dw NULL ; SUPER_FANG_EFFECT + dw NULL ; SPECIAL_DAMAGE_EFFECT + dw TrappingEffect ; TRAPPING_EFFECT + dw ChargeEffect ; FLY_EFFECT + dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT + dw NULL ; JUMP_KICK_EFFECT + dw MistEffect ; MIST_EFFECT + dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT + dw RecoilEffect ; RECOIL_EFFECT + dw ConfusionEffect ; CONFUSION_EFFECT + dw StatModifierUpEffect ; ATTACK_UP2_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP2_EFFECT + dw StatModifierUpEffect ; SPEED_UP2_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP2_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP2_EFFECT + dw StatModifierUpEffect ; EVASION_UP2_EFFECT + dw HealEffect ; HEAL_EFFECT + dw TransformEffect ; TRANSFORM_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN2_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN2_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN2_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN2_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN2_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN2_EFFECT + dw ReflectLightScreenEffect ; LIGHT_SCREEN_EFFECT + dw ReflectLightScreenEffect ; REFLECT_EFFECT + dw PoisonEffect ; POISON_EFFECT + dw ParalyzeEffect ; PARALYZE_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT + dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT + dw NULL ; unused effect + dw SubstituteEffect ; SUBSTITUTE_EFFECT + dw HyperBeamEffect ; HYPER_BEAM_EFFECT + dw RageEffect ; RAGE_EFFECT + dw MimicEffect ; MIMIC_EFFECT + dw NULL ; METRONOME_EFFECT + dw LeechSeedEffect ; LEECH_SEED_EFFECT + dw SplashEffect ; SPLASH_EFFECT + dw DisableEffect ; DISABLE_EFFECT diff --git a/data/moves/field_move_names.asm b/data/moves/field_move_names.asm new file mode 100644 index 00000000..b68ed828 --- /dev/null +++ b/data/moves/field_move_names.asm @@ -0,0 +1,10 @@ +FieldMoveNames: + db "CUT@" + db "FLY@" + db "@" + db "SURF@" + db "STRENGTH@" + db "FLASH@" + db "DIG@" + db "TELEPORT@" + db "SOFTBOILED@" diff --git a/data/moves/field_moves.asm b/data/moves/field_moves.asm new file mode 100644 index 00000000..d7e9219b --- /dev/null +++ b/data/moves/field_moves.asm @@ -0,0 +1,14 @@ +FieldMoveDisplayData: + ; move id, FieldMoveNames index, leftmost tile + ; (leftmost tile = -1 + tile column in which the first + ; letter of the move's name should be displayed) + db CUT, 1, $0C + db FLY, 2, $0C + db ANIM_B4, 3, $0C ; unused + db SURF, 4, $0C + db STRENGTH, 5, $0A + db FLASH, 6, $0C + db DIG, 7, $0C + db TELEPORT, 8, $0A + db SOFTBOILED, 9, $08 + db -1 ; end diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm new file mode 100644 index 00000000..5855c98c --- /dev/null +++ b/data/moves/grammar.asm @@ -0,0 +1,74 @@ +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 + db 0 ; end set + +; set 1 + db RECOVER + db SELFDESTRUCT + db AMNESIA + db 0 ; end set + +; set 2 + db MEDITATE + db AGILITY + db TELEPORT + db MIMIC + db DOUBLE_TEAM + db BIDE + db BARRAGE + db 0 ; end set + +; set 3 + db POUND + db SCRATCH + db VICEGRIP + db WING_ATTACK + db FLY + db BIND + db SLAM + db HORN_ATTACK + db BODY_SLAM + db WRAP + db THRASH + db TAIL_WHIP + db LEER + db BITE + db GROWL + db ROAR + db SING + db PECK + db COUNTER + db STRENGTH + db ABSORB + db STRING_SHOT + db EARTHQUAKE + db FISSURE + db DIG + db TOXIC + db SCREECH + db HARDEN + db MINIMIZE + db WITHDRAW + db DEFENSE_CURL + db METRONOME + db LICK + db CLAMP + db CONSTRICT + db POISON_GAS + db LEECH_LIFE + db BUBBLE + db FLASH + db SPLASH + db ACID_ARMOR + db FURY_SWIPES + db REST + db SHARPEN + db SLASH + db SUBSTITUTE + db 0 ; end set + + db -1 ; end diff --git a/data/moves/hm_moves.asm b/data/moves/hm_moves.asm new file mode 100644 index 00000000..4f14b8df --- /dev/null +++ b/data/moves/hm_moves.asm @@ -0,0 +1,10 @@ +; This file is INCLUDEd twice: +; - for HMMoves in home/names.asm +; - for HMMoveArray in engine/pokemon/bills_pc.asm + + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db -1 ; end diff --git a/data/moves/moves.asm b/data/moves/moves.asm new file mode 100755 index 00000000..85b6dcfc --- /dev/null +++ b/data/moves/moves.asm @@ -0,0 +1,178 @@ +Moves: +; Characteristics of each move. + +move: MACRO + db \1 ; animation (interchangeable with move id) + db \2 ; effect + db \3 ; power + db \4 ; type + db \5 percent ; accuracy + db \6 ; pp +ENDM + + move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 +MoveEnd: + move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 + move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 + move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 + move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20 + move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20 + move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15 + move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15 + move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15 + move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 + move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30 + move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5 + move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10 + move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30 + move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 + move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 + move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 + move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 + move FLY, FLY_EFFECT, 70, FLYING, 95, 15 + move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20 + move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 + move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10 + move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20 + move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30 + move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5 + move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25 + move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15 + move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15 + move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15 + move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25 + move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 + move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5 + move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35 + move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15 + move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20 + move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20 + move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20 + move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15 + move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 + move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35 + move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20 + move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20 + move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 + move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25 + move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40 + move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 + move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 + move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 + move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 + move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 + move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 + move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 + move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15 + move MIST, MIST_EFFECT, 0, ICE, 100, 30 + move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25 + move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5 + move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15 + move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10 + move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5 + move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC_TYPE, 100, 20 + move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20 + move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20 + move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5 + move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 + move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20 + move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25 + move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20 + move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 + move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20 + move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15 + move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20 + move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10 + move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 + move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40 + move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 + move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 + move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 + move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 + move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 + move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20 + move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40 + move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10 + move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15 + move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 + move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15 + move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 + move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10 + move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15 + move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 + move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 + move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10 + move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 + move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC_TYPE, 100, 25 + move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC_TYPE, 100, 10 + move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC_TYPE, 60, 20 + move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC_TYPE, 100, 40 + move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30 + move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20 + move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15 + move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 + move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 + move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 + move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 + move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 + move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 + move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 + move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 + move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 + move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 + move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 + move REFLECT, REFLECT_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30 + move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10 + move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10 + move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20 + move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5 + move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10 + move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30 + move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20 + move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20 + move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20 + move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5 + move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15 + move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10 + move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20 + move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15 + move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15 + move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 + move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC_TYPE, 80, 15 + move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 + move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 + move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 + move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC_TYPE, 100, 15 + move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40 + move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 + move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15 + move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 + move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 + move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 + move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30 + move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10 + move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 + move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 + move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC_TYPE, 80, 15 + move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 + move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 + move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10 + move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 + move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 + move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 + move REST, HEAL_EFFECT, 0, PSYCHIC_TYPE, 100, 10 + move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 + move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 + move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 + move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30 + move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10 + move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10 + move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 + move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 + move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 diff --git a/data/moves/names.asm b/data/moves/names.asm new file mode 100644 index 00000000..cbb1a322 --- /dev/null +++ b/data/moves/names.asm @@ -0,0 +1,166 @@ +MoveNames:: + db "POUND@" + db "KARATE CHOP@" + db "DOUBLESLAP@" + db "COMET PUNCH@" + db "MEGA PUNCH@" + db "PAY DAY@" + db "FIRE PUNCH@" + db "ICE PUNCH@" + db "THUNDERPUNCH@" + db "SCRATCH@" + db "VICEGRIP@" + db "GUILLOTINE@" + db "RAZOR WIND@" + db "SWORDS DANCE@" + db "CUT@" + db "GUST@" + db "WING ATTACK@" + db "WHIRLWIND@" + db "FLY@" + db "BIND@" + db "SLAM@" + db "VINE WHIP@" + db "STOMP@" + db "DOUBLE KICK@" + db "MEGA KICK@" + db "JUMP KICK@" + db "ROLLING KICK@" + db "SAND-ATTACK@" + db "HEADBUTT@" + db "HORN ATTACK@" + db "FURY ATTACK@" + db "HORN DRILL@" + db "TACKLE@" + db "BODY SLAM@" + db "WRAP@" + db "TAKE DOWN@" + db "THRASH@" + db "DOUBLE-EDGE@" + db "TAIL WHIP@" + db "POISON STING@" + db "TWINEEDLE@" + db "PIN MISSILE@" + db "LEER@" + db "BITE@" + db "GROWL@" + db "ROAR@" + db "SING@" + db "SUPERSONIC@" + db "SONICBOOM@" + db "DISABLE@" + db "ACID@" + db "EMBER@" + db "FLAMETHROWER@" + db "MIST@" + db "WATER GUN@" + db "HYDRO PUMP@" + db "SURF@" + db "ICE BEAM@" + db "BLIZZARD@" + db "PSYBEAM@" + db "BUBBLEBEAM@" + db "AURORA BEAM@" + db "HYPER BEAM@" + db "PECK@" + db "DRILL PECK@" + db "SUBMISSION@" + db "LOW KICK@" + db "COUNTER@" + db "SEISMIC TOSS@" + db "STRENGTH@" + db "ABSORB@" + db "MEGA DRAIN@" + db "LEECH SEED@" + db "GROWTH@" + db "RAZOR LEAF@" + db "SOLARBEAM@" + db "POISONPOWDER@" + db "STUN SPORE@" + db "SLEEP POWDER@" + db "PETAL DANCE@" + db "STRING SHOT@" + db "DRAGON RAGE@" + db "FIRE SPIN@" + db "THUNDERSHOCK@" + db "THUNDERBOLT@" + db "THUNDER WAVE@" + db "THUNDER@" + db "ROCK THROW@" + db "EARTHQUAKE@" + db "FISSURE@" + db "DIG@" + db "TOXIC@" + db "CONFUSION@" + db "PSYCHIC@" + db "HYPNOSIS@" + db "MEDITATE@" + db "AGILITY@" + db "QUICK ATTACK@" + db "RAGE@" + db "TELEPORT@" + db "NIGHT SHADE@" + db "MIMIC@" + db "SCREECH@" + db "DOUBLE TEAM@" + db "RECOVER@" + db "HARDEN@" + db "MINIMIZE@" + db "SMOKESCREEN@" + db "CONFUSE RAY@" + db "WITHDRAW@" + db "DEFENSE CURL@" + db "BARRIER@" + db "LIGHT SCREEN@" + db "HAZE@" + db "REFLECT@" + db "FOCUS ENERGY@" + db "BIDE@" + db "METRONOME@" + db "MIRROR MOVE@" + db "SELFDESTRUCT@" + db "EGG BOMB@" + db "LICK@" + db "SMOG@" + db "SLUDGE@" + db "BONE CLUB@" + db "FIRE BLAST@" + db "WATERFALL@" + db "CLAMP@" + db "SWIFT@" + db "SKULL BASH@" + db "SPIKE CANNON@" + db "CONSTRICT@" + db "AMNESIA@" + db "KINESIS@" + db "SOFTBOILED@" + db "HI JUMP KICK@" + db "GLARE@" + db "DREAM EATER@" + db "POISON GAS@" + db "BARRAGE@" + db "LEECH LIFE@" + db "LOVELY KISS@" + db "SKY ATTACK@" + db "TRANSFORM@" + db "BUBBLE@" + db "DIZZY PUNCH@" + db "SPORE@" + db "FLASH@" + db "PSYWAVE@" + db "SPLASH@" + db "ACID ARMOR@" + db "CRABHAMMER@" + db "EXPLOSION@" + db "FURY SWIPES@" + db "BONEMERANG@" + db "REST@" + db "ROCK SLIDE@" + db "HYPER FANG@" + db "SHARPEN@" + db "CONVERSION@" + db "TRI ATTACK@" + db "SUPER FANG@" + db "SLASH@" + db "SUBSTITUTE@" + db "STRUGGLE@" diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm new file mode 100644 index 00000000..c1f12084 --- /dev/null +++ b/data/moves/sfx.asm @@ -0,0 +1,168 @@ +MoveSoundTable: + ; ID, pitch mod, tempo mod + db SFX_POUND, $00, $80 ; POUND + db SFX_BATTLE_0C, $10, $80 ; KARATE_CHOP + db SFX_DOUBLESLAP, $00, $80 ; DOUBLESLAP + db SFX_BATTLE_0B, $01, $80 ; COMET_PUNCH + db SFX_BATTLE_0D, $00, $40 ; MEGA_PUNCH + db SFX_SILPH_SCOPE, $00, $ff ; PAY_DAY + db SFX_BATTLE_0D, $10, $60 ; FIRE_PUNCH + db SFX_BATTLE_0D, $20, $80 ; ICE_PUNCH + db SFX_BATTLE_0D, $00, $a0 ; THUNDERPUNCH + db SFX_DAMAGE, $00, $80 ; SCRATCH + db SFX_BATTLE_0F, $20, $40 ; VICEGRIP + db SFX_BATTLE_0F, $00, $80 ; GUILLOTINE + db SFX_BATTLE_0E, $00, $a0 ; RAZOR_WIND + db SFX_NOT_VERY_EFFECTIVE, $10, $c0 ; SWORDS_DANCE + db SFX_NOT_VERY_EFFECTIVE, $00, $a0 ; CUT + db SFX_BATTLE_12, $00, $c0 ; GUST + db SFX_BATTLE_12, $10, $a0 ; WING_ATTACK + db SFX_BATTLE_13, $00, $e0 ; WHIRLWIND + db SFX_NOT_VERY_EFFECTIVE, $20, $c0 ; FLY + db SFX_BATTLE_14, $00, $80 ; BIND + db SFX_BATTLE_22, $00, $80 ; SLAM + db SFX_VINE_WHIP, $01, $80 ; VINE_WHIP + db SFX_BATTLE_20, $00, $80 ; STOMP + db SFX_BATTLE_17, $f0, $40 ; DOUBLE_KICK + db SFX_SUPER_EFFECTIVE, $00, $80 ; MEGA_KICK + db SFX_BATTLE_17, $00, $80 ; JUMP_KICK + db SFX_BATTLE_21, $10, $80 ; ROLLING_KICK + db SFX_BATTLE_1B, $01, $a0 ; SAND_ATTACK + db SFX_BATTLE_18, $00, $80 ; HEADBUTT + db SFX_BATTLE_1E, $00, $60 ; HORN_ATTACK + db SFX_BATTLE_1E, $01, $40 ; FURY_ATTACK + db SFX_HORN_DRILL, $00, $a0 ; HORN_DRILL + db SFX_SUPER_EFFECTIVE, $10, $a0 ; TACKLE + db SFX_BATTLE_20, $00, $c0 ; BODY_SLAM + db SFX_BATTLE_14, $10, $60 ; WRAP + db SFX_SUPER_EFFECTIVE, $00, $a0 ; TAKE_DOWN + db SFX_BATTLE_22, $11, $c0 ; THRASH + db SFX_SUPER_EFFECTIVE, $20, $c0 ; DOUBLE_EDGE + db SFX_BATTLE_21, $00, $80 ; TAIL_WHIP + db SFX_BATTLE_1B, $00, $80 ; POISON_STING + db SFX_BATTLE_1B, $20, $c0 ; TWINEEDLE + db SFX_BATTLE_19, $00, $80 ; PIN_MISSILE + db SFX_BATTLE_31, $ff, $40 ; LEER + db SFX_BATTLE_1E, $00, $80 ; BITE + db SFX_BATTLE_0B, $00, $c0 ; GROWL + db SFX_BATTLE_0B, $00, $40 ; ROAR + db SFX_BATTLE_35, $00, $80 ; SING + db SFX_BATTLE_27, $40, $60 ; SUPERSONIC + db SFX_BATTLE_27, $00, $80 ; SONICBOOM + db SFX_BATTLE_27, $ff, $40 ; DISABLE + db SFX_BATTLE_2A, $80, $c0 ; ACID + db SFX_BATTLE_19, $10, $a0 ; EMBER + db SFX_BATTLE_19, $21, $e0 ; FLAMETHROWER + db SFX_BATTLE_29, $00, $80 ; MIST + db SFX_BATTLE_24, $20, $60 ; WATER_GUN + db SFX_BATTLE_2A, $00, $80 ; HYDRO_PUMP + db SFX_BATTLE_2C, $00, $80 ; SURF + db SFX_BATTLE_28, $40, $80 ; ICE_BEAM + db SFX_BATTLE_29, $f0, $e0 ; BLIZZARD + db SFX_PSYBEAM, $00, $80 ; PSYBEAM + db SFX_BATTLE_2A, $f0, $60 ; BUBBLEBEAM + db SFX_BATTLE_28, $00, $80 ; AURORA_BEAM + db SFX_BATTLE_36, $00, $80 ; HYPER_BEAM + db SFX_PECK, $01, $a0 ; PECK + db SFX_BATTLE_13, $f0, $20 ; DRILL_PECK + db SFX_BATTLE_23, $01, $c0 ; SUBMISSION + db SFX_BATTLE_23, $00, $80 ; LOW_KICK + db SFX_SUPER_EFFECTIVE, $00, $e0 ; COUNTER + db SFX_BATTLE_26, $01, $60 ; SEISMIC_TOSS + db SFX_BATTLE_26, $20, $40 ; STRENGTH + db SFX_BATTLE_24, $00, $80 ; ABSORB + db SFX_BATTLE_24, $40, $c0 ; MEGA_DRAIN + db SFX_BATTLE_1B, $03, $60 ; LEECH_SEED + db SFX_BATTLE_25, $11, $e0 ; GROWTH + db SFX_BATTLE_12, $20, $e0 ; RAZOR_LEAF + db SFX_BATTLE_2E, $00, $80 ; SOLARBEAM + db SFX_BATTLE_1C, $00, $80 ; POISONPOWDER + db SFX_BATTLE_1C, $11, $a0 ; STUN_SPORE + db SFX_BATTLE_1C, $01, $c0 ; SLEEP_POWDER + db SFX_BATTLE_13, $14, $c0 ; PETAL_DANCE + db SFX_BATTLE_1B, $02, $a0 ; STRING_SHOT + db SFX_BATTLE_29, $f0, $80 ; DRAGON_RAGE + db SFX_BATTLE_29, $20, $c0 ; FIRE_SPIN + db SFX_BATTLE_2F, $00, $20 ; THUNDERSHOCK + db SFX_BATTLE_2F, $20, $80 ; THUNDERBOLT + db SFX_BATTLE_2E, $12, $60 ; THUNDER_WAVE + db SFX_BATTLE_26, $00, $80 ; THUNDER + db SFX_BATTLE_14, $01, $e0 ; ROCK_THROW + db SFX_BATTLE_29, $0f, $e0 ; EARTHQUAKE + db SFX_BATTLE_29, $11, $20 ; FISSURE + db SFX_DAMAGE, $10, $40 ; DIG + db SFX_BATTLE_0F, $10, $c0 ; TOXIC + db SFX_BATTLE_14, $00, $20 ; CONFUSION + db SFX_PSYCHIC_M, $00, $80 ; PSYCHIC_M + db SFX_BATTLE_35, $11, $18 ; HYPNOSIS + db SFX_BATTLE_09, $20, $c0 ; MEDITATE + db SFX_FAINT_FALL, $20, $c0 ; AGILITY + db SFX_BATTLE_25, $00, $10 ; QUICK_ATTACK + db SFX_BATTLE_26, $f0, $20 ; RAGE + db SFX_BATTLE_33, $f0, $c0 ; TELEPORT + db SFX_NOT_VERY_EFFECTIVE, $f0, $e0 ; NIGHT_SHADE + db SFX_BATTLE_09, $f0, $40 ; MIMIC + db SFX_BATTLE_31, $00, $80 ; SCREECH + db SFX_BATTLE_33, $80, $40 ; DOUBLE_TEAM + db SFX_BATTLE_33, $00, $80 ; RECOVER + db SFX_BATTLE_14, $11, $20 ; HARDEN + db SFX_BATTLE_14, $22, $10 ; MINIMIZE + db SFX_BATTLE_1B, $f1, $ff ; SMOKESCREEN + db SFX_BATTLE_13, $f1, $ff ; CONFUSE_RAY + db SFX_BATTLE_14, $33, $30 ; WITHDRAW + db SFX_BATTLE_32, $40, $c0 ; DEFENSE_CURL + db SFX_BATTLE_0E, $20, $20 ; BARRIER + db SFX_BATTLE_0E, $f0, $10 ; LIGHT_SCREEN + db SFX_BATTLE_0F, $f8, $10 ; HAZE + db SFX_NOT_VERY_EFFECTIVE, $f0, $10 ; REFLECT + db SFX_BATTLE_25, $00, $80 ; FOCUS_ENERGY + db SFX_BATTLE_18, $00, $c0 ; BIDE + db SFX_BATTLE_32, $c0, $ff ; METRONOME + db SFX_BATTLE_09, $f2, $20 ; MIRROR_MOVE + db SFX_BATTLE_34, $00, $80 ; SELFDESTRUCT + db SFX_BATTLE_34, $00, $40 ; EGG_BOMB + db SFX_BATTLE_09, $00, $40 ; LICK + db SFX_NOT_VERY_EFFECTIVE, $10, $ff ; SMOG + db SFX_BATTLE_2A, $20, $20 ; SLUDGE + db SFX_BATTLE_32, $00, $80 ; BONE_CLUB + db SFX_BATTLE_29, $1f, $20 ; FIRE_BLAST + db SFX_BATTLE_25, $2f, $80 ; WATERFALL + db SFX_BATTLE_0F, $1f, $ff ; CLAMP + db SFX_BATTLE_2B, $1f, $60 ; SWIFT + db SFX_BATTLE_26, $1e, $20 ; SKULL_BASH + db SFX_BATTLE_26, $1f, $18 ; SPIKE_CANNON + db SFX_BATTLE_14, $0f, $80 ; CONSTRICT + db SFX_BATTLE_09, $f8, $10 ; AMNESIA + db SFX_FAINT_FALL, $18, $20 ; KINESIS + db SFX_BATTLE_32, $08, $40 ; SOFTBOILED + db SFX_BATTLE_17, $01, $e0 ; HI_JUMP_KICK + db SFX_NOT_VERY_EFFECTIVE, $09, $ff ; GLARE + db SFX_BATTLE_35, $42, $01 ; DREAM_EATER + db SFX_BATTLE_1C, $00, $ff ; POISON_GAS + db SFX_BATTLE_32, $08, $e0 ; BARRAGE + db SFX_BATTLE_24, $00, $80 ; LEECH_LIFE + db SFX_BATTLE_09, $88, $10 ; LOVELY_KISS + db SFX_BATTLE_25, $48, $ff ; SKY_ATTACK + db SFX_FAINT_FALL, $ff, $ff ; TRANSFORM + db SFX_BATTLE_24, $ff, $10 ; BUBBLE + db SFX_FAINT_FALL, $ff, $04 ; DIZZY_PUNCH + db SFX_BATTLE_1C, $01, $ff ; SPORE + db SFX_BATTLE_13, $f8, $ff ; FLASH + db SFX_BATTLE_0C, $f0, $f0 ; PSYWAVE + db SFX_BATTLE_0F, $08, $10 ; SPLASH + db SFX_BATTLE_0D, $f0, $ff ; ACID_ARMOR + db SFX_SUPER_EFFECTIVE, $f0, $ff ; CRABHAMMER + db SFX_BATTLE_34, $10, $ff ; EXPLOSION + db SFX_BATTLE_0E, $f0, $20 ; FURY_SWIPES + db SFX_BATTLE_2B, $f0, $60 ; BONEMERANG + db SFX_BATTLE_21, $12, $10 ; REST + db SFX_BATTLE_36, $f0, $20 ; ROCK_SLIDE + db SFX_BATTLE_1E, $12, $ff ; HYPER_FANG + db SFX_BATTLE_31, $80, $04 ; SHARPEN + db SFX_BATTLE_33, $f0, $10 ; CONVERSION + db SFX_BATTLE_29, $f8, $ff ; TRI_ATTACK + db SFX_BATTLE_26, $f0, $ff ; SUPER_FANG + db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH + db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE + db SFX_BATTLE_0B, $00, $80 ; STRUGGLE + db SFX_BATTLE_0B, $00, $80 diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm new file mode 100755 index 00000000..a313af28 --- /dev/null +++ b/data/moves/tmhm_moves.asm @@ -0,0 +1,30 @@ +; The add_hm and add_tm macros in constants/item_constants.asm simultaneously +; define constants for the item IDs and for the corresponding move values. + +TechnicalMachines: + +n = 1 +REPT NUM_TMS +IF n < 10 +MOVE_FOR_TM EQUS "TM0{d:n}_MOVE" +ELSE +MOVE_FOR_TM EQUS "TM{d:n}_MOVE" +ENDC + db MOVE_FOR_TM +PURGE MOVE_FOR_TM +n = n + 1 +ENDR + +n = 1 +REPT NUM_HMS +IF n < 10 +MOVE_FOR_HM EQUS "HM0{d:n}_MOVE" +ELSE +MOVE_FOR_HM EQUS "HM{d:n}_MOVE" +ENDC + db MOVE_FOR_HM +PURGE MOVE_FOR_HM +n = n + 1 +ENDR + + db -1 ; end diff --git a/data/player_names.asm b/data/player_names.asm new file mode 100644 index 00000000..cf461a7a --- /dev/null +++ b/data/player_names.asm @@ -0,0 +1,13 @@ +DefaultNamesPlayer: + db "NEW NAME" + next "YELLOW" + next "ASH" + next "JACK" + db "@" + +DefaultNamesRival: + db "NEW NAME" + next "BLUE" + next "GARY" + next "JOHN" + db "@" diff --git a/data/player_names_list.asm b/data/player_names_list.asm new file mode 100644 index 00000000..a5f38919 --- /dev/null +++ b/data/player_names_list.asm @@ -0,0 +1,11 @@ +DefaultNamesPlayerList: + db "NEW NAME@" + db "YELLOW@" + db "ASH@" + db "JACK@" + +DefaultNamesRivalList: + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm deleted file mode 100755 index a1dad53a..00000000 --- a/data/pokedex_entries.asm +++ /dev/null @@ -1,1265 +0,0 @@ -PokedexEntryPointers: - dw RhydonDexEntry - dw KangaskhanDexEntry - dw NidoranMDexEntry - dw ClefairyDexEntry - dw SpearowDexEntry - dw VoltorbDexEntry - dw NidokingDexEntry - dw SlowbroDexEntry - dw IvysaurDexEntry - dw ExeggutorDexEntry - dw LickitungDexEntry - dw ExeggcuteDexEntry - dw GrimerDexEntry - dw GengarDexEntry - dw NidoranFDexEntry - dw NidoqueenDexEntry - dw CuboneDexEntry - dw RhyhornDexEntry - dw LaprasDexEntry - dw ArcanineDexEntry - dw MewDexEntry - dw GyaradosDexEntry - dw ShellderDexEntry - dw TentacoolDexEntry - dw GastlyDexEntry - dw ScytherDexEntry - dw StaryuDexEntry - dw BlastoiseDexEntry - dw PinsirDexEntry - dw TangelaDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw GrowlitheDexEntry - dw OnixDexEntry - dw FearowDexEntry - dw PidgeyDexEntry - dw SlowpokeDexEntry - dw KadabraDexEntry - dw GravelerDexEntry - dw ChanseyDexEntry - dw MachokeDexEntry - dw MrMimeDexEntry - dw HitmonleeDexEntry - dw HitmonchanDexEntry - dw ArbokDexEntry - dw ParasectDexEntry - dw PsyduckDexEntry - dw DrowzeeDexEntry - dw GolemDexEntry - dw MissingNoDexEntry - dw MagmarDexEntry - dw MissingNoDexEntry - dw ElectabuzzDexEntry - dw MagnetonDexEntry - dw KoffingDexEntry - dw MissingNoDexEntry - dw MankeyDexEntry - dw SeelDexEntry - dw DiglettDexEntry - dw TaurosDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw FarfetchdDexEntry - dw VenonatDexEntry - dw DragoniteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DoduoDexEntry - dw PoliwagDexEntry - dw JynxDexEntry - dw MoltresDexEntry - dw ArticunoDexEntry - dw ZapdosDexEntry - dw DittoDexEntry - dw MeowthDexEntry - dw KrabbyDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw VulpixDexEntry - dw NinetalesDexEntry - dw PikachuDexEntry - dw RaichuDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DratiniDexEntry - dw DragonairDexEntry - dw KabutoDexEntry - dw KabutopsDexEntry - dw HorseaDexEntry - dw SeadraDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw SandshrewDexEntry - dw SandslashDexEntry - dw OmanyteDexEntry - dw OmastarDexEntry - dw JigglypuffDexEntry - dw WigglytuffDexEntry - dw EeveeDexEntry - dw FlareonDexEntry - dw JolteonDexEntry - dw VaporeonDexEntry - dw MachopDexEntry - dw ZubatDexEntry - dw EkansDexEntry - dw ParasDexEntry - dw PoliwhirlDexEntry - dw PoliwrathDexEntry - dw WeedleDexEntry - dw KakunaDexEntry - dw BeedrillDexEntry - dw MissingNoDexEntry - dw DodrioDexEntry - dw PrimeapeDexEntry - dw DugtrioDexEntry - dw VenomothDexEntry - dw DewgongDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CaterpieDexEntry - dw MetapodDexEntry - dw ButterfreeDexEntry - dw MachampDexEntry - dw MissingNoDexEntry - dw GolduckDexEntry - dw HypnoDexEntry - dw GolbatDexEntry - dw MewtwoDexEntry - dw SnorlaxDexEntry - dw MagikarpDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MukDexEntry - dw MissingNoDexEntry - dw KinglerDexEntry - dw CloysterDexEntry - dw MissingNoDexEntry - dw ElectrodeDexEntry - dw ClefableDexEntry - dw WeezingDexEntry - dw PersianDexEntry - dw MarowakDexEntry - dw MissingNoDexEntry - dw HaunterDexEntry - dw AbraDexEntry - dw AlakazamDexEntry - dw PidgeottoDexEntry - dw PidgeotDexEntry - dw StarmieDexEntry - dw BulbasaurDexEntry - dw VenusaurDexEntry - dw TentacruelDexEntry - dw MissingNoDexEntry - dw GoldeenDexEntry - dw SeakingDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw PonytaDexEntry - dw RapidashDexEntry - dw RattataDexEntry - dw RaticateDexEntry - dw NidorinoDexEntry - dw NidorinaDexEntry - dw GeodudeDexEntry - dw PorygonDexEntry - dw AerodactylDexEntry - dw MissingNoDexEntry - dw MagnemiteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CharmanderDexEntry - dw SquirtleDexEntry - dw CharmeleonDexEntry - dw WartortleDexEntry - dw CharizardDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw OddishDexEntry - dw GloomDexEntry - dw VileplumeDexEntry - dw BellsproutDexEntry - dw WeepinbellDexEntry - dw VictreebelDexEntry - -; string: species name -; height in feet, inches -; weight in pounds -; text entry - -BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 - TX_FAR _BulbasaurDexEntry - db "@" - -IvysaurDexEntry: - db "SEED@" - db 3,3 - dw 290 - TX_FAR _IvysaurDexEntry - db "@" - -VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 - TX_FAR _VenusaurDexEntry - db "@" - -CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 - TX_FAR _CharmanderDexEntry - db "@" - -CharmeleonDexEntry: - db "FLAME@" - db 3,7 - dw 420 - TX_FAR _CharmeleonDexEntry - db "@" - -CharizardDexEntry: - db "FLAME@" - db 5,7 - dw 2000 - TX_FAR _CharizardDexEntry - db "@" - -SquirtleDexEntry: - db "TINYTURTLE@" - db 1,8 - dw 200 - TX_FAR _SquirtleDexEntry - db "@" - -WartortleDexEntry: - db "TURTLE@" - db 3,3 - dw 500 - TX_FAR _WartortleDexEntry - db "@" - -BlastoiseDexEntry: - db "SHELLFISH@" - db 5,3 - dw 1890 - TX_FAR _BlastoiseDexEntry - db "@" - -CaterpieDexEntry: - db "WORM@" - db 1,0 - dw 60 - TX_FAR _CaterpieDexEntry - db "@" - -MetapodDexEntry: - db "COCOON@" - db 2,4 - dw 220 - TX_FAR _MetapodDexEntry - db "@" - -ButterfreeDexEntry: - db "BUTTERFLY@" - db 3,7 - dw 710 - TX_FAR _ButterfreeDexEntry - db "@" - -WeedleDexEntry: - db "HAIRY BUG@" - db 1,0 - dw 70 - TX_FAR _WeedleDexEntry - db "@" - -KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 - TX_FAR _KakunaDexEntry - db "@" - -BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 - TX_FAR _BeedrillDexEntry - db "@" - -PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - TX_FAR _PidgeyDexEntry - db "@" - -PidgeottoDexEntry: - db "BIRD@" - db 3,7 - dw 660 - TX_FAR _PidgeottoDexEntry - db "@" - -PidgeotDexEntry: - db "BIRD@" - db 4,11 - dw 870 - TX_FAR _PidgeotDexEntry - db "@" - -RattataDexEntry: - db "RAT@" - db 1,0 - dw 80 - TX_FAR _RattataDexEntry - db "@" - -RaticateDexEntry: - db "RAT@" - db 2,4 - dw 410 - TX_FAR _RaticateDexEntry - db "@" - -SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - TX_FAR _SpearowDexEntry - db "@" - -FearowDexEntry: - db "BEAK@" - db 3,11 - dw 840 - TX_FAR _FearowDexEntry - db "@" - -EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 - TX_FAR _EkansDexEntry - db "@" - -ArbokDexEntry: - db "COBRA@" - db 11,6 - dw 1430 - TX_FAR _ArbokDexEntry - db "@" - -PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 - TX_FAR _PikachuDexEntry - db "@" - -RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 - TX_FAR _RaichuDexEntry - db "@" - -SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 - TX_FAR _SandshrewDexEntry - db "@" - -SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 - TX_FAR _SandslashDexEntry - db "@" - -NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 - TX_FAR _NidoranFDexEntry - db "@" - -NidorinaDexEntry: - db "POISON PIN@" - db 2,7 - dw 440 - TX_FAR _NidorinaDexEntry - db "@" - -NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 - TX_FAR _NidoqueenDexEntry - db "@" - -NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 - TX_FAR _NidoranMDexEntry - db "@" - -NidorinoDexEntry: - db "POISON PIN@" - db 2,11 - dw 430 - TX_FAR _NidorinoDexEntry - db "@" - -NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 - TX_FAR _NidokingDexEntry - db "@" - -ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 - TX_FAR _ClefairyDexEntry - db "@" - -ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 - TX_FAR _ClefableDexEntry - db "@" - -VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 - TX_FAR _VulpixDexEntry - db "@" - -NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 - TX_FAR _NinetalesDexEntry - db "@" - -JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 - TX_FAR _JigglypuffDexEntry - db "@" - -WigglytuffDexEntry: - db "BALLOON@" - db 3,3 - dw 260 - TX_FAR _WigglytuffDexEntry - db "@" - -ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 - TX_FAR _ZubatDexEntry - db "@" - -GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 - TX_FAR _GolbatDexEntry - db "@" - -OddishDexEntry: - db "WEED@" - db 1,8 - dw 120 - TX_FAR _OddishDexEntry - db "@" - -GloomDexEntry: - db "WEED@" - db 2,7 - dw 190 - TX_FAR _GloomDexEntry - db "@" - -VileplumeDexEntry: - db "FLOWER@" - db 3,11 - dw 410 - TX_FAR _VileplumeDexEntry - db "@" - -ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 - TX_FAR _ParasDexEntry - db "@" - -ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 - TX_FAR _ParasectDexEntry - db "@" - -VenonatDexEntry: - db "INSECT@" - db 3,3 - dw 660 - TX_FAR _VenonatDexEntry - db "@" - -VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 - TX_FAR _VenomothDexEntry - db "@" - -DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 - TX_FAR _DiglettDexEntry - db "@" - -DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 - TX_FAR _DugtrioDexEntry - db "@" - -MeowthDexEntry: - db "SCRATCHCAT@" - db 1,4 - dw 90 - TX_FAR _MeowthDexEntry - db "@" - -PersianDexEntry: - db "CLASSY CAT@" - db 3,3 - dw 710 - TX_FAR _PersianDexEntry - db "@" - -PsyduckDexEntry: - db "DUCK@" - db 2,7 - dw 430 - TX_FAR _PsyduckDexEntry - db "@" - -GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 - TX_FAR _GolduckDexEntry - db "@" - -MankeyDexEntry: - db "PIG MONKEY@" - db 1,8 - dw 620 - TX_FAR _MankeyDexEntry - db "@" - -PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 - TX_FAR _PrimeapeDexEntry - db "@" - -GrowlitheDexEntry: - db "PUPPY@" - db 2,4 - dw 420 - TX_FAR _GrowlitheDexEntry - db "@" - -ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 - TX_FAR _ArcanineDexEntry - db "@" - -PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 - TX_FAR _PoliwagDexEntry - db "@" - -PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 - TX_FAR _PoliwhirlDexEntry - db "@" - -PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 - TX_FAR _PoliwrathDexEntry - db "@" - -AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 - TX_FAR _AbraDexEntry - db "@" - -KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 - TX_FAR _KadabraDexEntry - db "@" - -AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 - TX_FAR _AlakazamDexEntry - db "@" - -MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 - TX_FAR _MachopDexEntry - db "@" - -MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 - TX_FAR _MachokeDexEntry - db "@" - -MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 - TX_FAR _MachampDexEntry - db "@" - -BellsproutDexEntry: - db "FLOWER@" - db 2,4 - dw 90 - TX_FAR _BellsproutDexEntry - db "@" - -WeepinbellDexEntry: - db "FLYCATCHER@" - db 3,3 - dw 140 - TX_FAR _WeepinbellDexEntry - db "@" - -VictreebelDexEntry: - db "FLYCATCHER@" - db 5,7 - dw 340 - TX_FAR _VictreebelDexEntry - db "@" - -TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 - TX_FAR _TentacoolDexEntry - db "@" - -TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 - TX_FAR _TentacruelDexEntry - db "@" - -GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 - TX_FAR _GeodudeDexEntry - db "@" - -GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 - TX_FAR _GravelerDexEntry - db "@" - -GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 - TX_FAR _GolemDexEntry - db "@" - -PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 - dw 660 - TX_FAR _PonytaDexEntry - db "@" - -RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 - TX_FAR _RapidashDexEntry - db "@" - -SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 - TX_FAR _SlowpokeDexEntry - db "@" - -SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 - TX_FAR _SlowbroDexEntry - db "@" - -MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 - TX_FAR _MagnemiteDexEntry - db "@" - -MagnetonDexEntry: - db "MAGNET@" - db 3,3 - dw 1320 - TX_FAR _MagnetonDexEntry - db "@" - -FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 - TX_FAR _FarfetchdDexEntry - db "@" - -DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 - TX_FAR _DoduoDexEntry - db "@" - -DodrioDexEntry: - db "TRIPLEBIRD@" - db 5,11 - dw 1880 - TX_FAR _DodrioDexEntry - db "@" - -SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 - TX_FAR _SeelDexEntry - db "@" - -DewgongDexEntry: - db "SEA LION@" - db 5,7 - dw 2650 - TX_FAR _DewgongDexEntry - db "@" - -GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 - TX_FAR _GrimerDexEntry - db "@" - -MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 - TX_FAR _MukDexEntry - db "@" - -ShellderDexEntry: - db "BIVALVE@" - db 1,0 - dw 90 - TX_FAR _ShellderDexEntry - db "@" - -CloysterDexEntry: - db "BIVALVE@" - db 4,11 - dw 2920 - TX_FAR _CloysterDexEntry - db "@" - -GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 - TX_FAR _GastlyDexEntry - db "@" - -HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 - TX_FAR _HaunterDexEntry - db "@" - -GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 - TX_FAR _GengarDexEntry - db "@" - -OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 - TX_FAR _OnixDexEntry - db "@" - -DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 - TX_FAR _DrowzeeDexEntry - db "@" - -HypnoDexEntry: - db "HYPNOSIS@" - db 5,3 - dw 1670 - TX_FAR _HypnoDexEntry - db "@" - -KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 - TX_FAR _KrabbyDexEntry - db "@" - -KinglerDexEntry: - db "PINCER@" - db 4,3 - dw 1320 - TX_FAR _KinglerDexEntry - db "@" - -VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 - TX_FAR _VoltorbDexEntry - db "@" - -ElectrodeDexEntry: - db "BALL@" - db 3,11 - dw 1470 - TX_FAR _ElectrodeDexEntry - db "@" - -ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 - TX_FAR _ExeggcuteDexEntry - db "@" - -ExeggutorDexEntry: - db "COCONUT@" - db 6,7 - dw 2650 - TX_FAR _ExeggutorDexEntry - db "@" - -CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 - TX_FAR _CuboneDexEntry - db "@" - -MarowakDexEntry: - db "BONEKEEPER@" - db 3,3 - dw 990 - TX_FAR _MarowakDexEntry - db "@" - -HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 - TX_FAR _HitmonleeDexEntry - db "@" - -HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 - TX_FAR _HitmonchanDexEntry - db "@" - -LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 - TX_FAR _LickitungDexEntry - db "@" - -KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 - TX_FAR _KoffingDexEntry - db "@" - -WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 - TX_FAR _WeezingDexEntry - db "@" - -RhyhornDexEntry: - db "SPIKES@" - db 3,3 - dw 2540 - TX_FAR _RhyhornDexEntry - db "@" - -RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 - TX_FAR _RhydonDexEntry - db "@" - -ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 - TX_FAR _ChanseyDexEntry - db "@" - -TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 - TX_FAR _TangelaDexEntry - db "@" - -KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 - TX_FAR _KangaskhanDexEntry - db "@" - -HorseaDexEntry: - db "DRAGON@" - db 1,4 - dw 180 - TX_FAR _HorseaDexEntry - db "@" - -SeadraDexEntry: - db "DRAGON@" - db 3,11 - dw 550 - TX_FAR _SeadraDexEntry - db "@" - -GoldeenDexEntry: - db "GOLDFISH@" - db 2,0 - dw 330 - TX_FAR _GoldeenDexEntry - db "@" - -SeakingDexEntry: - db "GOLDFISH@" - db 4,3 - dw 860 - TX_FAR _SeakingDexEntry - db "@" - -StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 - TX_FAR _StaryuDexEntry - db "@" - -StarmieDexEntry: - db "MYSTERIOUS@" - db 3,7 - dw 1760 - TX_FAR _StarmieDexEntry - db "@" - -MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 - TX_FAR _MrMimeDexEntry - db "@" - -ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 - TX_FAR _ScytherDexEntry - db "@" - -JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 - TX_FAR _JynxDexEntry - db "@" - -ElectabuzzDexEntry: - db "ELECTRIC@" - db 3,7 - dw 660 - TX_FAR _ElectabuzzDexEntry - db "@" - -MagmarDexEntry: - db "SPITFIRE@" - db 4,3 - dw 980 - TX_FAR _MagmarDexEntry - db "@" - -PinsirDexEntry: - db "STAGBEETLE@" - db 4,11 - dw 1210 - TX_FAR _PinsirDexEntry - db "@" - -TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 - TX_FAR _TaurosDexEntry - db "@" - -MagikarpDexEntry: - db "FISH@" - db 2,11 - dw 220 - TX_FAR _MagikarpDexEntry - db "@" - -GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 - TX_FAR _GyaradosDexEntry - db "@" - -LaprasDexEntry: - db "TRANSPORT@" - db 8,2 - dw 4850 - TX_FAR _LaprasDexEntry - db "@" - -DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 - TX_FAR _DittoDexEntry - db "@" - -EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 - TX_FAR _EeveeDexEntry - db "@" - -VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 - TX_FAR _VaporeonDexEntry - db "@" - -JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 - TX_FAR _JolteonDexEntry - db "@" - -FlareonDexEntry: - db "FLAME@" - db 2,11 - dw 550 - TX_FAR _FlareonDexEntry - db "@" - -PorygonDexEntry: - db "VIRTUAL@" - db 2,7 - dw 800 - TX_FAR _PorygonDexEntry - db "@" - -OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 - TX_FAR _OmanyteDexEntry - db "@" - -OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 - TX_FAR _OmastarDexEntry - db "@" - -KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 - TX_FAR _KabutoDexEntry - db "@" - -KabutopsDexEntry: - db "SHELLFISH@" - db 4,3 - dw 890 - TX_FAR _KabutopsDexEntry - db "@" - -AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 - TX_FAR _AerodactylDexEntry - db "@" - -SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 - TX_FAR _SnorlaxDexEntry - db "@" - -ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 - TX_FAR _ArticunoDexEntry - db "@" - -ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 - TX_FAR _ZapdosDexEntry - db "@" - -MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 - TX_FAR _MoltresDexEntry - db "@" - -DratiniDexEntry: - db "DRAGON@" - db 5,11 - dw 70 - TX_FAR _DratiniDexEntry - db "@" - -DragonairDexEntry: - db "DRAGON@" - db 13,1 - dw 360 - TX_FAR _DragonairDexEntry - db "@" - -DragoniteDexEntry: - db "DRAGON@" - db 7,3 - dw 4630 - TX_FAR _DragoniteDexEntry - db "@" - -MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 - TX_FAR _MewtwoDexEntry - db "@" - -MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 - TX_FAR _MewDexEntry - db "@" - -MissingNoDexEntry: - db "???@" - db 10 ; 1.0 m - db 100 ; 10.0 kg - text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) - -; what the game sees -; db "???@" -; db 10,100 ; 10 feet, 100 inches -; dw 35072 ; dw ("コ" << 8 | 0), 3507.2 lbs -; db "メント さくせいちゅう@" ; a whole bunch of sound effects diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm new file mode 100755 index 00000000..b4360286 --- /dev/null +++ b/data/pokemon/base_stats.asm @@ -0,0 +1,154 @@ +BaseStats:: +MonBaseStats:: +INCLUDE "data/pokemon/base_stats/bulbasaur.asm" +MonBaseStatsEnd:: +INCLUDE "data/pokemon/base_stats/ivysaur.asm" +INCLUDE "data/pokemon/base_stats/venusaur.asm" +INCLUDE "data/pokemon/base_stats/charmander.asm" +INCLUDE "data/pokemon/base_stats/charmeleon.asm" +INCLUDE "data/pokemon/base_stats/charizard.asm" +INCLUDE "data/pokemon/base_stats/squirtle.asm" +INCLUDE "data/pokemon/base_stats/wartortle.asm" +INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/caterpie.asm" +INCLUDE "data/pokemon/base_stats/metapod.asm" +INCLUDE "data/pokemon/base_stats/butterfree.asm" +INCLUDE "data/pokemon/base_stats/weedle.asm" +INCLUDE "data/pokemon/base_stats/kakuna.asm" +INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/pidgey.asm" +INCLUDE "data/pokemon/base_stats/pidgeotto.asm" +INCLUDE "data/pokemon/base_stats/pidgeot.asm" +INCLUDE "data/pokemon/base_stats/rattata.asm" +INCLUDE "data/pokemon/base_stats/raticate.asm" +INCLUDE "data/pokemon/base_stats/spearow.asm" +INCLUDE "data/pokemon/base_stats/fearow.asm" +INCLUDE "data/pokemon/base_stats/ekans.asm" +INCLUDE "data/pokemon/base_stats/arbok.asm" +INCLUDE "data/pokemon/base_stats/pikachu.asm" +INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/sandshrew.asm" +INCLUDE "data/pokemon/base_stats/sandslash.asm" +INCLUDE "data/pokemon/base_stats/nidoranf.asm" +INCLUDE "data/pokemon/base_stats/nidorina.asm" +INCLUDE "data/pokemon/base_stats/nidoqueen.asm" +INCLUDE "data/pokemon/base_stats/nidoranm.asm" +INCLUDE "data/pokemon/base_stats/nidorino.asm" +INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/clefairy.asm" +INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpix.asm" +INCLUDE "data/pokemon/base_stats/ninetales.asm" +INCLUDE "data/pokemon/base_stats/jigglypuff.asm" +INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/zubat.asm" +INCLUDE "data/pokemon/base_stats/golbat.asm" +INCLUDE "data/pokemon/base_stats/oddish.asm" +INCLUDE "data/pokemon/base_stats/gloom.asm" +INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paras.asm" +INCLUDE "data/pokemon/base_stats/parasect.asm" +INCLUDE "data/pokemon/base_stats/venonat.asm" +INCLUDE "data/pokemon/base_stats/venomoth.asm" +INCLUDE "data/pokemon/base_stats/diglett.asm" +INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/meowth.asm" +INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/psyduck.asm" +INCLUDE "data/pokemon/base_stats/golduck.asm" +INCLUDE "data/pokemon/base_stats/mankey.asm" +INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/growlithe.asm" +INCLUDE "data/pokemon/base_stats/arcanine.asm" +INCLUDE "data/pokemon/base_stats/poliwag.asm" +INCLUDE "data/pokemon/base_stats/poliwhirl.asm" +INCLUDE "data/pokemon/base_stats/poliwrath.asm" +INCLUDE "data/pokemon/base_stats/abra.asm" +INCLUDE "data/pokemon/base_stats/kadabra.asm" +INCLUDE "data/pokemon/base_stats/alakazam.asm" +INCLUDE "data/pokemon/base_stats/machop.asm" +INCLUDE "data/pokemon/base_stats/machoke.asm" +INCLUDE "data/pokemon/base_stats/machamp.asm" +INCLUDE "data/pokemon/base_stats/bellsprout.asm" +INCLUDE "data/pokemon/base_stats/weepinbell.asm" +INCLUDE "data/pokemon/base_stats/victreebel.asm" +INCLUDE "data/pokemon/base_stats/tentacool.asm" +INCLUDE "data/pokemon/base_stats/tentacruel.asm" +INCLUDE "data/pokemon/base_stats/geodude.asm" +INCLUDE "data/pokemon/base_stats/graveler.asm" +INCLUDE "data/pokemon/base_stats/golem.asm" +INCLUDE "data/pokemon/base_stats/ponyta.asm" +INCLUDE "data/pokemon/base_stats/rapidash.asm" +INCLUDE "data/pokemon/base_stats/slowpoke.asm" +INCLUDE "data/pokemon/base_stats/slowbro.asm" +INCLUDE "data/pokemon/base_stats/magnemite.asm" +INCLUDE "data/pokemon/base_stats/magneton.asm" +INCLUDE "data/pokemon/base_stats/farfetchd.asm" +INCLUDE "data/pokemon/base_stats/doduo.asm" +INCLUDE "data/pokemon/base_stats/dodrio.asm" +INCLUDE "data/pokemon/base_stats/seel.asm" +INCLUDE "data/pokemon/base_stats/dewgong.asm" +INCLUDE "data/pokemon/base_stats/grimer.asm" +INCLUDE "data/pokemon/base_stats/muk.asm" +INCLUDE "data/pokemon/base_stats/shellder.asm" +INCLUDE "data/pokemon/base_stats/cloyster.asm" +INCLUDE "data/pokemon/base_stats/gastly.asm" +INCLUDE "data/pokemon/base_stats/haunter.asm" +INCLUDE "data/pokemon/base_stats/gengar.asm" +INCLUDE "data/pokemon/base_stats/onix.asm" +INCLUDE "data/pokemon/base_stats/drowzee.asm" +INCLUDE "data/pokemon/base_stats/hypno.asm" +INCLUDE "data/pokemon/base_stats/krabby.asm" +INCLUDE "data/pokemon/base_stats/kingler.asm" +INCLUDE "data/pokemon/base_stats/voltorb.asm" +INCLUDE "data/pokemon/base_stats/electrode.asm" +INCLUDE "data/pokemon/base_stats/exeggcute.asm" +INCLUDE "data/pokemon/base_stats/exeggutor.asm" +INCLUDE "data/pokemon/base_stats/cubone.asm" +INCLUDE "data/pokemon/base_stats/marowak.asm" +INCLUDE "data/pokemon/base_stats/hitmonlee.asm" +INCLUDE "data/pokemon/base_stats/hitmonchan.asm" +INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/koffing.asm" +INCLUDE "data/pokemon/base_stats/weezing.asm" +INCLUDE "data/pokemon/base_stats/rhyhorn.asm" +INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/kangaskhan.asm" +INCLUDE "data/pokemon/base_stats/horsea.asm" +INCLUDE "data/pokemon/base_stats/seadra.asm" +INCLUDE "data/pokemon/base_stats/goldeen.asm" +INCLUDE "data/pokemon/base_stats/seaking.asm" +INCLUDE "data/pokemon/base_stats/staryu.asm" +INCLUDE "data/pokemon/base_stats/starmie.asm" +INCLUDE "data/pokemon/base_stats/mrmime.asm" +INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/jynx.asm" +INCLUDE "data/pokemon/base_stats/electabuzz.asm" +INCLUDE "data/pokemon/base_stats/magmar.asm" +INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tauros.asm" +INCLUDE "data/pokemon/base_stats/magikarp.asm" +INCLUDE "data/pokemon/base_stats/gyarados.asm" +INCLUDE "data/pokemon/base_stats/lapras.asm" +INCLUDE "data/pokemon/base_stats/ditto.asm" +INCLUDE "data/pokemon/base_stats/eevee.asm" +INCLUDE "data/pokemon/base_stats/vaporeon.asm" +INCLUDE "data/pokemon/base_stats/jolteon.asm" +INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/porygon.asm" +INCLUDE "data/pokemon/base_stats/omanyte.asm" +INCLUDE "data/pokemon/base_stats/omastar.asm" +INCLUDE "data/pokemon/base_stats/kabuto.asm" +INCLUDE "data/pokemon/base_stats/kabutops.asm" +INCLUDE "data/pokemon/base_stats/aerodactyl.asm" +INCLUDE "data/pokemon/base_stats/snorlax.asm" +INCLUDE "data/pokemon/base_stats/articuno.asm" +INCLUDE "data/pokemon/base_stats/zapdos.asm" +INCLUDE "data/pokemon/base_stats/moltres.asm" +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 new file mode 100644 index 00000000..54c9a9c9 --- /dev/null +++ b/data/pokemon/base_stats/abra.asm @@ -0,0 +1,24 @@ + db DEX_ABRA ; pokedex id + + db 25, 20, 15, 90, 105 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 200 ; catch rate + db 73 ; base exp + + 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, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm new file mode 100644 index 00000000..5ed73b3e --- /dev/null +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -0,0 +1,23 @@ + db DEX_AERODACTYL ; pokedex id + + db 80, 105, 65, 130, 60 + ; hp atk def spd spc + + db ROCK, FLYING ; type + db 45 ; catch rate + db 202 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm new file mode 100644 index 00000000..c3e1c4cd --- /dev/null +++ b/data/pokemon/base_stats/alakazam.asm @@ -0,0 +1,25 @@ + db DEX_ALAKAZAM ; pokedex id + + db 55, 50, 45, 120, 135 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 50 ; catch rate + db 186 ; base exp + + INCBIN "gfx/pokemon/front_yellow/alakazam.pic", 0, 1 ; sprite dimensions + dw AlakazamPicFront, AlakazamPicBack + + 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, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm new file mode 100644 index 00000000..f981efae --- /dev/null +++ b/data/pokemon/base_stats/arbok.asm @@ -0,0 +1,23 @@ + db DEX_ARBOK ; pokedex id + + db 60, 85, 69, 80, 65 + ; hp atk def spd spc + + db POISON, POISON ; type + db 90 ; catch rate + db 147 ; base exp + + 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, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm new file mode 100644 index 00000000..380be0a8 --- /dev/null +++ b/data/pokemon/base_stats/arcanine.asm @@ -0,0 +1,23 @@ + db DEX_ARCANINE ; pokedex id + + db 90, 110, 80, 95, 80 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 75 ; catch rate + db 213 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm new file mode 100644 index 00000000..d53fc4fc --- /dev/null +++ b/data/pokemon/base_stats/articuno.asm @@ -0,0 +1,23 @@ + db DEX_ARTICUNO ; pokedex id + + db 90, 85, 100, 85, 125 + ; hp atk def spd spc + + db ICE, FLYING ; type + db 3 ; catch rate + db 215 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm new file mode 100644 index 00000000..ac1c5757 --- /dev/null +++ b/data/pokemon/base_stats/beedrill.asm @@ -0,0 +1,23 @@ + db DEX_BEEDRILL ; pokedex id + + db 65, 80, 40, 75, 45 + ; hp atk def spd spc + + db BUG, POISON ; type + db 45 ; catch rate + db 159 ; base exp + + 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm new file mode 100644 index 00000000..8b46be24 --- /dev/null +++ b/data/pokemon/base_stats/bellsprout.asm @@ -0,0 +1,22 @@ + db DEX_BELLSPROUT ; pokedex id + + db 50, 75, 35, 40, 70 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 255 ; catch rate + db 84 ; base exp + + 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, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm new file mode 100644 index 00000000..041db750 --- /dev/null +++ b/data/pokemon/base_stats/blastoise.asm @@ -0,0 +1,25 @@ + db DEX_BLASTOISE ; pokedex id + + db 79, 83, 100, 78, 85 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 210 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm new file mode 100644 index 00000000..a20d2744 --- /dev/null +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -0,0 +1,22 @@ + db DEX_BULBASAUR ; pokedex id + + db 45, 49, 49, 45, 65 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 64 ; base exp + + INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions + dw BulbasaurPicFront, BulbasaurPicBack + + db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm new file mode 100644 index 00000000..ca480b58 --- /dev/null +++ b/data/pokemon/base_stats/butterfree.asm @@ -0,0 +1,23 @@ + db DEX_BUTTERFREE ; pokedex id + + db 60, 45, 50, 70, 80 + ; hp atk def spd spc + + db BUG, FLYING ; type + db 45 ; catch rate + db 160 ; base exp + + 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 + 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, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm new file mode 100644 index 00000000..1f048547 --- /dev/null +++ b/data/pokemon/base_stats/caterpie.asm @@ -0,0 +1,20 @@ + db DEX_CATERPIE ; pokedex id + + db 45, 30, 35, 45, 20 + ; hp atk def spd spc + + db BUG, BUG ; type + db 255 ; catch rate + db 53 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm new file mode 100644 index 00000000..81da1513 --- /dev/null +++ b/data/pokemon/base_stats/chansey.asm @@ -0,0 +1,27 @@ + db DEX_CHANSEY ; pokedex id + + db 250, 5, 5, 50, 105 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 30 ; catch rate + db 255 ; base exp + + INCBIN "gfx/pokemon/front_yellow/chansey.pic", 0, 1 ; sprite dimensions + dw ChanseyPicFront, ChanseyPicBack + + 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, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm new file mode 100644 index 00000000..7154f472 --- /dev/null +++ b/data/pokemon/base_stats/charizard.asm @@ -0,0 +1,25 @@ + db DEX_CHARIZARD ; pokedex id + + db 78, 84, 78, 100, 85 + ; hp atk def spd spc + + db FIRE, FLYING ; type + db 45 ; catch rate + db 209 ; base exp + + 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, FLY, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm new file mode 100644 index 00000000..4e3a7f59 --- /dev/null +++ b/data/pokemon/base_stats/charmander.asm @@ -0,0 +1,24 @@ + db DEX_CHARMANDER ; pokedex id + + db 39, 52, 43, 65, 50 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 65 ; base exp + + 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, \ + RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm new file mode 100644 index 00000000..e85ef0de --- /dev/null +++ b/data/pokemon/base_stats/charmeleon.asm @@ -0,0 +1,24 @@ + db DEX_CHARMELEON ; pokedex id + + db 58, 64, 58, 80, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 142 ; base exp + + 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, \ + RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm new file mode 100644 index 00000000..c01ac2e6 --- /dev/null +++ b/data/pokemon/base_stats/clefable.asm @@ -0,0 +1,26 @@ + db DEX_CLEFABLE ; pokedex id + + db 95, 70, 73, 60, 85 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 25 ; catch rate + db 129 ; base exp + + 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, \ + TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm new file mode 100644 index 00000000..a00ccafe --- /dev/null +++ b/data/pokemon/base_stats/clefairy.asm @@ -0,0 +1,26 @@ + db DEX_CLEFAIRY ; pokedex id + + db 70, 45, 48, 35, 60 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 150 ; catch rate + db 68 ; base exp + + 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, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm new file mode 100644 index 00000000..eb691a50 --- /dev/null +++ b/data/pokemon/base_stats/cloyster.asm @@ -0,0 +1,24 @@ + db DEX_CLOYSTER ; pokedex id + + db 50, 95, 180, 70, 85 + ; hp atk def spd spc + + db WATER, ICE ; type + db 60 ; catch rate + db 203 ; base exp + + 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, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm new file mode 100644 index 00000000..53224fb8 --- /dev/null +++ b/data/pokemon/base_stats/cubone.asm @@ -0,0 +1,24 @@ + db DEX_CUBONE ; pokedex id + + db 50, 50, 95, 35, 40 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 190 ; catch rate + db 87 ; base exp + + INCBIN "gfx/pokemon/front_yellow/cubone.pic", 0, 1 ; sprite dimensions + dw CubonePicFront, CubonePicBack + + 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, \ + FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm new file mode 100644 index 00000000..7bb63662 --- /dev/null +++ b/data/pokemon/base_stats/dewgong.asm @@ -0,0 +1,23 @@ + db DEX_DEWGONG ; pokedex id + + db 90, 70, 80, 70, 95 + ; hp atk def spd spc + + db WATER, ICE ; type + db 75 ; catch rate + db 176 ; base exp + + INCBIN "gfx/pokemon/front_yellow/dewgong.pic", 0, 1 ; sprite dimensions + dw DewgongPicFront, DewgongPicBack + + db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm new file mode 100644 index 00000000..76721d69 --- /dev/null +++ b/data/pokemon/base_stats/diglett.asm @@ -0,0 +1,22 @@ + db DEX_DIGLETT ; pokedex id + + db 10, 55, 25, 95, 45 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 255 ; catch rate + db 81 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + 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 new file mode 100644 index 00000000..a8a175ec --- /dev/null +++ b/data/pokemon/base_stats/ditto.asm @@ -0,0 +1,20 @@ + db DEX_DITTO ; pokedex id + + db 48, 48, 48, 48, 48 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 35 ; catch rate + db 61 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm new file mode 100644 index 00000000..481c021b --- /dev/null +++ b/data/pokemon/base_stats/dodrio.asm @@ -0,0 +1,23 @@ + db DEX_DODRIO ; pokedex id + + db 60, 110, 70, 100, 60 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 158 ; base exp + + INCBIN "gfx/pokemon/front_yellow/dodrio.pic", 0, 1 ; sprite dimensions + dw DodrioPicFront, DodrioPicBack + + db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm new file mode 100644 index 00000000..af9e2cf7 --- /dev/null +++ b/data/pokemon/base_stats/doduo.asm @@ -0,0 +1,23 @@ + db DEX_DODUO ; pokedex id + + db 35, 85, 45, 75, 35 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 190 ; catch rate + db 96 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm new file mode 100644 index 00000000..c50c8e74 --- /dev/null +++ b/data/pokemon/base_stats/dragonair.asm @@ -0,0 +1,24 @@ + db DEX_DRAGONAIR ; pokedex id + + db 61, 84, 65, 70, 70 + ; hp atk def spd spc + + db DRAGON, DRAGON ; type + db 27 ; catch rate + db 144 ; base exp + + INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions + dw DragonairPicFront, DragonairPicBack + + db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, 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, THUNDER_WAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm new file mode 100644 index 00000000..ff4aa45a --- /dev/null +++ b/data/pokemon/base_stats/dragonite.asm @@ -0,0 +1,25 @@ + db DEX_DRAGONITE ; pokedex id + + db 91, 134, 95, 80, 100 + ; hp atk def spd spc + + db DRAGON, FLYING ; type + db 9 ; catch rate + db 218 ; base exp + + 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, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm new file mode 100644 index 00000000..28ac755b --- /dev/null +++ b/data/pokemon/base_stats/dratini.asm @@ -0,0 +1,24 @@ + db DEX_DRATINI ; pokedex id + + db 41, 64, 45, 50, 50 + ; hp atk def spd spc + + db DRAGON, DRAGON ; type + db 45 ; catch rate + db 67 ; base exp + + 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, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, DRAGON_RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm new file mode 100644 index 00000000..0c71b320 --- /dev/null +++ b/data/pokemon/base_stats/drowzee.asm @@ -0,0 +1,24 @@ + db DEX_DROWZEE ; pokedex id + + db 60, 48, 45, 42, 90 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 190 ; catch rate + db 102 ; base exp + + 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, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm new file mode 100644 index 00000000..e29c120b --- /dev/null +++ b/data/pokemon/base_stats/dugtrio.asm @@ -0,0 +1,23 @@ + db DEX_DUGTRIO ; pokedex id + + db 35, 80, 50, 120, 70 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 50 ; catch rate + db 153 ; base exp + + 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm new file mode 100644 index 00000000..add50a6d --- /dev/null +++ b/data/pokemon/base_stats/eevee.asm @@ -0,0 +1,22 @@ + db DEX_EEVEE ; pokedex id + + db 55, 55, 50, 55, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 92 ; base exp + + INCBIN "gfx/pokemon/front_yellow/eevee.pic", 0, 1 ; sprite dimensions + dw EeveePicFront, EeveePicBack + + 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, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm new file mode 100644 index 00000000..0b6a8945 --- /dev/null +++ b/data/pokemon/base_stats/ekans.asm @@ -0,0 +1,23 @@ + db DEX_EKANS ; pokedex id + + db 35, 60, 44, 55, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 255 ; catch rate + db 62 ; base exp + + 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, \ + SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm new file mode 100644 index 00000000..dfd153bb --- /dev/null +++ b/data/pokemon/base_stats/electabuzz.asm @@ -0,0 +1,25 @@ + db DEX_ELECTABUZZ ; pokedex id + + db 65, 83, 57, 105, 85 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 45 ; catch rate + db 156 ; base exp + + 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, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm new file mode 100644 index 00000000..ae2e6cf4 --- /dev/null +++ b/data/pokemon/base_stats/electrode.asm @@ -0,0 +1,23 @@ + db DEX_ELECTRODE ; pokedex id + + db 60, 50, 70, 140, 80 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 60 ; catch rate + db 150 ; base exp + + INCBIN "gfx/pokemon/front_yellow/electrode.pic", 0, 1 ; sprite dimensions + dw ElectrodePicFront, ElectrodePicBack + + db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, HYPER_BEAM, RAGE, THUNDERBOLT, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, EXPLOSION, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm new file mode 100644 index 00000000..418c3948 --- /dev/null +++ b/data/pokemon/base_stats/exeggcute.asm @@ -0,0 +1,23 @@ + db DEX_EXEGGCUTE ; pokedex id + + db 60, 40, 80, 40, 60 + ; hp atk def spd spc + + db GRASS, PSYCHIC_TYPE ; type + db 90 ; catch rate + db 98 ; base exp + + 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm new file mode 100644 index 00000000..236d706e --- /dev/null +++ b/data/pokemon/base_stats/exeggutor.asm @@ -0,0 +1,23 @@ + db DEX_EXEGGUTOR ; pokedex id + + db 95, 95, 85, 55, 125 + ; hp atk def spd spc + + db GRASS, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 212 ; base exp + + 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, \ + REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm new file mode 100644 index 00000000..d608b3fb --- /dev/null +++ b/data/pokemon/base_stats/farfetchd.asm @@ -0,0 +1,23 @@ + db DEX_FARFETCHD ; pokedex id + + db 52, 65, 55, 60, 58 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 94 ; base exp + + 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, \ + TAKE_DOWN, DOUBLE_EDGE, RAGE, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE, CUT, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm new file mode 100644 index 00000000..afb89921 --- /dev/null +++ b/data/pokemon/base_stats/fearow.asm @@ -0,0 +1,22 @@ + db DEX_FEAROW ; pokedex id + + db 65, 90, 65, 100, 61 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 90 ; catch rate + db 162 ; base exp + + INCBIN "gfx/pokemon/front_yellow/fearow.pic", 0, 1 ; sprite dimensions + dw FearowPicFront, FearowPicBack + + db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm new file mode 100644 index 00000000..0a714783 --- /dev/null +++ b/data/pokemon/base_stats/flareon.asm @@ -0,0 +1,22 @@ + db DEX_FLAREON ; pokedex id + + db 65, 130, 60, 65, 110 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 198 ; base exp + + INCBIN "gfx/pokemon/front_yellow/flareon.pic", 0, 1 ; sprite dimensions + dw FlareonPicFront, FlareonPicBack + + 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, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm new file mode 100644 index 00000000..fc8c86ef --- /dev/null +++ b/data/pokemon/base_stats/gastly.asm @@ -0,0 +1,22 @@ + db DEX_GASTLY ; pokedex id + + db 30, 35, 30, 80, 100 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 190 ; catch rate + db 95 ; base exp + + 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, \ + DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm new file mode 100644 index 00000000..dc9105c6 --- /dev/null +++ b/data/pokemon/base_stats/gengar.asm @@ -0,0 +1,25 @@ + db DEX_GENGAR ; pokedex id + + db 60, 65, 60, 110, 130 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 45 ; catch rate + db 190 ; base exp + + 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, \ + SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm new file mode 100644 index 00000000..a2225f5c --- /dev/null +++ b/data/pokemon/base_stats/geodude.asm @@ -0,0 +1,24 @@ + db DEX_GEODUDE ; pokedex id + + db 40, 80, 100, 20, 30 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 255 ; catch rate + db 86 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm new file mode 100644 index 00000000..8c24985c --- /dev/null +++ b/data/pokemon/base_stats/gloom.asm @@ -0,0 +1,22 @@ + db DEX_GLOOM ; pokedex id + + db 60, 65, 70, 40, 85 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 120 ; catch rate + db 132 ; base exp + + 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, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm new file mode 100644 index 00000000..6eb60490 --- /dev/null +++ b/data/pokemon/base_stats/golbat.asm @@ -0,0 +1,22 @@ + db DEX_GOLBAT ; pokedex id + + db 75, 80, 70, 90, 75 + ; hp atk def spd spc + + db POISON, FLYING ; type + db 90 ; catch rate + db 171 ; base exp + + INCBIN "gfx/pokemon/front_yellow/golbat.pic", 0, 1 ; sprite dimensions + dw GolbatPicFront, GolbatPicBack + + db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; 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, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm new file mode 100644 index 00000000..662c6c93 --- /dev/null +++ b/data/pokemon/base_stats/goldeen.asm @@ -0,0 +1,23 @@ + db DEX_GOLDEEN ; pokedex id + + db 45, 67, 60, 63, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 111 ; base exp + + 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, \ + SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm new file mode 100644 index 00000000..b7c035c6 --- /dev/null +++ b/data/pokemon/base_stats/golduck.asm @@ -0,0 +1,25 @@ + db DEX_GOLDUCK ; pokedex id + + db 80, 82, 78, 85, 80 + ; hp atk def spd spc + + db WATER, WATER ; type + db 75 ; catch rate + db 174 ; base exp + + 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm new file mode 100644 index 00000000..a8f5cbf9 --- /dev/null +++ b/data/pokemon/base_stats/golem.asm @@ -0,0 +1,24 @@ + db DEX_GOLEM ; pokedex id + + db 80, 110, 130, 45, 55 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 45 ; catch rate + db 177 ; base exp + + 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, \ + REST, EXPLOSION, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm new file mode 100644 index 00000000..d5dfda81 --- /dev/null +++ b/data/pokemon/base_stats/graveler.asm @@ -0,0 +1,24 @@ + db DEX_GRAVELER ; pokedex id + + db 55, 95, 115, 35, 45 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 120 ; catch rate + db 134 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm new file mode 100644 index 00000000..b2e0f08a --- /dev/null +++ b/data/pokemon/base_stats/grimer.asm @@ -0,0 +1,22 @@ + db DEX_GRIMER ; pokedex id + + db 80, 80, 50, 25, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 190 ; catch rate + db 90 ; base exp + + INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions + dw GrimerPicFront, GrimerPicBack + + db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm new file mode 100644 index 00000000..2c70184f --- /dev/null +++ b/data/pokemon/base_stats/growlithe.asm @@ -0,0 +1,23 @@ + db DEX_GROWLITHE ; pokedex id + + db 55, 70, 45, 60, 50 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 91 ; base exp + + 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm new file mode 100644 index 00000000..13c30ff8 --- /dev/null +++ b/data/pokemon/base_stats/gyarados.asm @@ -0,0 +1,24 @@ + db DEX_GYARADOS ; pokedex id + + db 95, 125, 79, 81, 100 + ; hp atk def spd spc + + db WATER, FLYING ; type + db 45 ; catch rate + db 214 ; base exp + + INCBIN "gfx/pokemon/front_yellow/gyarados.pic", 0, 1 ; sprite dimensions + dw GyaradosPicFront, GyaradosPicBack + + 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, \ + DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm new file mode 100644 index 00000000..cf9df9ec --- /dev/null +++ b/data/pokemon/base_stats/haunter.asm @@ -0,0 +1,22 @@ + db DEX_HAUNTER ; pokedex id + + db 45, 50, 45, 95, 115 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 90 ; catch rate + db 126 ; base exp + + 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, \ + DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm new file mode 100644 index 00000000..1b7651ff --- /dev/null +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -0,0 +1,23 @@ + db DEX_HITMONCHAN ; pokedex id + + db 50, 105, 79, 76, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 140 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm new file mode 100644 index 00000000..51da5f75 --- /dev/null +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -0,0 +1,23 @@ + db DEX_HITMONLEE ; pokedex id + + db 50, 120, 53, 87, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 139 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm new file mode 100644 index 00000000..1a5a5aff --- /dev/null +++ b/data/pokemon/base_stats/horsea.asm @@ -0,0 +1,23 @@ + db DEX_HORSEA ; pokedex id + + db 30, 40, 70, 60, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 83 ; base exp + + 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, \ + ICE_BEAM, BLIZZARD, RAGE, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm new file mode 100644 index 00000000..b43cd961 --- /dev/null +++ b/data/pokemon/base_stats/hypno.asm @@ -0,0 +1,25 @@ + db DEX_HYPNO ; pokedex id + + db 85, 73, 70, 67, 115 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 75 ; catch rate + db 165 ; base exp + + 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, \ + RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm new file mode 100644 index 00000000..3d69a8d7 --- /dev/null +++ b/data/pokemon/base_stats/ivysaur.asm @@ -0,0 +1,22 @@ + db DEX_IVYSAUR ; pokedex id + + db 60, 62, 63, 60, 80 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 141 ; base exp + + INCBIN "gfx/pokemon/front_yellow/ivysaur.pic", 0, 1 ; sprite dimensions + dw IvysaurPicFront, IvysaurPicBack + + db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm new file mode 100644 index 00000000..8348431d --- /dev/null +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -0,0 +1,26 @@ + db DEX_JIGGLYPUFF ; pokedex id + + db 115, 45, 20, 20, 25 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 170 ; catch rate + db 76 ; base exp + + 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, \ + STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm new file mode 100644 index 00000000..3db8c96a --- /dev/null +++ b/data/pokemon/base_stats/jolteon.asm @@ -0,0 +1,23 @@ + db DEX_JOLTEON ; pokedex id + + db 65, 65, 60, 130, 110 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 45 ; catch rate + db 197 ; base exp + + INCBIN "gfx/pokemon/front_yellow/jolteon.pic", 0, 1 ; sprite dimensions + dw JolteonPicFront, JolteonPicBack + + 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, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm new file mode 100644 index 00000000..f4fe28c7 --- /dev/null +++ b/data/pokemon/base_stats/jynx.asm @@ -0,0 +1,25 @@ + db DEX_JYNX ; pokedex id + + db 65, 50, 35, 95, 95 + ; hp atk def spd spc + + db ICE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 137 ; base exp + + 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm new file mode 100644 index 00000000..d5d96d1f --- /dev/null +++ b/data/pokemon/base_stats/kabuto.asm @@ -0,0 +1,23 @@ + db DEX_KABUTO ; pokedex id + + db 30, 80, 90, 55, 45 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 119 ; base exp + + 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, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm new file mode 100644 index 00000000..f067949e --- /dev/null +++ b/data/pokemon/base_stats/kabutops.asm @@ -0,0 +1,24 @@ + db DEX_KABUTOPS ; pokedex id + + db 60, 115, 105, 80, 70 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 201 ; base exp + + 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, CUT, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm new file mode 100644 index 00000000..30d2feef --- /dev/null +++ b/data/pokemon/base_stats/kadabra.asm @@ -0,0 +1,24 @@ + db DEX_KADABRA ; pokedex id + + db 40, 35, 30, 105, 120 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 100 ; catch rate + db 145 ; base exp + + INCBIN "gfx/pokemon/front_yellow/kadabra.pic", 0, 1 ; sprite dimensions + dw KadabraPicFront, KadabraPicBack + + 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, \ + DIG, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm new file mode 100644 index 00000000..39870dc4 --- /dev/null +++ b/data/pokemon/base_stats/kakuna.asm @@ -0,0 +1,20 @@ + db DEX_KAKUNA ; pokedex id + + db 45, 25, 50, 35, 25 + ; hp atk def spd spc + + db BUG, POISON ; type + db 120 ; catch rate + db 71 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm new file mode 100644 index 00000000..7d3cf971 --- /dev/null +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -0,0 +1,25 @@ + db DEX_KANGASKHAN ; pokedex id + + db 105, 95, 80, 90, 40 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 175 ; base exp + + 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, \ + ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm new file mode 100644 index 00000000..c0d75d62 --- /dev/null +++ b/data/pokemon/base_stats/kingler.asm @@ -0,0 +1,23 @@ + db DEX_KINGLER ; pokedex id + + db 55, 130, 115, 75, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 60 ; catch rate + db 206 ; base exp + + INCBIN "gfx/pokemon/front_yellow/kingler.pic", 0, 1 ; sprite dimensions + dw KinglerPicFront, KinglerPicBack + + db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + SUBSTITUTE, CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm new file mode 100644 index 00000000..5b63ebc8 --- /dev/null +++ b/data/pokemon/base_stats/koffing.asm @@ -0,0 +1,22 @@ + db DEX_KOFFING ; pokedex id + + db 40, 65, 95, 35, 60 + ; hp atk def spd spc + + db POISON, POISON ; type + db 190 ; catch rate + db 114 ; base exp + + 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, \ + EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm new file mode 100644 index 00000000..dd0f739a --- /dev/null +++ b/data/pokemon/base_stats/krabby.asm @@ -0,0 +1,23 @@ + db DEX_KRABBY ; pokedex id + + db 30, 105, 90, 50, 25 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 115 ; base exp + + INCBIN "gfx/pokemon/front_yellow/krabby.pic", 0, 1 ; sprite dimensions + dw KrabbyPicFront, KrabbyPicBack + + db BUBBLE, LEER, 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, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm new file mode 100644 index 00000000..eb45e08c --- /dev/null +++ b/data/pokemon/base_stats/lapras.asm @@ -0,0 +1,25 @@ + db DEX_LAPRAS ; pokedex id + + db 130, 85, 80, 60, 95 + ; hp atk def spd spc + + db WATER, ICE ; type + db 45 ; catch rate + db 219 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm new file mode 100644 index 00000000..eef13946 --- /dev/null +++ b/data/pokemon/base_stats/lickitung.asm @@ -0,0 +1,25 @@ + db DEX_LICKITUNG ; pokedex id + + db 90, 55, 75, 30, 60 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 127 ; base exp + + 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, \ + REST, SUBSTITUTE, CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm new file mode 100644 index 00000000..e00ccea6 --- /dev/null +++ b/data/pokemon/base_stats/machamp.asm @@ -0,0 +1,24 @@ + db DEX_MACHAMP ; pokedex id + + db 90, 130, 80, 55, 65 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 193 ; base exp + + 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, \ + REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm new file mode 100644 index 00000000..0e1a1d46 --- /dev/null +++ b/data/pokemon/base_stats/machoke.asm @@ -0,0 +1,24 @@ + db DEX_MACHOKE ; pokedex id + + db 80, 100, 70, 45, 50 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 90 ; catch rate + db 146 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm new file mode 100644 index 00000000..3c7b8491 --- /dev/null +++ b/data/pokemon/base_stats/machop.asm @@ -0,0 +1,24 @@ + db DEX_MACHOP ; pokedex id + + db 70, 80, 50, 35, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 180 ; catch rate + db 88 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm new file mode 100644 index 00000000..8d7eef46 --- /dev/null +++ b/data/pokemon/base_stats/magikarp.asm @@ -0,0 +1,20 @@ + db DEX_MAGIKARP ; pokedex id + + db 20, 10, 55, 80, 20 + ; hp atk def spd spc + + db WATER, WATER ; type + db 255 ; catch rate + db 20 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm new file mode 100644 index 00000000..1619e211 --- /dev/null +++ b/data/pokemon/base_stats/magmar.asm @@ -0,0 +1,24 @@ + db DEX_MAGMAR ; pokedex id + + db 65, 95, 57, 93, 85 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 167 ; base exp + + 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, \ + RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + PSYWAVE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm new file mode 100644 index 00000000..cb249496 --- /dev/null +++ b/data/pokemon/base_stats/magnemite.asm @@ -0,0 +1,23 @@ + db DEX_MAGNEMITE ; pokedex id + + db 25, 35, 70, 45, 95 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 89 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm new file mode 100644 index 00000000..36db2428 --- /dev/null +++ b/data/pokemon/base_stats/magneton.asm @@ -0,0 +1,23 @@ + db DEX_MAGNETON ; pokedex id + + db 50, 60, 95, 70, 120 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 60 ; catch rate + db 161 ; base exp + + 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, \ + THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm new file mode 100644 index 00000000..cb60435b --- /dev/null +++ b/data/pokemon/base_stats/mankey.asm @@ -0,0 +1,24 @@ + db DEX_MANKEY ; pokedex id + + db 40, 80, 35, 70, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 190 ; catch rate + db 74 ; base exp + + 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, \ + REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm new file mode 100644 index 00000000..bdd1636e --- /dev/null +++ b/data/pokemon/base_stats/marowak.asm @@ -0,0 +1,25 @@ + db DEX_MAROWAK ; pokedex id + + db 60, 80, 110, 45, 50 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 75 ; catch rate + db 124 ; base exp + + INCBIN "gfx/pokemon/front_yellow/marowak.pic", 0, 1 ; sprite dimensions + dw MarowakPicFront, MarowakPicBack + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm new file mode 100644 index 00000000..9b06043b --- /dev/null +++ b/data/pokemon/base_stats/meowth.asm @@ -0,0 +1,23 @@ + db DEX_MEOWTH ; pokedex id + + db 40, 45, 35, 90, 40 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 255 ; catch rate + db 69 ; base exp + + 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, \ + REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm new file mode 100644 index 00000000..5d3d1740 --- /dev/null +++ b/data/pokemon/base_stats/metapod.asm @@ -0,0 +1,20 @@ + db DEX_METAPOD ; pokedex id + + db 50, 20, 55, 30, 25 + ; hp atk def spd spc + + db BUG, BUG ; type + db 120 ; catch rate + db 72 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm new file mode 100644 index 00000000..caa7fb85 --- /dev/null +++ b/data/pokemon/base_stats/mew.asm @@ -0,0 +1,30 @@ + db DEX_MEW ; pokedex id + + db 100, 100, 100, 100, 100 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 64 ; base exp + + 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, \ + 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 + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm new file mode 100644 index 00000000..99ff53fe --- /dev/null +++ b/data/pokemon/base_stats/mewtwo.asm @@ -0,0 +1,26 @@ + db DEX_MEWTWO ; pokedex id + + db 106, 110, 90, 130, 154 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 3 ; catch rate + db 220 ; base exp + + 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, 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 new file mode 100644 index 00000000..50b23fd8 --- /dev/null +++ b/data/pokemon/base_stats/moltres.asm @@ -0,0 +1,23 @@ + db DEX_MOLTRES ; pokedex id + + db 90, 100, 90, 90, 125 + ; hp atk def spd spc + + db FIRE, FLYING ; type + db 3 ; catch rate + db 217 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm new file mode 100644 index 00000000..e6cdba21 --- /dev/null +++ b/data/pokemon/base_stats/mrmime.asm @@ -0,0 +1,25 @@ + db DEX_MR_MIME ; pokedex id + + db 40, 45, 65, 90, 100 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 136 ; base exp + + 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, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm new file mode 100644 index 00000000..42885050 --- /dev/null +++ b/data/pokemon/base_stats/muk.asm @@ -0,0 +1,22 @@ + db DEX_MUK ; pokedex id + + db 105, 105, 75, 50, 65 + ; hp atk def spd spc + + db POISON, POISON ; type + db 75 ; catch rate + db 157 ; base exp + + 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, \ + SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm new file mode 100644 index 00000000..602ed2ff --- /dev/null +++ b/data/pokemon/base_stats/nidoking.asm @@ -0,0 +1,26 @@ + db DEX_NIDOKING ; pokedex id + + db 81, 92, 77, 85, 75 + ; hp atk def spd spc + + db POISON, GROUND ; type + db 45 ; catch rate + db 195 ; base exp + + 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, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm new file mode 100644 index 00000000..5fba3fed --- /dev/null +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -0,0 +1,26 @@ + db DEX_NIDOQUEEN ; pokedex id + + db 90, 82, 87, 76, 75 + ; hp atk def spd spc + + db POISON, GROUND ; type + db 45 ; catch rate + db 194 ; base exp + + 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, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm new file mode 100644 index 00000000..814e2dd7 --- /dev/null +++ b/data/pokemon/base_stats/nidoranf.asm @@ -0,0 +1,22 @@ + db DEX_NIDORAN_F ; pokedex id + + db 55, 47, 52, 41, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 235 ; catch rate + db 59 ; base exp + + 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, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm new file mode 100644 index 00000000..05b3050a --- /dev/null +++ b/data/pokemon/base_stats/nidoranm.asm @@ -0,0 +1,23 @@ + db DEX_NIDORAN_M ; pokedex id + + db 46, 57, 40, 50, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 235 ; catch rate + db 60 ; base exp + + INCBIN "gfx/pokemon/front_yellow/nidoranm.pic", 0, 1 ; sprite dimensions + dw NidoranMPicFront, NidoranMPicBack + + db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm new file mode 100644 index 00000000..9831db3e --- /dev/null +++ b/data/pokemon/base_stats/nidorina.asm @@ -0,0 +1,23 @@ + db DEX_NIDORINA ; pokedex id + + db 70, 62, 67, 56, 55 + ; hp atk def spd spc + + db POISON, POISON ; type + db 120 ; catch rate + db 117 ; base exp + + INCBIN "gfx/pokemon/front_yellow/nidorina.pic", 0, 1 ; sprite dimensions + dw NidorinaPicFront, NidorinaPicBack + + db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm new file mode 100644 index 00000000..d8abd036 --- /dev/null +++ b/data/pokemon/base_stats/nidorino.asm @@ -0,0 +1,23 @@ + db DEX_NIDORINO ; pokedex id + + db 61, 72, 57, 65, 55 + ; hp atk def spd spc + + db POISON, POISON ; type + db 120 ; catch rate + db 118 ; base exp + + INCBIN "gfx/pokemon/front_yellow/nidorino.pic", 0, 1 ; sprite dimensions + dw NidorinoPicFront, NidorinoPicBack + + db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm new file mode 100644 index 00000000..7373d2e9 --- /dev/null +++ b/data/pokemon/base_stats/ninetales.asm @@ -0,0 +1,23 @@ + db DEX_NINETALES ; pokedex id + + db 73, 76, 75, 100, 100 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 75 ; catch rate + db 178 ; base exp + + 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm new file mode 100644 index 00000000..de1498b9 --- /dev/null +++ b/data/pokemon/base_stats/oddish.asm @@ -0,0 +1,22 @@ + db DEX_ODDISH ; pokedex id + + db 45, 50, 55, 30, 75 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 255 ; catch rate + db 78 ; base exp + + 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, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm new file mode 100644 index 00000000..1dff5d20 --- /dev/null +++ b/data/pokemon/base_stats/omanyte.asm @@ -0,0 +1,23 @@ + db DEX_OMANYTE ; pokedex id + + db 35, 40, 100, 35, 90 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 120 ; base exp + + 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, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm new file mode 100644 index 00000000..1deaf789 --- /dev/null +++ b/data/pokemon/base_stats/omastar.asm @@ -0,0 +1,24 @@ + db DEX_OMASTAR ; pokedex id + + db 70, 60, 125, 55, 115 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 199 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, 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 + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm new file mode 100644 index 00000000..96048ee5 --- /dev/null +++ b/data/pokemon/base_stats/onix.asm @@ -0,0 +1,23 @@ + db DEX_ONIX ; pokedex id + + db 35, 45, 160, 70, 30 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 45 ; catch rate + db 108 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm new file mode 100644 index 00000000..82e9920e --- /dev/null +++ b/data/pokemon/base_stats/paras.asm @@ -0,0 +1,23 @@ + db DEX_PARAS ; pokedex id + + db 35, 70, 55, 25, 55 + ; hp atk def spd spc + + db BUG, GRASS ; type + db 190 ; catch rate + db 70 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm new file mode 100644 index 00000000..bcd47673 --- /dev/null +++ b/data/pokemon/base_stats/parasect.asm @@ -0,0 +1,23 @@ + db DEX_PARASECT ; pokedex id + + db 60, 95, 80, 30, 80 + ; hp atk def spd spc + + db BUG, GRASS ; type + db 75 ; catch rate + db 128 ; base exp + + 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 + 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, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm new file mode 100644 index 00000000..4da05861 --- /dev/null +++ b/data/pokemon/base_stats/persian.asm @@ -0,0 +1,23 @@ + db DEX_PERSIAN ; pokedex id + + db 65, 70, 60, 115, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 90 ; catch rate + db 148 ; base exp + + 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, \ + WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm new file mode 100644 index 00000000..b4370201 --- /dev/null +++ b/data/pokemon/base_stats/pidgeot.asm @@ -0,0 +1,23 @@ + db DEX_PIDGEOT ; pokedex id + + db 83, 80, 75, 91, 70 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 172 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm new file mode 100644 index 00000000..c44325db --- /dev/null +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -0,0 +1,22 @@ + db DEX_PIDGEOTTO ; pokedex id + + db 63, 60, 55, 71, 50 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 120 ; catch rate + db 113 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm new file mode 100644 index 00000000..0c1c241b --- /dev/null +++ b/data/pokemon/base_stats/pidgey.asm @@ -0,0 +1,22 @@ + db DEX_PIDGEY ; pokedex id + + db 40, 45, 40, 56, 35 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 255 ; catch rate + db 55 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm new file mode 100644 index 00000000..8bef5f8b --- /dev/null +++ b/data/pokemon/base_stats/pikachu.asm @@ -0,0 +1,24 @@ + db DEX_PIKACHU ; pokedex id + + db 35, 55, 30, 90, 50 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 82 ; base exp + + 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, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm new file mode 100644 index 00000000..e67a2896 --- /dev/null +++ b/data/pokemon/base_stats/pinsir.asm @@ -0,0 +1,23 @@ + db DEX_PINSIR ; pokedex id + + db 65, 125, 100, 85, 55 + ; hp atk def spd spc + + db BUG, BUG ; type + db 45 ; catch rate + db 200 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm new file mode 100644 index 00000000..04f0aae5 --- /dev/null +++ b/data/pokemon/base_stats/poliwag.asm @@ -0,0 +1,23 @@ + db DEX_POLIWAG ; pokedex id + + db 40, 50, 40, 90, 40 + ; hp atk def spd spc + + db WATER, WATER ; type + db 255 ; catch rate + db 77 ; base exp + + 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, \ + PSYWAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm new file mode 100644 index 00000000..54673b74 --- /dev/null +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -0,0 +1,25 @@ + db DEX_POLIWHIRL ; pokedex id + + db 65, 65, 65, 90, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 120 ; catch rate + db 131 ; base exp + + 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, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm new file mode 100644 index 00000000..2c3b6bc5 --- /dev/null +++ b/data/pokemon/base_stats/poliwrath.asm @@ -0,0 +1,25 @@ + db DEX_POLIWRATH ; pokedex id + + db 90, 85, 95, 70, 70 + ; hp atk def spd spc + + db WATER, FIGHTING ; type + db 45 ; catch rate + db 185 ; base exp + + 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, \ + EARTHQUAKE, FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm new file mode 100644 index 00000000..ee8e3389 --- /dev/null +++ b/data/pokemon/base_stats/ponyta.asm @@ -0,0 +1,22 @@ + db DEX_PONYTA ; pokedex id + + db 50, 85, 55, 90, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 152 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm new file mode 100644 index 00000000..8be8923e --- /dev/null +++ b/data/pokemon/base_stats/porygon.asm @@ -0,0 +1,24 @@ + db DEX_PORYGON ; pokedex id + + db 65, 60, 70, 40, 75 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 130 ; base exp + + 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, \ + TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm new file mode 100644 index 00000000..57f6e901 --- /dev/null +++ b/data/pokemon/base_stats/primeape.asm @@ -0,0 +1,24 @@ + db DEX_PRIMEAPE ; pokedex id + + db 65, 105, 60, 95, 60 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 75 ; catch rate + db 149 ; base exp + + INCBIN "gfx/pokemon/front_yellow/primeape.pic", 0, 1 ; sprite dimensions + dw PrimeapePicFront, PrimeapePicBack + + 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, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm new file mode 100644 index 00000000..1f6c4437 --- /dev/null +++ b/data/pokemon/base_stats/psyduck.asm @@ -0,0 +1,24 @@ + db DEX_PSYDUCK ; pokedex id + + db 50, 52, 48, 55, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 80 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm new file mode 100644 index 00000000..9ac93813 --- /dev/null +++ b/data/pokemon/base_stats/raichu.asm @@ -0,0 +1,24 @@ + db DEX_RAICHU ; pokedex id + + db 60, 90, 55, 100, 90 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 75 ; catch rate + db 122 ; base exp + + 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, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm new file mode 100644 index 00000000..8a093859 --- /dev/null +++ b/data/pokemon/base_stats/rapidash.asm @@ -0,0 +1,23 @@ + db DEX_RAPIDASH ; pokedex id + + db 65, 100, 70, 105, 80 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 60 ; catch rate + db 192 ; base exp + + INCBIN "gfx/pokemon/front_yellow/rapidash.pic", 0, 1 ; sprite dimensions + dw RapidashPicFront, RapidashPicBack + + db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm new file mode 100644 index 00000000..9dc46afb --- /dev/null +++ b/data/pokemon/base_stats/raticate.asm @@ -0,0 +1,23 @@ + db DEX_RATICATE ; pokedex id + + db 55, 81, 60, 97, 50 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 90 ; catch rate + db 116 ; base exp + + 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, \ + THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm new file mode 100644 index 00000000..9cace629 --- /dev/null +++ b/data/pokemon/base_stats/rattata.asm @@ -0,0 +1,23 @@ + db DEX_RATTATA ; pokedex id + + db 30, 56, 35, 72, 25 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 255 ; catch rate + db 57 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm new file mode 100644 index 00000000..f08f7255 --- /dev/null +++ b/data/pokemon/base_stats/rhydon.asm @@ -0,0 +1,26 @@ + db DEX_RHYDON ; pokedex id + + db 105, 130, 120, 40, 45 + ; hp atk def spd spc + + db GROUND, ROCK ; type + db 60 ; catch rate + db 204 ; base exp + + 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, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm new file mode 100644 index 00000000..3b8b1eb4 --- /dev/null +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -0,0 +1,23 @@ + db DEX_RHYHORN ; pokedex id + + db 80, 85, 95, 25, 30 + ; hp atk def spd spc + + db GROUND, ROCK ; type + db 120 ; catch rate + db 135 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm new file mode 100644 index 00000000..aa107190 --- /dev/null +++ b/data/pokemon/base_stats/sandshrew.asm @@ -0,0 +1,24 @@ + db DEX_SANDSHREW ; pokedex id + + db 50, 75, 85, 40, 30 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 255 ; catch rate + db 93 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm new file mode 100644 index 00000000..9c51bbba --- /dev/null +++ b/data/pokemon/base_stats/sandslash.asm @@ -0,0 +1,24 @@ + db DEX_SANDSLASH ; pokedex id + + db 75, 100, 110, 65, 55 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 90 ; catch rate + db 163 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm new file mode 100644 index 00000000..de73eea4 --- /dev/null +++ b/data/pokemon/base_stats/scyther.asm @@ -0,0 +1,22 @@ + db DEX_SCYTHER ; pokedex id + + db 70, 110, 80, 105, 55 + ; hp atk def spd spc + + db BUG, FLYING ; type + db 45 ; catch rate + db 187 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm new file mode 100644 index 00000000..89ab670f --- /dev/null +++ b/data/pokemon/base_stats/seadra.asm @@ -0,0 +1,23 @@ + db DEX_SEADRA ; pokedex id + + db 55, 65, 95, 85, 95 + ; hp atk def spd spc + + db WATER, WATER ; type + db 75 ; catch rate + db 155 ; base exp + + 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, \ + SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm new file mode 100644 index 00000000..bcb0dd64 --- /dev/null +++ b/data/pokemon/base_stats/seaking.asm @@ -0,0 +1,23 @@ + db DEX_SEAKING ; pokedex id + + db 80, 92, 65, 68, 80 + ; hp atk def spd spc + + db WATER, WATER ; type + db 60 ; catch rate + db 170 ; base exp + + 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, \ + REST, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm new file mode 100644 index 00000000..eba3d34d --- /dev/null +++ b/data/pokemon/base_stats/seel.asm @@ -0,0 +1,23 @@ + db DEX_SEEL ; pokedex id + + db 65, 45, 55, 45, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 100 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; 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, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm new file mode 100644 index 00000000..ed8cc154 --- /dev/null +++ b/data/pokemon/base_stats/shellder.asm @@ -0,0 +1,23 @@ + db DEX_SHELLDER ; pokedex id + + db 30, 65, 100, 40, 45 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 97 ; base exp + + 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, \ + REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm new file mode 100644 index 00000000..33f02f22 --- /dev/null +++ b/data/pokemon/base_stats/slowbro.asm @@ -0,0 +1,27 @@ + db DEX_SLOWBRO ; pokedex id + + db 95, 75, 110, 30, 80 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 75 ; catch rate + db 164 ; base exp + + 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, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm new file mode 100644 index 00000000..32eb6aa9 --- /dev/null +++ b/data/pokemon/base_stats/slowpoke.asm @@ -0,0 +1,25 @@ + db DEX_SLOWPOKE ; pokedex id + + db 90, 65, 65, 15, 40 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 190 ; catch rate + db 99 ; base exp + + 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, \ + TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm new file mode 100644 index 00000000..f835a4b9 --- /dev/null +++ b/data/pokemon/base_stats/snorlax.asm @@ -0,0 +1,27 @@ + db DEX_SNORLAX ; pokedex id + + db 160, 110, 65, 30, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 25 ; catch rate + db 154 ; base exp + + 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm new file mode 100644 index 00000000..c353fc89 --- /dev/null +++ b/data/pokemon/base_stats/spearow.asm @@ -0,0 +1,22 @@ + db DEX_SPEAROW ; pokedex id + + db 40, 60, 30, 70, 31 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 255 ; catch rate + db 58 ; base exp + + INCBIN "gfx/pokemon/front_yellow/spearow.pic", 0, 1 ; sprite dimensions + dw SpearowPicFront, SpearowPicBack + + db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm new file mode 100644 index 00000000..11db64ac --- /dev/null +++ b/data/pokemon/base_stats/squirtle.asm @@ -0,0 +1,24 @@ + db DEX_SQUIRTLE ; pokedex id + + db 44, 48, 65, 43, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 66 ; base exp + + 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, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm new file mode 100644 index 00000000..6f9681a2 --- /dev/null +++ b/data/pokemon/base_stats/starmie.asm @@ -0,0 +1,25 @@ + db DEX_STARMIE ; pokedex id + + db 60, 75, 85, 115, 100 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 60 ; catch rate + db 207 ; base exp + + 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, \ + 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, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm new file mode 100644 index 00000000..08b1250b --- /dev/null +++ b/data/pokemon/base_stats/staryu.asm @@ -0,0 +1,24 @@ + db DEX_STARYU ; pokedex id + + db 30, 45, 55, 85, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 106 ; base exp + + 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, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm new file mode 100644 index 00000000..bb0bafd1 --- /dev/null +++ b/data/pokemon/base_stats/tangela.asm @@ -0,0 +1,23 @@ + db DEX_TANGELA ; pokedex id + + db 65, 55, 115, 60, 100 + ; hp atk def spd spc + + db GRASS, GRASS ; type + db 45 ; catch rate + db 166 ; base exp + + INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions + dw TangelaPicFront, TangelaPicBack + + 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm new file mode 100644 index 00000000..311eecad --- /dev/null +++ b/data/pokemon/base_stats/tauros.asm @@ -0,0 +1,24 @@ + db DEX_TAUROS ; pokedex id + + db 75, 100, 95, 110, 70 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 211 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + 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, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm new file mode 100644 index 00000000..7f128c3f --- /dev/null +++ b/data/pokemon/base_stats/tentacool.asm @@ -0,0 +1,23 @@ + db DEX_TENTACOOL ; pokedex id + + db 40, 40, 35, 70, 100 + ; hp atk def spd spc + + db WATER, POISON ; type + db 190 ; catch rate + db 105 ; base exp + + 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, \ + REST, SUBSTITUTE, CUT, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm new file mode 100644 index 00000000..eeea2d0f --- /dev/null +++ b/data/pokemon/base_stats/tentacruel.asm @@ -0,0 +1,23 @@ + db DEX_TENTACRUEL ; pokedex id + + db 80, 70, 65, 100, 120 + ; hp atk def spd spc + + db WATER, POISON ; type + db 60 ; catch rate + db 205 ; base exp + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, CUT, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm new file mode 100644 index 00000000..bc800fea --- /dev/null +++ b/data/pokemon/base_stats/vaporeon.asm @@ -0,0 +1,23 @@ + db DEX_VAPOREON ; pokedex id + + db 130, 65, 60, 65, 110 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 196 ; base exp + + INCBIN "gfx/pokemon/front_yellow/vaporeon.pic", 0, 1 ; sprite dimensions + dw VaporeonPicFront, VaporeonPicBack + + 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, \ + SKULL_BASH, REST, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm new file mode 100644 index 00000000..85c1de76 --- /dev/null +++ b/data/pokemon/base_stats/venomoth.asm @@ -0,0 +1,23 @@ + db DEX_VENOMOTH ; pokedex id + + db 70, 65, 60, 90, 90 + ; hp atk def spd spc + + db BUG, POISON ; type + db 75 ; catch rate + db 138 ; base exp + + INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions + dw VenomothPicFront, VenomothPicBack + + 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, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm new file mode 100644 index 00000000..47590f61 --- /dev/null +++ b/data/pokemon/base_stats/venonat.asm @@ -0,0 +1,22 @@ + db DEX_VENONAT ; pokedex id + + db 60, 55, 50, 45, 40 + ; hp atk def spd spc + + db BUG, POISON ; type + db 190 ; catch rate + db 75 ; base exp + + 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, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm new file mode 100644 index 00000000..d97b9c64 --- /dev/null +++ b/data/pokemon/base_stats/venusaur.asm @@ -0,0 +1,23 @@ + db DEX_VENUSAUR ; pokedex id + + db 80, 82, 83, 80, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 208 ; base exp + + INCBIN "gfx/pokemon/front_yellow/venusaur.pic", 0, 1 ; sprite dimensions + dw VenusaurPicFront, VenusaurPicBack + + db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm new file mode 100644 index 00000000..8fd9c2f9 --- /dev/null +++ b/data/pokemon/base_stats/victreebel.asm @@ -0,0 +1,23 @@ + db DEX_VICTREEBEL ; pokedex id + + db 80, 105, 65, 70, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 191 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm new file mode 100644 index 00000000..d6baddb9 --- /dev/null +++ b/data/pokemon/base_stats/vileplume.asm @@ -0,0 +1,23 @@ + db DEX_VILEPLUME ; pokedex id + + db 75, 80, 85, 50, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 184 ; base exp + + 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 + db GROWTH_MEDIUM_SLOW ; growth rate + + ; 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, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm new file mode 100644 index 00000000..6234d3a4 --- /dev/null +++ b/data/pokemon/base_stats/voltorb.asm @@ -0,0 +1,23 @@ + db DEX_VOLTORB ; pokedex id + + db 40, 30, 50, 100, 55 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 103 ; base exp + + 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, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm new file mode 100644 index 00000000..7aba033e --- /dev/null +++ b/data/pokemon/base_stats/vulpix.asm @@ -0,0 +1,22 @@ + db DEX_VULPIX ; pokedex id + + db 38, 41, 40, 65, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 63 ; base exp + + 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, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm new file mode 100644 index 00000000..df4c7314 --- /dev/null +++ b/data/pokemon/base_stats/wartortle.asm @@ -0,0 +1,24 @@ + db DEX_WARTORTLE ; pokedex id + + db 59, 63, 80, 58, 65 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 143 ; base exp + + 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, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm new file mode 100644 index 00000000..67769f3b --- /dev/null +++ b/data/pokemon/base_stats/weedle.asm @@ -0,0 +1,20 @@ + db DEX_WEEDLE ; pokedex id + + db 40, 35, 30, 50, 20 + ; hp atk def spd spc + + db BUG, POISON ; type + db 255 ; catch rate + db 52 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm new file mode 100644 index 00000000..90a3dc49 --- /dev/null +++ b/data/pokemon/base_stats/weepinbell.asm @@ -0,0 +1,22 @@ + db DEX_WEEPINBELL ; pokedex id + + db 65, 90, 50, 55, 85 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 120 ; catch rate + db 151 ; base exp + + 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, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm new file mode 100644 index 00000000..f5618bb0 --- /dev/null +++ b/data/pokemon/base_stats/weezing.asm @@ -0,0 +1,22 @@ + db DEX_WEEZING ; pokedex id + + db 65, 90, 120, 60, 85 + ; hp atk def spd spc + + db POISON, POISON ; type + db 60 ; catch rate + db 173 ; base exp + + 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, \ + REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm new file mode 100644 index 00000000..2a6876b2 --- /dev/null +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -0,0 +1,26 @@ + db DEX_WIGGLYTUFF ; pokedex id + + db 140, 70, 45, 45, 50 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 50 ; catch rate + db 109 ; base exp + + 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, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm new file mode 100644 index 00000000..68b6396a --- /dev/null +++ b/data/pokemon/base_stats/zapdos.asm @@ -0,0 +1,23 @@ + db DEX_ZAPDOS ; pokedex id + + db 90, 90, 85, 100, 125 + ; hp atk def spd spc + + db ELECTRIC, FLYING ; type + db 3 ; catch rate + db 216 ; base exp + + 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 + db GROWTH_SLOW ; growth rate + + ; 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, \ + REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm new file mode 100644 index 00000000..9e4fa80f --- /dev/null +++ b/data/pokemon/base_stats/zubat.asm @@ -0,0 +1,22 @@ + db DEX_ZUBAT ; pokedex id + + db 40, 45, 35, 55, 40 + ; hp atk def spd spc + + db POISON, FLYING ; type + db 255 ; catch rate + db 54 ; base exp + + 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 + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm new file mode 100755 index 00000000..e4bf07d9 --- /dev/null +++ b/data/pokemon/cries.asm @@ -0,0 +1,197 @@ +mon_cry: MACRO + db (\1 - CRY_SFX_START) / 3 + db \2, \3 +ENDM + +CryData:: + ; base cry, pitch, length + mon_cry SFX_CRY_11, $00, $80 ; Rhydon + mon_cry SFX_CRY_03, $00, $80 ; Kangaskhan + mon_cry SFX_CRY_00, $00, $80 ; Nidoran♂ + mon_cry SFX_CRY_19, $CC, $01 ; Clefairy + mon_cry SFX_CRY_10, $00, $80 ; Spearow + mon_cry SFX_CRY_06, $ED, $80 ; Voltorb + mon_cry SFX_CRY_09, $00, $80 ; Nidoking + mon_cry SFX_CRY_1F, $00, $80 ; Slowbro + mon_cry SFX_CRY_0F, $20, $80 ; Ivysaur + mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor + mon_cry SFX_CRY_0C, $00, $80 ; Lickitung + mon_cry SFX_CRY_0B, $00, $80 ; Exeggcute + mon_cry SFX_CRY_05, $00, $80 ; Grimer + mon_cry SFX_CRY_07, $00, $FF ; Gengar + mon_cry SFX_CRY_01, $00, $80 ; Nidoran♀ + mon_cry SFX_CRY_0A, $00, $80 ; Nidoqueen + mon_cry SFX_CRY_19, $00, $80 ; Cubone + mon_cry SFX_CRY_04, $00, $80 ; Rhyhorn + mon_cry SFX_CRY_1B, $00, $80 ; Lapras + mon_cry SFX_CRY_15, $00, $80 ; Arcanine + mon_cry SFX_CRY_1E, $EE, $FF ; Mew + mon_cry SFX_CRY_17, $00, $80 ; Gyarados + mon_cry SFX_CRY_18, $00, $80 ; Shellder + mon_cry SFX_CRY_1A, $00, $80 ; Tentacool + mon_cry SFX_CRY_1C, $00, $80 ; Gastly + mon_cry SFX_CRY_16, $00, $80 ; Scyther + mon_cry SFX_CRY_1E, $02, $20 ; Staryu + mon_cry SFX_CRY_13, $00, $80 ; Blastoise + mon_cry SFX_CRY_14, $00, $80 ; Pinsir + mon_cry SFX_CRY_12, $00, $80 ; Tangela + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1F, $20, $40 ; Growlithe + mon_cry SFX_CRY_17, $FF, $C0 ; Onix + mon_cry SFX_CRY_18, $40, $A0 ; Fearow + mon_cry SFX_CRY_0E, $DF, $04 ; Pidgey + mon_cry SFX_CRY_02, $00, $80 ; Slowpoke + mon_cry SFX_CRY_1C, $A8, $C0 ; Kadabra + mon_cry SFX_CRY_24, $00, $80 ; Graveler + mon_cry SFX_CRY_14, $0A, $C0 ; Chansey + mon_cry SFX_CRY_1F, $48, $60 ; Machoke + mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime + mon_cry SFX_CRY_12, $80, $C0 ; Hitmonlee + mon_cry SFX_CRY_0C, $EE, $C0 ; Hitmonchan + mon_cry SFX_CRY_17, $E0, $10 ; Arbok + mon_cry SFX_CRY_1E, $42, $FF ; Parasect + mon_cry SFX_CRY_21, $20, $60 ; Psyduck + mon_cry SFX_CRY_0D, $88, $20 ; Drowzee + mon_cry SFX_CRY_12, $E0, $40 ; Golem + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_04, $FF, $30 ; Magmar + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz + mon_cry SFX_CRY_1C, $20, $C0 ; Magneton + mon_cry SFX_CRY_12, $E6, $DD ; Koffing + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0A, $DD, $60 ; Mankey + mon_cry SFX_CRY_0C, $88, $C0 ; Seel + mon_cry SFX_CRY_0B, $AA, $01 ; Diglett + mon_cry SFX_CRY_1D, $11, $40 ; Tauros + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd + mon_cry SFX_CRY_1A, $44, $40 ; Venonat + mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite + mon_cry SFX_CRY_00, $80, $10 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo. + mon_cry SFX_CRY_0B, $BB, $01 ; Doduo + mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag + mon_cry SFX_CRY_0D, $FF, $FF ; Jynx + mon_cry SFX_CRY_09, $F8, $40 ; Moltres + mon_cry SFX_CRY_09, $80, $40 ; Articuno + mon_cry SFX_CRY_18, $FF, $80 ; Zapdos + mon_cry SFX_CRY_0E, $FF, $FF ; Ditto + mon_cry SFX_CRY_19, $77, $10 ; Meowth + mon_cry SFX_CRY_20, $20, $E0 ; Krabby + mon_cry SFX_CRY_22, $FF, $40 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo. + mon_cry SFX_CRY_24, $4F, $10 ; Vulpix + mon_cry SFX_CRY_24, $88, $60 ; Ninetales + mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu + mon_cry SFX_CRY_09, $EE, $08 ; Raichu + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0F, $60, $40 ; Dratini + mon_cry SFX_CRY_0F, $40, $80 ; Dragonair + mon_cry SFX_CRY_16, $BB, $40 ; Kabuto + mon_cry SFX_CRY_18, $EE, $01 ; Kabutops + mon_cry SFX_CRY_19, $99, $10 ; Horsea + mon_cry SFX_CRY_19, $3C, $01 ; Seadra + mon_cry SFX_CRY_0F, $40, $C0 ; MissingNo. + mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo. + mon_cry SFX_CRY_00, $20, $40 ; Sandshrew + mon_cry SFX_CRY_00, $FF, $FF ; Sandslash + mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte + mon_cry SFX_CRY_1F, $FF, $40 ; Omastar + mon_cry SFX_CRY_0E, $FF, $35 ; Jigglypuff + mon_cry SFX_CRY_0E, $68, $60 ; Wigglytuff + mon_cry SFX_CRY_1A, $88, $60 ; Eevee + mon_cry SFX_CRY_1A, $10, $20 ; Flareon + mon_cry SFX_CRY_1A, $3D, $80 ; Jolteon + mon_cry SFX_CRY_1A, $AA, $FF ; Vaporeon + mon_cry SFX_CRY_1F, $EE, $01 ; Machop + mon_cry SFX_CRY_1D, $E0, $80 ; Zubat + mon_cry SFX_CRY_17, $12, $40 ; Ekans + mon_cry SFX_CRY_1E, $20, $E0 ; Paras + mon_cry SFX_CRY_0E, $77, $60 ; Poliwhirl + mon_cry SFX_CRY_0E, $00, $FF ; Poliwrath + mon_cry SFX_CRY_15, $EE, $01 ; Weedle + mon_cry SFX_CRY_13, $FF, $01 ; Kakuna + mon_cry SFX_CRY_13, $60, $80 ; Beedrill + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0B, $99, $20 ; Dodrio + mon_cry SFX_CRY_0A, $AF, $40 ; Primeape + mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio + mon_cry SFX_CRY_1A, $29, $80 ; Venomoth + mon_cry SFX_CRY_0C, $23, $FF ; Dewgong + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_16, $80, $20 ; Caterpie + mon_cry SFX_CRY_1C, $CC, $01 ; Metapod + mon_cry SFX_CRY_16, $77, $40 ; Butterfree + mon_cry SFX_CRY_1F, $08, $C0 ; Machamp + mon_cry SFX_CRY_11, $20, $10 ; MissingNo. + mon_cry SFX_CRY_21, $FF, $40 ; Golduck + mon_cry SFX_CRY_0D, $EE, $40 ; Hypno + mon_cry SFX_CRY_1D, $FA, $80 ; Golbat + mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo + mon_cry SFX_CRY_05, $55, $01 ; Snorlax + mon_cry SFX_CRY_17, $80, $00 ; Magikarp + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_07, $EF, $FF ; Muk + mon_cry SFX_CRY_0F, $40, $80 ; MissingNo. + mon_cry SFX_CRY_20, $EE, $E0 ; Kingler + mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_06, $A8, $90 ; Electrode + mon_cry SFX_CRY_19, $AA, $20 ; Clefable + mon_cry SFX_CRY_12, $FF, $FF ; Weezing + mon_cry SFX_CRY_19, $99, $FF ; Persian + mon_cry SFX_CRY_08, $4F, $60 ; Marowak + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1C, $30, $40 ; Haunter + mon_cry SFX_CRY_1C, $C0, $01 ; Abra + mon_cry SFX_CRY_1C, $98, $FF ; Alakazam + mon_cry SFX_CRY_14, $28, $C0 ; Pidgeotto + mon_cry SFX_CRY_14, $11, $FF ; Pidgeot + mon_cry SFX_CRY_1E, $00, $80 ; Starmie + mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur + mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur + mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_16, $80, $40 ; Goldeen + mon_cry SFX_CRY_16, $10, $FF ; Seaking + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_25, $00, $80 ; Ponyta + mon_cry SFX_CRY_25, $20, $C0 ; Rapidash + mon_cry SFX_CRY_22, $00, $80 ; Rattata + mon_cry SFX_CRY_22, $20, $FF ; Raticate + mon_cry SFX_CRY_00, $2C, $C0 ; Nidorino + mon_cry SFX_CRY_01, $2C, $E0 ; Nidorina + mon_cry SFX_CRY_24, $F0, $10 ; Geodude + mon_cry SFX_CRY_25, $AA, $FF ; Porygon + mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1C, $80, $60 ; Magnemite + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_04, $60, $40 ; Charmander + mon_cry SFX_CRY_1D, $60, $40 ; Squirtle + mon_cry SFX_CRY_04, $20, $40 ; Charmeleon + mon_cry SFX_CRY_1D, $20, $40 ; Wartortle + mon_cry SFX_CRY_04, $00, $80 ; Charizard + mon_cry SFX_CRY_1D, $00, $80 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_08, $DD, $01 ; Oddish + mon_cry SFX_CRY_08, $AA, $40 ; Gloom + mon_cry SFX_CRY_23, $22, $FF ; Vileplume + mon_cry SFX_CRY_21, $55, $01 ; Bellsprout + mon_cry SFX_CRY_25, $44, $20 ; Weepinbell + mon_cry SFX_CRY_25, $66, $CC ; Victreebel diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm new file mode 100755 index 00000000..5b9acf27 --- /dev/null +++ b/data/pokemon/dex_entries.asm @@ -0,0 +1,1259 @@ +PokedexEntryPointers: + dw RhydonDexEntry + dw KangaskhanDexEntry + dw NidoranMDexEntry + dw ClefairyDexEntry + dw SpearowDexEntry + dw VoltorbDexEntry + dw NidokingDexEntry + dw SlowbroDexEntry + dw IvysaurDexEntry + dw ExeggutorDexEntry + dw LickitungDexEntry + dw ExeggcuteDexEntry + dw GrimerDexEntry + dw GengarDexEntry + dw NidoranFDexEntry + dw NidoqueenDexEntry + dw CuboneDexEntry + dw RhyhornDexEntry + dw LaprasDexEntry + dw ArcanineDexEntry + dw MewDexEntry + dw GyaradosDexEntry + dw ShellderDexEntry + dw TentacoolDexEntry + dw GastlyDexEntry + dw ScytherDexEntry + dw StaryuDexEntry + dw BlastoiseDexEntry + dw PinsirDexEntry + dw TangelaDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw GrowlitheDexEntry + dw OnixDexEntry + dw FearowDexEntry + dw PidgeyDexEntry + dw SlowpokeDexEntry + dw KadabraDexEntry + dw GravelerDexEntry + dw ChanseyDexEntry + dw MachokeDexEntry + dw MrMimeDexEntry + dw HitmonleeDexEntry + dw HitmonchanDexEntry + dw ArbokDexEntry + dw ParasectDexEntry + dw PsyduckDexEntry + dw DrowzeeDexEntry + dw GolemDexEntry + dw MissingNoDexEntry + dw MagmarDexEntry + dw MissingNoDexEntry + dw ElectabuzzDexEntry + dw MagnetonDexEntry + dw KoffingDexEntry + dw MissingNoDexEntry + dw MankeyDexEntry + dw SeelDexEntry + dw DiglettDexEntry + dw TaurosDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw FarfetchdDexEntry + dw VenonatDexEntry + dw DragoniteDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw DoduoDexEntry + dw PoliwagDexEntry + dw JynxDexEntry + dw MoltresDexEntry + dw ArticunoDexEntry + dw ZapdosDexEntry + dw DittoDexEntry + dw MeowthDexEntry + dw KrabbyDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw VulpixDexEntry + dw NinetalesDexEntry + dw PikachuDexEntry + dw RaichuDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw DratiniDexEntry + dw DragonairDexEntry + dw KabutoDexEntry + dw KabutopsDexEntry + dw HorseaDexEntry + dw SeadraDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw SandshrewDexEntry + dw SandslashDexEntry + dw OmanyteDexEntry + dw OmastarDexEntry + dw JigglypuffDexEntry + dw WigglytuffDexEntry + dw EeveeDexEntry + dw FlareonDexEntry + dw JolteonDexEntry + dw VaporeonDexEntry + dw MachopDexEntry + dw ZubatDexEntry + dw EkansDexEntry + dw ParasDexEntry + dw PoliwhirlDexEntry + dw PoliwrathDexEntry + dw WeedleDexEntry + dw KakunaDexEntry + dw BeedrillDexEntry + dw MissingNoDexEntry + dw DodrioDexEntry + dw PrimeapeDexEntry + dw DugtrioDexEntry + dw VenomothDexEntry + dw DewgongDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw CaterpieDexEntry + dw MetapodDexEntry + dw ButterfreeDexEntry + dw MachampDexEntry + dw MissingNoDexEntry + dw GolduckDexEntry + dw HypnoDexEntry + dw GolbatDexEntry + dw MewtwoDexEntry + dw SnorlaxDexEntry + dw MagikarpDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MukDexEntry + dw MissingNoDexEntry + dw KinglerDexEntry + dw CloysterDexEntry + dw MissingNoDexEntry + dw ElectrodeDexEntry + dw ClefableDexEntry + dw WeezingDexEntry + dw PersianDexEntry + dw MarowakDexEntry + dw MissingNoDexEntry + dw HaunterDexEntry + dw AbraDexEntry + dw AlakazamDexEntry + dw PidgeottoDexEntry + dw PidgeotDexEntry + dw StarmieDexEntry + dw BulbasaurDexEntry + dw VenusaurDexEntry + dw TentacruelDexEntry + dw MissingNoDexEntry + dw GoldeenDexEntry + dw SeakingDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw PonytaDexEntry + dw RapidashDexEntry + dw RattataDexEntry + dw RaticateDexEntry + dw NidorinoDexEntry + dw NidorinaDexEntry + dw GeodudeDexEntry + dw PorygonDexEntry + dw AerodactylDexEntry + dw MissingNoDexEntry + dw MagnemiteDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw CharmanderDexEntry + dw SquirtleDexEntry + dw CharmeleonDexEntry + dw WartortleDexEntry + dw CharizardDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw OddishDexEntry + dw GloomDexEntry + dw VileplumeDexEntry + dw BellsproutDexEntry + dw WeepinbellDexEntry + dw VictreebelDexEntry + +; string: species name +; height in feet, inches +; weight in pounds +; text entry + +BulbasaurDexEntry: + db "SEED@" + db 2,4 + dw 150 + text_far _BulbasaurDexEntry + text_end + +IvysaurDexEntry: + db "SEED@" + db 3,3 + dw 290 + text_far _IvysaurDexEntry + text_end + +VenusaurDexEntry: + db "SEED@" + db 6,7 + dw 2210 + text_far _VenusaurDexEntry + text_end + +CharmanderDexEntry: + db "LIZARD@" + db 2,0 + dw 190 + text_far _CharmanderDexEntry + text_end + +CharmeleonDexEntry: + db "FLAME@" + db 3,7 + dw 420 + text_far _CharmeleonDexEntry + text_end + +CharizardDexEntry: + db "FLAME@" + db 5,7 + dw 2000 + text_far _CharizardDexEntry + text_end + +SquirtleDexEntry: + db "TINYTURTLE@" + db 1,8 + dw 200 + text_far _SquirtleDexEntry + text_end + +WartortleDexEntry: + db "TURTLE@" + db 3,3 + dw 500 + text_far _WartortleDexEntry + text_end + +BlastoiseDexEntry: + db "SHELLFISH@" + db 5,3 + dw 1890 + text_far _BlastoiseDexEntry + text_end + +CaterpieDexEntry: + db "WORM@" + db 1,0 + dw 60 + text_far _CaterpieDexEntry + text_end + +MetapodDexEntry: + db "COCOON@" + db 2,4 + dw 220 + text_far _MetapodDexEntry + text_end + +ButterfreeDexEntry: + db "BUTTERFLY@" + db 3,7 + dw 710 + text_far _ButterfreeDexEntry + text_end + +WeedleDexEntry: + db "HAIRY BUG@" + db 1,0 + dw 70 + text_far _WeedleDexEntry + text_end + +KakunaDexEntry: + db "COCOON@" + db 2,0 + dw 220 + text_far _KakunaDexEntry + text_end + +BeedrillDexEntry: + db "POISON BEE@" + db 3,3 + dw 650 + text_far _BeedrillDexEntry + text_end + +PidgeyDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _PidgeyDexEntry + text_end + +PidgeottoDexEntry: + db "BIRD@" + db 3,7 + dw 660 + text_far _PidgeottoDexEntry + text_end + +PidgeotDexEntry: + db "BIRD@" + db 4,11 + dw 870 + text_far _PidgeotDexEntry + text_end + +RattataDexEntry: + db "RAT@" + db 1,0 + dw 80 + text_far _RattataDexEntry + text_end + +RaticateDexEntry: + db "RAT@" + db 2,4 + dw 410 + text_far _RaticateDexEntry + text_end + +SpearowDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _SpearowDexEntry + text_end + +FearowDexEntry: + db "BEAK@" + db 3,11 + dw 840 + text_far _FearowDexEntry + text_end + +EkansDexEntry: + db "SNAKE@" + db 6,7 + dw 150 + text_far _EkansDexEntry + text_end + +ArbokDexEntry: + db "COBRA@" + db 11,6 + dw 1430 + text_far _ArbokDexEntry + text_end + +PikachuDexEntry: + db "MOUSE@" + db 1,4 + dw 130 + text_far _PikachuDexEntry + text_end + +RaichuDexEntry: + db "MOUSE@" + db 2,7 + dw 660 + text_far _RaichuDexEntry + text_end + +SandshrewDexEntry: + db "MOUSE@" + db 2,0 + dw 260 + text_far _SandshrewDexEntry + text_end + +SandslashDexEntry: + db "MOUSE@" + db 3,3 + dw 650 + text_far _SandslashDexEntry + text_end + +NidoranFDexEntry: + db "POISON PIN@" + db 1,4 + dw 150 + text_far _NidoranFDexEntry + text_end + +NidorinaDexEntry: + db "POISON PIN@" + db 2,7 + dw 440 + text_far _NidorinaDexEntry + text_end + +NidoqueenDexEntry: + db "DRILL@" + db 4,3 + dw 1320 + text_far _NidoqueenDexEntry + text_end + +NidoranMDexEntry: + db "POISON PIN@" + db 1,8 + dw 200 + text_far _NidoranMDexEntry + text_end + +NidorinoDexEntry: + db "POISON PIN@" + db 2,11 + dw 430 + text_far _NidorinoDexEntry + text_end + +NidokingDexEntry: + db "DRILL@" + db 4,7 + dw 1370 + text_far _NidokingDexEntry + text_end + +ClefairyDexEntry: + db "FAIRY@" + db 2,0 + dw 170 + text_far _ClefairyDexEntry + text_end + +ClefableDexEntry: + db "FAIRY@" + db 4,3 + dw 880 + text_far _ClefableDexEntry + text_end + +VulpixDexEntry: + db "FOX@" + db 2,0 + dw 220 + text_far _VulpixDexEntry + text_end + +NinetalesDexEntry: + db "FOX@" + db 3,7 + dw 440 + text_far _NinetalesDexEntry + text_end + +JigglypuffDexEntry: + db "BALLOON@" + db 1,8 + dw 120 + text_far _JigglypuffDexEntry + text_end + +WigglytuffDexEntry: + db "BALLOON@" + db 3,3 + dw 260 + text_far _WigglytuffDexEntry + text_end + +ZubatDexEntry: + db "BAT@" + db 2,7 + dw 170 + text_far _ZubatDexEntry + text_end + +GolbatDexEntry: + db "BAT@" + db 5,3 + dw 1210 + text_far _GolbatDexEntry + text_end + +OddishDexEntry: + db "WEED@" + db 1,8 + dw 120 + text_far _OddishDexEntry + text_end + +GloomDexEntry: + db "WEED@" + db 2,7 + dw 190 + text_far _GloomDexEntry + text_end + +VileplumeDexEntry: + db "FLOWER@" + db 3,11 + dw 410 + text_far _VileplumeDexEntry + text_end + +ParasDexEntry: + db "MUSHROOM@" + db 1,0 + dw 120 + text_far _ParasDexEntry + text_end + +ParasectDexEntry: + db "MUSHROOM@" + db 3,3 + dw 650 + text_far _ParasectDexEntry + text_end + +VenonatDexEntry: + db "INSECT@" + db 3,3 + dw 660 + text_far _VenonatDexEntry + text_end + +VenomothDexEntry: + db "POISONMOTH@" + db 4,11 + dw 280 + text_far _VenomothDexEntry + text_end + +DiglettDexEntry: + db "MOLE@" + db 0,8 + dw 20 + text_far _DiglettDexEntry + text_end + +DugtrioDexEntry: + db "MOLE@" + db 2,4 + dw 730 + text_far _DugtrioDexEntry + text_end + +MeowthDexEntry: + db "SCRATCHCAT@" + db 1,4 + dw 90 + text_far _MeowthDexEntry + text_end + +PersianDexEntry: + db "CLASSY CAT@" + db 3,3 + dw 710 + text_far _PersianDexEntry + text_end + +PsyduckDexEntry: + db "DUCK@" + db 2,7 + dw 430 + text_far _PsyduckDexEntry + text_end + +GolduckDexEntry: + db "DUCK@" + db 5,7 + dw 1690 + text_far _GolduckDexEntry + text_end + +MankeyDexEntry: + db "PIG MONKEY@" + db 1,8 + dw 620 + text_far _MankeyDexEntry + text_end + +PrimeapeDexEntry: + db "PIG MONKEY@" + db 3,3 + dw 710 + text_far _PrimeapeDexEntry + text_end + +GrowlitheDexEntry: + db "PUPPY@" + db 2,4 + dw 420 + text_far _GrowlitheDexEntry + text_end + +ArcanineDexEntry: + db "LEGENDARY@" + db 6,3 + dw 3420 + text_far _ArcanineDexEntry + text_end + +PoliwagDexEntry: + db "TADPOLE@" + db 2,0 + dw 270 + text_far _PoliwagDexEntry + text_end + +PoliwhirlDexEntry: + db "TADPOLE@" + db 3,3 + dw 440 + text_far _PoliwhirlDexEntry + text_end + +PoliwrathDexEntry: + db "TADPOLE@" + db 4,3 + dw 1190 + text_far _PoliwrathDexEntry + text_end + +AbraDexEntry: + db "PSI@" + db 2,11 + dw 430 + text_far _AbraDexEntry + text_end + +KadabraDexEntry: + db "PSI@" + db 4,3 + dw 1250 + text_far _KadabraDexEntry + text_end + +AlakazamDexEntry: + db "PSI@" + db 4,11 + dw 1060 + text_far _AlakazamDexEntry + text_end + +MachopDexEntry: + db "SUPERPOWER@" + db 2,7 + dw 430 + text_far _MachopDexEntry + text_end + +MachokeDexEntry: + db "SUPERPOWER@" + db 4,11 + dw 1550 + text_far _MachokeDexEntry + text_end + +MachampDexEntry: + db "SUPERPOWER@" + db 5,3 + dw 2870 + text_far _MachampDexEntry + text_end + +BellsproutDexEntry: + db "FLOWER@" + db 2,4 + dw 90 + text_far _BellsproutDexEntry + text_end + +WeepinbellDexEntry: + db "FLYCATCHER@" + db 3,3 + dw 140 + text_far _WeepinbellDexEntry + text_end + +VictreebelDexEntry: + db "FLYCATCHER@" + db 5,7 + dw 340 + text_far _VictreebelDexEntry + text_end + +TentacoolDexEntry: + db "JELLYFISH@" + db 2,11 + dw 1000 + text_far _TentacoolDexEntry + text_end + +TentacruelDexEntry: + db "JELLYFISH@" + db 5,3 + dw 1210 + text_far _TentacruelDexEntry + text_end + +GeodudeDexEntry: + db "ROCK@" + db 1,4 + dw 440 + text_far _GeodudeDexEntry + text_end + +GravelerDexEntry: + db "ROCK@" + db 3,3 + dw 2320 + text_far _GravelerDexEntry + text_end + +GolemDexEntry: + db "MEGATON@" + db 4,7 + dw 6620 + text_far _GolemDexEntry + text_end + +PonytaDexEntry: + db "FIRE HORSE@" + db 3,3 + dw 660 + text_far _PonytaDexEntry + text_end + +RapidashDexEntry: + db "FIRE HORSE@" + db 5,7 + dw 2090 + text_far _RapidashDexEntry + text_end + +SlowpokeDexEntry: + db "DOPEY@" + db 3,11 + dw 790 + text_far _SlowpokeDexEntry + text_end + +SlowbroDexEntry: + db "HERMITCRAB@" + db 5,3 + dw 1730 + text_far _SlowbroDexEntry + text_end + +MagnemiteDexEntry: + db "MAGNET@" + db 1,0 + dw 130 + text_far _MagnemiteDexEntry + text_end + +MagnetonDexEntry: + db "MAGNET@" + db 3,3 + dw 1320 + text_far _MagnetonDexEntry + text_end + +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: + db "TRIPLEBIRD@" + db 5,11 + dw 1880 + text_far _DodrioDexEntry + text_end + +SeelDexEntry: + db "SEA LION@" + db 3,7 + dw 1980 + text_far _SeelDexEntry + text_end + +DewgongDexEntry: + db "SEA LION@" + db 5,7 + dw 2650 + text_far _DewgongDexEntry + text_end + +GrimerDexEntry: + db "SLUDGE@" + db 2,11 + dw 660 + text_far _GrimerDexEntry + text_end + +MukDexEntry: + db "SLUDGE@" + db 3,11 + dw 660 + text_far _MukDexEntry + text_end + +ShellderDexEntry: + db "BIVALVE@" + db 1,0 + dw 90 + text_far _ShellderDexEntry + text_end + +CloysterDexEntry: + db "BIVALVE@" + db 4,11 + dw 2920 + text_far _CloysterDexEntry + text_end + +GastlyDexEntry: + db "GAS@" + db 4,3 + dw 2 + text_far _GastlyDexEntry + text_end + +HaunterDexEntry: + db "GAS@" + db 5,3 + dw 2 + text_far _HaunterDexEntry + text_end + +GengarDexEntry: + db "SHADOW@" + db 4,11 + dw 890 + text_far _GengarDexEntry + text_end + +OnixDexEntry: + db "ROCK SNAKE@" + db 28,10 + dw 4630 + text_far _OnixDexEntry + text_end + +DrowzeeDexEntry: + db "HYPNOSIS@" + db 3,3 + dw 710 + text_far _DrowzeeDexEntry + text_end + +HypnoDexEntry: + db "HYPNOSIS@" + db 5,3 + dw 1670 + text_far _HypnoDexEntry + text_end + +KrabbyDexEntry: + db "RIVER CRAB@" + db 1,4 + dw 140 + text_far _KrabbyDexEntry + text_end + +KinglerDexEntry: + db "PINCER@" + db 4,3 + dw 1320 + text_far _KinglerDexEntry + text_end + +VoltorbDexEntry: + db "BALL@" + db 1,8 + dw 230 + text_far _VoltorbDexEntry + text_end + +ElectrodeDexEntry: + db "BALL@" + db 3,11 + dw 1470 + text_far _ElectrodeDexEntry + text_end + +ExeggcuteDexEntry: + db "EGG@" + db 1,4 + dw 60 + text_far _ExeggcuteDexEntry + text_end + +ExeggutorDexEntry: + db "COCONUT@" + db 6,7 + dw 2650 + text_far _ExeggutorDexEntry + text_end + +CuboneDexEntry: + db "LONELY@" + db 1,4 + dw 140 + text_far _CuboneDexEntry + text_end + +MarowakDexEntry: + db "BONEKEEPER@" + db 3,3 + dw 990 + text_far _MarowakDexEntry + text_end + +HitmonleeDexEntry: + db "KICKING@" + db 4,11 + dw 1100 + text_far _HitmonleeDexEntry + text_end + +HitmonchanDexEntry: + db "PUNCHING@" + db 4,7 + dw 1110 + text_far _HitmonchanDexEntry + text_end + +LickitungDexEntry: + db "LICKING@" + db 3,11 + dw 1440 + text_far _LickitungDexEntry + text_end + +KoffingDexEntry: + db "POISON GAS@" + db 2,0 + dw 20 + text_far _KoffingDexEntry + text_end + +WeezingDexEntry: + db "POISON GAS@" + db 3,11 + dw 210 + text_far _WeezingDexEntry + text_end + +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 760 + text_far _ChanseyDexEntry + text_end + +TangelaDexEntry: + db "VINE@" + db 3,3 + dw 770 + text_far _TangelaDexEntry + text_end + +KangaskhanDexEntry: + db "PARENT@" + db 7,3 + dw 1760 + text_far _KangaskhanDexEntry + text_end + +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: + db "GOLDFISH@" + db 2,0 + dw 330 + text_far _GoldeenDexEntry + text_end + +SeakingDexEntry: + db "GOLDFISH@" + db 4,3 + dw 860 + text_far _SeakingDexEntry + text_end + +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 _ElectabuzzDexEntry + text_end + +MagmarDexEntry: + db "SPITFIRE@" + db 4,3 + dw 980 + text_far _MagmarDexEntry + text_end + +PinsirDexEntry: + db "STAGBEETLE@" + db 4,11 + dw 1210 + text_far _PinsirDexEntry + text_end + +TaurosDexEntry: + db "WILD BULL@" + db 4,7 + dw 1950 + text_far _TaurosDexEntry + text_end + +MagikarpDexEntry: + db "FISH@" + db 2,11 + dw 220 + text_far _MagikarpDexEntry + text_end + +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 540 + text_far _JolteonDexEntry + text_end + +FlareonDexEntry: + db "FLAME@" + db 2,11 + dw 550 + text_far _FlareonDexEntry + text_end + +PorygonDexEntry: + db "VIRTUAL@" + db 2,7 + dw 800 + text_far _PorygonDexEntry + text_end + +OmanyteDexEntry: + db "SPIRAL@" + db 1,4 + dw 170 + text_far _OmanyteDexEntry + text_end + +OmastarDexEntry: + db "SPIRAL@" + db 3,3 + dw 770 + text_far _OmastarDexEntry + text_end + +KabutoDexEntry: + db "SHELLFISH@" + db 1,8 + dw 250 + text_far _KabutoDexEntry + text_end + +KabutopsDexEntry: + db "SHELLFISH@" + db 4,3 + dw 890 + text_far _KabutopsDexEntry + text_end + +AerodactylDexEntry: + db "FOSSIL@" + db 5,11 + dw 1300 + text_far _AerodactylDexEntry + text_end + +SnorlaxDexEntry: + db "SLEEPING@" + db 6,11 + dw 10140 + text_far _SnorlaxDexEntry + text_end + +ArticunoDexEntry: + db "FREEZE@" + db 5,7 + dw 1220 + text_far _ArticunoDexEntry + text_end + +ZapdosDexEntry: + db "ELECTRIC@" + db 5,3 + dw 1160 + text_far _ZapdosDexEntry + text_end + +MoltresDexEntry: + db "FLAME@" + db 6,7 + dw 1320 + text_far _MoltresDexEntry + text_end + +DratiniDexEntry: + db "DRAGON@" + db 5,11 + dw 70 + text_far _DratiniDexEntry + text_end + +DragonairDexEntry: + db "DRAGON@" + db 13,1 + dw 360 + text_far _DragonairDexEntry + text_end + +DragoniteDexEntry: + db "DRAGON@" + db 7,3 + dw 4630 + text_far _DragoniteDexEntry + text_end + +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: + db "???@" + db 10 ; 1.0 m + dw 100 ; 10.0 kg + db "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/pokedex_order.asm b/data/pokemon/dex_order.asm index 0e293946..0e293946 100755 --- a/data/pokedex_order.asm +++ b/data/pokemon/dex_order.asm diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm new file mode 100644 index 00000000..7e84a83d --- /dev/null +++ b/data/pokemon/dex_text.asm @@ -0,0 +1,1508 @@ +_BulbasaurDexEntry:: + text "It can go for days" + next "without eating a" + next "single morsel." + + page "In the bulb on" + next "its back, it" + next "stores energy" + dex + +_IvysaurDexEntry:: + text "The bulb on its" + next "back grows by" + next "drawing energy." + + page "It gives off an" + next "aroma when it is" + next "ready to bloom" + dex + +_VenusaurDexEntry:: + text "The flower on its" + next "back catches the" + next "sun's rays." + + page "The sunlight is" + next "then absorbed and" + next "used for energy" + dex + +_CharmanderDexEntry:: + text "The flame at the" + next "tip of its tail" + next "makes a sound as" + + page "it burns. You can" + next "only hear it in" + next "quiet places" + dex + +_CharmeleonDexEntry:: + text "Tough fights could" + next "excite this" + next "#MON. When" + + page "excited, it may" + next "blow out bluish-" + next "white flames" + dex + +_CharizardDexEntry:: + text "When expelling a" + next "blast of super" + next "hot fire, the red" + + page "flame at the tip" + next "of its tail burns" + next "more intensely" + dex + +_SquirtleDexEntry:: + text "Shoots water at" + next "prey while in the" + next "water." + + page "Withdraws into" + next "its shell when in" + next "danger" + dex + +_WartortleDexEntry:: + text "When tapped, this" + next "#MON will pull" + next "in its head, but" + + page "its tail will" + next "still stick out a" + next "little bit" + dex + +_BlastoiseDexEntry:: + text "Once it takes aim" + next "at its enemy, it" + next "blasts out water" + + page "with even more" + next "force than a fire" + next "hose" + dex + +_CaterpieDexEntry:: + text "If you touch the" + next "feeler on top of" + next "its head, it will" + + page "release a horrible" + next "stink to protect" + next "itself" + dex + +_MetapodDexEntry:: + text "Hardens its shell" + next "to protect itself." + next "However, a large" + + page "impact may cause" + next "it to pop out of" + next "its shell" + dex + +_ButterfreeDexEntry:: + text "Its wings, covered" + next "with poisonous" + next "powders, repel" + + page "water. This" + next "allows it to fly" + next "in the rain" + dex + +_WeedleDexEntry:: + text "Beware of the" + next "sharp stinger on" + next "its head. It" + + page "hides in grass" + next "and bushes where" + next "it eats leaves" + dex + +_KakunaDexEntry:: + text "Able to move only" + next "slightly. When" + next "endangered, it" + + page "may stick out its" + next "stinger and poison" + next "its enemy" + dex + +_BeedrillDexEntry:: + text "It has 3 poisonous" + next "stingers on its" + next "forelegs and its" + + page "tail. They are" + next "used to jab its" + next "enemy repeatedly" + dex + +_PidgeyDexEntry:: + text "Very docile. If" + next "attacked, it will" + next "often kick up" + + page "sand to protect" + next "itself rather" + next "than fight back" + dex + +_PidgeottoDexEntry:: + text "This #MON is" + next "full of vitality." + next "It constantly" + + page "flies around its" + next "large territory in" + next "search of prey" + dex + +_PidgeotDexEntry:: + text "This #MON flies" + next "at Mach 2 speed," + next "seeking prey." + + page "Its large talons" + next "are feared as" + next "wicked weapons" + dex + +_RattataDexEntry:: + text "Will chew on any-" + next "thing with its" + next "fangs. If you see" + + page "one, it is certain" + next "that 40 more live" + next "in the area" + dex + +_RaticateDexEntry:: + text "Its hind feet are" + next "webbed. They act" + next "as flippers, so" + + page "it can swim in" + next "rivers and hunt" + next "for prey" + dex + +_SpearowDexEntry:: + text "Inept at flying" + next "high. However, it" + next "can fly around" + + page "very fast to" + next "protect its ter-" + next "ritory" + dex + +_FearowDexEntry:: + text "A #MON that" + next "dates back many" + next "years. If it" + + page "senses danger, it" + next "flies high and" + next "away, instantly" + dex + +_EkansDexEntry:: + text "The older it gets," + next "the longer it" + next "grows. At night," + + page "it wraps its long" + next "body around tree" + next "branches to rest" + dex + +_ArbokDexEntry:: + text "The frightening" + next "patterns on its" + next "belly have been" + + page "studied. Six" + next "variations have" + next "been confirmed" + dex + +_PikachuDexEntry:: + text "It keeps its tail" + next "raised to monitor" + next "its surroundings." + + page "If you yank its" + next "tail, it will try" + next "to bite you" + dex + +_RaichuDexEntry:: + text "When electricity" + next "builds up inside" + next "its body, it" + + page "becomes feisty." + next "It also glows in" + next "the dark" + dex + +_SandshrewDexEntry:: + text "Its body is dry." + next "When it gets cold" + next "at night, its" + + page "hide is said to" + next "become coated with" + next "a fine dew" + dex + +_SandslashDexEntry:: + text "It is skilled at" + next "slashing enemies" + next "with its claws." + + page "If broken, they" + next "start to grow back" + next "in a day" + dex + +_NidoranFDexEntry:: + text "A mild-mannered" + next "#MON that does" + next "not like to" + + page "fight. Beware, its" + next "small horns" + next "secrete venom" + dex + +_NidorinaDexEntry:: + text "When resting deep" + next "in its burrow, its" + next "thorns always" + + page "retract." + next "This is proof that" + next "it is relaxed" + dex + +_NidoqueenDexEntry:: + text "Tough scales cover" + next "the sturdy body" + next "of this #MON." + + page "It appears that" + next "the scales grow" + next "in cycles" + dex + +_NidoranMDexEntry:: + text "Its large ears" + next "are always kept" + next "upright. If it" + + page "senses danger, it" + next "will attack with a" + next "poisonous sting" + dex + +_NidorinoDexEntry:: + text "Its horns contain" + next "venom. If they" + next "are stabbed into" + + page "an enemy, the" + next "impact makes the" + next "poison leak out" + dex + +_NidokingDexEntry:: + text "Its steel-like" + next "hide adds to its" + next "powerful tackle." + + page "Its horns are so" + next "hard, they can" + next "pierce a diamond" + dex + +_ClefairyDexEntry:: + text "Adored for their" + next "cute looks and" + next "playfulness. They" + + page "are thought to be" + next "rare, as they do" + next "not appear often" + dex + +_ClefableDexEntry:: + text "They appear to be" + next "very protective of" + next "their own world." + + page "It is a kind of" + next "fairy, rarely seen" + next "by people" + dex + +_VulpixDexEntry:: + text "Both its fur and" + next "its tails are" + next "beautiful. As it" + + page "grows, the tails" + next "split and form" + next "more tails" + dex + +_NinetalesDexEntry:: + text "According to an" + next "enduring legend," + next "9 noble saints" + + page "were united and" + next "reincarnated as" + next "this #MON" + dex + +_JigglypuffDexEntry:: + text "Uses its alluring" + next "eyes to enrapture" + next "its foe. It then" + + page "sings a pleasing" + next "melody that lulls" + next "the foe to sleep" + dex + +_WigglytuffDexEntry:: + text "Its body is full" + next "of elasticity. By" + next "inhaling deeply," + + page "it can continue" + next "to inflate itself" + next "without limit" + dex + +_ZubatDexEntry:: + text "Emits ultrasonic" + next "cries while it" + next "flies. They act" + + page "as a sonar used" + next "to check for ob-" + next "jects in its way" + dex + +_GolbatDexEntry:: + text "It attacks in a" + next "stealthy manner," + next "without warning." + + page "Its sharp fangs" + next "are used to bite" + next "and suck blood" + dex + +_OddishDexEntry:: + text "It may be mistaken" + next "for a clump of" + next "weeds. If you try" + + page "to yank it out of" + next "the ground, it" + next "shrieks horribly" + dex + +_GloomDexEntry:: + text "Smells incredibly" + next "foul! However," + next "around 1 out of" + + page "1,000 people enjoy" + next "sniffing its nose-" + next "bending stink" + dex + +_VileplumeDexEntry:: + text "Flaps its broad" + next "flower petals to" + next "scatter its" + + page "poisonous pollen." + next "The flapping sound" + next "is very loud" + dex + +_ParasDexEntry:: + text "Burrows under the" + next "ground to gnaw on" + next "tree roots. The" + + page "mushrooms on its" + next "back absorb most" + next "of the nutrition" + dex + +_ParasectDexEntry:: + text "The bug host is" + next "drained of energy" + next "by the mushrooms" + + page "on its back. They" + next "appear to do all" + next "the thinking" + dex + +_VenonatDexEntry:: + text "Its large eyes act" + next "as radars. In a" + next "bright place, you" + + page "can see that they" + next "are clusters of" + next "many tiny eyes" + dex + +_VenomothDexEntry:: + text "The powdery scales" + next "on its wings are" + next "hard to remove." + + page "They also contain" + next "poison that leaks" + next "out on contact" + dex + +_DiglettDexEntry:: + text "It prefers dark" + next "places. It spends" + next "most of its time" + + page "underground," + next "though it may pop" + next "up in caves" + dex + +_DugtrioDexEntry:: + text "A team of triplets" + next "that can burrow" + next "over 60 MPH." + + page "Due to this, some" + next "people think it's" + next "an earthquake" + dex + +_MeowthDexEntry:: + text "Appears to be more" + next "active at night." + next "It loves round" + + page "and shiny things." + next "It can't stop from" + next "picking them up" + dex + +_PersianDexEntry:: + text "The gem in its" + next "forehead glows on" + next "its own! It walks" + + page "with all the grace" + next "and elegance of a" + next "proud queen" + dex + +_PsyduckDexEntry:: + text "Always tormented" + next "by headaches." + next "It uses psychic" + + page "powers, but it is" + next "not known if it" + next "intends to do so" + dex + +_GolduckDexEntry:: + text "Its slim and long" + next "limbs end in broad" + next "flippers. They" + + page "are used for swim-" + next "ming gracefully" + next "in lakes" + dex + +_MankeyDexEntry:: + text "An agile #MON" + next "that lives in" + next "trees. It angers" + + page "easily and will" + next "not hesitate to" + next "attack anything" + dex + +_PrimeapeDexEntry:: + text "It stops being" + next "angry only when" + next "nobody else is" + + page "around. To view" + next "this moment is" + next "very difficult" + dex + +_GrowlitheDexEntry:: + text "A #MON with a" + next "friendly nature." + next "However, it will" + + page "bark fiercely at" + next "anything invading" + next "its territory" + dex + +_ArcanineDexEntry:: + text "A legendary #-" + next "MON in China." + next "Many people are" + + page "charmed by its" + next "grace and beauty" + next "while running" + dex + +_PoliwagDexEntry:: + text "The direction of" + next "the spiral on the" + next "belly differs by" + + page "area. It is more" + next "adept at swimming" + next "than walking" + dex + +_PoliwhirlDexEntry:: + text "Under attack, it" + next "uses its belly " + next "spiral to put the" + + page "foe to sleep. It" + next "then makes its" + next "escape" + dex + +_PoliwrathDexEntry:: + text "Swims powerfully" + next "using all the" + next "muscles in its" + + page "body. It can even" + next "overtake champion" + next "swimmers" + dex + +_AbraDexEntry:: + text "Sleeps 18 hours a" + next "day. If it senses" + next "danger, it will" + + page "teleport itself to" + next "safety even as it" + next "sleeps" + dex + +_KadabraDexEntry:: + text "Many odd things" + next "happen if this" + next "#MON is close" + + page "by. For example," + next "it makes clocks" + next "run backwards" + dex + +_AlakazamDexEntry:: + text "A #MON that can" + next "memorize anything." + next "It never forgets" + + page "what it learns--" + next "that's why this" + next "#MON is smart" + dex + +_MachopDexEntry:: + text "Very powerful in" + next "spite of its small" + next "size. Its mastery" + + page "of many types of" + next "martial arts makes" + next "it very tough" + dex + +_MachokeDexEntry:: + text "The belt around" + next "its waist holds" + next "back its energy." + + page "Without it, this" + next "#MON would be" + next "unstoppable" + dex + +_MachampDexEntry:: + text "One arm alone can" + next "move mountains." + next "Using all four" + + page "arms, this #MON" + next "fires off awesome" + next "punches" + dex + +_BellsproutDexEntry:: + text "Prefers hot and" + next "humid places." + next "It ensnares tiny" + + page "insects with its" + next "vines and devours" + next "them" + dex + +_WeepinbellDexEntry:: + text "When hungry, it" + next "swallows anything" + next "that moves. Its" + + page "hapless prey is" + next "melted inside by" + next "strong acids" + dex + +_VictreebelDexEntry:: + text "Lures prey with" + next "the sweet aroma of" + next "honey. Swallowed" + + page "whole, the prey is" + next "melted in a day," + next "bones and all" + dex + +_TentacoolDexEntry:: + text "It can sometimes" + next "be found all dry" + next "and shriveled up" + + page "on a beach. Toss" + next "it back into the" + next "sea to revive it" + dex + +_TentacruelDexEntry:: + text "Its 80 tentacles" + next "can stretch and" + next "contract freely." + + page "They wrap around" + next "prey and weaken" + next "it with poison" + dex + +_GeodudeDexEntry:: + text "Commonly found" + next "near mountain" + next "trails, etc." + + page "If you step on" + next "one by accident," + next "it gets angry" + dex + +_GravelerDexEntry:: + text "Often seen rolling" + next "down mountain" + next "trails. Obstacles" + + page "are just things to" + next "roll straight" + next "over, not avoid" + dex + +_GolemDexEntry:: + text "Once it sheds its" + next "skin, its body" + next "turns tender and" + + page "whitish. Its hide" + next "hardens when it's" + next "exposed to air" + dex + +_PonytaDexEntry:: + text "Capable of jumping" + next "incredibly high." + next "Its hooves and" + + page "sturdy legs absorb" + next "the impact of a" + next "hard landing" + dex + +_RapidashDexEntry:: + text "Just loves to run." + next "If it sees some-" + next "thing faster than" + + page "itself, it will" + next "give chase at top" + next "speed" + dex + +_SlowpokeDexEntry:: + text "Incredibly slow" + next "and sluggish. It" + next "is quite content" + + page "to loll about" + next "without worrying" + next "about the time" + dex + +_SlowbroDexEntry:: + text "Lives lazily by" + next "the sea. If the" + next "SHELLDER on its" + + page "tail comes off," + next "it becomes a" + next "SLOWPOKE again" + dex + +_MagnemiteDexEntry:: + text "It is born with" + next "the ability to" + next "defy gravity. It" + + page "floats in air on" + next "powerful electro-" + next "magnetic waves" + dex + +_MagnetonDexEntry:: + text "Generates strange" + next "radio signals. It" + next "raises the tem-" + + page "perature by 3.6F" + next "degrees within" + next "3,300 feet" + dex + +_FarfetchdDexEntry:: + text "Lives where reedy" + next "plants grow. They" + next "are rarely seen," + + page "so it's thought" + next "their numbers are" + next "decreasing" + dex + +_DoduoDexEntry:: + text "Its short wings" + next "make flying dif-" + next "ficult. Instead," + + page "this #MON runs" + next "at high speed on" + next "developed legs" + dex + +_DodrioDexEntry:: + text "One of DODUO's 2" + next "heads splits to" + next "form a unique" + + page "species. It runs" + next "close to 40 MPH" + next "in prairies" + dex + +_SeelDexEntry:: + text "Loves freezing" + next "cold conditions." + next "Relishes swimming" + + page "in a frigid cli-" + next "mate of around 14F" + next "degrees" + dex + +_DewgongDexEntry:: + text "Its entire body is" + next "a snowy-white." + next "Unharmed by even" + + page "intense cold, it" + next "swims powerfully" + next "in icy waters" + dex + +_GrimerDexEntry:: + text "Made of hardened" + next "sludge. It smells" + next "too putrid to" + + page "touch." + next "Even weeds won't" + next "grow in its path" + dex + +_MukDexEntry:: + text "Smells so awful," + next "it can cause" + next "fainting. Through" + + page "degeneration, it" + next "lost its sense of" + next "smell" + dex + +_ShellderDexEntry:: + text "The shell can" + next "withstand any" + next "attack. However," + + page "when it is open," + next "the tender body" + next "is exposed" + dex + +_CloysterDexEntry:: + text "For protection, it" + next "uses its harder-" + next "than-diamonds" + + page "shell. It also" + next "shoots spikes from" + next "the shell" + dex + +_GastlyDexEntry:: + text "Said to appear in" + next "decrepit, deserted" + next "buildings. It has" + + page "no real shape as" + next "it appears to be" + next "made of a gas" + dex + +_HaunterDexEntry:: + text "By licking, it" + next "saps the victim's" + next "life. It causes" + + page "shaking that won't" + next "stop until the" + next "victim's demise" + dex + +_GengarDexEntry:: + text "A GENGAR is close" + next "by if you feel a" + next "sudden chill." + + page "It may be trying" + next "to lay a curse" + next "on you" + dex + +_OnixDexEntry:: + text "Burrows at high" + next "speed in search" + next "of food. The" + + page "tunnels it leaves" + next "are used as homes" + next "by DIGLETTs" + dex + +_DrowzeeDexEntry:: + text "If you sleep by" + next "it all the time," + next "it will sometimes" + + page "show you dreams" + next "it has eaten in" + next "the past" + dex + +_HypnoDexEntry:: + text "Avoid eye contact" + next "if you come across" + next "one. It will try" + + page "to put you to" + next "sleep by using" + next "its pendulum" + dex + +_KrabbyDexEntry:: + text "Its pincers are" + next "superb weapons." + next "They sometimes" + + page "break off during" + next "battle, but they" + next "grow back fast" + dex + +_KinglerDexEntry:: + text "One claw grew" + next "massively and as" + next "hard as steel." + + page "It has 10,000-HP" + next "strength. However," + next "it is too heavy" + dex + +_VoltorbDexEntry:: + text "It is said to" + next "camouflage itself" + next "as a # BALL. It" + + page "will self-destruct" + next "with very little" + next "stimulus" + dex + +_ElectrodeDexEntry:: + text "Stores electrical" + next "energy inside its" + next "body. Even the" + + page "slightest shock" + next "could trigger a" + next "huge explosion" + dex + +_ExeggcuteDexEntry:: + text "The heads attract" + next "each other and" + next "spin around." + + page "There must be 6" + next "heads for it to" + next "maintain balance" + dex + +_ExeggutorDexEntry:: + text "Its cries are very" + next "noisy. This is" + next "because each of" + + page "the 3 heads thinks" + next "about whatever it" + next "likes" + dex + +_CuboneDexEntry:: + text "Wears the skull" + next "of its deceased" + next "mother. Its cries" + + page "echo inside the" + next "skull and come out" + next "as a sad melody" + dex + +_MarowakDexEntry:: + text "Small and weak," + next "this #MON is" + next "adept with its" + + page "bone club. It has" + next "grown more vicious" + next "over the ages" + dex + +_HitmonleeDexEntry:: + text "When kicking, the" + next "sole of its foot" + next "turns as hard as" + + page "a diamond on im-" + next "pact and destroys" + next "its enemy" + dex + +_HitmonchanDexEntry:: + text "Punches in cork-" + next "screw fashion. It" + next "can punch its way" + + page "through a concrete" + next "wall in the same" + next "way as a drill" + dex + +_LickitungDexEntry:: + text "Its tongue spans" + next "almost 7 feet and" + next "moves more freely" + + page "than its forelegs." + next "Its licks can" + next "cause paralysis" + dex + +_KoffingDexEntry:: + text "In hot places, its" + next "internal gases" + next "could expand and" + + page "explode without" + next "any warning. Be" + next "very careful!@@" + +_WeezingDexEntry:: + text "It lives and grows" + next "by absorbing dust," + next "germs and poison" + + page "gases that are" + next "contained in toxic" + next "waste and garbage" + dex + +_RhyhornDexEntry:: + text "A #MON with a" + next "one-track mind." + next "Once it charges, " + + page "it won't stop" + next "running until it" + next "falls asleep" + dex + +_RhydonDexEntry:: + text "Walks on its hind" + next "legs. Shows signs" + next "of intelligence." + + page "Its armor-like" + next "hide even repels" + next "molten lava" + dex + +_ChanseyDexEntry:: + text "A gentle and kind-" + next "hearted #MON" + next "that shares its" + + page "nutritious eggs" + next "if it sees an" + next "injured #MON" + dex + +_TangelaDexEntry:: + text "Its identity is" + next "obscured by masses" + next "of thick, blue" + + page "vines. The vines" + next "are said to never" + next "stop growing" + dex + +_KangaskhanDexEntry:: + text "Raises its young" + next "in its belly" + next "pouch. Won't run" + + page "from any fight" + next "to keep its young" + next "protected" + dex + +_HorseaDexEntry:: + text "If it senses any" + next "danger, it will" + next "vigorously spray" + + page "water or a special" + next "type of ink from" + next "its mouth" + dex + +_SeadraDexEntry:: + text "Touching the back" + next "fin causes numb-" + next "ness. It hooks" + + page "its tail to coral" + next "to stay in place" + next "while sleeping" + dex + +_GoldeenDexEntry:: + text "When it is time" + next "for them to lay" + next "eggs, they can be" + + page "seen swimming up" + next "rivers and falls" + next "in large groups" + dex + +_SeakingDexEntry:: + text "It is the male's" + next "job to make a" + next "nest by carving" + + page "out boulders in a" + next "stream using the" + next "horn on its head" + dex + +_StaryuDexEntry:: + text "As long as the" + next "center section is" + next "unharmed, it can" + + page "grow back fully" + next "even if it is" + next "chopped to bits" + dex + +_StarmieDexEntry:: + text "The center section" + next "is named the core." + next "People think it" + + page "is communicating" + next "when it glows in" + next "7 colors" + dex + +_MrMimeDexEntry:: + text "Always practices" + next "its pantomime act." + next "It makes enemies" + + page "believe something" + next "exists that" + next "really doesn't" + dex + +_ScytherDexEntry:: + text "Leaps out of tall" + next "grass and slices" + next "prey with its" + + page "scythes. The move-" + next "ment looks like" + next "that of a ninja" + dex + +_JynxDexEntry:: + text "Appears to move" + next "to a rhythm of" + next "its own, as if it" + + page "were dancing. It" + next "wiggles its hips" + next "as it walks" + dex + +_ElectabuzzDexEntry:: + text "If a major power" + next "outage occurs, it" + next "is certain that" + + page "this #MON has" + next "eaten electricity" + next "at a power plant" + dex + +_MagmarDexEntry:: + text "Born in an active" + next "volcano. Its body" + next "is always cloaked" + + page "in flames, so it" + next "looks like a big" + next "ball of fire" + dex + +_PinsirDexEntry:: + text "Grips its prey in" + next "its pincers and" + next "squeezes hard! It" + + page "can't move if it's" + next "cold, so it lives" + next "in warm places" + dex + +_TaurosDexEntry:: + text "A rowdy #MON" + next "with a lot of" + next "stamina. Once" + + page "running, it won't" + next "stop until it hits" + next "something" + dex + +_MagikarpDexEntry:: + text "Famous for being" + next "very unreliable." + next "It can be found" + + page "swimming in seas," + next "lakes, rivers and" + next "shallow puddles" + dex + +_GyaradosDexEntry:: + text "Brutally vicious" + next "and enormously" + next "destructive." + + page "Known for totally" + next "destroying cities" + next "in ancient times" + dex + +_LaprasDexEntry:: + text "A gentle soul that" + next "can read the minds" + next "of people. It can" + + page "ferry people" + next "across the sea on" + next "its back" + dex + +_DittoDexEntry:: + text "When it spots an" + next "enemy, its body" + next "transfigures into" + + page "an almost perfect" + next "copy of its oppo-" + next "nent" + dex + +_EeveeDexEntry:: + text "Its genetic code" + next "is unstable, so it" + next "could evolve in" + + page "a variety of ways." + next "There are only a" + next "few alive" + dex + +_VaporeonDexEntry:: + text "Its cell structure" + next "is similar to" + next "water molecules." + + page "It will melt away" + next "and become invis-" + next "ible in water" + dex + +_JolteonDexEntry:: + text "A sensitive #-" + next "MON that easily" + next "becomes sad or" + + page "angry. Every time" + next "its mood changes," + next "it charges power" + dex + +_FlareonDexEntry:: + text "It has a flame" + next "chamber inside its" + next "body. It inhales," + + page "then blows out" + next "fire that is over" + next "3,000F degrees" + dex + +_PorygonDexEntry:: + text "The only #MON" + next "people anticipate" + next "can fly into" + + page "space. None has" + next "managed the feat" + next "yet, however" + dex + +_OmanyteDexEntry:: + text "An ancient #MON" + next "that was recovered" + next "from a fossil. It" + + page "swims by cleverly" + next "twisting its 10" + next "tentacles about" + dex + +_OmastarDexEntry:: + text "Sharp beaks ring" + next "its mouth. Its" + next "shell was too big" + + page "for it to move" + next "freely, so it" + next "became extinct" + dex + +_KabutoDexEntry:: + text "A #MON that was" + next "recovered from a" + next "fossil. It uses" + + page "the eyes on its" + next "back while hiding" + next "on the sea floor" + dex + +_KabutopsDexEntry:: + text "A slim and fast" + next "swimmer. It slices" + next "its prey with its" + + page "sharp sickles and" + next "drinks the body" + next "fluids" + dex + +_AerodactylDexEntry:: + text "A savage #MON" + next "that died out in" + next "ancient times. It" + + page "was resurrected" + next "using DNA taken" + next "from amber" + dex + +_SnorlaxDexEntry:: + text "Will eat anything," + next "even if the food" + next "happens to be a" + + page "little moldy. It" + next "never gets an" + next "upset stomach" + dex + +_ArticunoDexEntry:: + text "A legendary bird" + next "#MON. It" + next "freezes water" + + page "that is contained" + next "in winter air and" + next "makes it snow" + dex + +_ZapdosDexEntry:: + text "This legendary" + next "bird #MON is" + next "said to appear" + + page "when the sky turns" + next "dark and lightning" + next "showers down" + dex + +_MoltresDexEntry:: + text "A legendary bird" + next "#MON. As it" + next "flaps its flaming" + + page "wings, even the" + next "night sky will" + next "turn red" + dex + +_DratiniDexEntry:: + text "The existence of" + next "this mythical" + next "#MON was only" + + page "recently confirmed" + next "by a fisherman" + next "who caught one" + dex + +_DragonairDexEntry:: + text "According to a" + next "witness, its body" + next "was surrounded by" + + page "a strange aura" + next "that gave it a" + next "mystical look" + dex + +_DragoniteDexEntry:: + text "It is said that" + next "this #MON lives" + next "somewhere in the" + + page "sea and that it" + next "flies. However, it" + next "is only a rumor" + dex + +_MewtwoDexEntry:: + text "Its DNA is almost" + next "the same as MEW's." + next "However, its size" + + page "and disposition" + next "are vastly dif-" + next "ferent" + dex + +_MewDexEntry:: + text "When viewed" + next "through a micro-" + next "scope, this" + + 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 new file mode 100755 index 00000000..19016d14 --- /dev/null +++ b/data/pokemon/evos_moves.asm @@ -0,0 +1,2161 @@ +; See constants/pokemon_data_constants.asm +; The max number of evolutions per monster is MAX_EVOLUTIONS + +EvosMovesPointerTable: + dw RhydonEvosMoves + dw KangaskhanEvosMoves + dw NidoranMEvosMoves + dw ClefairyEvosMoves + dw SpearowEvosMoves + dw VoltorbEvosMoves + dw NidokingEvosMoves + dw SlowbroEvosMoves + dw IvysaurEvosMoves + dw ExeggutorEvosMoves + dw LickitungEvosMoves + dw ExeggcuteEvosMoves + dw GrimerEvosMoves + dw GengarEvosMoves + dw NidoranFEvosMoves + dw NidoqueenEvosMoves + dw CuboneEvosMoves + dw RhyhornEvosMoves + dw LaprasEvosMoves + dw ArcanineEvosMoves + dw MewEvosMoves + dw GyaradosEvosMoves + dw ShellderEvosMoves + dw TentacoolEvosMoves + dw GastlyEvosMoves + dw ScytherEvosMoves + dw StaryuEvosMoves + dw BlastoiseEvosMoves + dw PinsirEvosMoves + dw TangelaEvosMoves + dw MissingNo1FEvosMoves + dw MissingNo20EvosMoves + dw GrowlitheEvosMoves + dw OnixEvosMoves + dw FearowEvosMoves + dw PidgeyEvosMoves + dw SlowpokeEvosMoves + dw KadabraEvosMoves + dw GravelerEvosMoves + dw ChanseyEvosMoves + dw MachokeEvosMoves + dw MrMimeEvosMoves + dw HitmonleeEvosMoves + dw HitmonchanEvosMoves + dw ArbokEvosMoves + dw ParasectEvosMoves + dw PsyduckEvosMoves + dw DrowzeeEvosMoves + dw GolemEvosMoves + dw MissingNo32EvosMoves + dw MagmarEvosMoves + dw MissingNo34EvosMoves + dw ElectabuzzEvosMoves + dw MagnetonEvosMoves + dw KoffingEvosMoves + dw MissingNo38EvosMoves + dw MankeyEvosMoves + dw SeelEvosMoves + dw DiglettEvosMoves + dw TaurosEvosMoves + dw MissingNo3DEvosMoves + dw MissingNo3EEvosMoves + dw MissingNo3FEvosMoves + dw FarfetchdEvosMoves + dw VenonatEvosMoves + dw DragoniteEvosMoves + dw MissingNo43EvosMoves + dw MissingNo44EvosMoves + dw MissingNo45EvosMoves + dw DoduoEvosMoves + dw PoliwagEvosMoves + dw JynxEvosMoves + dw MoltresEvosMoves + dw ArticunoEvosMoves + dw ZapdosEvosMoves + dw DittoEvosMoves + dw MeowthEvosMoves + dw KrabbyEvosMoves + dw MissingNo4FEvosMoves + dw MissingNo50EvosMoves + dw MissingNo51EvosMoves + dw VulpixEvosMoves + dw NinetalesEvosMoves + dw PikachuEvosMoves + dw RaichuEvosMoves + dw MissingNo56EvosMoves + dw MissingNo57EvosMoves + dw DratiniEvosMoves + dw DragonairEvosMoves + dw KabutoEvosMoves + dw KabutopsEvosMoves + dw HorseaEvosMoves + dw SeadraEvosMoves + dw MissingNo5EEvosMoves + dw MissingNo5FEvosMoves + dw SandshrewEvosMoves + dw SandslashEvosMoves + dw OmanyteEvosMoves + dw OmastarEvosMoves + dw JigglypuffEvosMoves + dw WigglytuffEvosMoves + dw EeveeEvosMoves + dw FlareonEvosMoves + dw JolteonEvosMoves + dw VaporeonEvosMoves + dw MachopEvosMoves + dw ZubatEvosMoves + dw EkansEvosMoves + dw ParasEvosMoves + dw PoliwhirlEvosMoves + dw PoliwrathEvosMoves + dw WeedleEvosMoves + dw KakunaEvosMoves + dw BeedrillEvosMoves + dw MissingNo73EvosMoves + dw DodrioEvosMoves + dw PrimeapeEvosMoves + dw DugtrioEvosMoves + dw VenomothEvosMoves + dw DewgongEvosMoves + dw MissingNo79EvosMoves + dw MissingNo7AEvosMoves + dw CaterpieEvosMoves + dw MetapodEvosMoves + dw ButterfreeEvosMoves + dw MachampEvosMoves + dw MissingNo7FEvosMoves + dw GolduckEvosMoves + dw HypnoEvosMoves + dw GolbatEvosMoves + dw MewtwoEvosMoves + dw SnorlaxEvosMoves + dw MagikarpEvosMoves + dw MissingNo86EvosMoves + dw MissingNo87EvosMoves + dw MukEvosMoves + dw MissingNo8AEvosMoves + dw KinglerEvosMoves + dw CloysterEvosMoves + dw MissingNo8CEvosMoves + dw ElectrodeEvosMoves + dw ClefableEvosMoves + dw WeezingEvosMoves + dw PersianEvosMoves + dw MarowakEvosMoves + dw MissingNo92EvosMoves + dw HaunterEvosMoves + dw AbraEvosMoves + dw AlakazamEvosMoves + dw PidgeottoEvosMoves + dw PidgeotEvosMoves + dw StarmieEvosMoves + dw BulbasaurEvosMoves + dw VenusaurEvosMoves + dw TentacruelEvosMoves + dw MissingNo9CEvosMoves + dw GoldeenEvosMoves + dw SeakingEvosMoves + dw MissingNo9FEvosMoves + dw MissingNoA0EvosMoves + dw MissingNoA1EvosMoves + dw MissingNoA2EvosMoves + dw PonytaEvosMoves + dw RapidashEvosMoves + dw RattataEvosMoves + dw RaticateEvosMoves + dw NidorinoEvosMoves + dw NidorinaEvosMoves + dw GeodudeEvosMoves + dw PorygonEvosMoves + dw AerodactylEvosMoves + dw MissingNoACEvosMoves + dw MagnemiteEvosMoves + dw MissingNoAEEvosMoves + dw MissingNoAFEvosMoves + dw CharmanderEvosMoves + dw SquirtleEvosMoves + dw CharmeleonEvosMoves + dw WartortleEvosMoves + dw CharizardEvosMoves + dw MissingNoB5EvosMoves + dw FossilKabutopsEvosMoves + dw FossilAerodactylEvosMoves + dw MonGhostEvosMoves + dw OddishEvosMoves + dw GloomEvosMoves + dw VileplumeEvosMoves + dw BellsproutEvosMoves + dw WeepinbellEvosMoves + dw VictreebelEvosMoves + +RhydonEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 48, HORN_DRILL + db 55, LEER + db 64, TAKE_DOWN + db 0 + +KangaskhanEvosMoves: +; Evolutions + db 0 +; Learnset + db 26, BITE + db 31, TAIL_WHIP + db 36, MEGA_PUNCH + db 41, LEER + db 46, DIZZY_PUNCH + db 0 + +NidoranMEvosMoves: +; Evolutions + db EV_LEVEL, 16, NIDORINO + db 0 +; Learnset + db 8, HORN_ATTACK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, FOCUS_ENERGY + db 30, FURY_ATTACK + db 38, HORN_DRILL + db 0 + +ClefairyEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, CLEFABLE + db 0 +; Learnset + db 13, SING + db 18, DOUBLESLAP + db 24, MINIMIZE + db 31, METRONOME + db 39, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 0 + +SpearowEvosMoves: +; Evolutions + db EV_LEVEL, 20, FEAROW + db 0 +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 22, MIRROR_MOVE + db 29, DRILL_PECK + db 36, AGILITY + db 0 + +VoltorbEvosMoves: +; Evolutions + db EV_LEVEL, 30, ELECTRODE + db 0 +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 36, SWIFT + db 43, EXPLOSION + db 0 + +NidokingEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, HORN_ATTACK + db 12, DOUBLE_KICK + db 23, THRASH + db 0 + +SlowbroEvosMoves: +; Evolutions + db 0 +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 37, WITHDRAW + db 44, AMNESIA + db 55, PSYCHIC_M + db 0 + +IvysaurEvosMoves: +; Evolutions + db EV_LEVEL, 32, VENUSAUR + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 38, GROWTH + db 46, SLEEP_POWDER + db 54, SOLARBEAM + db 0 + +ExeggutorEvosMoves: +; Evolutions + db 0 +; Learnset + db 28, STOMP + db 0 + +LickitungEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, STOMP + db 15, DISABLE + db 23, DEFENSE_CURL + db 31, SLAM + db 39, SCREECH + db 0 + +ExeggcuteEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR + db 0 +; Learnset + db 25, REFLECT + db 28, LEECH_SEED + db 32, STUN_SPORE + db 37, POISONPOWDER + db 42, SOLARBEAM + db 48, SLEEP_POWDER + db 0 + +GrimerEvosMoves: +; Evolutions + db EV_LEVEL, 38, MUK + db 0 +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 42, HARDEN + db 48, SCREECH + db 55, ACID_ARMOR + db 0 + +GengarEvosMoves: +; Evolutions + db 0 +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER + db 0 + +NidoranFEvosMoves: +; Evolutions + db EV_LEVEL, 16, NIDORINA + db 0 +; Learnset + db 8, SCRATCH + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, TAIL_WHIP + db 30, BITE + db 38, FURY_SWIPES + db 0 + +NidoqueenEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, SCRATCH + db 12, DOUBLE_KICK + db 23, BODY_SLAM + db 0 + +CuboneEvosMoves: +; Evolutions + 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 + db 43, BONEMERANG + db 46, RAGE + db 0 + +RhyhornEvosMoves: +; Evolutions + db EV_LEVEL, 42, RHYDON + db 0 +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 45, HORN_DRILL + db 50, LEER + db 55, TAKE_DOWN + db 0 + +LaprasEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, SING + db 20, MIST + db 25, BODY_SLAM + db 31, CONFUSE_RAY + db 38, ICE_BEAM + db 46, HYDRO_PUMP + db 0 + +ArcanineEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MewEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, TRANSFORM + db 20, MEGA_PUNCH + db 30, METRONOME + db 40, PSYCHIC_M + db 0 + +GyaradosEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, BITE + db 25, DRAGON_RAGE + db 32, LEER + db 41, HYDRO_PUMP + db 52, HYPER_BEAM + db 0 + +ShellderEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, CLOYSTER + db 0 +; Learnset + db 18, SUPERSONIC + db 23, CLAMP + db 30, AURORA_BEAM + db 39, LEER + db 50, ICE_BEAM + db 0 + +TentacoolEvosMoves: +; Evolutions + db EV_LEVEL, 30, TENTACRUEL + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 33, BARRIER + db 40, SCREECH + db 48, HYDRO_PUMP + db 0 + +GastlyEvosMoves: +; Evolutions + db EV_LEVEL, 25, HAUNTER + db 0 +; Learnset + db 27, HYPNOSIS + db 35, DREAM_EATER + db 0 + +ScytherEvosMoves: +; Evolutions + db 0 +; Learnset + db 17, LEER + db 20, FOCUS_ENERGY + db 24, DOUBLE_TEAM + db 29, SLASH + db 35, SWORDS_DANCE + db 42, AGILITY + db 50, WING_ATTACK + db 0 + +StaryuEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, STARMIE + db 0 +; Learnset + db 17, WATER_GUN + db 22, HARDEN + db 27, RECOVER + db 32, SWIFT + db 37, MINIMIZE + db 42, LIGHT_SCREEN + db 47, HYDRO_PUMP + db 0 + +BlastoiseEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 42, SKULL_BASH + db 52, HYDRO_PUMP + db 0 + +PinsirEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, BIND + db 25, SEISMIC_TOSS + db 30, GUILLOTINE + db 36, FOCUS_ENERGY + db 43, HARDEN + db 49, SLASH + db 54, SWORDS_DANCE + db 0 + +TangelaEvosMoves: +; Evolutions + db 0 +; Learnset + 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 48, GROWTH + db 0 + +MissingNo1FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo20EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GrowlitheEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, ARCANINE + db 0 +; Learnset + db 18, EMBER + db 23, LEER + db 30, TAKE_DOWN + db 39, AGILITY + db 50, FLAMETHROWER + db 0 + +OnixEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, BIND + db 19, ROCK_THROW + db 25, RAGE + db 33, SLAM + db 43, HARDEN + db 0 + +FearowEvosMoves: +; Evolutions + db 0 +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 25, MIRROR_MOVE + db 34, DRILL_PECK + db 43, AGILITY + db 0 + +PidgeyEvosMoves: +; Evolutions + db EV_LEVEL, 18, PIDGEOTTO + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 19, WHIRLWIND + db 28, WING_ATTACK + db 36, AGILITY + db 44, MIRROR_MOVE + db 0 + +SlowpokeEvosMoves: +; Evolutions + db EV_LEVEL, 37, SLOWBRO + db 0 +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 40, AMNESIA + db 48, PSYCHIC_M + db 0 + +KadabraEvosMoves: +; Evolutions + db EV_TRADE, 1, ALAKAZAM + db 0 +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT + db 0 + +GravelerEvosMoves: +; Evolutions + db EV_TRADE, 1, GOLEM + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION + db 0 + +ChanseyEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, DOUBLESLAP + db 24, SING + db 30, GROWL + db 38, MINIMIZE + db 44, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 54, DOUBLE_EDGE + db 0 + +MachokeEvosMoves: +; Evolutions + db EV_TRADE, 1, MACHAMP + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION + db 0 + +MrMimeEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, CONFUSION + db 23, LIGHT_SCREEN + db 31, DOUBLESLAP + db 39, MEDITATE + db 47, SUBSTITUTE + db 0 + +HitmonleeEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, ROLLING_KICK + db 38, JUMP_KICK + db 43, FOCUS_ENERGY + db 48, HI_JUMP_KICK + db 53, MEGA_KICK + db 0 + +HitmonchanEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, FIRE_PUNCH + db 38, ICE_PUNCH + db 43, THUNDERPUNCH + db 48, MEGA_PUNCH + db 53, COUNTER + db 0 + +ArbokEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, POISON_STING + db 17, BITE + db 27, GLARE + db 36, SCREECH + db 47, ACID + db 0 + +ParasectEvosMoves: +; Evolutions + db 0 +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 30, SPORE + db 39, SLASH + db 48, GROWTH + db 0 + +PsyduckEvosMoves: +; Evolutions + db EV_LEVEL, 33, GOLDUCK + db 0 +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 36, CONFUSION + db 43, FURY_SWIPES + db 52, HYDRO_PUMP + db 0 + +DrowzeeEvosMoves: +; Evolutions + db EV_LEVEL, 26, HYPNO + db 0 +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 29, POISON_GAS + db 32, PSYCHIC_M + db 37, MEDITATE + db 0 + +GolemEvosMoves: +; Evolutions + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION + db 0 + +MissingNo32EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MagmarEvosMoves: +; Evolutions + db 0 +; Learnset + db 36, LEER + db 39, CONFUSE_RAY + db 43, FIRE_PUNCH + db 48, SMOKESCREEN + db 52, SMOG + db 55, FLAMETHROWER + db 0 + +MissingNo34EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +ElectabuzzEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, THUNDERSHOCK + db 37, SCREECH + db 42, THUNDERPUNCH + db 49, LIGHT_SCREEN + db 54, THUNDER + db 0 + +MagnetonEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 38, THUNDER_WAVE + db 46, SWIFT + db 54, SCREECH + db 0 + +KoffingEvosMoves: +; Evolutions + db EV_LEVEL, 35, WEEZING + db 0 +; Learnset + db 32, SLUDGE + db 37, SMOKESCREEN + db 40, SELFDESTRUCT + db 45, HAZE + db 48, EXPLOSION + db 0 + +MissingNo38EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MankeyEvosMoves: +; Evolutions + 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: +; Evolutions + db EV_LEVEL, 34, DEWGONG + db 0 +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 40, REST + db 45, TAKE_DOWN + db 50, ICE_BEAM + db 0 + +DiglettEvosMoves: +; Evolutions + db EV_LEVEL, 26, DUGTRIO + db 0 +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 31, SLASH + db 40, EARTHQUAKE + db 0 + +TaurosEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, STOMP + db 28, TAIL_WHIP + db 35, LEER + db 44, RAGE + db 51, TAKE_DOWN + db 0 + +MissingNo3DEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo3EEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo3FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FarfetchdEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, LEER + db 15, FURY_ATTACK + db 23, SWORDS_DANCE + db 31, AGILITY + db 39, SLASH + db 0 + +VenonatEvosMoves: +; Evolutions + db EV_LEVEL, 31, VENOMOTH + db 0 +; Learnset + db 11, SUPERSONIC + db 19, CONFUSION + db 22, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 35, PSYBEAM + db 38, SLEEP_POWDER + db 43, PSYCHIC_M + db 0 + +DragoniteEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 60, HYPER_BEAM + db 0 + +MissingNo43EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo44EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo45EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DoduoEvosMoves: +; Evolutions + db EV_LEVEL, 31, DODRIO + db 0 +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 36, RAGE + db 40, TRI_ATTACK + db 44, AGILITY + db 0 + +PoliwagEvosMoves: +; Evolutions + db EV_LEVEL, 25, POLIWHIRL + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 25, DOUBLESLAP + db 31, BODY_SLAM + db 38, AMNESIA + db 45, HYDRO_PUMP + db 0 + +JynxEvosMoves: +; Evolutions + db 0 +; Learnset + db 18, LICK + db 23, DOUBLESLAP + db 31, ICE_PUNCH + db 39, BODY_SLAM + db 47, THRASH + db 58, BLIZZARD + db 0 + +MoltresEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, LEER + db 55, AGILITY + db 60, SKY_ATTACK + db 0 + +ArticunoEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, BLIZZARD + db 55, AGILITY + db 60, MIST + db 0 + +ZapdosEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, THUNDER + db 55, AGILITY + db 60, LIGHT_SCREEN + db 0 + +DittoEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MeowthEvosMoves: +; Evolutions + db EV_LEVEL, 28, PERSIAN + db 0 +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 33, FURY_SWIPES + db 44, SLASH + db 0 + +KrabbyEvosMoves: +; Evolutions + db EV_LEVEL, 28, KINGLER + db 0 +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 30, STOMP + db 35, CRABHAMMER + db 40, HARDEN + db 0 + +MissingNo4FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo50EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo51EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +VulpixEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, NINETALES + db 0 +; Learnset + db 16, QUICK_ATTACK + db 21, ROAR + db 28, CONFUSE_RAY + db 35, FLAMETHROWER + db 42, FIRE_SPIN + db 0 + +NinetalesEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +PikachuEvosMoves: +; Evolutions + db EV_ITEM, THUNDER_STONE, 1, RAICHU + db 0 +; Learnset + 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 41, THUNDER + db 50, LIGHT_SCREEN + db 0 + +RaichuEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo56EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo57EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DratiniEvosMoves: +; Evolutions + db EV_LEVEL, 30, DRAGONAIR + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 30, SLAM + db 40, DRAGON_RAGE + db 50, HYPER_BEAM + db 0 + +DragonairEvosMoves: +; Evolutions + db EV_LEVEL, 55, DRAGONITE + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 55, HYPER_BEAM + db 0 + +KabutoEvosMoves: +; Evolutions + db EV_LEVEL, 40, KABUTOPS + db 0 +; Learnset + db 34, ABSORB + db 39, SLASH + db 44, LEER + db 49, HYDRO_PUMP + db 0 + +KabutopsEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, ABSORB + db 39, SLASH + db 46, LEER + db 53, HYDRO_PUMP + db 0 + +HorseaEvosMoves: +; Evolutions + db EV_LEVEL, 32, SEADRA + db 0 +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 37, AGILITY + db 45, HYDRO_PUMP + db 0 + +SeadraEvosMoves: +; Evolutions + db 0 +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 41, AGILITY + db 52, HYDRO_PUMP + db 0 + +MissingNo5EEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo5FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +SandshrewEvosMoves: +; Evolutions + db EV_LEVEL, 22, SANDSLASH + db 0 +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 24, POISON_STING + db 31, SWIFT + db 38, FURY_SWIPES + db 0 + +SandslashEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 27, POISON_STING + db 36, SWIFT + db 47, FURY_SWIPES + db 0 + +OmanyteEvosMoves: +; Evolutions + db EV_LEVEL, 40, OMASTAR + db 0 +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 46, SPIKE_CANNON + db 53, HYDRO_PUMP + db 0 + +OmastarEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 44, SPIKE_CANNON + db 49, HYDRO_PUMP + db 0 + +JigglypuffEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF + db 0 +; Learnset + db 9, POUND + db 14, DISABLE + db 19, DEFENSE_CURL + db 24, DOUBLESLAP + db 29, REST + db 34, BODY_SLAM + db 39, DOUBLE_EDGE + db 0 + +WigglytuffEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +EeveeEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, FLAREON + db EV_ITEM, THUNDER_STONE, 1, JOLTEON + db EV_ITEM, WATER_STONE, 1, VAPOREON + db 0 +; Learnset + 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 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 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 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: +; Evolutions + db EV_LEVEL, 28, MACHOKE + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 32, FOCUS_ENERGY + db 39, SEISMIC_TOSS + db 46, SUBMISSION + db 0 + +ZubatEvosMoves: +; Evolutions + db EV_LEVEL, 22, GOLBAT + db 0 +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 28, WING_ATTACK + db 36, HAZE + db 0 + +EkansEvosMoves: +; Evolutions + db EV_LEVEL, 22, ARBOK + db 0 +; Learnset + db 10, POISON_STING + db 17, BITE + db 24, GLARE + db 31, SCREECH + db 38, ACID + db 0 + +ParasEvosMoves: +; Evolutions + db EV_LEVEL, 24, PARASECT + db 0 +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 27, SPORE + db 34, SLASH + db 41, GROWTH + db 0 + +PoliwhirlEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, POLIWRATH + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 26, DOUBLESLAP + db 33, BODY_SLAM + db 41, AMNESIA + db 49, HYDRO_PUMP + db 0 + +PoliwrathEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 0 + +WeedleEvosMoves: +; Evolutions + db EV_LEVEL, 7, KAKUNA + db 0 +; Learnset + db 0 + +KakunaEvosMoves: +; Evolutions + db EV_LEVEL, 10, BEEDRILL + db 0 +; Learnset + db 0 + +BeedrillEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, FURY_ATTACK + db 16, FOCUS_ENERGY + db 20, TWINEEDLE + db 25, RAGE + db 30, PIN_MISSILE + db 35, AGILITY + db 0 + +MissingNo73EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DodrioEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 39, RAGE + db 45, TRI_ATTACK + db 51, AGILITY + db 0 + +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: +; Evolutions + db 0 +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 35, SLASH + db 47, EARTHQUAKE + db 0 + +VenomothEvosMoves: +; Evolutions + db 0 +; Learnset + db 22, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 38, PSYBEAM + db 43, SLEEP_POWDER + db 50, PSYCHIC_M + db 0 + +DewgongEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 44, REST + db 50, TAKE_DOWN + db 56, ICE_BEAM + db 0 + +MissingNo79EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo7AEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +CaterpieEvosMoves: +; Evolutions + db EV_LEVEL, 7, METAPOD + db 0 +; Learnset + db 0 + +MetapodEvosMoves: +; Evolutions + db EV_LEVEL, 10, BUTTERFREE + db 0 +; Learnset + db 7, HARDEN + db 0 + +ButterfreeEvosMoves: +; Evolutions + db 0 +; Learnset + 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: +; Evolutions + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION + db 0 + +MissingNo7FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GolduckEvosMoves: +; Evolutions + db 0 +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 39, CONFUSION + db 48, FURY_SWIPES + db 59, HYDRO_PUMP + db 0 + +HypnoEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 33, POISON_GAS + db 37, PSYCHIC_M + db 43, MEDITATE + db 0 + +GolbatEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 32, WING_ATTACK + db 43, HAZE + db 0 + +MewtwoEvosMoves: +; Evolutions + db 0 +; Learnset + db 63, BARRIER + db 66, PSYCHIC_M + db 70, RECOVER + db 75, MIST + db 81, AMNESIA + db 0 + +SnorlaxEvosMoves: +; Evolutions + db 0 +; Learnset + db 35, BODY_SLAM + db 41, HARDEN + db 48, DOUBLE_EDGE + db 56, HYPER_BEAM + db 0 + +MagikarpEvosMoves: +; Evolutions + db EV_LEVEL, 20, GYARADOS + db 0 +; Learnset + db 15, TACKLE + db 0 + +MissingNo86EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo87EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MukEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 45, HARDEN + db 53, SCREECH + db 60, ACID_ARMOR + db 0 + +MissingNo8AEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +KinglerEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 34, STOMP + db 42, CRABHAMMER + db 49, HARDEN + db 0 + +CloysterEvosMoves: +; Evolutions + db 0 +; Learnset + db 50, SPIKE_CANNON + db 0 + +MissingNo8CEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +ElectrodeEvosMoves: +; Evolutions + db 0 +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 40, SWIFT + db 50, EXPLOSION + db 0 + +ClefableEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +WeezingEvosMoves: +; Evolutions + db 0 +; Learnset + db 32, SLUDGE + db 39, SMOKESCREEN + db 43, SELFDESTRUCT + db 49, HAZE + db 53, EXPLOSION + db 0 + +PersianEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 37, FURY_SWIPES + db 51, SLASH + db 0 + +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 + db 48, BONEMERANG + db 55, RAGE + db 0 + +MissingNo92EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +HaunterEvosMoves: +; Evolutions + db EV_TRADE, 1, GENGAR + db 0 +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER + db 0 + +AbraEvosMoves: +; Evolutions + db EV_LEVEL, 16, KADABRA + db 0 +; Learnset + db 0 + +AlakazamEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT + db 0 + +PidgeottoEvosMoves: +; Evolutions + db EV_LEVEL, 36, PIDGEOT + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 40, AGILITY + db 49, MIRROR_MOVE + db 0 + +PidgeotEvosMoves: +; Evolutions + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 44, AGILITY + db 54, MIRROR_MOVE + db 0 + +StarmieEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +BulbasaurEvosMoves: +; Evolutions + db EV_LEVEL, 16, IVYSAUR + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 20, POISONPOWDER + db 27, RAZOR_LEAF + db 34, GROWTH + db 41, SLEEP_POWDER + db 48, SOLARBEAM + db 0 + +VenusaurEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 43, GROWTH + db 55, SLEEP_POWDER + db 65, SOLARBEAM + db 0 + +TentacruelEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 35, BARRIER + db 43, SCREECH + db 50, HYDRO_PUMP + db 0 + +MissingNo9CEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GoldeenEvosMoves: +; Evolutions + db EV_LEVEL, 33, SEAKING + db 0 +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 37, WATERFALL + db 45, HORN_DRILL + db 54, AGILITY + db 0 + +SeakingEvosMoves: +; Evolutions + db 0 +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 39, WATERFALL + db 48, HORN_DRILL + db 54, AGILITY + db 0 + +MissingNo9FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA0EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA1EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA2EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +PonytaEvosMoves: +; Evolutions + db EV_LEVEL, 40, RAPIDASH + db 0 +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 43, TAKE_DOWN + db 48, AGILITY + db 0 + +RapidashEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 47, TAKE_DOWN + db 55, AGILITY + db 0 + +RattataEvosMoves: +; Evolutions + db EV_LEVEL, 20, RATICATE + db 0 +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 23, FOCUS_ENERGY + db 34, SUPER_FANG + db 0 + +RaticateEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 27, FOCUS_ENERGY + db 41, SUPER_FANG + db 0 + +NidorinoEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOKING + db 0 +; Learnset + db 8, HORN_ATTACK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, FOCUS_ENERGY + db 36, FURY_ATTACK + db 46, HORN_DRILL + db 0 + +NidorinaEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOQUEEN + db 0 +; Learnset + db 8, SCRATCH + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, TAIL_WHIP + db 36, BITE + db 46, FURY_SWIPES + db 0 + +GeodudeEvosMoves: +; Evolutions + db EV_LEVEL, 25, GRAVELER + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 26, HARDEN + db 31, EARTHQUAKE + db 36, EXPLOSION + db 0 + +PorygonEvosMoves: +; Evolutions + db 0 +; Learnset + db 23, PSYBEAM + db 28, RECOVER + db 35, AGILITY + db 42, TRI_ATTACK + db 0 + +AerodactylEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, SUPERSONIC + db 38, BITE + db 45, TAKE_DOWN + db 54, HYPER_BEAM + db 0 + +MissingNoACEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MagnemiteEvosMoves: +; Evolutions + db EV_LEVEL, 30, MAGNETON + db 0 +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 35, THUNDER_WAVE + db 41, SWIFT + db 47, SCREECH + db 0 + +MissingNoAEEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoAFEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +CharmanderEvosMoves: +; Evolutions + db EV_LEVEL, 16, CHARMELEON + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 22, RAGE + db 30, SLASH + db 38, FLAMETHROWER + db 46, FIRE_SPIN + db 0 + +SquirtleEvosMoves: +; Evolutions + db EV_LEVEL, 16, WARTORTLE + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 22, BITE + db 28, WITHDRAW + db 35, SKULL_BASH + db 42, HYDRO_PUMP + db 0 + +CharmeleonEvosMoves: +; Evolutions + db EV_LEVEL, 36, CHARIZARD + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 33, SLASH + db 42, FLAMETHROWER + db 56, FIRE_SPIN + db 0 + +WartortleEvosMoves: +; Evolutions + db EV_LEVEL, 36, BLASTOISE + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 39, SKULL_BASH + db 47, HYDRO_PUMP + db 0 + +CharizardEvosMoves: +; Evolutions + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 36, SLASH + db 46, FLAMETHROWER + db 55, FIRE_SPIN + db 0 + +MissingNoB5EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FossilKabutopsEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FossilAerodactylEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MonGhostEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +OddishEvosMoves: +; Evolutions + db EV_LEVEL, 21, GLOOM + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 24, ACID + db 33, PETAL_DANCE + db 46, SOLARBEAM + db 0 + +GloomEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VILEPLUME + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 28, ACID + db 38, PETAL_DANCE + db 52, SOLARBEAM + db 0 + +VileplumeEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 0 + +BellsproutEvosMoves: +; Evolutions + db EV_LEVEL, 21, WEEPINBELL + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 21, STUN_SPORE + db 26, ACID + db 33, RAZOR_LEAF + db 42, SLAM + db 0 + +WeepinbellEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VICTREEBEL + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 23, STUN_SPORE + db 29, ACID + db 38, RAZOR_LEAF + db 49, SLAM + db 0 + +VictreebelEvosMoves: +; Evolutions + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 0 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm new file mode 100755 index 00000000..0fbc9260 --- /dev/null +++ b/data/pokemon/menu_icons.asm @@ -0,0 +1,77 @@ +MonPartyData: + dn ICON_GRASS, ICON_GRASS ; Bulbasaur / Ivysaur + dn ICON_GRASS, ICON_MON ; Venusaur / Charmander + dn ICON_MON, ICON_MON ; Charmeleon / Charizard + dn ICON_WATER, ICON_WATER ; Squirtle / Wartortle + dn ICON_WATER, ICON_BUG ; Blastoise / Caterpie + dn ICON_BUG, ICON_BUG ; Metapod / Butterfree + dn ICON_BUG, ICON_BUG ; Weedle / Kakuna + dn ICON_BUG, ICON_BIRD ; Beedrill / Pidgey + dn ICON_BIRD, ICON_BIRD ; Pidgeotto / Pidgeot + dn ICON_QUADRUPED, ICON_QUADRUPED ; Rattata / Raticate + dn ICON_BIRD, ICON_BIRD ; Spearow / Fearow + dn ICON_SNAKE, ICON_SNAKE ; Ekans / Arbok + 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 + dn ICON_MON, ICON_MON ; Nidorino / Nidoking + dn ICON_FAIRY, ICON_FAIRY ; Clefairy / Clefable + dn ICON_QUADRUPED, ICON_QUADRUPED ; Vulpix / Ninetales + dn ICON_FAIRY, ICON_FAIRY ; Jigglypuff / Wigglytuff + dn ICON_MON, ICON_MON ; Zubat / Golbat + dn ICON_GRASS, ICON_GRASS ; Oddish / Gloom + dn ICON_GRASS, ICON_BUG ; Vileplume / Paras + dn ICON_BUG, ICON_BUG ; Parasect / Venonat + dn ICON_BUG, ICON_MON ; Venomoth / Diglett + dn ICON_MON, ICON_MON ; Dugtrio / Meowth + dn ICON_MON, ICON_MON ; Persian / Psyduck + dn ICON_MON, ICON_MON ; Golduck / Mankey + dn ICON_MON, ICON_QUADRUPED ; Primeape / Growlithe + dn ICON_QUADRUPED, ICON_MON ; Arcanine / Poliwag + dn ICON_MON, ICON_MON ; Poliwhirl / Poliwrath + dn ICON_MON, ICON_MON ; Abra / Kadabra + dn ICON_MON, ICON_MON ; Alakazam / Machop + dn ICON_MON, ICON_MON ; Machoke / Machamp + dn ICON_GRASS, ICON_GRASS ; Bellsprout / Weepinbell + dn ICON_GRASS, ICON_WATER ; Victreebel / Tentacool + dn ICON_WATER, ICON_MON ; Tentacruel / Geodude + dn ICON_MON, ICON_MON ; Graveler / Golem + dn ICON_QUADRUPED, ICON_QUADRUPED ; Ponyta / Rapidash + dn ICON_QUADRUPED, ICON_MON ; Slowpoke / Slowbro + dn ICON_BALL, ICON_BALL ; Magnemite / Magneton + dn ICON_BIRD, ICON_BIRD ; Farfetch'd / Doduo + dn ICON_BIRD, ICON_WATER ; Dodrio / Seel + dn ICON_WATER, ICON_MON ; Dewgong / Grimer + dn ICON_MON, ICON_HELIX ; Muk / Shellder + dn ICON_HELIX, ICON_MON ; Cloyster / Gastly + dn ICON_MON, ICON_MON ; Haunter / Gengar + dn ICON_SNAKE, ICON_MON ; Onix / Drowzee + dn ICON_MON, ICON_WATER ; Hypno / Krabby + dn ICON_WATER, ICON_BALL ; Kingler / Voltorb + dn ICON_BALL, ICON_GRASS ; Electrode / Exeggcute + dn ICON_GRASS, ICON_MON ; Exeggutor / Cubone + dn ICON_MON, ICON_MON ; Marowak / Hitmonlee + dn ICON_MON, ICON_MON ; Hitmonchan / Lickitung + dn ICON_MON, ICON_MON ; Koffing / Weezing + dn ICON_QUADRUPED, ICON_MON ; Rhyhorn / Rhydon + dn ICON_FAIRY, ICON_GRASS ; Chansey / Tangela + dn ICON_MON, ICON_WATER ; Kangaskhan / Horsea + dn ICON_WATER, ICON_WATER ; Seadra / Goldeen + dn ICON_WATER, ICON_HELIX ; Seaking / Staryu + dn ICON_HELIX, ICON_MON ; Starmie / Mr.Mime + dn ICON_BUG, ICON_MON ; Scyther / Jynx + dn ICON_MON, ICON_MON ; Electabuzz / Magmar + dn ICON_BUG, ICON_QUADRUPED ; Pinsir / Tauros + dn ICON_WATER, ICON_SNAKE ; Magikarp / Gyarados + dn ICON_WATER, ICON_MON ; Lapras / Ditto + dn ICON_QUADRUPED, ICON_QUADRUPED ; Eevee / Vaporeon + dn ICON_QUADRUPED, ICON_QUADRUPED ; Jolteon / Flareon + dn ICON_MON, ICON_HELIX ; Porygon / Omanyte + dn ICON_HELIX, ICON_HELIX ; Omastar / Kabuto + dn ICON_HELIX, ICON_BIRD ; Kabutops / Aerodactyl + dn ICON_MON, ICON_BIRD ; Snorlax / Articuno + dn ICON_BIRD, ICON_BIRD ; Zapdos / Moltres + dn ICON_SNAKE, ICON_SNAKE ; Dratini / Dragonair + dn ICON_SNAKE, ICON_MON ; Dragonite / Mewtwo + dn ICON_MON, 0 ; Mew / padding diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm new file mode 100755 index 00000000..83a45b77 --- /dev/null +++ b/data/pokemon/names.asm @@ -0,0 +1,191 @@ +MonsterNames:: + db "RHYDON@@@@" + db "KANGASKHAN" + db "NIDORAN♂@@" + db "CLEFAIRY@@" + db "SPEAROW@@@" + db "VOLTORB@@@" + db "NIDOKING@@" + db "SLOWBRO@@@" + db "IVYSAUR@@@" + db "EXEGGUTOR@" + db "LICKITUNG@" + db "EXEGGCUTE@" + db "GRIMER@@@@" + db "GENGAR@@@@" + db "NIDORAN♀@@" + db "NIDOQUEEN@" + db "CUBONE@@@@" + db "RHYHORN@@@" + db "LAPRAS@@@@" + db "ARCANINE@@" + db "MEW@@@@@@@" + db "GYARADOS@@" + db "SHELLDER@@" + db "TENTACOOL@" + db "GASTLY@@@@" + db "SCYTHER@@@" + db "STARYU@@@@" + db "BLASTOISE@" + db "PINSIR@@@@" + db "TANGELA@@@" + db "MISSINGNO." + db "MISSINGNO." + db "GROWLITHE@" + db "ONIX@@@@@@" + db "FEAROW@@@@" + db "PIDGEY@@@@" + db "SLOWPOKE@@" + db "KADABRA@@@" + db "GRAVELER@@" + db "CHANSEY@@@" + db "MACHOKE@@@" + db "MR.MIME@@@" + db "HITMONLEE@" + db "HITMONCHAN" + db "ARBOK@@@@@" + db "PARASECT@@" + db "PSYDUCK@@@" + db "DROWZEE@@@" + db "GOLEM@@@@@" + db "MISSINGNO." + db "MAGMAR@@@@" + db "MISSINGNO." + db "ELECTABUZZ" + db "MAGNETON@@" + db "KOFFING@@@" + db "MISSINGNO." + db "MANKEY@@@@" + db "SEEL@@@@@@" + db "DIGLETT@@@" + db "TAUROS@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "FARFETCH'D" + db "VENONAT@@@" + db "DRAGONITE@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "DODUO@@@@@" + db "POLIWAG@@@" + db "JYNX@@@@@@" + db "MOLTRES@@@" + db "ARTICUNO@@" + db "ZAPDOS@@@@" + db "DITTO@@@@@" + db "MEOWTH@@@@" + db "KRABBY@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "VULPIX@@@@" + db "NINETALES@" + db "PIKACHU@@@" + db "RAICHU@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "DRATINI@@@" + db "DRAGONAIR@" + db "KABUTO@@@@" + db "KABUTOPS@@" + db "HORSEA@@@@" + db "SEADRA@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "SANDSHREW@" + db "SANDSLASH@" + db "OMANYTE@@@" + db "OMASTAR@@@" + db "JIGGLYPUFF" + db "WIGGLYTUFF" + db "EEVEE@@@@@" + db "FLAREON@@@" + db "JOLTEON@@@" + db "VAPOREON@@" + db "MACHOP@@@@" + db "ZUBAT@@@@@" + db "EKANS@@@@@" + db "PARAS@@@@@" + db "POLIWHIRL@" + db "POLIWRATH@" + db "WEEDLE@@@@" + db "KAKUNA@@@@" + db "BEEDRILL@@" + db "MISSINGNO." + db "DODRIO@@@@" + db "PRIMEAPE@@" + db "DUGTRIO@@@" + db "VENOMOTH@@" + db "DEWGONG@@@" + db "MISSINGNO." + db "MISSINGNO." + db "CATERPIE@@" + db "METAPOD@@@" + db "BUTTERFREE" + db "MACHAMP@@@" + db "MISSINGNO." + db "GOLDUCK@@@" + db "HYPNO@@@@@" + db "GOLBAT@@@@" + db "MEWTWO@@@@" + db "SNORLAX@@@" + db "MAGIKARP@@" + db "MISSINGNO." + db "MISSINGNO." + db "MUK@@@@@@@" + db "MISSINGNO." + db "KINGLER@@@" + db "CLOYSTER@@" + db "MISSINGNO." + db "ELECTRODE@" + db "CLEFABLE@@" + db "WEEZING@@@" + db "PERSIAN@@@" + db "MAROWAK@@@" + db "MISSINGNO." + db "HAUNTER@@@" + db "ABRA@@@@@@" + db "ALAKAZAM@@" + db "PIDGEOTTO@" + db "PIDGEOT@@@" + db "STARMIE@@@" + db "BULBASAUR@" + db "VENUSAUR@@" + db "TENTACRUEL" + db "MISSINGNO." + db "GOLDEEN@@@" + db "SEAKING@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "PONYTA@@@@" + db "RAPIDASH@@" + db "RATTATA@@@" + db "RATICATE@@" + db "NIDORINO@@" + db "NIDORINA@@" + db "GEODUDE@@@" + db "PORYGON@@@" + db "AERODACTYL" + db "MISSINGNO." + db "MAGNEMITE@" + db "MISSINGNO." + db "MISSINGNO." + db "CHARMANDER" + db "SQUIRTLE@@" + db "CHARMELEON" + db "WARTORTLE@" + db "CHARIZARD@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "ODDISH@@@@" + db "GLOOM@@@@@" + db "VILEPLUME@" + db "BELLSPROUT" + db "WEEPINBELL" + db "VICTREEBEL" diff --git a/data/mon_palettes.asm b/data/pokemon/palettes.asm index 8c4d0bc0..8c4d0bc0 100755 --- a/data/mon_palettes.asm +++ b/data/pokemon/palettes.asm diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm new file mode 100644 index 00000000..b8911f3c --- /dev/null +++ b/data/predef_pointers.asm @@ -0,0 +1,111 @@ +add_predef: MACRO +\1Predef:: +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC +ENDM + +PredefPointers:: +; these are pointers to ASM routines. +; they appear to be used in overworld map scripts. + add_predef DrawPlayerHUDAndHPBar + add_predef CopyUncompressedPicToTilemap + add_predef AnimateSendingOutMon + add_predef ScaleSpriteByTwo + add_predef LoadMonBackPic + add_predef CopyDownscaledMonTiles + add_predef JumpMoveEffect, $03 ; wrong bank + add_predef HealParty + add_predef MoveAnimation + add_predef DivideBCDPredef + add_predef DivideBCDPredef2 + add_predef AddBCDPredef + add_predef SubBCDPredef + add_predef DivideBCDPredef3 + add_predef DivideBCDPredef4 + add_predef InitPlayerData + add_predef FlagActionPredef + add_predef HideObject + add_predef IsObjectHidden + add_predef ApplyOutOfBattlePoisonDamage + add_predef AnyPartyAlive + add_predef ShowObject + add_predef ShowObject2 + add_predef ReplaceTileBlock + add_predef InitPlayerData2 + add_predef LoadTilesetHeader + add_predef LearnMoveFromLevelUp + add_predef LearnMove + add_predef GetQuantityOfItemInBag + add_predef CheckForHiddenObjectOrBookshelfOrCardKeyDoor, $03 ; home bank + add_predef GiveItem, $03 ; home bank + add_predef ChangeBGPalColor0_4Frames + add_predef FindPathToPlayer + add_predef PredefShakeScreenVertically + add_predef CalcPositionOfPlayerRelativeToNPC + add_predef ConvertNPCMovementDirectionsToJoypadMasks + add_predef PredefShakeScreenHorizontally + add_predef UpdateHPBar + add_predef HPBarLength + add_predef Diploma_TextBoxBorder + add_predef DoubleOrHalveSelectedStats + add_predef ShowPokedexMenu + add_predef EvolutionAfterBattle + add_predef SaveSAVtoSRAM0 + add_predef InitOpponent + add_predef CableClub_Run + add_predef DrawBadges + add_predef ExternalClockTradeAnim + add_predef BattleTransition + add_predef CopyTileIDsFromList + add_predef PlayIntro + add_predef GetMoveSoundB + add_predef FlashScreen + add_predef GetTileAndCoordsInFrontOfPlayer + add_predef StatusScreen + add_predef StatusScreen2 + add_predef InternalClockTradeAnim + add_predef TrainerEngage + add_predef IndexToPokedex + add_predef DisplayPicCenteredOrUpperRight + add_predef UsedCut + add_predef ShowPokedexData + add_predef WriteMonMoves + add_predef SaveSAV + add_predef LoadSGB + add_predef MarkTownVisitedAndLoadMissableObjects + add_predef SetPartyMonTypes + add_predef CanLearnTM + add_predef TMToMove + add_predef _RunPaletteCommand + add_predef StarterDex + add_predef _AddPartyMon + add_predef UpdateHPBar2 + add_predef DrawEnemyHUDAndHPBar + add_predef LoadTownMap_Nest + add_predef PrintMonType + add_predef EmotionBubble + add_predef EmptyFunc ; return immediately + add_predef AskName + add_predef PewterGuys + add_predef SaveSAVtoSRAM2 + add_predef LoadSAV2 + add_predef LoadSAV + add_predef SaveSAVtoSRAM1 + add_predef DoInGameTradeDialogue + add_predef HallOfFamePC + add_predef DisplayDexRating + add_predef _LeaveMapAnim, $1E ; wrong bank + add_predef EnterMapAnim, $1E ; wrong bank + add_predef GetTileTwoStepsInFrontOfPlayer + add_predef CheckForCollisionWhenPushingBoulder + add_predef PrintStrengthTxt + add_predef PickUpItem + add_predef PrintMoveType + add_predef LoadMovePPs + add_predef DrawHP + add_predef DrawHP2 + add_predef DisplayElevatorFloorMenu + add_predef OaksAideScript diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm deleted file mode 100755 index eb126d37..00000000 --- a/data/prize_mon_levels.asm +++ /dev/null @@ -1,8 +0,0 @@ -PrizeMonLevelDictionary: - db ABRA,15 - db VULPIX,18 - db WIGGLYTUFF,22 - - db SCYTHER,30 - db PINSIR,30 - db PORYGON,26 diff --git a/data/prizes.asm b/data/prizes.asm deleted file mode 100755 index b113c7cb..00000000 --- a/data/prizes.asm +++ /dev/null @@ -1,45 +0,0 @@ -PrizeDifferentMenuPtrs: - dw PrizeMenuMon1Entries - dw PrizeMenuMon1Cost - - dw PrizeMenuMon2Entries - dw PrizeMenuMon2Cost - - dw PrizeMenuTMsEntries - dw PrizeMenuTMsCost - -PrizeMenuMon1Entries: - db ABRA - db VULPIX - db WIGGLYTUFF - db "@" - -PrizeMenuMon1Cost: - coins 230 - coins 1000 - coins 2680 - db "@" - -PrizeMenuMon2Entries: - db SCYTHER - db PINSIR - db PORYGON - db "@" - -PrizeMenuMon2Cost: - coins 6500 - coins 6500 - coins 9999 - db "@" - -PrizeMenuTMsEntries: - db TM_23 - db TM_15 - db TM_50 - db "@" - -PrizeMenuTMsCost: - coins 3300 - coins 5500 - coins 7700 - db "@" diff --git a/data/sgb/sgb_border.asm b/data/sgb/sgb_border.asm new file mode 100755 index 00000000..9955acda --- /dev/null +++ b/data/sgb/sgb_border.asm @@ -0,0 +1,87 @@ +BorderPalettes: + INCBIN "gfx/sgb/border.tilemap" + + ds $100 + + 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: + INCBIN "gfx/sgb/border.2bpp" diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm new file mode 100755 index 00000000..a0582416 --- /dev/null +++ b/data/sgb/sgb_packets.asm @@ -0,0 +1,244 @@ +ATTR_BLK: MACRO +; This is a command macro. +; Use ATTR_BLK_DATA for data sets. + db ($4 << 3) + ((\1 * 6) / 16 + 1) + db \1 +ENDM + +ATTR_BLK_DATA: MACRO + db \1 ; which regions are affected + db \2 + (\3 << 2) + (\4 << 4) ; palette for each region + db \5, \6, \7, \8 ; x1, y1, x2, y2 +ENDM + +PAL_SET: MACRO + db ($a << 3) + 1 + dw \1, \2, \3, \4 + ds 7, 0 +ENDM + +PAL_TRN: MACRO + db ($b << 3) + 1 + ds 15, 0 +ENDM + +MLT_REQ: MACRO + db ($11 << 3) + 1 + db \1 - 1 + ds 14, 0 +ENDM + +CHR_TRN: MACRO + db ($13 << 3) + 1 + db \1 + (\2 << 1) + ds 14, 0 +ENDM + +PCT_TRN: MACRO + db ($14 << 3) + 1 + ds 15, 0 +ENDM + +MASK_EN: MACRO + db ($17 << 3) + 1 + db \1 + ds 14, 0 +ENDM + +DATA_SND: MACRO + db ($f << 3) + 1 + dw \1 ; address + db \2 ; bank + db \3 ; length (1-11) +ENDM + + +BlkPacket_WholeScreen: + ATTR_BLK 1 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 + ds 8, 0 + +BlkPacket_Battle: + ATTR_BLK 5 + ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 + ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 ; player HP bar: pal 0 + 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 + +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 + +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 + +BlkPacket_Slots: + ATTR_BLK 5 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 + ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3 + 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 + +BlkPacket_Titlescreen: + ATTR_BLK 3 + 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 + +BlkPacket_NidorinoIntro: + ATTR_BLK 3 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 + ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 + ds 12, 0 + +BlkPacket_PartyMenu: + ATTR_BLK 7 + ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 + ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 ; HP bar 1: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 ; HP bar 2: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically + ds 4, 0 + +BlkPacket_TrainerCard: + ATTR_BLK 10 + 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 + +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 + ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 + ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 + ds 12, 0 + +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 +PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR +PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK +PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 +PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 +PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 +PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON +PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON +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 +MltReq2Packet: MLT_REQ 2 +ChrTrnPacket: CHR_TRN 0, 0 +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_728a1: + DATA_SND $85d, $0, 11 + db $8C ; cpx #$8c (2) + db $D0, $F4 ; bne -$0c + db $60 ; rts + ds 7, 0 + +DataSnd_728b1: + DATA_SND $852, $0, 11 + db $A9, $E7 ; lda #$e7 + db $9F, $01, $C0, $7E ; sta $7ec001, x + db $E8 ; inx + db $E8 ; inx + db $E8 ; inx + db $E8 ; inx + db $E0 ; cpx #$8c (1) + +DataSnd_728c1: + DATA_SND $847, $0, 11 ; 728c1 (1c:68c1) + db $C4 ; cmp #$c4 (2) + db $D0, $16 ; bne +$16 + db $A5 ; lda dp + db $CB ; wai + db $C9, $05 ; cmp #$05 + db $D0, $10 ; bne +$10 + db $A2, $28 ; ldx #$28 + +DataSnd_728d1: + DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) + db $F0, $12 ; beq +$12 + db $A5 ; lda dp + db $C9, $C9 ; cmp #$c9 + db $C8 ; iny + db $D0, $1C ; bne +$1c + db $A5 ; lda dp + db $CA ; dex + db $C9 ; cmp #$c4 (1) + +DataSnd_728e1: + DATA_SND $831, $0, 11 + dbw $0C, $CAA5 ; tsb $caa5 + db $C9, $7E ; cmp #$7e + db $D0, $06 ; bne +$06 + db $A5 ; lda dp + db $CB ; wai + db $C9, $7E ; cmp #$7e + +DataSnd_728f1: + DATA_SND $826, $0, 11 + db $39 ; bne +$39 (2) + dbw $CD, $C48 ; cmp $c48 + db $D0, $34 ; bne +$34 + db $A5 ; lda dp + db $C9, $C9 ; cmp #$c9 + db $80, $D0 ; bra -$30 + +DataSnd_72901: + DATA_SND $81b, $0, 11 + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + ; $820: + db $A9,$01 ; lda #01 + dbw $CD,$C4F ; cmp $c4f + db $D0 ; bne +$39 (1) + +DataSnd_72911: + DATA_SND $810, $0, 11 + dbw $4C, $820 ; jmp $820 + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $60 ; rts + db $EA ; nop + db $EA ; nop diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm new file mode 100755 index 00000000..5ddca002 --- /dev/null +++ b/data/sgb/sgb_palettes.asm @@ -0,0 +1,84 @@ +SuperPalettes: +; entries correspond to PAL_* constants + 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/sgb_border.asm b/data/sgb_border.asm deleted file mode 100755 index cc592487..00000000 --- a/data/sgb_border.asm +++ /dev/null @@ -1,87 +0,0 @@ -BorderPalettes: - INCBIN "gfx/tilemaps/sgbborder.map" - - ds $100 - - 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: - INCBIN "gfx/pokemon_yellow.2bpp" diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm deleted file mode 100755 index b188ad42..00000000 --- a/data/sgb_packets.asm +++ /dev/null @@ -1,233 +0,0 @@ -ATTR_BLK: MACRO -; This is a command macro. -; Use ATTR_BLK_DATA for data sets. - db ($4 << 3) + ((\1 * 6) / 16 + 1) - db \1 -ENDM -ATTR_BLK_DATA: MACRO - db \1 ; which regions are affected - db \2 + (\3 << 2) + (\4 << 4) ; palette for each region - db \5, \6, \7, \8 ; x1, y1, x2, y2 -ENDM - -PAL_SET: MACRO - db ($a << 3) + 1 - dw \1, \2, \3, \4 - ds 7 -ENDM - -PAL_TRN: MACRO - db ($b<< 3) + 1 - ds 15 -ENDM - -MLT_REQ: MACRO - db ($11 << 3) + 1 - db \1 - 1 - ds 14 -ENDM - -CHR_TRN: MACRO - db ($13 << 3) + 1 - db \1 + (\2 << 1) - ds 14 -ENDM - -PCT_TRN: MACRO - db ($14 << 3) + 1 - ds 15 -ENDM - -MASK_EN: MACRO - db ($17 << 3) + 1 - db \1 - ds 14 -ENDM - -DATA_SND: MACRO - db ($f << 3) + 1 - dw \1 ; address - db \2 ; bank - db \3 ; length (1-11) -ENDM - -BlkPacket_WholeScreen: - ATTR_BLK 1 - ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 - ds 8 - -BlkPacket_Battle: - ATTR_BLK 5 - ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 - ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 - ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 ; player HP bar: pal 0 - 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 - -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 - -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 - -BlkPacket_Slots: - ATTR_BLK 5 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 - ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 - ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3 - 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 - -BlkPacket_Titlescreen: - ATTR_BLK 3 - 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 - -BlkPacket_NidorinoIntro: - ATTR_BLK 3 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 - ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 - ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 - ds 12 - -BlkPacket_PartyMenu: - ATTR_BLK 7 - ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 - ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically - ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 ; HP bar 1: pal set dynamically - ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 ; HP bar 2: pal set dynamically - ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically - ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically - ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically - ds 4 - -BlkPacket_TrainerCard: - ATTR_BLK 10 - 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 - -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 - ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 - ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 - ds 12 - -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 -PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR -PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK -PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 -PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 -PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 -PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON -PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON -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 -MltReq2Packet: MLT_REQ 2 -ChrTrnPacket: CHR_TRN 0, 0 -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_728a1: DATA_SND $85d, $0, 11 - db $8C ; cpx #$8c (2) - db $D0, $F4 ; bne -$0c - db $60 ; rts - ds 7 - -DataSnd_728b1: DATA_SND $852, $0, 11 - db $A9, $E7 ; lda #$e7 - db $9F, $01, $C0, $7E ; sta $7ec001, x - db $E8 ; inx - db $E8 ; inx - db $E8 ; inx - db $E8 ; inx - db $E0 ; cpx #$8c (1) - -DataSnd_728c1: DATA_SND $847, $0, 11 ; 728c1 (1c:68c1) - db $C4 ; cmp #$c4 (2) - db $D0, $16 ; bne +$16 - db $A5 ; lda dp - db $CB ; wai - db $C9, $05 ; cmp #$05 - db $D0, $10 ; bne +$10 - db $A2, $28 ; ldx #$28 - -DataSnd_728d1: DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) - db $F0, $12 ; beq +$12 - db $A5 ; lda dp - db $C9, $C9 ; cmp #$c9 - db $C8 ; iny - db $D0, $1C ; bne +$1c - db $A5 ; lda dp - db $CA ; dex - db $C9 ; cmp #$c4 (1) - -DataSnd_728e1: DATA_SND $831, $0, 11 - dbw $0C, $CAA5 ; tsb $caa5 - db $C9, $7E ; cmp #$7e - db $D0, $06 ; bne +$06 - db $A5 ; lda dp - db $CB ; wai - db $C9, $7E ; cmp #$7e - -DataSnd_728f1: DATA_SND $826, $0, 11 - db $39 ; bne +$39 (2) - dbw $CD, $C48 ; cmp $c48 - db $D0, $34 ; bne +$34 - db $A5 ; lda dp - db $C9, $C9 ; cmp #$c9 - db $80, $D0 ; bra -$30 - -DataSnd_72901: DATA_SND $81b, $0, 11 - db $EA ; nop - db $EA ; nop - db $EA ; nop - db $EA ; nop - db $EA ; nop - ; $820: - db $A9,$01 ; lda #01 - dbw $CD,$C4F ; cmp $c4f - db $D0 ; bne +$39 (1) - -DataSnd_72911: DATA_SND $810, $0, 11 - dbw $4C, $820 ; jmp $820 - db $EA ; nop - db $EA ; nop - db $EA ; nop - db $EA ; nop - db $EA ; nop - db $60 ; rts - db $EA ; nop - db $EA ; nop diff --git a/data/special_warps.asm b/data/special_warps.asm deleted file mode 100755 index 6b536b67..00000000 --- a/data/special_warps.asm +++ /dev/null @@ -1,119 +0,0 @@ -; Format: (size 2 bytes) -; 00: target map ID -; 01: which dungeon warp in the source map was used -DungeonWarpList: - db SEAFOAM_ISLANDS_B1F,$01 - db SEAFOAM_ISLANDS_B1F,$02 - db SEAFOAM_ISLANDS_B2F,$01 - db SEAFOAM_ISLANDS_B2F,$02 - db SEAFOAM_ISLANDS_B3F,$01 - db SEAFOAM_ISLANDS_B3F,$02 - db SEAFOAM_ISLANDS_B4F,$01 - db SEAFOAM_ISLANDS_B4F,$02 - db VICTORY_ROAD_2F,$02 - db POKEMON_MANSION_1F,$01 - db POKEMON_MANSION_1F,$02 - db POKEMON_MANSION_2F,$03 - db $FF - -DungeonWarpData: - FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23 - FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22 - FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4 - FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5 - FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22 - FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 - FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 - FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18 - -;Format: -; db Map_id -; FLYWARP_DATA [Map Width][Y-pos][X-pos] -; db Tileset_id -FirstMapSpec: - db REDS_HOUSE_2F - FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 - db REDS_HOUSE_2 - -TradeCenterSpec1: - db TRADE_CENTER - FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 - db CLUB - -TradeCenterSpec2: - db TRADE_CENTER - FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 - db CLUB - -ColosseumSpec1: - db COLOSSEUM - FLYWARP_DATA COLOSSEUM_WIDTH,4,3 - db CLUB - -ColosseumSpec2: - db COLOSSEUM - FLYWARP_DATA COLOSSEUM_WIDTH,4,6 - db CLUB - -FlyWarpDataPtr: - db PALLET_TOWN, 0 - dw PalletTownFlyWarp - db VIRIDIAN_CITY, 0 - dw ViridianCityFlyWarp - db PEWTER_CITY, 0 - dw PewterCityFlyWarp - db CERULEAN_CITY, 0 - dw CeruleanCityFlyWarp - db LAVENDER_TOWN, 0 - dw LavenderTownFlyWarp - db VERMILION_CITY, 0 - dw VermilionCityFlyWarp - db CELADON_CITY, 0 - dw CeladonCityFlyWarp - db FUCHSIA_CITY, 0 - dw FuchsiaCityFlyWarp - db CINNABAR_ISLAND, 0 - dw CinnabarIslandFlyWarp - db INDIGO_PLATEAU, 0 - dw IndigoPlateauFlyWarp - db SAFFRON_CITY, 0 - dw SaffronCityFlyWarp - db ROUTE_4, 0 - dw Route4FlyWarp - db ROUTE_10, 0 - dw Route10FlyWarp - -; Original Format: -; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] -; Macro Format: -; FLYWARP_DATA [Map Width][Y-pos][X-pos] -PalletTownFlyWarp: - FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5 -ViridianCityFlyWarp: - FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23 -PewterCityFlyWarp: - FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13 -CeruleanCityFlyWarp: - FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19 -LavenderTownFlyWarp: - FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3 -VermilionCityFlyWarp: - FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11 -CeladonCityFlyWarp: - FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41 -FuchsiaCityFlyWarp: - FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19 -CinnabarIslandFlyWarp: - FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11 -IndigoPlateauFlyWarp: - FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9 -SaffronCityFlyWarp: - FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9 -Route4FlyWarp: - FLYWARP_DATA ROUTE_4_WIDTH, 6, 11 -Route10FlyWarp: - FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm deleted file mode 100755 index d74c9d2f..00000000 --- a/data/sprite_sets.asm +++ /dev/null @@ -1,601 +0,0 @@ -MapSpriteSets: - db $01 ; PALLET_TOWN - db $01 ; VIRIDIAN_CITY - db $02 ; PEWTER_CITY - db $02 ; CERULEAN_CITY - db $03 ; LAVENDER_TOWN - db $04 ; VERMILION_CITY - db $05 ; CELADON_CITY - db $0a ; FUCHSIA_CITY - db $01 ; CINNABAR_ISLAND - db $06 ; INDIGO_PLATEAU - db $07 ; SAFFRON_CITY - db $01 ; unused map ID - db $01 ; ROUTE_1 - db $f1 ; ROUTE_2 - db $02 ; ROUTE_3 - db $02 ; ROUTE_4 - db $f9 ; ROUTE_5 - db $fa ; ROUTE_6 - db $fb ; ROUTE_7 - db $fc ; ROUTE_8 - db $02 ; ROUTE_9 - db $f2 ; ROUTE_10 - db $f3 ; ROUTE_11 - db $f4 ; ROUTE_12 - db $08 ; ROUTE_13 - db $08 ; ROUTE_14 - db $f5 ; ROUTE_15 - db $f6 ; ROUTE_16 - db $09 ; ROUTE_17 - db $f7 ; ROUTE_18 - db $0a ; ROUTE_19 - db $f8 ; ROUTE_20 - db $01 ; ROUTE_21 - db $01 ; ROUTE_22 - db $06 ; ROUTE_23 - db $02 ; ROUTE_24 - db $02 ; ROUTE_25 - -; Format: -; 00: determines whether the map is split East/West or North/South -; $01 = East/West divide -; $02 = North/South divide -; 01: coordinate of dividing line -; 02: sprite set ID if in the West or North side -; 03: sprite set ID if in the East or South side -SplitMapSpriteSets: - db $02,$25,$02,$01 ; $f1 - db $02,$32,$02,$03 ; $f2 - db $01,$39,$04,$08 ; $f3 - db $02,$15,$03,$08 ; $f4 - db $01,$08,$0A,$08 ; $f5 - db $01,$18,$09,$05 ; $f6 - db $01,$22,$09,$0A ; $f7 - db $01,$35,$01,$0A ; $f8 - db $02,$21,$02,$07 ; $f9 - db $02,$02,$07,$04 ; $fa - db $01,$11,$05,$07 ; $fb - db $01,$03,$07,$03 ; $fc - -SpriteSets: -; sprite set $01 - db SPRITE_PIKACHU - db SPRITE_BLUE - db SPRITE_BUG_CATCHER - db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_GAMBLER - db SPRITE_OAK - db SPRITE_SWIMMER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN - -; sprite set $02 - db SPRITE_PIKACHU - db SPRITE_BUG_CATCHER - db SPRITE_ROCKET - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_HIKER - db SPRITE_BLUE - db SPRITE_OFFICER_JENNY - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $03 - db SPRITE_PIKACHU - db SPRITE_LITTLE_GIRL - db SPRITE_GIRL - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_HIKER - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $04 - db SPRITE_PIKACHU - db SPRITE_OFFICER_JENNY - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_BUG_CATCHER - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_SAILOR - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $05 - db SPRITE_PIKACHU - db SPRITE_LITTLE_GIRL - db SPRITE_YOUNG_BOY - db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_FAT_BALD_GUY - db SPRITE_OLD_PERSON - db SPRITE_SLOWBRO - db SPRITE_ROCKET - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $06 - db SPRITE_PIKACHU - db SPRITE_GYM_HELPER - db SPRITE_SLOWBRO - db SPRITE_BLUE - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_SWIMMER - db SPRITE_GUARD - db SPRITE_GAMBLER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $07 - db SPRITE_PIKACHU - db SPRITE_ROCKET - db SPRITE_OAK_AIDE - db SPRITE_LAPRAS_GIVER - db SPRITE_ERIKA - db SPRITE_GENTLEMAN - db SPRITE_BIRD - db SPRITE_ROCKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $08 - db SPRITE_PIKACHU - db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_FAT_BALD_GUY - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_FOULARD_WOMAN - db SPRITE_FISHER2 - db SPRITE_ROCKER - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $09 - db SPRITE_PIKACHU - db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_LAPRAS_GIVER - db SPRITE_FISHER2 - db SPRITE_ROCKER - db SPRITE_HIKER - db SPRITE_GAMBLER - db SPRITE_FAT_BALD_GUY - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $0a - db SPRITE_PIKACHU - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_CHANSEY - db SPRITE_FISHER2 - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_SEEL - db SPRITE_SWIMMER - db SPRITE_BUG_CATCHER - db SPRITE_BALL - db SPRITE_OMANYTE - -SpriteSheetPointerTable: - ; SPRITE_RED - dw RedSprite - db $c0 ; byte count - db BANK(RedSprite) - - ; SPRITE_BLUE - dw BlueSprite - db $c0 ; byte count - db BANK(BlueSprite) - - ; SPRITE_OAK - dw OakSprite - db $c0 ; byte count - db BANK(OakSprite) - - ; SPRITE_BUG_CATCHER - dw BugCatcherSprite - db $c0 ; byte count - db BANK(BugCatcherSprite) - - ; SPRITE_SLOWBRO - dw SlowbroSprite - db $c0 ; byte count - db BANK(SlowbroSprite) - - ; SPRITE_LASS - dw LassSprite - db $c0 ; byte count - db BANK(LassSprite) - - ; SPRITE_BLACK_HAIR_BOY_1 - dw BlackHairBoy1Sprite - db $c0 ; byte count - db BANK(BlackHairBoy1Sprite) - - ; SPRITE_LITTLE_GIRL - dw LittleGirlSprite - db $c0 ; byte count - db BANK(LittleGirlSprite) - - ; SPRITE_BIRD - dw BirdSprite - db $c0 ; byte count - db BANK(BirdSprite) - - ; SPRITE_FAT_BALD_GUY - dw FatBaldGuySprite - db $c0 ; byte count - db BANK(FatBaldGuySprite) - - ; SPRITE_GAMBLER - dw GamblerSprite - db $c0 ; byte count - db BANK(GamblerSprite) - - ; SPRITE_BLACK_HAIR_BOY_2 - dw BlackHairBoy2Sprite - db $c0 ; byte count - db BANK(BlackHairBoy2Sprite) - - ; SPRITE_GIRL - dw GirlSprite - db $c0 ; byte count - db BANK(GirlSprite) - - ; SPRITE_HIKER - dw HikerSprite - db $c0 ; byte count - db BANK(HikerSprite) - - ; SPRITE_FOULARD_WOMAN - dw FoulardWomanSprite - db $c0 ; byte count - db BANK(FoulardWomanSprite) - - ; SPRITE_GENTLEMAN - dw GentlemanSprite - db $c0 ; byte count - db BANK(GentlemanSprite) - - ; SPRITE_DAISY - dw DaisySprite - db $c0 ; byte count - db BANK(DaisySprite) - - ; SPRITE_BIKER - dw BikerSprite - db $c0 ; byte count - db BANK(BikerSprite) - - ; SPRITE_SAILOR - dw SailorSprite - db $c0 ; byte count - db BANK(SailorSprite) - - ; SPRITE_COOK - dw CookSprite - db $c0 ; byte count - db BANK(CookSprite) - - ; SPRITE_BIKE_SHOP_GUY - dw BikeShopGuySprite - db $c0 ; byte count - db BANK(BikeShopGuySprite) - - ; SPRITE_MR_FUJI - dw MrFujiSprite - db $c0 ; byte count - db BANK(MrFujiSprite) - - ; SPRITE_GIOVANNI - dw GiovanniSprite - db $c0 ; byte count - db BANK(GiovanniSprite) - - ; SPRITE_ROCKET - dw RocketSprite - db $c0 ; byte count - db BANK(RocketSprite) - - ; SPRITE_MEDIUM - dw MediumSprite - db $c0 ; byte count - db BANK(MediumSprite) - - ; SPRITE_WAITER - dw WaiterSprite - db $c0 ; byte count - db BANK(WaiterSprite) - - ; SPRITE_ERIKA - dw ErikaSprite - db $c0 ; byte count - db BANK(ErikaSprite) - - ; SPRITE_MOM_GEISHA - dw MomGeishaSprite - db $c0 ; byte count - db BANK(MomGeishaSprite) - - ; SPRITE_BRUNETTE_GIRL - dw BrunetteGirlSprite - db $c0 ; byte count - db BANK(BrunetteGirlSprite) - - ; SPRITE_LANCE - dw LanceSprite - db $c0 ; byte count - db BANK(LanceSprite) - - ; SPRITE_UNUSED_1 - dw RedSprite - db $c0 ; byte count - db BANK(RedSprite) - - ; SPRITE_OAK_AIDE - dw OakAideSprite - db $c0 ; byte count - db BANK(OakAideSprite) - - ; SPRITE_ROCKER - dw RockerSprite - db $c0 ; byte count - db BANK(RockerSprite) - - ; SPRITE_SWIMMER - dw SwimmerSprite - db $c0 ; byte count - db BANK(SwimmerSprite) - - ; SPRITE_WHITE_PLAYER - dw WhitePlayerSprite - db $c0 ; byte count - db BANK(WhitePlayerSprite) - - ; SPRITE_GYM_HELPER - dw GymHelperSprite - db $c0 ; byte count - db BANK(GymHelperSprite) - - ; SPRITE_OLD_PERSON - dw OldPersonSprite - db $c0 ; byte count - db BANK(OldPersonSprite) - - ; SPRITE_MART_GUY - dw MartGuySprite - db $c0 ; byte count - db BANK(MartGuySprite) - - ; SPRITE_FISHER - dw FisherSprite - db $c0 ; byte count - db BANK(FisherSprite) - - ; SPRITE_OLD_MEDIUM_WOMAN - dw OldMediumWomanSprite - db $c0 ; byte count - db BANK(OldMediumWomanSprite) - - ; SPRITE_NURSE - dw NurseSprite - db $c0 ; byte count - db BANK(NurseSprite) - - ; SPRITE_CABLE_CLUB_WOMAN - dw CableClubWomanSprite - db $c0 ; byte count - db BANK(CableClubWomanSprite) - - ; SPRITE_MR_MASTERBALL - dw MrMasterballSprite - db $c0 ; byte count - db BANK(MrMasterballSprite) - - ; SPRITE_LAPRAS_GIVER - dw LaprasGiverSprite - db $c0 ; byte count - db BANK(LaprasGiverSprite) - - ; SPRITE_WARDEN - dw WardenSprite - db $c0 ; byte count - db BANK(WardenSprite) - - ; SPRITE_SS_CAPTAIN - dw SsCaptainSprite - db $c0 ; byte count - db BANK(SsCaptainSprite) - - ; SPRITE_FISHER2 - dw Fisher2Sprite - db $c0 ; byte count - db BANK(Fisher2Sprite) - - ; SPRITE_BLACKBELT - dw BlackbeltSprite - db $c0 ; byte count - db BANK(BlackbeltSprite) - - ; SPRITE_GUARD - dw GuardSprite - db $c0 ; byte count - db BANK(GuardSprite) - - ; SPRITE_UNUSED_2 - dw RedSprite - db $c0 ; byte count - db BANK(RedSprite) - - ; SPRITE_MOM - dw MomSprite - db $c0 ; byte count - db BANK(MomSprite) - - ; SPRITE_BALDING_GUY - dw BaldingGuySprite - db $c0 ; byte count - db BANK(BaldingGuySprite) - - ; SPRITE_YOUNG_BOY - dw YoungBoySprite - db $c0 ; byte count - db BANK(YoungBoySprite) - - ; SPRITE_UNUSED_3 - dw RedSprite - db $c0 ; byte count - db BANK(RedSprite) - - ; SPRITE_GAMEBOY_KID - dw GameboyKidSprite - db $c0 ; byte count - db BANK(GameboyKidSprite) - - ; SPRITE_CLEFAIRY - dw ClefairySprite - db $c0 ; byte count - db BANK(ClefairySprite) - - ; SPRITE_AGATHA - dw AgathaSprite - db $c0 ; byte count - db BANK(AgathaSprite) - - ; SPRITE_BRUNO - dw BrunoSprite - db $c0 ; byte count - db BANK(BrunoSprite) - - ; SPRITE_LORELEI - dw LoreleiSprite - db $c0 ; byte count - db BANK(LoreleiSprite) - - ; SPRITE_SEEL - dw SeelSprite - db $c0 ; byte count - db BANK(SeelSprite) - - ; SPRITE_PIKACHU - dw PikachuSprite - db $c0 - db BANK(PikachuSprite) - - ; SPRITE_OFFICER_JENNY - dw OfficerJennySprite - db $c0 - db BANK(OfficerJennySprite) - - ; SPRITE_SANDSHREW - dw SandshrewSprite - db $c0 - db BANK(SandshrewSprite) - - ; SPRITE_ODDISH - dw OddishSprite - db $c0 - db BANK(OddishSprite) - - ; SPRITE_BULBASAUR - dw BulbasaurSprite - db $c0 - db BANK(BulbasaurSprite) - - ; SPRITE_JIGGLYPUFF - dw JigglypuffSprite - db $c0 - db BANK(JigglypuffSprite) - - ; SPRITE_CLEFAIRY_2 - dw Clefairy2Sprite - db $c0 - db BANK(Clefairy2Sprite) - - ; SPRITE_CHANSEY - dw ChanseySprite - db $c0 - db BANK(ChanseySprite) - - ; SPRITE_JESSIE - dw JessieSprite - db $c0 - db BANK(JessieSprite) - - ; SPRITE_JAMES - dw JamesSprite - db $c0 - db BANK(JamesSprite) - - ; SPRITE_BALL - dw BallSprite - db $40 ; byte count - db BANK(BallSprite) - - ; SPRITE_OMANYTE - dw OmanyteSprite - db $40 ; byte count - db BANK(OmanyteSprite) - - ; SPRITE_BOULDER - dw BoulderSprite - db $40 ; byte count - db BANK(BoulderSprite) - - ; SPRITE_PAPER_SHEET - dw PaperSheetSprite - db $40 ; byte count - db BANK(PaperSheetSprite) - - ; SPRITE_BOOK_MAP_DEX - dw BookMapDexSprite - db $40 ; byte count - db BANK(BookMapDexSprite) - - ; SPRITE_CLIPBOARD - dw ClipboardSprite - db $40 ; byte count - db BANK(ClipboardSprite) - - ; SPRITE_SNORLAX - dw SnorlaxSprite - db $40 ; byte count - db BANK(SnorlaxSprite) - - ; SPRITE_OLD_AMBER_COPY - dw OldAmberSprite - db $40 ; byte count - db BANK(OldAmberSprite) - - ; SPRITE_OLD_AMBER - dw OldAmberSprite - db $40 ; byte count - db BANK(OldAmberSprite) - - ; SPRITE_LYING_OLD_MAN_UNUSED_1 - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) - - ; SPRITE_LYING_OLD_MAN_UNUSED_2 - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) - - ; SPRITE_LYING_OLD_MAN - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm new file mode 100644 index 00000000..e87a9627 --- /dev/null +++ b/data/sprites/facings.asm @@ -0,0 +1,131 @@ +SpriteFacingAndAnimationTable: + 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 + 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 new file mode 100644 index 00000000..b7bee609 --- /dev/null +++ b/data/sprites/sprites.asm @@ -0,0 +1,90 @@ +overworld_sprite: MACRO + dw \1 + db \2 tiles + db BANK(\1) +ENDM + +SpriteSheetPointerTable: + ; graphics, tile count + overworld_sprite RedSprite, 12 ; SPRITE_RED + overworld_sprite BlueSprite, 12 ; SPRITE_BLUE + overworld_sprite OakSprite, 12 ; SPRITE_OAK + overworld_sprite YoungsterSprite, 12 ; SPRITE_YOUNGSTER + overworld_sprite MonsterSprite, 12 ; SPRITE_MONSTER + overworld_sprite CooltrainerFSprite, 12 ; SPRITE_COOLTRAINER_F + overworld_sprite CooltrainerMSprite, 12 ; SPRITE_COOLTRAINER_M + overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL + overworld_sprite BirdSprite, 12 ; SPRITE_BIRD + overworld_sprite MiddleAgedManSprite, 12 ; SPRITE_MIDDLE_AGED_MAN + overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER + overworld_sprite SuperNerdSprite, 12 ; SPRITE_SUPER_NERD + overworld_sprite GirlSprite, 12 ; SPRITE_GIRL + overworld_sprite HikerSprite, 12 ; SPRITE_HIKER + overworld_sprite BeautySprite, 12 ; SPRITE_BEAUTY + overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN + overworld_sprite DaisySprite, 12 ; SPRITE_DAISY + overworld_sprite BikerSprite, 12 ; SPRITE_BIKER + overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR + overworld_sprite CookSprite, 12 ; SPRITE_COOK + overworld_sprite BikeShopClerkSprite, 12 ; SPRITE_BIKE_SHOP_CLERK + overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI + overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI + overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET + overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER + overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER + overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA + overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN + overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL + overworld_sprite LanceSprite, 12 ; SPRITE_LANCE + 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 + overworld_sprite SafariZoneWorkerSprite, 12 ; SPRITE_SAFARI_ZONE_WORKER + overworld_sprite GymGuideSprite, 12 ; SPRITE_GYM_GUIDE + overworld_sprite GrampsSprite, 12 ; SPRITE_GRAMPS + overworld_sprite ClerkSprite, 12 ; SPRITE_CLERK + overworld_sprite FishingGuruSprite, 12 ; SPRITE_FISHING_GURU + overworld_sprite GrannySprite, 12 ; SPRITE_GRANNY + overworld_sprite NurseSprite, 12 ; SPRITE_NURSE + overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST + overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT + overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER + overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN + overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN + overworld_sprite FisherSprite, 12 ; SPRITE_FISHER + overworld_sprite KogaSprite, 12 ; SPRITE_KOGA + overworld_sprite GuardSprite, 12 ; SPRITE_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 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 + overworld_sprite PaperSprite, 4 ; SPRITE_PAPER + overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX + overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD + overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX + overworld_sprite OldAmberSprite, 4 ; SPRITE_UNUSED_OLD_AMBER + overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP diff --git a/data/super_palettes.asm b/data/super_palettes.asm deleted file mode 100755 index d04d461e..00000000 --- a/data/super_palettes.asm +++ /dev/null @@ -1,481 +0,0 @@ -SuperPalettes: - ; PAL_ROUTE - RGB 31, 31, 30 - RGB 23, 26, 19 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_PALLET - RGB 31, 31, 30 - RGB 28, 27, 31 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_VIRIDIAN - RGB 31, 31, 30 - RGB 26, 31, 21 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_PEWTER - RGB 31, 31, 30 - RGB 23, 23, 22 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_CERULEAN - RGB 31, 31, 30 - RGB 22, 23, 31 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_LAVENDER - RGB 31, 31, 30 - RGB 27, 23, 29 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_VERMILION - RGB 31, 31, 30 - RGB 31, 25, 16 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_CELADON - RGB 31, 31, 30 - RGB 22, 31, 22 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_FUCHSIA - RGB 31, 31, 30 - RGB 31, 26, 26 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_CINNABAR - RGB 31, 31, 30 - RGB 31, 15, 14 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_INDIGO - RGB 31, 31, 30 - RGB 17, 17, 25 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_SAFFRON - RGB 31, 31, 30 - RGB 31, 31, 19 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_TOWNMAP - RGB 31, 31, 30 - RGB 20, 26, 31 - RGB 17, 23, 10 - RGB 3, 2, 2 - - ; PAL_LOGO1 - RGB 31, 31, 30 - RGB 30, 30, 17 - RGB 21, 0, 4 - RGB 21, 0, 4 - - ; PAL_LOGO2 - RGB 31, 31, 30 - RGB 30, 30, 17 - RGB 18, 18, 24 - RGB 7, 7, 16 - - ; PAL_0F - RGB 31, 31, 30 - RGB 24, 20, 30 - RGB 11, 20, 30 - RGB 3, 2, 2 - - ; PAL_MEWMON - RGB 31, 31, 30 - RGB 31, 30, 22 - RGB 27, 16, 16 - RGB 6, 6, 6 - - ; PAL_BLUEMON - RGB 31, 31, 30 - RGB 21, 22, 31 - RGB 9, 10, 20 - RGB 6, 6, 6 - - ; PAL_REDMON - RGB 31, 31, 30 - RGB 31, 24, 11 - RGB 26, 9, 6 - RGB 6, 6, 6 - - ; PAL_CYANMON - RGB 31, 31, 30 - RGB 26, 28, 31 - RGB 7, 24, 28 - RGB 6, 6, 6 - - ; PAL_PURPLEMON - RGB 31, 31, 30 - RGB 27, 22, 30 - RGB 22, 15, 23 - RGB 6, 6, 6 - - ; PAL_BROWNMON - RGB 31, 31, 30 - RGB 26, 23, 18 - RGB 18, 14, 10 - RGB 6, 6, 6 - - ; PAL_GREENMON - RGB 31, 31, 30 - RGB 24, 28, 18 - RGB 13, 21, 15 - RGB 6, 6, 6 - - ; PAL_PINKMON - RGB 31, 31, 30 - RGB 31, 24, 26 - RGB 31, 18, 21 - RGB 6, 6, 6 - - ; PAL_YELLOWMON - RGB 31, 31, 30 - RGB 31, 31, 19 - RGB 28, 23, 9 - RGB 6, 6, 6 - - ; PAL_GREYMON - RGB 31, 31, 30 - RGB 25, 25, 18 - RGB 16, 16, 14 - RGB 6, 6, 6 - - ; PAL_SLOTS1 - RGB 31, 31, 30 - RGB 27, 22, 30 - RGB 26, 9, 6 - RGB 6, 6, 6 - - ; PAL_SLOTS2 - RGB 31, 31, 30 - RGB 31, 23, 26 - RGB 29, 29, 8 - RGB 6, 6, 6 - - ; PAL_SLOTS3 - RGB 31, 31, 30 - RGB 23, 31, 20 - RGB 29, 29, 8 - RGB 6, 6, 6 - - ; PAL_SLOTS4 - RGB 31, 31, 30 - RGB 23, 29, 31 - RGB 29, 29, 8 - RGB 6, 6, 6 - - ; PAL_BLACK - RGB 31, 31, 30 - RGB 6, 6, 6 - RGB 6, 6, 6 - RGB 6, 6, 6 - - ; PAL_GREENBAR - RGB 31, 31, 30 - RGB 31, 31, 19 - RGB 0, 21, 0 - RGB 6, 6, 6 - - ; PAL_YELLOWBAR - RGB 31, 31, 30 - RGB 31, 31, 19 - RGB 28, 23, 9 - RGB 6, 6, 6 - - ; PAL_REDBAR - RGB 31, 31, 30 - RGB 31, 31, 19 - RGB 26, 9, 6 - RGB 6, 6, 6 - - ; PAL_BADGE - RGB 31, 31, 30 - RGB 20, 15, 11 - RGB 22, 21, 20 - RGB 6, 6, 6 - - ; PAL_CAVE - RGB 31, 31, 30 - RGB 20, 15, 11 - RGB 22, 21, 20 - RGB 6, 6, 6 - - ; PAL_GAMEFREAK - RGB 31, 31, 30 - RGB 28, 24, 14 - RGB 20, 20, 11 - RGB 6, 6, 6 - - ; PAL_25 - RGB 31, 31, 30 - RGB 31, 30, 22 - RGB 23, 27, 31 - RGB 6, 6, 6 - - ; PAL_26 - RGB 31, 31, 30 - RGB 28, 23, 9 - RGB 18, 14, 10 - RGB 6, 6, 6 - - ; PAL_27 - RGB 31, 31, 30 - RGB 16, 16, 16 - RGB 31, 25, 9 - RGB 6, 6, 6 - -GBCBasePalettes: - ; PAL_ROUTE - RGB 31, 31, 31 - RGB 16, 31, 4 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_PALLET - RGB 31, 31, 31 - RGB 23, 17, 31 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_VIRIDIAN - RGB 31, 31, 31 - RGB 19, 31, 0 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_PEWTER - RGB 31, 31, 31 - RGB 18, 18, 15 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_CERULEAN - RGB 31, 31, 31 - RGB 5, 8, 31 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_LAVENDER - RGB 31, 31, 31 - RGB 25, 4, 31 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_VERMILION - RGB 31, 31, 31 - RGB 31, 19, 0 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_CELADON - RGB 31, 31, 31 - RGB 5, 31, 5 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_FUCHSIA - RGB 31, 31, 31 - RGB 31, 15, 15 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_CINNABAR - RGB 31, 31, 31 - RGB 31, 8, 8 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_INDIGO - RGB 31, 31, 31 - RGB 11, 8, 31 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_SAFFRON - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_TOWNMAP - RGB 31, 31, 31 - RGB 0, 21, 31 - RGB 10, 28, 0 - RGB 1, 1, 1 - - ; PAL_LOGO1 - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 31, 0, 0 - RGB 31, 0, 0 - - ; PAL_LOGO2 - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 7, 7, 25 - RGB 0, 0, 17 - - ; PAL_0F - RGB 31, 31, 31 - RGB 13, 1, 31 - RGB 0, 9, 31 - RGB 1, 1, 1 - - ; PAL_MEWMON - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 31, 1, 1 - RGB 3, 3, 3 - - ; PAL_BLUEMON - RGB 31, 31, 31 - RGB 16, 18, 31 - RGB 0, 1, 25 - RGB 3, 3, 3 - - ; PAL_REDMON - RGB 31, 31, 31 - RGB 31, 17, 0 - RGB 31, 0, 0 - RGB 3, 3, 3 - - ; PAL_CYANMON - RGB 31, 31, 31 - RGB 16, 26, 31 - RGB 0, 17, 31 - RGB 3, 3, 3 - - ; PAL_PURPLEMON - RGB 31, 31, 31 - RGB 25, 15, 31 - RGB 19, 0, 22 - RGB 3, 3, 3 - - ; PAL_BROWNMON - RGB 31, 31, 31 - RGB 29, 18, 10 - RGB 17, 9, 5 - RGB 3, 3, 3 - - ; PAL_GREENMON - RGB 31, 31, 31 - RGB 17, 31, 11 - RGB 1, 22, 6 - RGB 3, 3, 3 - - ; PAL_PINKMON - RGB 31, 31, 31 - RGB 31, 15, 18 - RGB 31, 0, 6 - RGB 3, 3, 3 - - ; PAL_YELLOWMON - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 28, 14, 0 - RGB 3, 3, 3 - - ; PAL_GREYMON - RGB 31, 31, 31 - RGB 20, 23, 10 - RGB 11, 11, 5 - RGB 3, 3, 3 - - ; PAL_SLOTS1 - RGB 31, 31, 31 - RGB 25, 1, 31 - RGB 31, 0, 0 - RGB 3, 3, 3 - - ; PAL_SLOTS2 - RGB 31, 31, 31 - RGB 31, 4, 19 - RGB 31, 31, 0 - RGB 3, 3, 3 - - ; PAL_SLOTS3 - RGB 31, 31, 31 - RGB 8, 31, 0 - RGB 31, 31, 0 - RGB 3, 3, 3 - - ; PAL_SLOTS4 - RGB 31, 31, 31 - RGB 0, 31, 31 - RGB 31, 31, 0 - RGB 3, 3, 3 - - ; PAL_BLACK - RGB 31, 31, 31 - RGB 3, 3, 3 - RGB 3, 3, 3 - RGB 3, 3, 3 - - ; PAL_GREENBAR - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 0, 31, 0 - RGB 3, 3, 3 - - ; PAL_YELLOWBAR - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 31, 18, 0 - RGB 3, 3, 3 - - ; PAL_REDBAR - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 31, 0, 0 - RGB 3, 3, 3 - - ; PAL_BADGE - RGB 31, 31, 31 - RGB 23, 8, 0 - RGB 17, 14, 11 - RGB 3, 3, 3 - - ; PAL_CAVE - RGB 31, 31, 31 - RGB 23, 8, 0 - RGB 17, 14, 11 - RGB 3, 3, 3 - - ; PAL_GAMEFREAK - RGB 31, 31, 31 - RGB 31, 19, 0 - RGB 19, 19, 0 - RGB 3, 3, 3 - - ; PAL_25 - RGB 31, 31, 31 - RGB 31, 31, 0 - RGB 11, 23, 31 - RGB 3, 3, 3 - - ; PAL_26 - RGB 31, 31, 31 - RGB 31, 18, 0 - RGB 19, 7, 1 - RGB 3, 3, 3 - - ; PAL_27 - RGB 31, 31, 31 - RGB 9, 9, 9 - RGB 31, 21, 0 - RGB 3, 3, 3 diff --git a/data/super_rod.asm b/data/super_rod.asm deleted file mode 100755 index 01c6b588..00000000 --- a/data/super_rod.asm +++ /dev/null @@ -1,33 +0,0 @@ -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 $ff diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm new file mode 100644 index 00000000..07e6cf96 --- /dev/null +++ b/data/text/alphabets.asm @@ -0,0 +1,15 @@ +LowerCaseAlphabet: + db "abcdefghi" + db "jklmnopqr" + db "stuvwxyz " + db "×():;[]<PK><MN>" + db "-?!♂♀/<DOT>,<ED>" + db "UPPER CASE@" + +UpperCaseAlphabet: + db "ABCDEFGHI" + db "JKLMNOPQR" + db "STUVWXYZ " + db "×():;[]<PK><MN>" + db "-?!♂♀/<DOT>,<ED>" + db "lower case@" diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm new file mode 100644 index 00000000..7a53c71f --- /dev/null +++ b/data/text/dakutens.asm @@ -0,0 +1,15 @@ +Dakutens: + db "かが", "きぎ", "くぐ", "けげ", "こご" + db "さざ", "しじ", "すず", "せぜ", "そぞ" + db "ただ", "ちぢ", "つづ", "てで", "とど" + db "はば", "ひび", "ふぶ", "へべ", "ほぼ" + db "カガ", "キギ", "クグ", "ケゲ", "コゴ" + db "サザ", "シジ", "スズ", "セゼ", "ソゾ" + db "タダ", "チヂ", "ツヅ", "テデ", "トド" + db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" + db -1 ; end + +Handakutens: + db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" + db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" + db -1 ; end diff --git a/data/text/text_1.asm b/data/text/text_1.asm new file mode 100644 index 00000000..eb394afe --- /dev/null +++ b/data/text/text_1.asm @@ -0,0 +1,154 @@ +_CardKeySuccessText1:: + text "Bingo!@" + text_end + +_CardKeySuccessText2:: + text_start + line "The CARD KEY" + cont "opened the door!" + done + +_CardKeyFailText:: + text "Darn! It needs a" + line "CARD KEY!" + done + +_TrainerNameText:: + text_ram wcd6d + text ": @" + text_end + +_NoNibbleText:: + text "Not even a nibble!" + prompt + +_NothingHereText:: + text "Looks like there's" + line "nothing here." + prompt + +_ItsABiteText:: + text "Oh!" + line "It's a bite!" + prompt + +_ExclamationText:: + text "!" + done + +_GroundRoseText:: + text "Ground rose up" + line "somewhere!" + done + +_BoulderText:: + text "This requires" + line "STRENGTH to move!" + done + +_MartSignText:: + text "All your item" + line "needs fulfilled!" + cont "#MON MART" + done + +_PokeCenterSignText:: + text "Heal Your #MON!" + line "#MON CENTER" + done + +_FoundItemText:: + text "<PLAYER> found" + line "@" + text_ram wcf4b + text "!@" + text_end + +_NoMoreRoomForItemText:: + text "No more room for" + line "items!" + done + +_OaksAideHiText:: + text "Hi! Remember me?" + line "I'm PROF.OAK's" + cont "AIDE!" + + para "If you caught @" + text_decimal hOaksAideRequirement, 1, 3 + text_start + line "kinds of #MON," + cont "I'm supposed to" + cont "give you an" + cont "@" + text_ram wOaksAideRewardItemName + text "!" + + para "So, <PLAYER>! Have" + line "you caught at" + cont "least @" + text_decimal hOaksAideRequirement, 1, 3 + text " kinds of" + cont "#MON?" + done + +_OaksAideUhOhText:: + text "Let's see..." + line "Uh-oh! You have" + cont "caught only @" + text_decimal hOaksAideNumMonsOwned, 1, 3 + text_start + cont "kinds of #MON!" + + para "You need @" + text_decimal hOaksAideRequirement, 1, 3 + text " kinds" + line "if you want the" + cont "@" + text_ram wOaksAideRewardItemName + text "." + done + +_OaksAideComeBackText:: + text "Oh. I see." + + para "When you get @" + text_decimal hOaksAideRequirement, 1, 3 + text_start + line "kinds, come back" + cont "for @" + text_ram wOaksAideRewardItemName + text "." + done + +_OaksAideHereYouGoText:: + text "Great! You have" + line "caught @" + text_decimal hOaksAideNumMonsOwned, 1, 3 + text " kinds " + cont "of #MON!" + cont "Congratulations!" + + para "Here you go!" + prompt + +_OaksAideGotItemText:: + text "<PLAYER> got the" + line "@" + text_ram wOaksAideRewardItemName + text "!@" + text_end + +_OaksAideNoRoomText:: + text "Oh! I see you" + line "don't have any" + cont "room for the" + cont "@" + 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 new file mode 100644 index 00000000..f1e5b68d --- /dev/null +++ b/data/text/text_2.asm @@ -0,0 +1,1322 @@ +_AIBattleWithdrawText:: + text_ram wTrainerName + text " with-" + line "drew @" + text_ram wEnemyMonNick + text "!" + prompt + +_AIBattleUseItemText:: + text_ram wTrainerName + text_start + line "used @" + text_ram wcd6d + text_start + cont "on @" + text_ram wEnemyMonNick + text "!" + prompt + +_BoxFullTest:: + text "The BOX is full!" + done + +_BoxWillBeClearedText:: + text "The BOX will be" + line "cleared." + done + +_TradeWentToText:: + text_ram wcf4b + text " went" + line "to @" + text_ram wLinkEnemyTrainerName + text "." + done + +_TradeForText:: + text "For <PLAYER>'s" + line "@" + text_ram wcf4b + text "," + done + +_TradeSendsText:: + text_ram wLinkEnemyTrainerName + text " sends" + line "@" + text_ram wcd6d + text "." + done + +_TradeWavesFarewellText:: + text_ram wLinkEnemyTrainerName + text " waves" + line "farewell as" + done + +_TradeTransferredText:: + text_ram wcd6d + text " is" + line "transferred." + done + +_TradeTakeCareText:: + text "Take good care of" + line "@" + text_ram wcd6d + text "." + done + +_TradeWillTradeText:: + text_ram wLinkEnemyTrainerName + text " will" + line "trade @" + text_ram wcd6d + text_start + done + +_TradeforText:: + text "for <PLAYER>'s" + line "@" + text_ram wcf4b + text "." + done + +_PlaySlotMachineText:: + text "A slot machine!" + line "Want to play?" + done + +_OutOfCoinsSlotMachineText:: + text "Darn!" + line "Ran out of coins!" + done + +_BetHowManySlotMachineText:: + text "Bet how many" + line "coins?" + done + +_StartSlotMachineText:: + text "Start!" + done + +_NotEnoughCoinsSlotMachineText:: + text "Not enough" + line "coins!" + prompt + +_OneMoreGoSlotMachineText:: + text "One more " + line "go?" + done + +_LinedUpText:: + text " lined up!" + line "Scored @" + text_ram wcf4b + text " coins!" + done + +_NotThisTimeText:: + text "Not this time!" + prompt + +_YeahText:: + text "Yeah!@" + text_end + +_DexSeenOwnedText:: + text "#DEX Seen:@" + text_decimal wDexRatingNumMonsSeen, 1, 3 + text_start + line " Owned:@" + text_decimal wDexRatingNumMonsOwned, 1, 3 + text_end + +_DexRatingText:: + text "#DEX Rating<COLON>" + done + +_GymStatueText1:: + text_ram wGymCityName + text_start + line "#MON GYM" + cont "LEADER: @" + text_ram wGymLeaderName + text_start + + para "WINNING TRAINERS:" + line "<RIVAL>" + done + +_GymStatueText2:: + text_ram wGymCityName + text_start + line "#MON GYM" + cont "LEADER: @" + text_ram wGymLeaderName + text_start + + para "WINNING TRAINERS:" + line "<RIVAL>" + cont "<PLAYER>" + done + +_ViridianCityPokecenterGuyText:: + text "#MON CENTERs" + line "heal your tired," + cont "hurt or fainted" + cont "#MON!" + done + +_PewterCityPokecenterGuyText:: + text "Yawn!" + + para "When JIGGLYPUFF" + line "sings, #MON" + cont "get drowsy..." + + para "...Me too..." + line "Snore..." + done + +_CeruleanPokecenterGuyText:: + text "BILL has lots of" + line "#MON!" + + para "He collects rare" + line "ones too!" + done + +_LavenderPokecenterGuyText:: + text "CUBONEs wear" + line "skulls, right?" + + para "People will pay a" + line "lot for one!" + done + +_MtMoonPokecenterBenchGuyText:: + text "If you have too" + line "many #MON, you" + cont "should store them" + cont "via PC!" + done + +_RockTunnelPokecenterGuyText:: + text "I heard that" + line "GHOSTs haunt" + cont "LAVENDER TOWN!" + done + +_UnusedBenchGuyText1:: + text "I wish I could" + line "catch #MON." + done + +_UnusedBenchGuyText2:: + text "I'm tired from" + line "all the fun..." + done + +_UnusedBenchGuyText3:: + text "SILPH's manager" + line "is hiding in the" + cont "SAFARI ZONE." + done + +_VermilionPokecenterGuyText:: + text "It is true that a" + line "higher level" + cont "#MON will be" + cont "more powerful..." + + para "But, all #MON" + line "will have weak" + cont "points against" + cont "specific types." + + para "So, there is no" + line "universally" + cont "strong #MON." + done + +_CeladonCityPokecenterGuyText:: + text "If I had a BIKE," + line "I would go to" + cont "CYCLING ROAD!" + done + +_FuchsiaCityPokecenterGuyText:: + text "If you're studying " + line "#MON, visit" + cont "the SAFARI ZONE." + + para "It has all sorts" + line "of rare #MON." + done + +_CinnabarPokecenterGuyText:: + text "#MON can still" + line "learn techniques" + cont "after canceling" + cont "evolution." + + para "Evolution can wait" + line "until new moves" + cont "have been learned." + done + +_SaffronCityPokecenterGuyText1:: + text "It would be great" + line "if the ELITE FOUR" + cont "came and stomped" + cont "TEAM ROCKET!" + done + +_SaffronCityPokecenterGuyText2:: + text "TEAM ROCKET took" + line "off! We can go" + cont "out safely again!" + cont "That's great!" + done + +_CeladonCityHotelText:: + text "My sis brought me" + line "on this vacation!" + done + +_BookcaseText:: + text "Crammed full of" + line "#MON books!" + done + +_NewBicycleText:: + text "A shiny new" + line "BICYCLE!" + done + +_PushStartText:: + text "Push START to" + line "open the MENU!" + done + +_SaveOptionText:: + text "The SAVE option is" + line "on the MENU" + cont "screen." + done + +_StrengthsAndWeaknessesText:: + text "All #MON types" + line "have strong and" + cont "weak points" + cont "against others." + done + +_TimesUpText:: + text "PA: Ding-dong!" + + para "Time's up!" + prompt + +_GameOverText:: + text "PA: Your SAFARI" + line "GAME is over!" + done + +_CinnabarGymQuizDummyIntroText:: + text "#MON Quiz!" + + para "Get it right and" + line "the door opens to" + cont "the next room!" + + para "Get it wrong and" + line "face a trainer!" + + para "If you want to" + line "conserve your" + cont "#MON for the" + cont "GYM LEADER..." + + para "Then get it right!" + 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?" + done + +_CinnabarQuizQuestionsText2:: + text "There are 9" + line "certified #MON" + cont "LEAGUE BADGEs?" + done + +_CinnabarQuizQuestionsText3:: + text "POLIWAG evolves 3" + line "times?" + done + +_CinnabarQuizQuestionsText4:: + text "Are thunder moves" + line "effective against" + cont "ground element-" + cont "type #MON?" + done + +_CinnabarQuizQuestionsText5:: + text "#MON of the" + line "same kind and" + cont "level are not" + cont "identical?" + done + +_CinnabarQuizQuestionsText6:: + text "TM28 contains" + line "TOMBSTONER?" + done + +_CinnabarGymQuizCorrectText:: + text "You're absolutely" + line "correct!" + + para "Go on through!@" + text_end + +_CinnabarGymQuizIncorrectText:: + text "Sorry! Bad call!" + prompt + +_MagazinesText:: + text "#MON magazines!" + + para "#MON notebooks!" + + para "#MON graphs!" + done + +_BillsHouseMonitorText:: + text "TELEPORTER is" + line "displayed on the" + cont "PC monitor." + done + +_BillsHouseInitiatedText:: + text "<PLAYER> initiated" + line "TELEPORTER's Cell" + cont "Separator!@" + text_end + +_BillsHousePokemonListText1:: + text "BILL's favorite" + line "#MON list!" + prompt + +_BillsHousePokemonListText2:: + text "Which #MON do" + line "you want to see?" + done + +_OakLabEmailText:: + text "There's an e-mail" + line "message here!" + + para "..." + + para "Calling all" + line "#MON trainers!" + + para "The elite trainers" + line "of #MON LEAGUE" + cont "are ready to take" + cont "on all comers!" + + para "Bring your best" + line "#MON and see" + cont "how you rate as a" + cont "trainer!" + + para "#MON LEAGUE HQ" + line "INDIGO PLATEAU" + + para "PS: PROF.OAK," + line "please visit us!" + cont "..." + done + +_GameCornerCoinCaseText:: + text "A COIN CASE is" + line "required!" + done + +_GameCornerNoCoinsText:: + text "You don't have" + line "any coins!" + done + +_GameCornerOutOfOrderText:: + text "OUT OF ORDER" + line "This is broken." + done + +_GameCornerOutToLunchText:: + text "OUT TO LUNCH" + line "This is reserved." + done + +_GameCornerSomeonesKeysText:: + text "Someone's keys!" + line "They'll be back." + done + +_JustAMomentText:: + text "Just a moment." + done + +TMNotebookText:: + text "It's a pamphlet" + line "on TMs." + + para "..." + + para "There are 50 TMs" + line "in all." + + para "There are also 5" + line "HMs that can be" + cont "used repeatedly." + + para "SILPH CO.@" + text_end + +_TurnPageText:: + text "Turn the page?" + done + +_ViridianSchoolNotebookText5:: + text "GIRL: Hey! Don't" + line "look at my notes!@" + text_end + +_ViridianSchoolNotebookText1:: + text "Looked at the" + line "notebook!" + + para "First page..." + + para "# BALLs are" + line "used to catch" + cont "#MON." + + para "Up to 6 #MON" + line "can be carried." + + para "People who raise" + line "and make #MON" + cont "fight are called" + cont "#MON trainers." + prompt + +_ViridianSchoolNotebookText2:: + text "Second page..." + + para "A healthy #MON" + line "may be hard to" + cont "catch, so weaken" + cont "it first!" + + para "Poison, burns and" + line "other damage are" + cont "effective!" + prompt + +_ViridianSchoolNotebookText3:: + text "Third page..." + + para "#MON trainers" + line "seek others to" + cont "engage in #MON" + cont "fights." + + para "Battles are" + line "constantly fought" + cont "at #MON GYMs." + prompt + +_ViridianSchoolNotebookText4:: + text "Fourth page..." + + para "The goal for" + line "#MON trainers" + cont "is to beat the " + cont "top 8 #MON" + cont "GYM LEADERs." + + para "Do so to earn the" + line "right to face..." + + para "The ELITE FOUR of" + line "#MON LEAGUE!" + prompt + +_EnemiesOnEverySideText:: + text "Enemies on every" + line "side!" + done + +_WhatGoesAroundComesAroundText:: + text "What goes around" + line "comes around!" + done + +_FightingDojoText:: + text "FIGHTING DOJO" + done + +_IndigoPlateauHQText:: + text "INDIGO PLATEAU" + line "#MON LEAGUE HQ" + done + +_RedBedroomSNESText:: + text "<PLAYER> is" + line "playing the SNES!" + cont "...Okay!" + cont "It's time to go!" + done + +_Route15UpstairsBinocularsText:: + text "Looked into the" + line "binoculars..." + + para "A large, shining" + line "bird is flying" + cont "toward the sea." + done + +_AerodactylFossilText:: + text "AERODACTYL Fossil" + line "A primitive and" + cont "rare #MON." + done + +_KabutopsFossilText:: + text "KABUTOPS Fossil" + line "A primitive and" + cont "rare #MON." + done + +_FanClubPicture1Text:: + text "My cute RAPIDASH." + done + +_FanClubPicture2Text:: + text "My beloved FEAROW." + done + +_LinkCableHelpText1:: + text "TRAINER TIPS" + + para "Using a Game Link" + line "Cable" + prompt + +_LinkCableHelpText2:: + text "Which heading do" + line "you want to read?" + done + +_LinkCableInfoText1:: + text "When you have" + line "linked your GAME" + cont "BOY with another" + cont "GAME BOY, talk to" + cont "the attendant on" + cont "the right in any" + cont "#MON CENTER." + prompt + +_LinkCableInfoText2:: + text "COLOSSEUM lets" + line "you play against" + cont "a friend." + prompt + +_LinkCableInfoText3:: + text "TRADE CENTER is" + line "used for trading" + cont "#MON." + prompt + +_ViridianSchoolBlackboardText1:: + text "The blackboard" + line "describes #MON" + cont "STATUS changes" + cont "during battles." + prompt + +_ViridianSchoolBlackboardText2:: + text "Which heading do" + line "you want to read?" + done + +_ViridianBlackboardSleepText:: + text "A #MON can't" + line "attack if it's" + cont "asleep!" + + para "#MON will stay" + line "asleep even after" + cont "battles." + + para "Use AWAKENING to" + line "wake them up!" + prompt + +_ViridianBlackboardPoisonText:: + text "When poisoned, a" + line "#MON's health" + cont "steadily drops." + + para "Poison lingers" + line "after battles." + + para "Use an ANTIDOTE" + line "to cure poison!" + prompt + +_ViridianBlackboardPrlzText:: + text "Paralysis could" + line "make #MON" + cont "moves misfire!" + + para "Paralysis remains" + line "after battles." + + para "Use PARLYZ HEAL" + line "for treatment!" + prompt + +_ViridianBlackboardBurnText:: + text "A burn reduces" + line "power and speed." + cont "It also causes" + cont "ongoing damage." + + para "Burns remain" + line "after battles." + + para "Use BURN HEAL to" + line "cure a burn!" + prompt + +_ViridianBlackboardFrozenText:: + text "If frozen, a" + line "#MON becomes" + cont "totally immobile!" + + para "It stays frozen" + line "even after the" + cont "battle ends." + + para "Use ICE HEAL to" + line "thaw out #MON!" + prompt + +_VermilionGymTrashText:: + text "Nope, there's" + line "only trash here." + done + +_VermilionGymTrashSuccessText1:: + text "Hey! There's a" + line "switch under the" + cont "trash!" + cont "Turn it on!" + + para "The 1st electric" + line "lock opened!@" + text_end + +_VermilionGymTrashSuccessText2:: + text "Hey! There's" + line "another switch" + cont "under the trash!" + cont "Turn it on!" + prompt + +_VermilionGymTrashSuccessText3:: + text "The 2nd electric" + line "lock opened!" + + para "The motorized door" + line "opened!@" + text_end + +_VermilionGymTrashFailText:: + text "Nope! There's" + line "only trash here." + cont "Hey! The electric" + cont "locks were reset!@" + text_end + +_FoundHiddenItemText:: + text "<PLAYER> found" + line "@" + text_ram wcd6d + text "!@" + text_end + +_HiddenItemBagFullText:: + text "But, <PLAYER> has" + line "no more room for" + cont "other items!" + done + +_FoundHiddenCoinsText:: + text "<PLAYER> found" + line "@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end + +_FoundHiddenCoins2Text:: + text "<PLAYER> found" + line "@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end + +_DroppedHiddenCoinsText:: + text_start + para "Oops! Dropped" + line "some coins!" + done + +_IndigoPlateauStatuesText1:: + text "INDIGO PLATEAU" + prompt + +_IndigoPlateauStatuesText2:: + text "The ultimate goal" + line "of trainers!" + cont "#MON LEAGUE HQ" + done + +_IndigoPlateauStatuesText3:: + text "The highest" + line "#MON authority" + cont "#MON LEAGUE HQ" + done + +_PokemonBooksText:: + text "Crammed full of" + line "#MON books!" + done + +_DiglettSculptureText:: + text "It's a sculpture" + line "of DIGLETT." + done + +_ElevatorText:: + text "This is an" + line "elevator." + done + +_TownMapText:: + text "A TOWN MAP.@" + text_end + +_PokemonStuffText:: + text "Wow! Tons of" + line "#MON stuff!" + done + +_OutOfSafariBallsText:: + text "PA: Ding-dong!" + + para "You are out of" + line "SAFARI BALLs!" + prompt + +_WildRanText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "ran!" + prompt + +_EnemyRanText:: + text "Enemy @" + text_ram wEnemyMonNick + text_start + line "ran!" + prompt + +_HurtByPoisonText:: + text "<USER>'s" + line "hurt by poison!" + prompt + +_HurtByBurnText:: + text "<USER>'s" + line "hurt by the burn!" + prompt + +_HurtByLeechSeedText:: + text "LEECH SEED saps" + line "<USER>!" + prompt + +_EnemyMonFaintedText:: + text "Enemy @" + text_ram wEnemyMonNick + text_start + line "fainted!" + prompt + +_MoneyForWinningText:: + text "<PLAYER> got ¥@" + text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text_start + line "for winning!" + prompt + +_TrainerDefeatedText:: + text "<PLAYER> defeated" + line "@" + text_ram wTrainerName + text "!" + prompt + +_PlayerMonFaintedText:: + text_ram wBattleMonNick + text_start + line "fainted!" + prompt + +_UseNextMonText:: + text "Use next #MON?" + done + +_Sony1WinText:: + text "<RIVAL>: Yeah! Am" + line "I great or what?" + prompt + +_PlayerBlackedOutText2:: + text "<PLAYER> is out of" + line "useable #MON!" + + para "<PLAYER> blacked" + line "out!" + prompt + +_LinkBattleLostText:: + text "<PLAYER> lost to" + line "@" + text_ram wTrainerName + text "!" + prompt + +_TrainerAboutToUseText:: + text_ram wTrainerName + text " is" + line "about to use" + cont"@" + text_ram wEnemyMonNick + text "!" + + para "Will <PLAYER>" + line "change #MON?" + done + +_TrainerSentOutText:: + text_ram wTrainerName + text " sent" + line "out @" + text_ram wEnemyMonNick + text "!" + done + +_NoWillText:: + text "There's no will" + line "to fight!" + prompt + +_CantEscapeText:: + text "Can't escape!" + prompt + +_NoRunningText:: + text "No! There's no" + line "running from a" + cont "trainer battle!" + prompt + +_GotAwayText:: + text "Got away safely!" + prompt + +_RunAwayText:: + text "Hurry, get away!" + prompt + +_ItemsCantBeUsedHereText:: + text "Items can't be" + line "used here." + prompt + +_AlreadyOutText:: + text_ram wBattleMonNick + text " is" + line "already out!" + prompt + +_MoveNoPPText:: + text "No PP left for" + line "this move!" + prompt + +_MoveDisabledText:: + text "The move is" + line "disabled!" + prompt + +_NoMovesLeftText:: + text_ram wBattleMonNick + text " has no" + line "moves left!" + done + +_MultiHitText:: + text "Hit the enemy" + line "@" + text_decimal wPlayerNumHits,1,1 + text " times!" + prompt + +_ScaredText:: + text_ram wBattleMonNick + text " is too" + line "scared to move!" + prompt + +_GetOutText:: + text "GHOST: Get out..." + line "Get out..." + prompt + +_FastAsleepText:: + text "<USER>" + line "is fast asleep!" + prompt + +_WokeUpText:: + text "<USER>" + line "woke up!" + prompt + +_IsFrozenText:: + text "<USER>" + line "is frozen solid!" + prompt + +_FullyParalyzedText:: + text "<USER>'s" + line "fully paralyzed!" + prompt + +_FlinchedText:: + text "<USER>" + line "flinched!" + prompt + +_MustRechargeText:: + text "<USER>" + line "must recharge!" + prompt + +_DisabledNoMoreText:: + text "<USER>'s" + line "disabled no more!" + prompt + +_IsConfusedText:: + text "<USER>" + line "is confused!" + prompt + +_HurtItselfText:: + text "It hurt itself in" + line "its confusion!" + prompt + +_ConfusedNoMoreText:: + text "<USER>'s" + line "confused no more!" + prompt + +_SavingEnergyText:: + text "<USER>" + line "is saving energy!" + prompt + +_UnleashedEnergyText:: + text "<USER>" + line "unleashed energy!" + prompt + +_ThrashingAboutText:: + text "<USER>'s" + line "thrashing about!" + done + +_AttackContinuesText:: + text "<USER>'s" + line "attack continues!" + done + +_CantMoveText:: + text "<USER>" + line "can't move!" + prompt + +_MoveIsDisabledText:: + text "<USER>'s" + line "@" + text_ram wcd6d + text " is" + cont "disabled!" + prompt + +_MonName1Text:: + text "<USER>@" + text_end + +_Used1Text:: + text_start + line "used @" + text_end + +_Used2Text:: + text_start + line "used @" + text_end + +_InsteadText:: + text "instead," + cont "@" + text_end + +_CF4BText:: + text_ram wcf4b + text "@" + +_ExclamationPoint1Text:: + text "!" + done + +_ExclamationPoint2Text:: + text "!" + done + +_ExclamationPoint3Text:: + text "!" + done + +_ExclamationPoint4Text:: + text "!" + done + +_ExclamationPoint5Text:: + text "!" + done + +_AttackMissedText:: + text "<USER>'s" + line "attack missed!" + prompt + +_KeptGoingAndCrashedText:: + text "<USER>" + line "kept going and" + cont "crashed!" + prompt + +_UnaffectedText:: + text "<TARGET>'s" + line "unaffected!" + prompt + +_DoesntAffectMonText:: + text "It doesn't affect" + line "<TARGET>!" + prompt + +_CriticalHitText:: + text "Critical hit!" + prompt + +_OHKOText:: + text "One-hit KO!" + prompt + +_LoafingAroundText:: + text_ram wBattleMonNick + text " is" + line "loafing around." + prompt + +_BeganToNapText:: + text_ram wBattleMonNick + text " began" + line "to nap!" + prompt + +_WontObeyText:: + text_ram wBattleMonNick + text " won't" + line "obey!" + prompt + +_TurnedAwayText:: + text_ram wBattleMonNick + text " turned" + line "away!" + prompt + +_IgnoredOrdersText:: + text_ram wBattleMonNick + text_start + line "ignored orders!" + prompt + +_SubstituteTookDamageText:: + text "The SUBSTITUTE" + line "took damage for" + cont "<TARGET>!" + prompt + +_SubstituteBrokeText:: + text "<TARGET>'s" + line "SUBSTITUTE broke!" + prompt + +_BuildingRageText:: + text "<USER>'s" + line "RAGE is building!" + prompt + +_MirrorMoveFailedText:: + text "The MIRROR MOVE" + next "failed!" + prompt + +_HitXTimesText:: + text "Hit @" + text_decimal wEnemyNumHits, 1, 1 + text " times!" + prompt + +_GainedText:: + text_ram wcd6d + text " gained" + line "@" + text_end + +_WithExpAllText:: + text "with EXP.ALL," + cont "@" + text_end + +_BoostedText:: + text "a boosted" + cont "@" + text_end + +_ExpPointsText:: + text_decimal wExpAmountGained, 2, 4 + text " EXP. Points!" + prompt + +_GrewLevelText:: + text_ram wcd6d + text " grew" + line "to level @" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end + +_SuperEffectiveText:: + text "It's super" + line "effective!" + prompt + +_NotVeryEffectiveText:: + text "It's not very" + line "effective..." + prompt + +_SafariZoneEatingText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "is eating!" + prompt + +_SafariZoneAngryText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "is angry!" + prompt + +_WildMonAppearedText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "appeared!" + prompt + +_HookedMonAttackedText:: + text "The hooked" + line "@" + text_ram wEnemyMonNick + text_start + cont "attacked!" + prompt diff --git a/data/text/text_3.asm b/data/text/text_3.asm new file mode 100644 index 00000000..bd418402 --- /dev/null +++ b/data/text/text_3.asm @@ -0,0 +1,637 @@ +_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 + +_ClearSaveDataText:: + text "Clear all saved" + line "data?" + done + +_WhichFloorText:: + text "Which floor do" + line "you want? " + done + +_SleepingPikachuText1:: + text "There isn't any" + line "response..." + prompt + +_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 "Teach to 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 + 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 + +_SleepingPikachuText2:: + text "There isn't any" + line "response..." + 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 + +_PikachuUnhappyText:: + text_ram wcd6d + text " looks" + line "unhappy about it!" + 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." + prompt + +_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 + +_ExpressionText:: + text "This expression is" + line "No. @" + text_decimal wExpressionNumber, 1, 2 + text "." + prompt + +_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 + +_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 + +_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>!" + prompt + +_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 + +_ColosseumMewText:: + text "Sorry, MEW can't" + line "attend!" + prompt + +_ColosseumDifferentMonsText:: + text "Your #MON must" + line "all be different!" + prompt + +_ColosseumMaxL55Text:: + text "No #MON can" + line "exceed L55!" + prompt + +_ColosseumMinL50Text:: + text "All #MON must" + line "be at least L50!" + prompt + +_ColosseumTotalL155Text:: + text "Your total levels" + line "exceed 155!" + prompt + +_ColosseumMaxL30Text:: + text "No #MON can" + line "exceed L30!" + prompt + +_ColosseumMinL25Text:: + text "All #MON must" + line "be at least L25!" + prompt + +_ColosseumTotalL80Text:: + text "Your total levels" + line "exceed 80!" + prompt + +_ColosseumMaxL20Text:: + text "No #MON can" + line "exceed L20!" + prompt + +_ColosseumMinL15Text:: + text "All #MON must" + line "be at least L15!" + prompt + +_ColosseumTotalL50Text:: + text "Your total levels" + line "exceed 50!" + prompt + +_ColosseumHeightText:: + text_ram wcd6d + text " is over" + line "6’8” tall!" + prompt + +_ColosseumWeightText:: + text_ram wcd6d + text " weighs" + line "over 44 pounds!" + prompt + +_ColosseumEvolvedText:: + text_ram wcd6d + text " is an" + line "evolved #MON!" + prompt + +_ColosseumIneligibleText:: + text "Your opponent is" + line "ineligible." + prompt + +_ColosseumWhereToText:: + text "Where would you" + line "like to go?" + done + +_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 new file mode 100644 index 00000000..4c3d6a9c --- /dev/null +++ b/data/text/text_4.asm @@ -0,0 +1,56 @@ +_FileDataDestroyedText:: + text "The file data is" + line "destroyed!" + prompt + +_WouldYouLikeToSaveText:: + text "Would you like to" + line "SAVE the game?" + done + +_SavingText:: + text "Saving..." + done + +_GameSavedText:: + text "<PLAYER> saved" + line "the game!" + done + +_OlderFileWillBeErasedText:: + text "The older file" + line "will be erased to" + cont "save. Okay?" + done + +_WhenYouChangeBoxText:: + text "When you change a" + line "#MON BOX, data" + cont "will be saved." + + para "Is that okay?" + done + +_ChooseABoxText:: + text "Choose a" + line "<PKMN> BOX.@" + text_end + +_EvolvedText:: + text_ram wcf4b + text " evolved" + done + +_IntoText:: + text_start + line "into @" + text_ram wcd6d + text "!" + done + +_StoppedEvolvingText:: + text "Huh? @" + text_ram wcf4b + text_start + line "stopped evolving!" + prompt diff --git a/data/text/text_5.asm b/data/text/text_5.asm new file mode 100644 index 00000000..fc758be9 --- /dev/null +++ b/data/text/text_5.asm @@ -0,0 +1,277 @@ +_IsEvolvingText:: + text "What? @" + text_ram wcf4b + text_start + line "is evolving!" + done + +_FellAsleepText:: + text "<TARGET>" + line "fell asleep!" + prompt + +_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 + +_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 + +_RanFromBattleText:: + text "<USER>" + line "ran from battle!" + prompt + +_RanAwayScaredText:: + text "<TARGET>" + line "ran away scared!" + prompt + +_WasBlownAwayText:: + text "<TARGET>" + line "was blown away!" + prompt + +_ChargeMoveEffectText:: + text "<USER>@" + text_end + +_MadeWhirlwindText:: + text_start + line "made a whirlwind!" + prompt + +_TookInSunlightText:: + text_start + line "took in sunlight!" + prompt + +_LoweredItsHeadText:: + text_start + line "lowered its head!" + prompt + +_SkyAttackGlowingText:: + text_start + line "is glowing!" + prompt + +_FlewUpHighText:: + text_start + line "flew up high!" + prompt + +_DugAHoleText:: + text_start + line "dug a hole!" + prompt + +_BecameConfusedText:: + text "<TARGET>" + line "became confused!" + prompt + +_MimicLearnedMoveText:: + text "<USER>" + line "learned" + cont "@" + text_ram wcd6d + text "!" + prompt + +_MoveWasDisabledText:: + text "<TARGET>'s" + line "@" + text_ram wcd6d + text " was" + 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 + +_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 + +_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 + +_ColosseumText1:: + text "!" + done diff --git a/data/text/text_6.asm b/data/text/text_6.asm new file mode 100644 index 00000000..bcdc75a3 --- /dev/null +++ b/data/text/text_6.asm @@ -0,0 +1,10 @@ +TeachingHMsText:: + text "Once a #MON" + line "learns an HM, the" + cont "technique can't" + cont "be replaced." + + para "Better think care-" + line "fully before you" + cont "teach HM moves." + done diff --git a/data/text/text_7.asm b/data/text/text_7.asm new file mode 100644 index 00000000..88c7d884 --- /dev/null +++ b/data/text/text_7.asm @@ -0,0 +1,216 @@ +_PokemonText:: + text "#MON!" + done + +_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!" + prompt + +_RepelWoreOffText:: + text "REPEL's effect" + line "wore off." + done + +_PokemartBuyingGreetingText:: + text "Take your time." + done + +_PokemartTellBuyPriceText:: + text_ram wcf4b + text "?" + line "That will be" + cont "¥@" + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text ". OK?" + 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." + done + +_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 + +_PokemartAnythingElseText:: + text "Is there anything" + line "else I can do?" + done + +_LearnedMove1Text:: + text_ram wLearnMoveMonName + text " learned" + line "@" + text_ram wcf4b + text "!@" + text_end + +_WhichMoveToForgetText:: + text "Which move should" + next "be forgotten?" + done + +_AbandonLearningText:: + text "Abandon learning" + line "@" + text_ram wcf4b + text "?" + done + +_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 "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 "@" + 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!" + prompt + +_PokemonCenterFarewellText:: + text "We hope to see" + line "you again!" + done + +_LooksContentText:: + text "It looks very" + line "content asleep." + 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 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/unused_names.asm b/data/text/unused_names.asm new file mode 100644 index 00000000..349a31cf --- /dev/null +++ b/data/text/unused_names.asm @@ -0,0 +1,22 @@ +UnusedBadgeNames:: + db "かみなりバッヂ@" ; THUNDER BADGE + db "かいがらバッヂ@" ; SHELL BADGE + db "おじぞうバッヂ@" ; JIZOU BADGE + db "はやぶさバッヂ@" ; FALCON BADGE + db "ひんやりバッヂ@" ; CHILL BADGE + db "なかよしバッヂ@" ; FRIENDSHIP BADGE + db "バラバッヂ@" ; ROSE BADGE + db "ひのたまバッヂ@" ; FIREBALL BADGE + db "ゴールドバッヂ@" ; GOLD BADGE + +UnusedRankingNames: + db "たまご@" ; EGG + db "ひよこ@" ; CHICK + db "ブロンズ@" ; BRONZE + db "シルバー@" ; SILVER + db "ゴールド@" ; GOLD + db "プチキャプテン@" ; PETIT CAPTAIN + db "キャプテン@" ; CAPTAIN + db "プチマスター@" ; PETIT MASTER + db "マスター@" ; MASTER + db "エクセレント" ; EXCELLENT diff --git a/data/text_boxes.asm b/data/text_boxes.asm new file mode 100644 index 00000000..34e6a414 --- /dev/null +++ b/data/text_boxes.asm @@ -0,0 +1,88 @@ +TextBoxFunctionTable: + ; text box ID, function address + dbw MONEY_BOX, DisplayMoneyBox + dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu + dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu + db -1 ; end + +TextBoxCoordTable: + ; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y + db MESSAGE_BOX, 0, 12, 19, 17 + db MENU_TEMPLATE_03, 0, 0, 19, 14 + db MENU_TEMPLATE_07, 0, 0, 11, 6 + db LIST_MENU_BOX, 4, 2, 19, 12 + db MENU_TEMPLATE_10, 7, 0, 19, 17 + db MON_SPRITE_POPUP, 6, 4, 14, 13 + db -1 ; end + +text_box_text: MACRO + db \1 ; text box ID + db \2, \3, \4, \5 ; text box coordinates + dw \6 ; text pointer + db \7, \8 ; text coordinates +ENDM + +TextBoxTextAndCoordTable: + ; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y, text pointer, text X, text Y + text_box_text JP_MOCHIMONO_MENU_TEMPLATE, 0, 0, 14, 17, JapaneseMochimonoText, 3, 0 + text_box_text USE_TOSS_MENU_TEMPLATE, 13, 10, 19, 14, UseTossText, 15, 11 + text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE, 0, 0, 7, 5, JapaneseSaveMessageText, 2, 2 + text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE, 0, 6, 5, 10, JapaneseSpeedOptionsText, 2, 7 + text_box_text BATTLE_MENU_TEMPLATE, 8, 12, 19, 17, BattleMenuText, 10, 14 + text_box_text SAFARI_BATTLE_MENU_TEMPLATE, 0, 12, 19, 17, SafariZoneBattleMenuText, 2, 14 + text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText, 13, 12 + text_box_text BUY_SELL_QUIT_MENU_TEMPLATE, 0, 0, 10, 6, BuySellQuitText, 2, 1 + text_box_text MONEY_BOX_TEMPLATE, 11, 0, 19, 2, MoneyText, 13, 0 + text_box_text JP_AH_MENU_TEMPLATE, 7, 6, 11, 10, JapaneseAhText, 8, 8 + text_box_text JP_POKEDEX_MENU_TEMPLATE, 11, 8, 19, 17, JapanesePokedexMenu, 12, 10 + +BuySellQuitText: + db "BUY" + next "SELL" + next "QUIT@" + + db "@" ; unused + +UseTossText: + db "USE" + next "TOSS@" + +JapaneseSaveMessageText: + db "きろく" + next "メッセージ@" + +JapaneseSpeedOptionsText: + db "はやい" + next "おそい@" + +MoneyText: + db "MONEY@" + +JapaneseMochimonoText: + db "もちもの@" + +JapaneseMainMenuText: + db "つづきから" + next "さいしょから@" + +BattleMenuText: + db "FIGHT <PK><MN>" + next "ITEM RUN@" + +SafariZoneBattleMenuText: + db "BALL× BAIT" + next "THROW ROCK RUN@" + +SwitchStatsCancelText: + db "SWITCH" + next "STATS" + next "CANCEL@" + +JapaneseAhText: + db "アッ！@" + +JapanesePokedexMenu: + db "データをみる" + next "なきごえ" + next "ぶんぷをみる" + next "キャンセル@" diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm new file mode 100644 index 00000000..df882ebd --- /dev/null +++ b/data/text_predef_pointers.asm @@ -0,0 +1,74 @@ +add_tx_pre: MACRO +\1_id:: + dw \1 +ENDM + +TextPredefs:: + add_tx_pre CardKeySuccessText ; 01 + add_tx_pre CardKeyFailText ; 02 + add_tx_pre RedBedroomPCText ; 03 + add_tx_pre RedBedroomSNESText ; 04 + add_tx_pre PushStartText ; 05 + add_tx_pre SaveOptionText ; 06 + add_tx_pre StrengthsAndWeaknessesText ; 07 + add_tx_pre OakLabEmailText ; 08 + add_tx_pre AerodactylFossilText ; 09 + add_tx_pre Route15UpstairsBinocularsText ; 0A + add_tx_pre KabutopsFossilText ; 0B + 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/tilemaps.asm b/data/tilemaps.asm new file mode 100644 index 00000000..97e687fd --- /dev/null +++ b/data/tilemaps.asm @@ -0,0 +1,46 @@ +tile_ids: MACRO + dw \1 + dn \3, \2 +ENDM + +TileIDListPointerTable: +; entries correspond to TILEMAP_* constants (see constants/gfx_constants.asm) + ; tilemap pointer, width, height + tile_ids MonTiles, 7, 7 + tile_ids SlideDownMonTiles_7x5, 7, 5 + tile_ids SlideDownMonTiles_7x3, 7, 3 + tile_ids GengarIntroTiles1, 7, 7 + tile_ids GengarIntroTiles2, 7, 7 + tile_ids GengarIntroTiles3, 7, 7 + tile_ids GameBoyTiles, 6, 8 + tile_ids LinkCableTiles, 12, 3 + +DownscaledMonTiles_5x5: + INCBIN "gfx/pokemon/downscaled_5x5.tilemap" + +DownscaledMonTiles_3x3: + INCBIN "gfx/pokemon/downscaled_3x3.tilemap" + +MonTiles: + INCBIN "gfx/pokemon/front.tilemap" + +SlideDownMonTiles_7x5: + INCBIN "gfx/pokemon/slide_down_7x5.tilemap" + +SlideDownMonTiles_7x3: + INCBIN "gfx/pokemon/slide_down_7x3.tilemap" + +GengarIntroTiles1: + INCBIN "gfx/intro/gengar_1.tilemap" + +GengarIntroTiles2: + INCBIN "gfx/intro/gengar_2.tilemap" + +GengarIntroTiles3: + INCBIN "gfx/intro/gengar_3.tilemap" + +GameBoyTiles: + INCBIN "gfx/trade/game_boy.tilemap" + +LinkCableTiles: + INCBIN "gfx/trade/link_cable.tilemap" diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm deleted file mode 100755 index c85a51e5..00000000 --- a/data/tileset_headers.asm +++ /dev/null @@ -1,27 +0,0 @@ -Tilesets: - - tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR - tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR - tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE - tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR - tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR - tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE - tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR - tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR - tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR - 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/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm new file mode 100755 index 00000000..b78c7c8c --- /dev/null +++ b/data/tilesets/bike_riding_tilesets.asm @@ -0,0 +1,7 @@ +BikeRidingTilesets:: + db OVERWORLD + db FOREST + db UNDERGROUND + db SHIP_PORT + db CAVERN + db -1 ; end diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm new file mode 100644 index 00000000..55143d73 --- /dev/null +++ b/data/tilesets/bookshelf_tile_ids.asm @@ -0,0 +1,25 @@ +bookshelf_tile: MACRO + db \1, \2 + db_tx_pre \3 +ENDM + +BookshelfTileIDs: + ; tileset id, bookshelf tile id, text id + bookshelf_tile PLATEAU, $30, IndigoPlateauStatues + bookshelf_tile HOUSE, $3D, TownMapText + bookshelf_tile HOUSE, $1E, BookOrSculptureText + bookshelf_tile MANSION, $32, BookOrSculptureText + bookshelf_tile REDS_HOUSE_1, $32, BookOrSculptureText + bookshelf_tile LAB, $28, BookOrSculptureText + bookshelf_tile LOBBY, $16, ElevatorText + bookshelf_tile GYM, $1D, BookOrSculptureText + bookshelf_tile DOJO, $1D, BookOrSculptureText + bookshelf_tile GATE, $22, BookOrSculptureText + bookshelf_tile MART, $54, PokemonStuffText + bookshelf_tile MART, $55, PokemonStuffText + bookshelf_tile POKECENTER, $54, PokemonStuffText + bookshelf_tile POKECENTER, $55, PokemonStuffText + bookshelf_tile LOBBY, $50, PokemonStuffText + bookshelf_tile LOBBY, $52, PokemonStuffText + bookshelf_tile SHIP, $36, BookOrSculptureText + db -1 ; end diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm new file mode 100644 index 00000000..058a815c --- /dev/null +++ b/data/tilesets/collision_tile_ids.asm @@ -0,0 +1,74 @@ +coll_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +Underground_Coll:: + coll_tiles $0b, $0c, $13, $15, $18 + +Overworld_Coll:: + coll_tiles $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b + +RedsHouse1_Coll:: +RedsHouse2_Coll:: + coll_tiles $01, $02, $03, $11, $12, $13, $14, $1c, $1a + +Mart_Coll:: +Pokecenter_Coll:: + coll_tiles $11, $1a, $1c, $3c, $5e + +Dojo_Coll:: +Gym_Coll:: + coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03 + +Forest_Coll:: + coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f + +House_Coll:: + coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c + +ForestGate_Coll:: +Museum_Coll:: +Gate_Coll:: + coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e + +Ship_Coll:: + coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a + +ShipPort_Coll:: + coll_tiles $0a, $1a, $32, $3b + +Cemetery_Coll:: + coll_tiles $01, $10, $13, $1b, $22, $42, $52 + +Interior_Coll:: + coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56 + +Cavern_Coll:: + coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30 + + coll_tiles ; unused + +Lobby_Coll:: + coll_tiles $14, $17, $1a, $1c, $20, $38, $45 + +Mansion_Coll:: + coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 + +Lab_Coll:: + coll_tiles $0c, $26, $16, $1e, $34, $37 + +Club_Coll:: + coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 + +Facility_Coll:: + coll_tiles $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e + +Plateau_Coll:: + coll_tiles $1b, $23, $2c, $2d, $3b, $45 + +BeachHouse_Coll:: + coll_tiles $01, $11, $12, $14 diff --git a/data/tilesets/cut_tree_blocks.asm b/data/tilesets/cut_tree_blocks.asm new file mode 100644 index 00000000..ddbe28fc --- /dev/null +++ b/data/tilesets/cut_tree_blocks.asm @@ -0,0 +1,13 @@ +CutTreeBlockSwaps: + ; first byte = tileset block containing the cut tree + ; second byte = corresponding tileset block after the cut animation happens + db $32, $6D + db $33, $6C + db $34, $6F + db $35, $4C + db $60, $6E + db $0B, $0A + db $3C, $35 + db $3F, $35 + db $3D, $36 + db -1 ; end diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm new file mode 100644 index 00000000..5fca7114 --- /dev/null +++ b/data/tilesets/door_tile_ids.asm @@ -0,0 +1,60 @@ +DoorTileIDPointers: + dbw OVERWORLD, .OverworldDoorTileIDs + dbw FOREST, .ForestDoorTileIDs + dbw MART, .MartDoorTileIDs + dbw HOUSE, .HouseDoorTileIDs + dbw FOREST_GATE, .TilesetMuseumDoorTileIDs + dbw MUSEUM, .TilesetMuseumDoorTileIDs + dbw GATE, .TilesetMuseumDoorTileIDs + dbw SHIP, .ShipDoorTileIDs + dbw LOBBY, .LobbyDoorTileIDs + dbw MANSION, .MansionDoorTileIDs + dbw LAB, .LabDoorTileIDs + dbw FACILITY, .FacilityDoorTileIDs + dbw PLATEAU, .PlateauDoorTileIDs + dbw INTERIOR, .InteriorDoorTileIDs + db -1 ; end + +door_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db 0 ; end +ENDM + +.OverworldDoorTileIDs: + door_tiles $1B, $58 + +.ForestDoorTileIDs: + door_tiles $3a + +.MartDoorTileIDs: + door_tiles $5e + +.HouseDoorTileIDs: + door_tiles $54 + +.TilesetMuseumDoorTileIDs: + door_tiles $3b + +.ShipDoorTileIDs: + door_tiles $1e + +.LobbyDoorTileIDs: + door_tiles $1c, $38, $1a + +.MansionDoorTileIDs: + door_tiles $1a, $1c, $53 + +.LabDoorTileIDs: + door_tiles $34 + +.FacilityDoorTileIDs: + door_tiles $43, $58, $1b + +.PlateauDoorTileIDs: + door_tiles $3b, $1b + +.InteriorDoorTileIDs: + door_tiles $04, $15 diff --git a/data/tilesets/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm new file mode 100755 index 00000000..2af36696 --- /dev/null +++ b/data/tilesets/dungeon_tilesets.asm @@ -0,0 +1,13 @@ +DungeonTilesets: + db FOREST + db MUSEUM + db SHIP + db CAVERN + db LOBBY + db MANSION + db GATE + db LAB + db FACILITY + db CEMETERY + db GYM + db -1 ; end diff --git a/data/tilesets/escape_rope_tilesets.asm b/data/tilesets/escape_rope_tilesets.asm new file mode 100644 index 00000000..6a40089c --- /dev/null +++ b/data/tilesets/escape_rope_tilesets.asm @@ -0,0 +1,7 @@ +EscapeRopeTilesets: + db FOREST + db CEMETERY + db CAVERN + db FACILITY + db INTERIOR + db -1 ; end diff --git a/data/tilesets/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm new file mode 100644 index 00000000..db293800 --- /dev/null +++ b/data/tilesets/ledge_tiles.asm @@ -0,0 +1,11 @@ +LedgeTiles: + ; player direction, tile player standing on, ledge tile, input required + db SPRITE_FACING_DOWN, $2C, $37, D_DOWN + db SPRITE_FACING_DOWN, $39, $36, D_DOWN + db SPRITE_FACING_DOWN, $39, $37, D_DOWN + db SPRITE_FACING_LEFT, $2C, $27, D_LEFT + db SPRITE_FACING_LEFT, $39, $27, D_LEFT + db SPRITE_FACING_RIGHT, $2C, $0D, D_RIGHT + db SPRITE_FACING_RIGHT, $2C, $1D, D_RIGHT + db SPRITE_FACING_RIGHT, $39, $0D, D_RIGHT + db -1 ; end diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm new file mode 100644 index 00000000..84869556 --- /dev/null +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -0,0 +1,24 @@ +; FORMAT: tileset number, tile 1, tile 2 +; terminated by -1 +; these entries indicate that the player may not cross between tile 1 and tile 2 +; it's mainly used to simulate differences in elevation + +TilePairCollisionsLand:: + db CAVERN, $20, $05 + db CAVERN, $41, $05 + db FOREST, $30, $2E + db CAVERN, $2A, $05 + db CAVERN, $05, $21 + db FOREST, $52, $2E + db FOREST, $55, $2E + db FOREST, $56, $2E + db FOREST, $20, $2E + db FOREST, $5E, $2E + db FOREST, $5F, $2E + db -1 ; end + +TilePairCollisionsWater:: + db FOREST, $14, $2E + db FOREST, $48, $2E + db CAVERN, $14, $05 + db -1 ; end diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm new file mode 100644 index 00000000..82506b6d --- /dev/null +++ b/data/tilesets/spinner_tiles.asm @@ -0,0 +1,29 @@ +spinner: MACRO +; \1: source +; \2: offset (BANK() chokes on literals) +; \3: dest + dw \1 tile \2 + db 1 + db BANK(\1) + dw vTileset tile \3 +ENDM + +FacilitySpinnerArrows: + spinner SpinnerArrowAnimTiles, 0, $20 + spinner SpinnerArrowAnimTiles, 1, $21 + spinner SpinnerArrowAnimTiles, 2, $30 + spinner SpinnerArrowAnimTiles, 3, $31 + spinner Facility_GFX, $20, $20 + spinner Facility_GFX, $21, $21 + spinner Facility_GFX, $30, $30 + spinner Facility_GFX, $31, $31 + +GymSpinnerArrows: + spinner SpinnerArrowAnimTiles, 1, $3c + spinner SpinnerArrowAnimTiles, 3, $3d + spinner SpinnerArrowAnimTiles, 0, $4c + spinner SpinnerArrowAnimTiles, 2, $4d + spinner Gym_GFX, $3c, $3c + spinner Gym_GFX, $3d, $3d + spinner Gym_GFX, $4c, $4c + spinner Gym_GFX, $4d, $4d diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm new file mode 100755 index 00000000..4e055591 --- /dev/null +++ b/data/tilesets/tileset_headers.asm @@ -0,0 +1,35 @@ +tileset: MACRO + db BANK(\2) ; BANK(GFX) + dw \1, \2, \3 ; Block, GFX, Coll + db \4, \5, \6 ; counter tiles + db \7 ; grass tile + db \8 ; permission (indoor, cave, outdoor) +ENDM + +Tilesets: + ; block, gfx, coll, 3 counter tiles, grass tile, permission + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR + tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR + tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE + tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR + tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR + tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE + tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR + tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR + tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR + 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_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm new file mode 100644 index 00000000..be327599 --- /dev/null +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -0,0 +1,25 @@ +WarpTileListPointers: + dw .FacingDownWarpTiles + dw .FacingUpWarpTiles + dw .FacingLeftWarpTiles + dw .FacingRightWarpTiles + +warp_carpet_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +.FacingDownWarpTiles: + warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33 + +.FacingUpWarpTiles: + warp_carpet_tiles $01, $5C + +.FacingLeftWarpTiles: + warp_carpet_tiles $1A, $4B + +.FacingRightWarpTiles: + warp_carpet_tiles $0F, $4E diff --git a/data/tilesets/warp_pad_hole_tile_ids.asm b/data/tilesets/warp_pad_hole_tile_ids.asm new file mode 100644 index 00000000..e12b3735 --- /dev/null +++ b/data/tilesets/warp_pad_hole_tile_ids.asm @@ -0,0 +1,7 @@ +WarpPadAndHoleData: + ; tileset id, tile id, value for [wStandingOnWarpPadOrHole] + db FACILITY, $20, 1 ; warp pad + db FACILITY, $11, 2 ; hole + db CAVERN, $22, 2 ; hole + db INTERIOR, $55, 1 ; warp pad + db -1 ; end diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm new file mode 100755 index 00000000..7c207e27 --- /dev/null +++ b/data/tilesets/warp_tile_ids.asm @@ -0,0 +1,97 @@ +WarpTileIDPointers: + dw .OverworldWarpTileIDs + dw .RedsHouse1WarpTileIDs + dw .MartWarpTileIDs + dw .ForestWarpTileIDs + dw .RedsHouse2WarpTileIDs + dw .DojoWarpTileIDs + dw .PokecenterWarpTileIDs + dw .GymWarpTileIDs + dw .HouseWarpTileIDs + dw .ForestGateWarpTileIDs + dw .MuseumWarpTileIDs + dw .UndergroundWarpTileIDs + dw .GateWarpTileIDs + dw .ShipWarpTileIDs + dw .ShipPortWarpTileIDs + dw .CemeteryWarpTileIDs + dw .InteriorWarpTileIDs + dw .CavernWarpTileIDs + dw .LobbyWarpTileIDs + dw .MansionWarpTileIDs + dw .LabWarpTileIDs + dw .ClubWarpTileIDs + dw .FacilityWarpTileIDs + dw .PlateauWarpTileIDs + dw .BeachHouseWarpTileIDs + +warp_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +.OverworldWarpTileIDs: + warp_tiles $1B, $58 + +.ForestGateWarpTileIDs: +.MuseumWarpTileIDs: +.GateWarpTileIDs: + db $3B + ; fallthrough +.RedsHouse1WarpTileIDs: +.RedsHouse2WarpTileIDs: + warp_tiles $1A, $1C + +.MartWarpTileIDs: +.PokecenterWarpTileIDs: + warp_tiles $5E + +.ForestWarpTileIDs: + warp_tiles $5A, $5C, $3A + +.DojoWarpTileIDs: +.GymWarpTileIDs: + warp_tiles $4A + +.HouseWarpTileIDs: + warp_tiles $54, $5C, $32 + +.ShipWarpTileIDs: + warp_tiles $37, $39, $1E, $4A + +.InteriorWarpTileIDs: + warp_tiles $15, $55, $04 + +.CavernWarpTileIDs: + warp_tiles $18, $1A, $22 + +.LobbyWarpTileIDs: + warp_tiles $1A, $1C, $38 + +.MansionWarpTileIDs: + warp_tiles $1A, $1C, $53 + +.LabWarpTileIDs: + warp_tiles $34 + +.FacilityWarpTileIDs: + db $43, $58, $20 + ; fallthrough +.CemeteryWarpTileIDs: + db $1B + ; fallthrough +.UndergroundWarpTileIDs: + warp_tiles $13 + +.PlateauWarpTileIDs: + db $1B, $3B + ; fallthrough +.ShipPortWarpTileIDs: +.ClubWarpTileIDs: + warp_tiles + +.BeachHouseWarpTileIDs: + warp_tiles ; end diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm new file mode 100644 index 00000000..8abdce39 --- /dev/null +++ b/data/tilesets/water_tilesets.asm @@ -0,0 +1,12 @@ +; tilesets with water +WaterTilesets: + db OVERWORLD + db FOREST + db DOJO + db GYM + db SHIP + db SHIP_PORT + db CAVERN + db FACILITY + db PLATEAU + db -1 ; end diff --git a/data/tm_prices.asm b/data/tm_prices.asm deleted file mode 100755 index ccc8be05..00000000 --- a/data/tm_prices.asm +++ /dev/null @@ -1,27 +0,0 @@ -TechnicalMachinePrices: -; In thousands (nybbles). - dn 3, 2 ; TM_01, TM_02 - dn 2, 1 ; TM_03, TM_04 - dn 3, 4 ; TM_05, TM_06 - dn 2, 4 ; TM_07, TM_08 - dn 3, 4 ; TM_09, TM_10 - dn 2, 1 ; TM_11, TM_12 - dn 4, 5 ; TM_13, TM_14 - dn 5, 5 ; TM_15, TM_16 - dn 3, 2 ; TM_17, TM_18 - dn 3, 2 ; TM_19, TM_20 - dn 5, 5 ; TM_21, TM_22 - dn 5, 2 ; TM_23, TM_24 - dn 5, 4 ; TM_25, TM_26 - dn 5, 2 ; TM_27, TM_28 - dn 4, 1 ; TM_29, TM_30 - dn 2, 1 ; TM_31, TM_32 - dn 1, 2 ; TM_33, TM_34 - dn 4, 2 ; TM_35, TM_36 - dn 2, 5 ; TM_37, TM_38 - dn 2, 4 ; TM_39, TM_40 - dn 2, 2 ; TM_41, TM_42 - dn 5, 2 ; TM_43, TM_44 - dn 2, 4 ; TM_45, TM_46 - dn 3, 4 ; TM_47, TM_48 - dn 4, 2 ; TM_49, TM_50 diff --git a/data/tms.asm b/data/tms.asm deleted file mode 100755 index d61392c4..00000000 --- a/data/tms.asm +++ /dev/null @@ -1,57 +0,0 @@ -TechnicalMachines: - db MEGA_PUNCH - db RAZOR_WIND - db SWORDS_DANCE - db WHIRLWIND - db MEGA_KICK - db TOXIC - db HORN_DRILL - db BODY_SLAM - db TAKE_DOWN - db DOUBLE_EDGE - db BUBBLEBEAM - db WATER_GUN - db ICE_BEAM - db BLIZZARD - db HYPER_BEAM - db PAY_DAY - db SUBMISSION - db COUNTER - db SEISMIC_TOSS - db RAGE - db MEGA_DRAIN - db SOLARBEAM - db DRAGON_RAGE - db THUNDERBOLT - db THUNDER - db EARTHQUAKE - db FISSURE - db DIG - db PSYCHIC_M - db TELEPORT - db MIMIC - db DOUBLE_TEAM - db REFLECT - db BIDE - db METRONOME - db SELFDESTRUCT - db EGG_BOMB - db FIRE_BLAST - db SWIFT - db SKULL_BASH - db SOFTBOILED - db DREAM_EATER - db SKY_ATTACK - db REST - db THUNDER_WAVE - db PSYWAVE - db EXPLOSION - db ROCK_SLIDE - db TRI_ATTACK - db SUBSTITUTE - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db $ff ; terminator diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm deleted file mode 100755 index eed56919..00000000 --- a/data/town_map_entries.asm +++ /dev/null @@ -1,102 +0,0 @@ -ExternalMapEntries: - EMAP $2,$B,PalletTownName - EMAP $2,$8,ViridianCityName - EMAP $2,$3,PewterCityName - EMAP $A,$2,CeruleanCityName - EMAP $E,$5,LavenderTownName - EMAP $A,$9,VermilionCityName - EMAP $7,$5,CeladonCityName - EMAP $8,$D,FuchsiaCityName - EMAP $2,$F,CinnabarIslandName - EMAP $0,$2,IndigoPlateauName - EMAP $A,$5,SaffronCityName - EMAP $0,$0,PalletTownName ; unused - EMAP $2,$A,Route1Name - EMAP $2,$6,Route2Name - EMAP $4,$3,Route3Name - EMAP $8,$2,Route4Name - EMAP $A,$3,Route5Name - EMAP $A,$8,Route6Name - EMAP $8,$5,Route7Name - EMAP $D,$5,Route8Name - EMAP $D,$2,Route9Name - EMAP $E,$4,Route10Name - EMAP $C,$9,Route11Name - EMAP $E,$9,Route12Name - EMAP $D,$B,Route13Name - EMAP $B,$C,Route14Name - EMAP $A,$D,Route15Name - EMAP $5,$5,Route16Name - EMAP $4,$8,Route17Name - EMAP $6,$D,Route18Name - EMAP $6,$F,Route19Name - EMAP $4,$F,Route20Name - EMAP $2,$D,Route21Name - EMAP $0,$8,Route22Name - EMAP $0,$6,Route23Name - EMAP $A,$1,Route24Name - EMAP $B,$0,Route25Name - -InternalMapEntries: - IMAP OAKS_LAB, $2,$B,PalletTownName - IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName - IMAP VIRIDIAN_FOREST_SOUTH_GATE, $2,$6,Route2Name - IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName - IMAP PEWTER_POKECENTER, $2,$3,PewterCityName - IMAP MT_MOON_B2F, $6,$2,MountMoonName - IMAP CERULEAN_MART, $A,$2,CeruleanCityName - IMAP MT_MOON_POKECENTER, $5,$2,Route4Name - IMAP CERULEAN_TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName - IMAP DAYCARE, $A,$4,Route5Name - IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name - IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name - IMAP UNDERGROUND_PATH_ROUTE_8, $B,$5,Route8Name - IMAP ROCK_TUNNEL_1F, $E,$3,RockTunnelName - IMAP POWER_PLANT, $F,$4,PowerPlantName - IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name - IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name - IMAP BILLS_HOUSE, $C,$0,SeaCottageName - IMAP VERMILION_DOCK, $A,$9,VermilionCityName - IMAP SS_ANNE_B1F_ROOMS, $9,$A,SSAnneName - IMAP VICTORY_ROAD_1F, $0,$4,VictoryRoadName - IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_NORTH_SOUTH, $A,$5,UndergroundPathName - IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_WEST_EAST, $A,$5,UndergroundPathName - IMAP CELADON_HOTEL, $7,$5,CeladonCityName - IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName - IMAP POKEMON_TOWER_7F, $F,$5,PokemonTowerName - IMAP LAVENDER_CUBONE_HOUSE, $E,$5,LavenderTownName - IMAP WARDENS_HOUSE, $8,$D,FuchsiaCityName - IMAP SAFARI_ZONE_GATE, $8,$C,SafariZoneName - IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName - IMAP SEAFOAM_ISLANDS_B4F, $5,$F,SeafoamIslandsName - IMAP VERMILION_OLD_ROD_HOUSE, $A,$9,VermilionCityName - IMAP FUCHSIA_GOOD_ROD_HOUSE, $8,$D,FuchsiaCityName - IMAP POKEMON_MANSION_1F, $2,$F,PokemonMansionName - IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName - IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName - IMAP MR_PSYCHICS_HOUSE, $A,$5,SaffronCityName - IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name - IMAP ROUTE_16_FLY_HOUSE, $4,$5,Route16Name - IMAP ROUTE_12_SUPER_ROD_HOUSE, $E,$A,Route12Name - IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name - IMAP SEAFOAM_ISLANDS_1F, $5,$F,SeafoamIslandsName - IMAP ROUTE_22_GATE, $0,$7,Route22Name - IMAP VICTORY_ROAD_2F, $0,$4,VictoryRoadName - IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name - IMAP VERMILION_TRADE_HOUSE, $A,$9,VermilionCityName - IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName - IMAP VICTORY_ROAD_3F, $0,$4,VictoryRoadName - IMAP UNUSED_MAP_CE, $7,$5,RocketHQName - IMAP SILPH_CO_8F, $A,$5,SilphCoName - IMAP POKEMON_MANSION_B1F, $2,$F,PokemonMansionName - IMAP SAFARI_ZONE_NORTH_REST_HOUSE, $8,$C,SafariZoneName - IMAP CERULEAN_CAVE_1F, $9,$1,CeruleanCaveName - IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_BADGE_HOUSE, $A,$2,CeruleanCityName - IMAP ROCK_TUNNEL_B1F, $E,$3,RockTunnelName - IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName - IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName - IMAP BEACH_HOUSE, $6,$F,Route19Name - db $FF diff --git a/data/trades.asm b/data/trades.asm deleted file mode 100755 index 4fa52d30..00000000 --- a/data/trades.asm +++ /dev/null @@ -1,12 +0,0 @@ -TradeMons: -; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total - db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" - db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" - db BUTTERFREE,BEEDRILL,2,"STINGER@@@@" - db KANGASKHAN,MUK, 0,"STICKY@@@@@" - db MEW, MEW, 2,"BART@@@@@@@" - db TANGELA, PARASECT,0,"SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" - db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" - db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" - db CUBONE, MACHOKE, 2,"RICKY@@@@@@" diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm deleted file mode 100755 index 696253e3..00000000 --- a/data/trainer_moves.asm +++ /dev/null @@ -1,160 +0,0 @@ -; yellow has its own format. - -; entry = trainerclass, trainerid, moveset+, 0 -; moveset = partymon location, partymon's move, moveid - -SpecialTrainerMoves: - db BUG_CATCHER,$f - db 2,2,TACKLE - db 2,3,STRING_SHOT - db 0 - - db YOUNGSTER,$e - 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 SONY3,$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 SONY3,$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 SONY3,$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 $ff diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm deleted file mode 100755 index 0c3dcc8f..00000000 --- a/data/trainer_parties.asm +++ /dev/null @@ -1,699 +0,0 @@ -TrainerDataPointers: - dw YoungsterData - dw BugCatcherData - dw LassData - dw SailorData - dw JrTrainerMData - dw JrTrainerFData - dw PokemaniacData - dw SuperNerdData - dw HikerData - dw BikerData - dw BurglarData - dw EngineerData - dw Juggler1Data - dw FisherData - dw SwimmerData - dw CueBallData - dw GamblerData - dw BeautyData - dw PsychicData - dw RockerData - dw JugglerData - dw TamerData - dw BirdKeeperData - dw BlackbeltData - dw Green1Data - dw ProfOakData - dw ChiefData - dw ScientistData - dw GiovanniData - dw RocketData - dw CooltrainerMData - dw CooltrainerFData - dw BrunoData - dw BrockData - dw MistyData - dw LtSurgeData - dw ErikaData - dw KogaData - dw BlaineData - dw SabrinaData - dw GentlemanData - dw Green2Data - dw Green3Data - dw LoreleiData - dw ChannelerData - dw AgathaData - dw LanceData - -; if first byte != FF, then - ; first byte is level (of all pokemon on this team) - ; all the next bytes are pokemon species - ; null-terminated -; if first byte == FF, then - ; first byte is FF (obviously) - ; every next two bytes are a level and species - ; null-terminated - -YoungsterData: - db 11,RATTATA,EKANS,0 - db 14,SPEAROW,0 -; Mt. Moon 1F - db 10,RATTATA,RATTATA,ZUBAT,0 -; Route 24 - db 14,RATTATA,EKANS,ZUBAT,0 -; Route 25 - db 15,RATTATA,SPEAROW,0 - db 17,SLOWPOKE,0 - db 14,EKANS,SANDSHREW,0 -; SS Anne 1F Rooms - db 21,NIDORAN_M,0 -; Route 11 - db 21,EKANS,0 - db 19,SANDSHREW,ZUBAT,0 - db 17,RATTATA,RATTATA,RATICATE,0 - db 18,NIDORAN_M,NIDORINO,0 -; Unused - db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 - db 24,SANDSHREW,0 -BugCatcherData: - db 7,CATERPIE,CATERPIE,0 - db 6,METAPOD,CATERPIE,METAPOD,0 - db 10,CATERPIE,0 - db 10,CATERPIE,WEEDLE,CATERPIE,0 - db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 - db 11,CATERPIE,METAPOD,0 -; Mt. Moon 1F - db 11,WEEDLE,KAKUNA,0 - db 10,CATERPIE,METAPOD,CATERPIE,0 -; Route 24 - db 14,CATERPIE,WEEDLE,0 -; Route 6 - db 16,WEEDLE,CATERPIE,WEEDLE,0 - db 20,BUTTERFREE,0 -; Unused - db 18,METAPOD,CATERPIE,VENONAT,0 -; Route 9 - db 19,BEEDRILL,BEEDRILL,0 - db 20,CATERPIE,WEEDLE,VENONAT,0 - db 8,CATERPIE,METAPOD,0 -LassData: - db 9,PIDGEY,PIDGEY,0 - db 10,RATTATA,NIDORAN_M,0 - db 14,JIGGLYPUFF,0 -; Route 4 - db 31,PARAS,PARAS,PARASECT,0 -; Mt. Moon 1F - db 11,ODDISH,BELLSPROUT,0 - db 14,CLEFAIRY,0 -; Route 24 - db 16,PIDGEY,NIDORAN_F,0 - db 14,PIDGEY,NIDORAN_F,0 -; Route 25 - db 15,NIDORAN_M,NIDORAN_F,0 - db 13,ODDISH,PIDGEY,ODDISH,0 -; SS Anne 1F Rooms - db 18,PIDGEY,NIDORAN_F,0 -; SS Anne 2F Rooms - db 20,JIGGLYPUFF,0 -; Route 8 - db 23,NIDORAN_F,NIDORINA,0 - db 24,MEOWTH,MEOWTH,MEOWTH,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 - db 18,MACHOP,SHELLDER,0 - db 17,MACHOP,TENTACOOL,0 -; SS Anne B1F Rooms - db 21,SHELLDER,0 - db 17,HORSEA,SHELLDER,TENTACOOL,0 - db 18,TENTACOOL,STARYU,0 - db 17,HORSEA,HORSEA,HORSEA,0 - db 20,MACHOP,0 -; Vermilion Gym - db 24,MAGNEMITE,0 -JrTrainerMData: -; Pewter Gym - db 9,DIGLETT,SANDSHREW,0 -; Route 24/Route 25 - db 14,RATTATA,EKANS,0 -; Route 24 - db 18,MANKEY,0 -; Route 6 - db 20,SQUIRTLE,0 - db 16,SPEAROW,RATICATE,0 -; Unused - db 18,DIGLETT,DIGLETT,SANDSHREW,0 -; Route 9 - db 21,GROWLITHE,CHARMANDER,0 - 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,ODDISH,BELLSPROUT,0 - db 16,PIDGEY,PIDGEY,PIDGEY,0 -; Unused - db 22,BULBASAUR,0 -; Route 9 - db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 - db 23,MEOWTH,0 -; Route 10 - db 20,JIGGLYPUFF,CLEFAIRY,0 - db 21,PIDGEY,PIDGEOTTO,0 -; Rock Tunnel B1F - db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 - db 22,ODDISH,BULBASAUR,0 -; Celadon Gym - db 24,BULBASAUR,IVYSAUR,0 -; Route 13 - 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 -; Route 20 - db 31,GOLDEEN,SEAKING,0 -; Rock Tunnel 1F - db 22,BELLSPROUT,CLEFAIRY,0 - db 20,MEOWTH,ODDISH,PIDGEY,0 - db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 -; Route 15 - db 28,GLOOM,ODDISH,ODDISH,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 - db 30,RHYHORN,LICKITUNG,0 - db 20,CUBONE,SLOWPOKE,0 -; Rock Tunnel B1F - db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 - db 22,CHARMANDER,CUBONE,0 - db 25,SLOWPOKE,0 -; Victory Road 2F - db 40,CHARMELEON,LAPRAS,LICKITUNG,0 -; Rock Tunnel 1F - db 23,CUBONE,SLOWPOKE,0 -SuperNerdData: -; Mt. Moon 1F - db 11,MAGNEMITE,VOLTORB,0 -; Mt. Moon B2F - db 12,GRIMER,VOLTORB,KOFFING,0 -; Route 8 - db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 - db 22,GRIMER,MUK,GRIMER,0 - db 26,KOFFING,0 -; Unused - db 22,KOFFING,MAGNEMITE,WEEZING,0 - db 20,MAGNEMITE,MAGNEMITE,KOFFING,MAGNEMITE,0 - db 24,MAGNEMITE,VOLTORB,0 -; Cinnabar Gym - db 36,VULPIX,VULPIX,NINETALES,0 - db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 - db 41,RAPIDASH,0 - db 37,GROWLITHE,VULPIX,0 -HikerData: -; Mt. Moon 1F - db 10,GEODUDE,GEODUDE,ONIX,0 -; Route 25 - db 15,MACHOP,GEODUDE,0 - db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 - db 17,ONIX,0 -; Route 9 - db 21,GEODUDE,ONIX,0 - db 20,GEODUDE,MACHOP,GEODUDE,0 -; Route 10 - db 21,GEODUDE,ONIX,0 - db 19,ONIX,GRAVELER,0 -; Rock Tunnel B1F - db 21,GEODUDE,GEODUDE,GRAVELER,0 - db 25,GEODUDE,0 -; Route 9/Rock Tunnel B1F - db 20,MACHOP,ONIX,0 -; Rock Tunnel 1F - db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 - db 20,ONIX,ONIX,GEODUDE,0 - db 21,GEODUDE,GRAVELER,0 -BikerData: -; Route 13 - db 28,KOFFING,KOFFING,KOFFING,0 -; Route 14 - db 29,KOFFING,GRIMER,0 -; Route 15 - db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 - db 28,KOFFING,GRIMER,WEEZING,0 -; Route 16 - db 29,GRIMER,KOFFING,0 - db 33,WEEZING,0 - db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 -; Route 17 - ; From https://www.smogon.com/smog/issue27/glitch: - ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. - ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; - ; that's the formula from GetMonHeader for the base stats of mon #000. - ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) - ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. - ; The result is that this data gets interpreted as the base stats - ; for MissingNo: 0,33,MUK,0,29,VOLTORB,VOLTORB,0,...,28,GRIMER,GRIMER. - db 28,WEEZING,KOFFING,WEEZING,0 - db 33,MUK,0 - db 29,VOLTORB,VOLTORB,0 - db 29,WEEZING,MUK,0 - db 25,KOFFING,WEEZING,KOFFING,KOFFING,WEEZING,0 -; Route 14 - db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 - db 28,GRIMER,GRIMER,KOFFING,0 - db 29,KOFFING,MUK,0 -BurglarData: -; Unused - db 29,GROWLITHE,VULPIX,0 - db 33,GROWLITHE,0 - db 28,VULPIX,CHARMANDER,PONYTA,0 -; Cinnabar Gym - db 36,GROWLITHE,VULPIX,NINETALES,0 - db 41,PONYTA,0 - db 37,VULPIX,GROWLITHE,0 -; Mansion 2F - db 34,CHARMANDER,CHARMELEON,0 -; Mansion 3F - db 38,NINETALES,0 -; Mansion B1F - db 34,GROWLITHE,PONYTA,0 -EngineerData: -; Unused - db 21,VOLTORB,MAGNEMITE,0 -; Route 11 - db 21,MAGNEMITE,0 - db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 -Juggler1Data: -; none -FisherData: -; SS Anne 2F Rooms - db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 -; SS Anne B1F Rooms - db 17,TENTACOOL,STARYU,SHELLDER,0 -; Route 12 - db 22,GOLDEEN,POLIWAG,GOLDEEN,0 - db 24,TENTACOOL,GOLDEEN,0 - db 27,GOLDEEN,0 - db 21,POLIWAG,SHELLDER,GOLDEEN,HORSEA,0 -; Route 21 - db 28,SEAKING,GOLDEEN,SEAKING,SEAKING,0 - db 31,SHELLDER,CLOYSTER,0 - db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 - db 33,SEAKING,GOLDEEN,0 -; Route 12 - db 24,MAGIKARP,MAGIKARP,0 -SwimmerData: -; Cerulean Gym - db 16,HORSEA,SHELLDER,0 -; Route 19 - db 30,TENTACOOL,SHELLDER,0 - db 29,GOLDEEN,HORSEA,STARYU,0 - db 30,POLIWAG,POLIWHIRL,0 - db 27,HORSEA,TENTACOOL,TENTACOOL,GOLDEEN,0 - db 29,GOLDEEN,SHELLDER,SEAKING,0 - db 30,HORSEA,HORSEA,0 - db 27,TENTACOOL,TENTACOOL,STARYU,HORSEA,TENTACRUEL,0 -; Route 20 - db 31,SHELLDER,CLOYSTER,0 - db 35,STARYU,0 - db 28,HORSEA,HORSEA,SEADRA,HORSEA,0 -; Route 21 - db 33,SEADRA,TENTACRUEL,0 - db 37,STARMIE,0 - db 33,STARYU,WARTORTLE,0 - db 32,POLIWHIRL,TENTACOOL,SEADRA,0 -CueBallData: -; Route 16 - db 28,MACHOP,MANKEY,MACHOP,0 - db 29,MANKEY,MACHOP,0 - db 33,MACHOP,0 -; Route 17 - db 29,MANKEY,PRIMEAPE,0 - db 29,MACHOP,MACHOKE,0 - db 33,MACHOKE,0 - db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 - db 29,PRIMEAPE,MACHOKE,0 -; Route 21 - db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 -GamblerData: -; Route 11 - db 18,POLIWAG,HORSEA,0 - db 18,BELLSPROUT,ODDISH,0 - db 18,VOLTORB,MAGNEMITE,0 - db 18,GROWLITHE,VULPIX,0 -; Route 8 - db 22,POLIWAG,POLIWAG,POLIWHIRL,0 -; Unused - db 22,ONIX,GEODUDE,GRAVELER,0 -; Route 8 - db 24,GROWLITHE,VULPIX,0 -BeautyData: -; Celadon Gym - db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 - db 24,BELLSPROUT,BELLSPROUT,0 - db 26,EXEGGCUTE,0 -; Route 13 - db 27,RATTATA,VULPIX,RATTATA,0 - db 29,CLEFAIRY,MEOWTH,0 -; Route 20 - db 35,SEAKING,0 - db 30,SHELLDER,SHELLDER,CLOYSTER,0 - db 31,POLIWAG,SEAKING,0 -; Route 15 - db 29,PIDGEOTTO,WIGGLYTUFF,0 - db 29,BULBASAUR,IVYSAUR,0 -; Unused - db 33,WEEPINBELL,BELLSPROUT,WEEPINBELL,0 -; Route 19 - db 27,POLIWAG,GOLDEEN,SEAKING,GOLDEEN,POLIWAG,0 - db 30,GOLDEEN,SEAKING,0 - db 29,STARYU,STARYU,STARYU,0 -; Route 20 - db 30,SEADRA,HORSEA,SEADRA,0 -PsychicData: -; Saffron Gym - db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 - db 34,MR_MIME,KADABRA,0 - db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 - db 38,SLOWBRO,0 -RockerData: -; Vermilion Gym - db 20,VOLTORB,VOLTORB,VOLTORB,0 -; Route 12 - db 29,VOLTORB,ELECTRODE,0 -JugglerData: -; Silph Co. 5F - db 29,KADABRA,MR_MIME,0 -; Victory Road 2F - db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 -; Fuchsia Gym - db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 - db 34,DROWZEE,HYPNO,0 -; Victory Road 2F - db 48,MR_MIME,0 -; Unused - db 33,HYPNO,0 -; Fuchsia Gym - db 38,HYPNO,0 - db 34,DROWZEE,KADABRA,0 -TamerData: -; Fuchsia Gym - db 34,SANDSLASH,ARBOK,0 - db 33,ARBOK,SANDSLASH,ARBOK,0 -; Viridian Gym - db 43,RHYHORN,0 - db 39,ARBOK,TAUROS,0 -; Victory Road 2F - db 44,PERSIAN,GOLDUCK,0 -; Unused - db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 -BirdKeeperData: -; Route 13 - db 29,PIDGEY,PIDGEOTTO,0 - db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 - db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 -; Route 14 - db 33,FARFETCHD,0 - db 29,SPEAROW,FEAROW,0 -; Route 15 - db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 - db 28,DODRIO,DODUO,DODUO,0 -; Route 18 - db 29,SPEAROW,FEAROW,0 - db 34,DODRIO,0 - db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 -; Route 20 - db 30,FEAROW,FEAROW,PIDGEOTTO,0 -; Unused - db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 - db 42,FARFETCHD,FEAROW,0 -; Route 14 - db 28,PIDGEY,DODUO,PIDGEOTTO,0 - db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 - db 29,PIDGEOTTO,FEAROW,0 - db 28,SPEAROW,DODUO,FEAROW,0 -BlackbeltData: -; Fighting Dojo - db 37,HITMONLEE,HITMONCHAN,0 - db 31,MANKEY,MANKEY,PRIMEAPE,0 - db 32,MACHOP,MACHOKE,0 - db 36,PRIMEAPE,0 - db 31,MACHOP,MANKEY,PRIMEAPE,0 -; Viridian Gym - db 40,MACHOP,MACHOKE,0 - db 43,MACHOKE,0 - db 38,MACHOKE,MACHOP,MACHOKE,0 -; Victory Road 2F - db 43,MACHOKE,MACHOP,MACHOKE,0 -Green1Data: - db 5,EEVEE,0 -; Route 22 - db $FF,9,SPEAROW,8,EEVEE,0 -; Cerulean City - db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0 -ProfOakData: -; Unused - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 -ChiefData: -; none -ScientistData: -; Unused - db 34,KOFFING,VOLTORB,0 -; Silph Co. 2F - db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 - db 28,MAGNEMITE,VOLTORB,MAGNETON,0 -; Silph Co. 3F/Mansion 1F - db 29,ELECTRODE,WEEZING,0 -; Silph Co. 4F - db 33,ELECTRODE,0 -; Silph Co. 5F - db 26,MAGNETON,KOFFING,WEEZING,MAGNEMITE,0 -; Silph Co. 6F - db 25,VOLTORB,KOFFING,MAGNETON,MAGNEMITE,KOFFING,0 -; Silph Co. 7F - db 29,ELECTRODE,MUK,0 -; Silph Co. 8F - db 29,GRIMER,ELECTRODE,0 -; Silph Co. 9F - db 28,VOLTORB,KOFFING,MAGNETON,0 -; Silph Co. 10F - db 29,MAGNEMITE,KOFFING,0 -; Mansion 3F - db 33,MAGNEMITE,MAGNETON,VOLTORB,0 -; Mansion B1F - db 34,MAGNEMITE,ELECTRODE,0 -GiovanniData: -; Rocket Hideout B4F - db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0 -; Silph Co. 11F - db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0 -; Viridian Gym - db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0 -RocketData: -; Mt. Moon B2F - db 13,RATTATA,ZUBAT,0 - db 11,SANDSHREW,RATTATA,ZUBAT,0 - db 12,ZUBAT,EKANS,0 - db 16,RATICATE,0 -; Cerulean City - db 17,MACHOP,DROWZEE,0 -; Route 24 - db 15,EKANS,ZUBAT,0 -; Game Corner - db 20,RATICATE,ZUBAT,0 -; Rocket Hideout B1F - db 21,DROWZEE,MACHOP,0 - db 21,RATICATE,RATICATE,0 - db 20,GRIMER,KOFFING,KOFFING,0 - db 19,RATTATA,RATICATE,RATICATE,RATTATA,0 - db 22,GRIMER,KOFFING,0 -; Rocket Hideout B2F - db 17,ZUBAT,KOFFING,GRIMER,ZUBAT,RATICATE,0 -; Rocket Hideout B3F - db 20,RATTATA,RATICATE,DROWZEE,0 - db 21,MACHOP,MACHOP,0 -; Rocket Hideout B4F - db 23,SANDSHREW,EKANS,SANDSLASH,0 - db 23,EKANS,SANDSHREW,ARBOK,0 - db 21,KOFFING,ZUBAT,0 -; Pokémon Tower 7F - db 25,ZUBAT,ZUBAT,GOLBAT,0 - db 26,KOFFING,DROWZEE,0 - db 23,ZUBAT,RATTATA,RATICATE,ZUBAT,0 -; Unused - db 26,DROWZEE,KOFFING,0 -; Silph Co. 2F - db 29,CUBONE,ZUBAT,0 - db 25,GOLBAT,ZUBAT,ZUBAT,RATICATE,ZUBAT,0 -; Silph Co. 3F - db 28,RATICATE,HYPNO,RATICATE,0 -; Silph Co. 4F - db 29,MACHOP,DROWZEE,0 - db 28,EKANS,ZUBAT,CUBONE,0 -; Silph Co. 5F - db 33,ARBOK,0 - db 33,HYPNO,0 -; Silph Co. 6F - db 29,MACHOP,MACHOKE,0 - db 28,ZUBAT,ZUBAT,GOLBAT,0 -; Silph Co. 7F - db 26,RATICATE,ARBOK,KOFFING,GOLBAT,0 - db 29,CUBONE,CUBONE,0 - db 29,SANDSHREW,SANDSLASH,0 -; Silph Co. 8F - db 26,RATICATE,ZUBAT,GOLBAT,RATTATA,0 - db 28,WEEZING,GOLBAT,KOFFING,0 -; Silph Co. 9F - db 28,DROWZEE,GRIMER,MACHOP,0 - db 28,GOLBAT,DROWZEE,HYPNO,0 -; Silph Co. 10F - db 33,MACHOKE,0 -; 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 - db 39,NIDORINO,NIDOKING,0 -; Victory Road 3F - db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 - db 43,KINGLER,TENTACRUEL,BLASTOISE,0 -; Unused - db 45,KINGLER,STARMIE,0 -; Victory Road 1F - db 42,IVYSAUR,WARTORTLE,CHARMELEON,CHARIZARD,0 -; Unused - db 44,IVYSAUR,WARTORTLE,CHARMELEON,0 - db 49,NIDOKING,0 - db 44,KINGLER,CLOYSTER,0 -; Viridian Gym - db 39,SANDSLASH,DUGTRIO,0 - db 43,RHYHORN,0 -CooltrainerFData: -; Celadon Gym - db 24,WEEPINBELL,GLOOM,IVYSAUR,0 -; Victory Road 3F - db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 - db 43,PARASECT,DEWGONG,CHANSEY,0 -; Unused - db 46,VILEPLUME,BUTTERFREE,0 -; Victory Road 1F - db 44,PERSIAN,NINETALES,0 -; Unused - db 45,IVYSAUR,VENUSAUR,0 - db 45,NIDORINA,NIDOQUEEN,0 - db 43,PERSIAN,NINETALES,RAICHU,0 -BrunoData: - db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0 -BrockData: - db $FF,10,GEODUDE,12,ONIX,0 -MistyData: - db $FF,18,STARYU,21,STARMIE,0 -LtSurgeData: - db $FF,28,RAICHU,0 -ErikaData: - db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0 -KogaData: - db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0 -BlaineData: - db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0 -SabrinaData: - 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 22,VOLTORB,MAGNEMITE,0 -; Unused - db 48,PRIMEAPE,0 -; SS Anne 2F Rooms - db 17,GROWLITHE,PONYTA,0 -Green2Data: -; SS Anne 2F - db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0 -; Pokémon Tower 2F - 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,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,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,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 -ChannelerData: -; Unused - db 22,GASTLY,0 - db 24,GASTLY,0 - db 23,GASTLY,GASTLY,0 - db 24,GASTLY,0 -; Pokémon Tower 3F - db 23,GASTLY,0 - db 24,GASTLY,0 -; Unused - db 24,HAUNTER,0 -; Pokémon Tower 3F - db 22,GASTLY,0 -; Pokémon Tower 4F - db 24,GASTLY,0 - db 23,GASTLY,GASTLY,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 4F - db 22,GASTLY,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 5F - db 23,HAUNTER,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 5F - db 22,GASTLY,0 - db 24,GASTLY,0 - db 22,HAUNTER,0 -; Pokémon Tower 6F - db 22,GASTLY,GASTLY,GASTLY,0 - db 24,GASTLY,0 - db 24,GASTLY,0 -; Saffron Gym - db 34,GASTLY,HAUNTER,0 - db 38,HAUNTER,0 - db 33,GASTLY,GASTLY,HAUNTER,0 -AgathaData: - db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0 -LanceData: - db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0 diff --git a/data/trainer_types.asm b/data/trainer_types.asm deleted file mode 100755 index cc7ca605..00000000 --- a/data/trainer_types.asm +++ /dev/null @@ -1,17 +0,0 @@ -FemaleTrainerList:: - db OPP_LASS - db OPP_JR_TRAINER_F - db OPP_BEAUTY - db OPP_COOLTRAINER_F - db $FF - -EvilTrainerList:: - db OPP_JUGGLER_X - db OPP_GAMBLER - db OPP_ROCKER - db OPP_JUGGLER - db OPP_CHIEF - db OPP_SCIENTIST - db OPP_GIOVANNI - db OPP_ROCKET - db $FF diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm new file mode 100644 index 00000000..9008be86 --- /dev/null +++ b/data/trainers/ai_pointers.asm @@ -0,0 +1,52 @@ +TrainerAIPointers: + ; one entry per trainer class + ; first byte, number of times (per Pokémon) it can occur + ; next two bytes, pointer to AI subroutine for trainer class + ; subroutines are defined in engine/battle/trainer_ai.asm + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, JugglerAI ; unused_juggler + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, JugglerAI ; juggler + dbw 3, GenericAI + dbw 3, GenericAI + dbw 2, BlackbeltAI ; blackbelt + dbw 3, GenericAI + dbw 3, GenericAI + dbw 1, GenericAI ; chief + dbw 3, GenericAI + dbw 1, GiovanniAI ; giovanni + dbw 3, GenericAI + dbw 2, CooltrainerMAI ; cooltrainerm + dbw 1, CooltrainerFAI ; cooltrainerf + dbw 2, BrunoAI ; bruno + dbw 5, BrockAI ; brock + dbw 1, MistyAI ; misty + dbw 1, LtSurgeAI ; surge + dbw 1, ErikaAI ; erika + dbw 2, KogaAI ; koga + dbw 2, BlaineAI ; blaine + dbw 1, SabrinaAI ; sabrina + dbw 3, GenericAI + dbw 1, Sony2AI ; sony2 + dbw 1, Sony3AI ; sony3 + dbw 2, LoreleiAI ; lorelei + dbw 3, GenericAI + dbw 2, AgathaAI ; agatha + dbw 1, LanceAI ; lance diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm new file mode 100755 index 00000000..5bca2517 --- /dev/null +++ b/data/trainers/encounter_types.asm @@ -0,0 +1,17 @@ +FemaleTrainerList:: + db OPP_LASS + db OPP_JR_TRAINER_F + db OPP_BEAUTY + db OPP_COOLTRAINER_F + db -1 ; end + +EvilTrainerList:: + db OPP_UNUSED_JUGGLER + db OPP_GAMBLER + db OPP_ROCKER + db OPP_JUGGLER + db OPP_CHIEF + db OPP_SCIENTIST + db OPP_GIOVANNI + db OPP_ROCKET + db -1 ; end diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm new file mode 100644 index 00000000..dd8277dc --- /dev/null +++ b/data/trainers/move_choices.asm @@ -0,0 +1,57 @@ +move_choices: MACRO +REPT _NARG + db \1 + shift +ENDR + db 0 ; end +ENDM + +; move choice modification methods that are applied for each trainer class +TrainerClassMoveChoiceModifications: + move_choices ; YOUNGSTER + move_choices 1 ; BUG CATCHER + move_choices 1 ; LASS + move_choices 1, 3 ; SAILOR + move_choices 1 ; JR_TRAINER_M + move_choices 1 ; JR_TRAINER_F + move_choices 1, 2, 3 ; POKEMANIAC + move_choices 1, 2 ; SUPER_NERD + move_choices 1 ; HIKER + move_choices 1 ; BIKER + move_choices 1, 3 ; BURGLAR + move_choices 1 ; ENGINEER + move_choices 1, 2 ; UNUSED_JUGGLER + move_choices 1, 3 ; FISHER + move_choices 1, 3 ; SWIMMER + move_choices ; CUE_BALL + move_choices 1 ; GAMBLER + move_choices 1, 3 ; BEAUTY + move_choices 1, 2 ; PSYCHIC_TR + move_choices 1 ; ROCKER + move_choices 1 ; JUGGLER + move_choices 1 ; TAMER + move_choices 1 ; BIRD_KEEPER + move_choices 1 ; BLACKBELT + move_choices 1 ; RIVAL1 + move_choices 1, 3 ; PROF_OAK + move_choices 1, 2 ; CHIEF + move_choices 1, 2 ; SCIENTIST + move_choices 1, 3 ; GIOVANNI + move_choices 1 ; ROCKET + move_choices 1, 3 ; COOLTRAINER_M + move_choices 1, 3 ; COOLTRAINER_F + move_choices 1 ; BRUNO + move_choices 1 ; BROCK + move_choices 1, 3 ; MISTY + move_choices 1 ; LT_SURGE + move_choices 1, 3 ; ERIKA + move_choices 1, 3 ; KOGA + move_choices 1 ; BLAINE + move_choices 1 ; SABRINA + move_choices 1, 2 ; GENTLEMAN + move_choices 1, 3 ; RIVAL2 + move_choices 1, 3 ; RIVAL3 + move_choices 1, 2, 3 ; LORELEI + move_choices 1 ; CHANNELER + move_choices 1 ; AGATHA + move_choices 1, 3 ; LANCE diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm new file mode 100644 index 00000000..98e2e406 --- /dev/null +++ b/data/trainers/name_pointers.asm @@ -0,0 +1,71 @@ +TrainerNamePointers: +; what is the point of these? + dw .YoungsterName + dw .BugCatcherName + dw .LassName + dw wTrainerName + dw .JrTrainerMName + dw .JrTrainerFName + dw .PokemaniacName + dw .SuperNerdName + dw wTrainerName + dw wTrainerName + dw .BurglarName + dw .EngineerName + dw .UnusedJugglerName + dw wTrainerName + dw .SwimmerName + dw wTrainerName + dw wTrainerName + dw .BeautyName + dw wTrainerName + dw .RockerName + dw .JugglerName + dw wTrainerName + dw wTrainerName + dw .BlackbeltName + dw wTrainerName + dw .ProfOakName + dw .ChiefName + dw .ScientistName + dw wTrainerName + dw .RocketName + dw .CooltrainerMName + dw .CooltrainerFName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + +.YoungsterName: db "YOUNGSTER@" +.BugCatcherName: db "BUG CATCHER@" +.LassName: db "LASS@" +.JrTrainerMName: db "JR.TRAINER♂@" +.JrTrainerFName: db "JR.TRAINER♀@" +.PokemaniacName: db "POKéMANIAC@" +.SuperNerdName: db "SUPER NERD@" +.BurglarName: db "BURGLAR@" +.EngineerName: db "ENGINEER@" +.UnusedJugglerName: db "JUGGLER@" +.SwimmerName: db "SWIMMER@" +.BeautyName: db "BEAUTY@" +.RockerName: db "ROCKER@" +.JugglerName: db "JUGGLER@" +.BlackbeltName: db "BLACKBELT@" +.ProfOakName: db "PROF.OAK@" +.ChiefName: db "CHIEF@" +.ScientistName: db "SCIENTIST@" +.RocketName: db "ROCKET@" +.CooltrainerMName: db "COOLTRAINER♂@" +.CooltrainerFName: db "COOLTRAINER♀@" diff --git a/data/trainers/names.asm b/data/trainers/names.asm new file mode 100755 index 00000000..d8e1f550 --- /dev/null +++ b/data/trainers/names.asm @@ -0,0 +1,48 @@ +TrainerNames:: + db "YOUNGSTER@" + db "BUG CATCHER@" + db "LASS@" + db "SAILOR@" + db "JR.TRAINER♂@" + db "JR.TRAINER♀@" + db "POKéMANIAC@" + db "SUPER NERD@" + db "HIKER@" + db "BIKER@" + db "BURGLAR@" + db "ENGINEER@" + db "JUGGLER@" + db "FISHERMAN@" + db "SWIMMER@" + db "CUE BALL@" + db "GAMBLER@" + db "BEAUTY@" + db "PSYCHIC@" + db "ROCKER@" + db "JUGGLER@" + db "TAMER@" + db "BIRD KEEPER@" + db "BLACKBELT@" + db "RIVAL1@" + db "PROF.OAK@" + db "CHIEF@" + db "SCIENTIST@" + db "GIOVANNI@" + db "ROCKET@" + db "COOLTRAINER♂@" + db "COOLTRAINER♀@" + db "BRUNO@" + db "BROCK@" + db "MISTY@" + db "LT.SURGE@" + db "ERIKA@" + db "KOGA@" + db "BLAINE@" + db "SABRINA@" + db "GENTLEMAN@" + db "RIVAL2@" + db "RIVAL3@" + db "LORELEI@" + db "CHANNELER@" + db "AGATHA@" + db "LANCE@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm new file mode 100755 index 00000000..af33a273 --- /dev/null +++ b/data/trainers/parties.asm @@ -0,0 +1,749 @@ +TrainerDataPointers: + dw YoungsterData + dw BugCatcherData + dw LassData + dw SailorData + dw JrTrainerMData + dw JrTrainerFData + dw PokemaniacData + dw SuperNerdData + dw HikerData + dw BikerData + dw BurglarData + dw EngineerData + dw UnusedJugglerData + dw FisherData + dw SwimmerData + dw CueBallData + dw GamblerData + dw BeautyData + dw PsychicData + dw RockerData + dw JugglerData + dw TamerData + dw BirdKeeperData + dw BlackbeltData + dw Green1Data + dw ProfOakData + dw ChiefData + dw ScientistData + dw GiovanniData + dw RocketData + dw CooltrainerMData + dw CooltrainerFData + dw BrunoData + dw BrockData + dw MistyData + dw LtSurgeData + dw ErikaData + dw KogaData + dw BlaineData + dw SabrinaData + dw GentlemanData + dw Green2Data + dw Green3Data + dw LoreleiData + dw ChannelerData + dw AgathaData + dw LanceData + +; if first byte != $FF, then + ; first byte is level (of all pokemon on this team) + ; all the next bytes are pokemon species + ; null-terminated +; if first byte == $FF, then + ; first byte is $FF (obviously) + ; every next two bytes are a level and species + ; null-terminated + +YoungsterData: +; Route 3 + db 11, RATTATA, EKANS, 0 + db 14, SPEAROW, 0 +; Mt. Moon 1F + db 10, RATTATA, RATTATA, ZUBAT, 0 +; Route 24 + db 14, RATTATA, EKANS, ZUBAT, 0 +; Route 25 + db 15, RATTATA, SPEAROW, 0 + db 17, SLOWPOKE, 0 + db 14, EKANS, SANDSHREW, 0 +; SS Anne 1F Rooms + db 21, NIDORAN_M, 0 +; Route 11 + db 21, EKANS, 0 + db 19, SANDSHREW, ZUBAT, 0 + db 17, RATTATA, RATTATA, RATICATE, 0 + db 18, NIDORAN_M, NIDORINO, 0 +; Unused + db 17, SPEAROW, RATTATA, RATTATA, SPEAROW, 0 + db 24, SANDSHREW, 0 + +BugCatcherData: +; Viridian Forest + 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 + db 11, CATERPIE, METAPOD, 0 +; Mt. Moon 1F + db 11, WEEDLE, KAKUNA, 0 + db 10, CATERPIE, METAPOD, CATERPIE, 0 +; Route 24 + db 14, CATERPIE, WEEDLE, 0 +; Route 6 + db 16, WEEDLE, CATERPIE, WEEDLE, 0 + db 20, BUTTERFREE, 0 +; Unused + db 18, METAPOD, CATERPIE, VENONAT, 0 +; Route 9 + db 19, BEEDRILL, BEEDRILL, 0 + db 20, CATERPIE, WEEDLE, VENONAT, 0 + db 8, CATERPIE, METAPOD, 0 + +LassData: +; Route 3 + db 9, PIDGEY, PIDGEY, 0 + db 10, RATTATA, NIDORAN_M, 0 + db 14, JIGGLYPUFF, 0 +; Route 4 + db 31, PARAS, PARAS, PARASECT, 0 +; Mt. Moon 1F + db 11, ODDISH, BELLSPROUT, 0 + db 14, CLEFAIRY, 0 +; Route 24 + db 16, PIDGEY, NIDORAN_F, 0 + db 14, PIDGEY, NIDORAN_F, 0 +; Route 25 + db 15, NIDORAN_M, NIDORAN_F, 0 + db 13, ODDISH, PIDGEY, ODDISH, 0 +; SS Anne 1F Rooms + db 18, PIDGEY, NIDORAN_F, 0 +; SS Anne 2F Rooms + db 20, JIGGLYPUFF, 0 +; Route 8 + db 23, NIDORAN_F, NIDORINA, 0 + db 24, MEOWTH, MEOWTH, MEOWTH, 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 + db 18, MACHOP, SHELLDER, 0 + db 17, MACHOP, TENTACOOL, 0 +; SS Anne B1F Rooms + db 21, SHELLDER, 0 + db 17, HORSEA, SHELLDER, TENTACOOL, 0 + db 18, TENTACOOL, STARYU, 0 + db 17, HORSEA, HORSEA, HORSEA, 0 + db 20, MACHOP, 0 +; Vermilion Gym + db 24, MAGNEMITE, 0 + +JrTrainerMData: +; Pewter Gym + db 9, DIGLETT, SANDSHREW, 0 +; Route 24/Route 25 + db 14, RATTATA, EKANS, 0 +; Route 24 + db 18, MANKEY, 0 +; Route 6 + db 20, SQUIRTLE, 0 + db 16, SPEAROW, RATICATE, 0 +; Unused + db 18, DIGLETT, DIGLETT, SANDSHREW, 0 +; Route 9 + db 21, GROWLITHE, CHARMANDER, 0 + 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, ODDISH, BELLSPROUT, 0 + db 16, PIDGEY, PIDGEY, PIDGEY, 0 +; Unused + db 22, BULBASAUR, 0 +; Route 9 + db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 + db 23, MEOWTH, 0 +; Route 10 + db 20, JIGGLYPUFF, CLEFAIRY, 0 + db 21, PIDGEY, PIDGEOTTO, 0 +; Rock Tunnel B1F + db 21, JIGGLYPUFF, PIDGEY, MEOWTH, 0 + db 22, ODDISH, BULBASAUR, 0 +; Celadon Gym + db 24, BULBASAUR, IVYSAUR, 0 +; Route 13 + 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 +; Route 20 + db 31, GOLDEEN, SEAKING, 0 +; Rock Tunnel 1F + db 22, BELLSPROUT, CLEFAIRY, 0 + db 20, MEOWTH, ODDISH, PIDGEY, 0 + db 19, PIDGEY, RATTATA, RATTATA, BELLSPROUT, 0 +; Route 15 + db 28, GLOOM, ODDISH, ODDISH, 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 + db 30, RHYHORN, LICKITUNG, 0 + db 20, CUBONE, SLOWPOKE, 0 +; Rock Tunnel B1F + db 20, SLOWPOKE, SLOWPOKE, SLOWPOKE, 0 + db 22, CHARMANDER, CUBONE, 0 + db 25, SLOWPOKE, 0 +; Victory Road 2F + db 40, CHARMELEON, LAPRAS, LICKITUNG, 0 +; Rock Tunnel 1F + db 23, CUBONE, SLOWPOKE, 0 + +SuperNerdData: +; Mt. Moon 1F + db 11, MAGNEMITE, VOLTORB, 0 +; Mt. Moon B2F + db 12, GRIMER, VOLTORB, KOFFING, 0 +; Route 8 + db 20, VOLTORB, KOFFING, VOLTORB, MAGNEMITE, 0 + db 22, GRIMER, MUK, GRIMER, 0 + db 26, KOFFING, 0 +; Unused + db 22, KOFFING, MAGNEMITE, WEEZING, 0 + db 20, MAGNEMITE, MAGNEMITE, KOFFING, MAGNEMITE, 0 + db 24, MAGNEMITE, VOLTORB, 0 +; Cinnabar Gym + db 36, VULPIX, VULPIX, NINETALES, 0 + db 34, PONYTA, CHARMANDER, VULPIX, GROWLITHE, 0 + db 41, RAPIDASH, 0 + db 37, GROWLITHE, VULPIX, 0 + +HikerData: +; Mt. Moon 1F + db 10, GEODUDE, GEODUDE, ONIX, 0 +; Route 25 + db 15, MACHOP, GEODUDE, 0 + db 13, GEODUDE, GEODUDE, MACHOP, GEODUDE, 0 + db 17, ONIX, 0 +; Route 9 + db 21, GEODUDE, ONIX, 0 + db 20, GEODUDE, MACHOP, GEODUDE, 0 +; Route 10 + db 21, GEODUDE, ONIX, 0 + db 19, ONIX, GRAVELER, 0 +; Rock Tunnel B1F + db 21, GEODUDE, GEODUDE, GRAVELER, 0 + db 25, GEODUDE, 0 +; Route 9/Rock Tunnel B1F + db 20, MACHOP, ONIX, 0 +; Rock Tunnel 1F + db 19, GEODUDE, MACHOP, GEODUDE, GEODUDE, 0 + db 20, ONIX, ONIX, GEODUDE, 0 + db 21, GEODUDE, GRAVELER, 0 + +BikerData: +; Route 13 + db 28, KOFFING, KOFFING, KOFFING, 0 +; Route 14 + db 29, KOFFING, GRIMER, 0 +; Route 15 + db 25, KOFFING, KOFFING, WEEZING, KOFFING, GRIMER, 0 + db 28, KOFFING, GRIMER, WEEZING, 0 +; Route 16 + db 29, GRIMER, KOFFING, 0 + db 33, WEEZING, 0 + db 26, GRIMER, GRIMER, GRIMER, GRIMER, 0 +; Route 17 + ; From https://www.smogon.com/smog/issue27/glitch: + ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. + ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; that's the formula from GetMonHeader for the base stats of mon #000. + ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) + ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. + ; The result is that this data gets interpreted as the base stats + ; for MissingNo: 0, 33, MUK, 0, 29, VOLTORB, VOLTORB, 0, ..., 28, GRIMER, GRIMER. + db 28, WEEZING, KOFFING, WEEZING, 0 + db 33, MUK, 0 + db 29, VOLTORB, VOLTORB, 0 + db 29, WEEZING, MUK, 0 + db 25, KOFFING, WEEZING, KOFFING, KOFFING, WEEZING, 0 +; Route 14 + db 26, KOFFING, KOFFING, GRIMER, KOFFING, 0 + db 28, GRIMER, GRIMER, KOFFING, 0 + db 29, KOFFING, MUK, 0 + +BurglarData: +; Unused + db 29, GROWLITHE, VULPIX, 0 + db 33, GROWLITHE, 0 + db 28, VULPIX, CHARMANDER, PONYTA, 0 +; Cinnabar Gym + db 36, GROWLITHE, VULPIX, NINETALES, 0 + db 41, PONYTA, 0 + db 37, VULPIX, GROWLITHE, 0 +; Mansion 2F + db 34, CHARMANDER, CHARMELEON, 0 +; Mansion 3F + db 38, NINETALES, 0 +; Mansion B1F + db 34, GROWLITHE, PONYTA, 0 + +EngineerData: +; Unused + db 21, VOLTORB, MAGNEMITE, 0 +; Route 11 + db 21, MAGNEMITE, 0 + db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0 + +UnusedJugglerData: +; none + +FisherData: +; SS Anne 2F Rooms + db 17, GOLDEEN, TENTACOOL, GOLDEEN, 0 +; SS Anne B1F Rooms + db 17, TENTACOOL, STARYU, SHELLDER, 0 +; Route 12 + db 22, GOLDEEN, POLIWAG, GOLDEEN, 0 + db 24, TENTACOOL, GOLDEEN, 0 + db 27, GOLDEEN, 0 + db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0 +; Route 21 + db 28, SEAKING, GOLDEEN, SEAKING, SEAKING, 0 + db 31, SHELLDER, CLOYSTER, 0 + db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0 + db 33, SEAKING, GOLDEEN, 0 +; Route 12 + db 24, MAGIKARP, MAGIKARP, 0 + +SwimmerData: +; Cerulean Gym + db 16, HORSEA, SHELLDER, 0 +; Route 19 + db 30, TENTACOOL, SHELLDER, 0 + db 29, GOLDEEN, HORSEA, STARYU, 0 + db 30, POLIWAG, POLIWHIRL, 0 + db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0 + db 29, GOLDEEN, SHELLDER, SEAKING, 0 + db 30, HORSEA, HORSEA, 0 + db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0 +; Route 20 + db 31, SHELLDER, CLOYSTER, 0 + db 35, STARYU, 0 + db 28, HORSEA, HORSEA, SEADRA, HORSEA, 0 +; Route 21 + db 33, SEADRA, TENTACRUEL, 0 + db 37, STARMIE, 0 + db 33, STARYU, WARTORTLE, 0 + db 32, POLIWHIRL, TENTACOOL, SEADRA, 0 + +CueBallData: +; Route 16 + db 28, MACHOP, MANKEY, MACHOP, 0 + db 29, MANKEY, MACHOP, 0 + db 33, MACHOP, 0 +; Route 17 + db 29, MANKEY, PRIMEAPE, 0 + db 29, MACHOP, MACHOKE, 0 + db 33, MACHOKE, 0 + db 26, MANKEY, MANKEY, MACHOKE, MACHOP, 0 + db 29, PRIMEAPE, MACHOKE, 0 +; Route 21 + db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0 + +GamblerData: +; Route 11 + db 18, POLIWAG, HORSEA, 0 + db 18, BELLSPROUT, ODDISH, 0 + db 18, VOLTORB, MAGNEMITE, 0 + db 18, GROWLITHE, VULPIX, 0 +; Route 8 + db 22, POLIWAG, POLIWAG, POLIWHIRL, 0 +; Unused + db 22, ONIX, GEODUDE, GRAVELER, 0 +; Route 8 + db 24, GROWLITHE, VULPIX, 0 + +BeautyData: +; Celadon Gym + db 21, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 + db 24, BELLSPROUT, BELLSPROUT, 0 + db 26, EXEGGCUTE, 0 +; Route 13 + db 27, RATTATA, VULPIX, RATTATA, 0 + db 29, CLEFAIRY, MEOWTH, 0 +; Route 20 + db 35, SEAKING, 0 + db 30, SHELLDER, SHELLDER, CLOYSTER, 0 + db 31, POLIWAG, SEAKING, 0 +; Route 15 + db 29, PIDGEOTTO, WIGGLYTUFF, 0 + db 29, BULBASAUR, IVYSAUR, 0 +; Unused + db 33, WEEPINBELL, BELLSPROUT, WEEPINBELL, 0 +; Route 19 + db 27, POLIWAG, GOLDEEN, SEAKING, GOLDEEN, POLIWAG, 0 + db 30, GOLDEEN, SEAKING, 0 + db 29, STARYU, STARYU, STARYU, 0 +; Route 20 + db 30, SEADRA, HORSEA, SEADRA, 0 + +PsychicData: +; Saffron Gym + db 31, KADABRA, SLOWPOKE, MR_MIME, KADABRA, 0 + db 34, MR_MIME, KADABRA, 0 + db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0 + db 38, SLOWBRO, 0 + +RockerData: +; Vermilion Gym + db 20, VOLTORB, VOLTORB, VOLTORB, 0 +; Route 12 + db 29, VOLTORB, ELECTRODE, 0 + +JugglerData: +; Silph Co. 5F + db 29, KADABRA, MR_MIME, 0 +; Victory Road 2F + db 41, DROWZEE, HYPNO, KADABRA, KADABRA, 0 +; Fuchsia Gym + db 31, DROWZEE, DROWZEE, KADABRA, DROWZEE, 0 + db 34, DROWZEE, HYPNO, 0 +; Victory Road 2F + db 48, MR_MIME, 0 +; Unused + db 33, HYPNO, 0 +; Fuchsia Gym + db 38, HYPNO, 0 + db 34, DROWZEE, KADABRA, 0 + +TamerData: +; Fuchsia Gym + db 34, SANDSLASH, ARBOK, 0 + db 33, ARBOK, SANDSLASH, ARBOK, 0 +; Viridian Gym + db 43, RHYHORN, 0 + db 39, ARBOK, TAUROS, 0 +; Victory Road 2F + db 44, PERSIAN, GOLDUCK, 0 +; Unused + db 42, RHYHORN, PRIMEAPE, ARBOK, TAUROS, 0 + +BirdKeeperData: +; Route 13 + db 29, PIDGEY, PIDGEOTTO, 0 + db 25, SPEAROW, PIDGEY, PIDGEY, SPEAROW, SPEAROW, 0 + db 26, PIDGEY, PIDGEOTTO, SPEAROW, FEAROW, 0 +; Route 14 + db 33, FARFETCHD, 0 + db 29, SPEAROW, FEAROW, 0 +; Route 15 + db 26, PIDGEOTTO, FARFETCHD, DODUO, PIDGEY, 0 + db 28, DODRIO, DODUO, DODUO, 0 +; Route 18 + db 29, SPEAROW, FEAROW, 0 + db 34, DODRIO, 0 + db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0 +; Route 20 + db 30, FEAROW, FEAROW, PIDGEOTTO, 0 +; Unused + db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0 + db 42, FARFETCHD, FEAROW, 0 +; Route 14 + db 28, PIDGEY, DODUO, PIDGEOTTO, 0 + db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0 + db 29, PIDGEOTTO, FEAROW, 0 + db 28, SPEAROW, DODUO, FEAROW, 0 + +BlackbeltData: +; Fighting Dojo + db 37, HITMONLEE, HITMONCHAN, 0 + db 31, MANKEY, MANKEY, PRIMEAPE, 0 + db 32, MACHOP, MACHOKE, 0 + db 36, PRIMEAPE, 0 + db 31, MACHOP, MANKEY, PRIMEAPE, 0 +; Viridian Gym + db 40, MACHOP, MACHOKE, 0 + db 43, MACHOKE, 0 + db 38, MACHOKE, MACHOP, MACHOKE, 0 +; Victory Road 2F + db 43, MACHOKE, MACHOP, MACHOKE, 0 + +Green1Data: + db 5, EEVEE, 0 +; Route 22 + db $FF, 9, SPEAROW, 8, EEVEE, 0 +; Cerulean City + db $FF, 18, SPEAROW, 15, SANDSHREW, 15, RATTATA, 17, EEVEE, 0 + +ProfOakData: +; Unused + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, BLASTOISE, 70, GYARADOS, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, VENUSAUR, 70, GYARADOS, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, CHARIZARD, 70, GYARADOS, 0 + +ChiefData: +; none + +ScientistData: +; Unused + db 34, KOFFING, VOLTORB, 0 +; Silph Co. 2F + db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 + db 28, MAGNEMITE, VOLTORB, MAGNETON, 0 +; Silph Co. 3F/Mansion 1F + db 29, ELECTRODE, WEEZING, 0 +; Silph Co. 4F + db 33, ELECTRODE, 0 +; Silph Co. 5F + db 26, MAGNETON, KOFFING, WEEZING, MAGNEMITE, 0 +; Silph Co. 6F + db 25, VOLTORB, KOFFING, MAGNETON, MAGNEMITE, KOFFING, 0 +; Silph Co. 7F + db 29, ELECTRODE, MUK, 0 +; Silph Co. 8F + db 29, GRIMER, ELECTRODE, 0 +; Silph Co. 9F + db 28, VOLTORB, KOFFING, MAGNETON, 0 +; Silph Co. 10F + db 29, MAGNEMITE, KOFFING, 0 +; Mansion 3F + db 33, MAGNEMITE, MAGNETON, VOLTORB, 0 +; Mansion B1F + db 34, MAGNEMITE, ELECTRODE, 0 + +GiovanniData: +; Rocket Hideout B4F + db $FF, 25, ONIX, 24, RHYHORN, 29, PERSIAN, 0 +; Silph Co. 11F + db $FF, 37, NIDORINO, 35, PERSIAN, 37, RHYHORN, 41, NIDOQUEEN, 0 +; Viridian Gym + db $FF, 50, DUGTRIO, 53, PERSIAN, 53, NIDOQUEEN, 55, NIDOKING, 55, RHYDON, 0 + +RocketData: +; Mt. Moon B2F + db 13, RATTATA, ZUBAT, 0 + db 11, SANDSHREW, RATTATA, ZUBAT, 0 + db 12, ZUBAT, EKANS, 0 + db 16, RATICATE, 0 +; Cerulean City + db 17, MACHOP, DROWZEE, 0 +; Route 24 + db 15, EKANS, ZUBAT, 0 +; Game Corner + db 20, RATICATE, ZUBAT, 0 +; Rocket Hideout B1F + db 21, DROWZEE, MACHOP, 0 + db 21, RATICATE, RATICATE, 0 + db 20, GRIMER, KOFFING, KOFFING, 0 + db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0 + db 22, GRIMER, KOFFING, 0 +; Rocket Hideout B2F + db 17, ZUBAT, KOFFING, GRIMER, ZUBAT, RATICATE, 0 +; Rocket Hideout B3F + db 20, RATTATA, RATICATE, DROWZEE, 0 + db 21, MACHOP, MACHOP, 0 +; Rocket Hideout B4F + db 23, SANDSHREW, EKANS, SANDSLASH, 0 + db 23, EKANS, SANDSHREW, ARBOK, 0 + db 21, KOFFING, ZUBAT, 0 +; Pokémon Tower 7F + db 25, ZUBAT, ZUBAT, GOLBAT, 0 + db 26, KOFFING, DROWZEE, 0 + db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0 +; Unused + db 26, DROWZEE, KOFFING, 0 +; Silph Co. 2F + db 29, CUBONE, ZUBAT, 0 + db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0 +; Silph Co. 3F + db 28, RATICATE, HYPNO, RATICATE, 0 +; Silph Co. 4F + db 29, MACHOP, DROWZEE, 0 + db 28, EKANS, ZUBAT, CUBONE, 0 +; Silph Co. 5F + db 33, ARBOK, 0 + db 33, HYPNO, 0 +; Silph Co. 6F + db 29, MACHOP, MACHOKE, 0 + db 28, ZUBAT, ZUBAT, GOLBAT, 0 +; Silph Co. 7F + db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0 + db 29, CUBONE, CUBONE, 0 + db 29, SANDSHREW, SANDSLASH, 0 +; Silph Co. 8F + db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0 + db 28, WEEZING, GOLBAT, KOFFING, 0 +; Silph Co. 9F + db 28, DROWZEE, GRIMER, MACHOP, 0 + db 28, GOLBAT, DROWZEE, HYPNO, 0 +; Silph Co. 10F + db 33, MACHOKE, 0 +; 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 + db 39, NIDORINO, NIDOKING, 0 +; Victory Road 3F + db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0 + db 43, KINGLER, TENTACRUEL, BLASTOISE, 0 +; Unused + db 45, KINGLER, STARMIE, 0 +; Victory Road 1F + db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0 +; Unused + db 44, IVYSAUR, WARTORTLE, CHARMELEON, 0 + db 49, NIDOKING, 0 + db 44, KINGLER, CLOYSTER, 0 +; Viridian Gym + db 39, SANDSLASH, DUGTRIO, 0 + db 43, RHYHORN, 0 + +CooltrainerFData: +; Celadon Gym + db 24, WEEPINBELL, GLOOM, IVYSAUR, 0 +; Victory Road 3F + db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0 + db 43, PARASECT, DEWGONG, CHANSEY, 0 +; Unused + db 46, VILEPLUME, BUTTERFREE, 0 +; Victory Road 1F + db 44, PERSIAN, NINETALES, 0 +; Unused + db 45, IVYSAUR, VENUSAUR, 0 + db 45, NIDORINA, NIDOQUEEN, 0 + db 43, PERSIAN, NINETALES, RAICHU, 0 + +BrunoData: + db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0 + +BrockData: + db $FF, 10, GEODUDE, 12, ONIX, 0 + +MistyData: + db $FF, 18, STARYU, 21, STARMIE, 0 + +LtSurgeData: + db $FF, 28, RAICHU, 0 + +ErikaData: + db $FF, 30, TANGELA, 32, WEEPINBELL, 32, GLOOM, 0 + +KogaData: + db $FF, 44, VENONAT, 46, VENONAT, 48, VENONAT, 50, VENOMOTH, 0 + +BlaineData: + db $FF, 48, NINETALES, 50, RAPIDASH, 54, ARCANINE, 0 + +SabrinaData: + 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 22, VOLTORB, MAGNEMITE, 0 +; Unused + db 48, PRIMEAPE, 0 +; SS Anne 2F Rooms + db 17, GROWLITHE, PONYTA, 0 + +Green2Data: +; SS Anne 2F + db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, EEVEE, 0 +; Pokémon Tower 2F + 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, 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, 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, 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 + +ChannelerData: +; Unused + db 22, GASTLY, 0 + db 24, GASTLY, 0 + db 23, GASTLY, GASTLY, 0 + db 24, GASTLY, 0 +; Pokémon Tower 3F + db 23, GASTLY, 0 + db 24, GASTLY, 0 +; Unused + db 24, HAUNTER, 0 +; Pokémon Tower 3F + db 22, GASTLY, 0 +; Pokémon Tower 4F + db 24, GASTLY, 0 + db 23, GASTLY, GASTLY, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 4F + db 22, GASTLY, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 5F + db 23, HAUNTER, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 5F + db 22, GASTLY, 0 + db 24, GASTLY, 0 + db 22, HAUNTER, 0 +; Pokémon Tower 6F + db 22, GASTLY, GASTLY, GASTLY, 0 + db 24, GASTLY, 0 + db 24, GASTLY, 0 +; Saffron Gym + db 34, GASTLY, HAUNTER, 0 + db 38, HAUNTER, 0 + db 33, GASTLY, GASTLY, HAUNTER, 0 + +AgathaData: + db $FF, 56, GENGAR, 56, GOLBAT, 55, HAUNTER, 58, ARBOK, 60, GENGAR, 0 + +LanceData: + db $FF, 58, GYARADOS, 56, DRAGONAIR, 56, DRAGONAIR, 60, AERODACTYL, 62, DRAGONITE, 0 diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm new file mode 100755 index 00000000..d4007394 --- /dev/null +++ b/data/trainers/pic_pointers_money.asm @@ -0,0 +1,55 @@ +pic_money: MACRO + dw \1 + money \2 +ENDM + +TrainerPicAndMoneyPointers:: + ; pic pointer, base reward money + ; money received after battle = base money × level of highest-level enemy mon + pic_money YoungsterPic, 1500 + pic_money BugCatcherPic, 1000 + pic_money LassPic, 1500 + pic_money SailorPic, 3000 + pic_money JrTrainerMPic, 2000 + pic_money JrTrainerFPic, 2000 + pic_money PokemaniacPic, 5000 + pic_money SuperNerdPic, 2500 + pic_money HikerPic, 3500 + pic_money BikerPic, 2000 + pic_money BurglarPic, 9000 + pic_money EngineerPic, 5000 + pic_money JugglerPic, 3500 + pic_money FisherPic, 3500 + pic_money SwimmerPic, 500 + pic_money CueBallPic, 2500 + pic_money GamblerPic, 7000 + pic_money BeautyPic, 7000 + pic_money PsychicPic, 1000 + pic_money RockerPic, 2500 + pic_money JugglerPic, 3500 + pic_money TamerPic, 4000 + pic_money BirdKeeperPic, 2500 + pic_money BlackbeltPic, 2500 + pic_money Rival1Pic, 3500 + pic_money ProfOakPic, 9900 + pic_money ChiefPic, 3000 + pic_money ScientistPic, 5000 + pic_money GiovanniPic, 9900 + pic_money RocketPic, 3000 + pic_money CooltrainerMPic, 3500 + pic_money CooltrainerFPic, 3500 + pic_money BrunoPic, 9900 + pic_money BrockPic, 9900 + pic_money MistyPic, 9900 + pic_money LtSurgePic, 9900 + pic_money ErikaPic, 9900 + pic_money KogaPic, 9900 + pic_money BlainePic, 9900 + pic_money SabrinaPic, 9900 + pic_money GentlemanPic, 7000 + pic_money Rival2Pic, 6500 + pic_money Rival3Pic, 9900 + pic_money LoreleiPic, 9900 + pic_money ChannelerPic, 3000 + pic_money AgathaPic, 9900 + pic_money LancePic, 9900 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm new file mode 100755 index 00000000..f858fa57 --- /dev/null +++ b/data/trainers/special_moves.asm @@ -0,0 +1,160 @@ +; 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/type_effects.asm b/data/type_effects.asm deleted file mode 100755 index 1321a3d9..00000000 --- a/data/type_effects.asm +++ /dev/null @@ -1,89 +0,0 @@ -TypeEffects: -; format: attacking type, defending type, damage multiplier -; the multiplier is a (decimal) fixed-point number: -; 20 is ×2.0 -; 05 is ×0.5 -; 00 is ×0 - db WATER,FIRE,20 - db FIRE,GRASS,20 - db FIRE,ICE,20 - db GRASS,WATER,20 - db ELECTRIC,WATER,20 - db WATER,ROCK,20 - db GROUND,FLYING,00 - db WATER,WATER,05 - db FIRE,FIRE,05 - db ELECTRIC,ELECTRIC,05 - db ICE,ICE,05 - db GRASS,GRASS,05 - db PSYCHIC,PSYCHIC,05 - db FIRE,WATER,05 - db GRASS,FIRE,05 - db WATER,GRASS,05 - db ELECTRIC,GRASS,05 - db NORMAL,ROCK,05 - db NORMAL,GHOST,00 - db GHOST,GHOST,20 - db FIRE,BUG,20 - db FIRE,ROCK,05 - db WATER,GROUND,20 - db ELECTRIC,GROUND,00 - db ELECTRIC,FLYING,20 - db GRASS,GROUND,20 - db GRASS,BUG,05 - db GRASS,POISON,05 - db GRASS,ROCK,20 - db GRASS,FLYING,05 - db ICE,WATER,05 - db ICE,GRASS,20 - db ICE,GROUND,20 - db ICE,FLYING,20 - db FIGHTING,NORMAL,20 - db FIGHTING,POISON,05 - db FIGHTING,FLYING,05 - db FIGHTING,PSYCHIC,05 - db FIGHTING,BUG,05 - db FIGHTING,ROCK,20 - db FIGHTING,ICE,20 - db FIGHTING,GHOST,00 - db POISON,GRASS,20 - db POISON,POISON,05 - db POISON,GROUND,05 - db POISON,BUG,20 - db POISON,ROCK,05 - db POISON,GHOST,05 - db GROUND,FIRE,20 - db GROUND,ELECTRIC,20 - db GROUND,GRASS,05 - db GROUND,BUG,05 - db GROUND,ROCK,20 - db GROUND,POISON,20 - db FLYING,ELECTRIC,05 - db FLYING,FIGHTING,20 - db FLYING,BUG,20 - db FLYING,GRASS,20 - db FLYING,ROCK,05 - db PSYCHIC,FIGHTING,20 - db PSYCHIC,POISON,20 - db BUG,FIRE,05 - db BUG,GRASS,20 - db BUG,FIGHTING,05 - db BUG,FLYING,05 - db BUG,PSYCHIC,20 - db BUG,GHOST,05 - db BUG,POISON,20 - db ROCK,FIRE,20 - db ROCK,FIGHTING,05 - db ROCK,GROUND,05 - db ROCK,FLYING,20 - db ROCK,BUG,20 - db ROCK,ICE,20 - db GHOST,NORMAL,00 - db GHOST,PSYCHIC,00 - db FIRE,DRAGON,05 - db WATER,DRAGON,05 - db ELECTRIC,DRAGON,05 - db GRASS,DRAGON,05 - db ICE,DRAGON,20 - db DRAGON,DRAGON,20 - db $FF diff --git a/data/types/names.asm b/data/types/names.asm new file mode 100755 index 00000000..b1c35f65 --- /dev/null +++ b/data/types/names.asm @@ -0,0 +1,40 @@ +TypeNames: + + dw .Normal + dw .Fighting + dw .Flying + dw .Poison + dw .Ground + dw .Rock + dw .Bird + dw .Bug + dw .Ghost + +REPT FIRE - GHOST - 1 + dw .Normal +ENDR + + dw .Fire + dw .Water + dw .Grass + dw .Electric + dw .Psychic + dw .Ice + dw .Dragon + +.Normal: db "NORMAL@" +.Fighting: db "FIGHTING@" +.Flying: db "FLYING@" +.Poison: db "POISON@" +.Fire: db "FIRE@" +.Water: db "WATER@" +.Grass: db "GRASS@" +.Electric: db "ELECTRIC@" +.Psychic: db "PSYCHIC@" +.Ice: db "ICE@" +.Ground: db "GROUND@" +.Rock: db "ROCK@" +.Bird: db "BIRD@" +.Bug: db "BUG@" +.Ghost: db "GHOST@" +.Dragon: db "DRAGON@" diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm new file mode 100755 index 00000000..52e3d956 --- /dev/null +++ b/data/types/type_matchups.asm @@ -0,0 +1,85 @@ +TypeEffects: + ; attacker, defender, *= + db WATER, FIRE, SUPER_EFFECTIVE + db FIRE, GRASS, SUPER_EFFECTIVE + db FIRE, ICE, SUPER_EFFECTIVE + db GRASS, WATER, SUPER_EFFECTIVE + db ELECTRIC, WATER, SUPER_EFFECTIVE + db WATER, ROCK, SUPER_EFFECTIVE + db GROUND, FLYING, NO_EFFECT + db WATER, WATER, NOT_VERY_EFFECTIVE + db FIRE, FIRE, NOT_VERY_EFFECTIVE + db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE + db ICE, ICE, NOT_VERY_EFFECTIVE + db GRASS, GRASS, NOT_VERY_EFFECTIVE + db PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE + db FIRE, WATER, NOT_VERY_EFFECTIVE + db GRASS, FIRE, NOT_VERY_EFFECTIVE + db WATER, GRASS, NOT_VERY_EFFECTIVE + db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE + db NORMAL, ROCK, NOT_VERY_EFFECTIVE + db NORMAL, GHOST, NO_EFFECT + db GHOST, GHOST, SUPER_EFFECTIVE + db FIRE, BUG, SUPER_EFFECTIVE + db FIRE, ROCK, NOT_VERY_EFFECTIVE + db WATER, GROUND, SUPER_EFFECTIVE + db ELECTRIC, GROUND, NO_EFFECT + db ELECTRIC, FLYING, SUPER_EFFECTIVE + db GRASS, GROUND, SUPER_EFFECTIVE + db GRASS, BUG, NOT_VERY_EFFECTIVE + db GRASS, POISON, NOT_VERY_EFFECTIVE + db GRASS, ROCK, SUPER_EFFECTIVE + db GRASS, FLYING, NOT_VERY_EFFECTIVE + db ICE, WATER, NOT_VERY_EFFECTIVE + db ICE, GRASS, SUPER_EFFECTIVE + db ICE, GROUND, SUPER_EFFECTIVE + db ICE, FLYING, SUPER_EFFECTIVE + db FIGHTING, NORMAL, SUPER_EFFECTIVE + db FIGHTING, POISON, NOT_VERY_EFFECTIVE + db FIGHTING, FLYING, NOT_VERY_EFFECTIVE + db FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE + db FIGHTING, BUG, NOT_VERY_EFFECTIVE + db FIGHTING, ROCK, SUPER_EFFECTIVE + db FIGHTING, ICE, SUPER_EFFECTIVE + db FIGHTING, GHOST, NO_EFFECT + db POISON, GRASS, SUPER_EFFECTIVE + db POISON, POISON, NOT_VERY_EFFECTIVE + db POISON, GROUND, NOT_VERY_EFFECTIVE + db POISON, BUG, SUPER_EFFECTIVE + db POISON, ROCK, NOT_VERY_EFFECTIVE + db POISON, GHOST, NOT_VERY_EFFECTIVE + db GROUND, FIRE, SUPER_EFFECTIVE + db GROUND, ELECTRIC, SUPER_EFFECTIVE + db GROUND, GRASS, NOT_VERY_EFFECTIVE + db GROUND, BUG, NOT_VERY_EFFECTIVE + db GROUND, ROCK, SUPER_EFFECTIVE + db GROUND, POISON, SUPER_EFFECTIVE + db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE + db FLYING, FIGHTING, SUPER_EFFECTIVE + db FLYING, BUG, SUPER_EFFECTIVE + db FLYING, GRASS, SUPER_EFFECTIVE + db FLYING, ROCK, NOT_VERY_EFFECTIVE + db PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE + db PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE + db BUG, FIRE, NOT_VERY_EFFECTIVE + db BUG, GRASS, SUPER_EFFECTIVE + db BUG, FIGHTING, NOT_VERY_EFFECTIVE + db BUG, FLYING, NOT_VERY_EFFECTIVE + db BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE + db BUG, GHOST, NOT_VERY_EFFECTIVE + db BUG, POISON, SUPER_EFFECTIVE + db ROCK, FIRE, SUPER_EFFECTIVE + db ROCK, FIGHTING, NOT_VERY_EFFECTIVE + db ROCK, GROUND, NOT_VERY_EFFECTIVE + db ROCK, FLYING, SUPER_EFFECTIVE + db ROCK, BUG, SUPER_EFFECTIVE + db ROCK, ICE, SUPER_EFFECTIVE + db GHOST, NORMAL, NO_EFFECT + db GHOST, PSYCHIC_TYPE, NO_EFFECT + db FIRE, DRAGON, NOT_VERY_EFFECTIVE + db WATER, DRAGON, NOT_VERY_EFFECTIVE + db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE + db GRASS, DRAGON, NOT_VERY_EFFECTIVE + db ICE, DRAGON, SUPER_EFFECTIVE + db DRAGON, DRAGON, SUPER_EFFECTIVE + db -1 ; end diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm deleted file mode 100755 index 4edc48a5..00000000 --- a/data/warp_tile_ids.asm +++ /dev/null @@ -1,89 +0,0 @@ -WarpTileIDPointers: - dw OverworldWarpTileIDs - dw RedsHouse1WarpTileIDs - dw MartWarpTileIDs - dw ForestWarpTileIDs - dw RedsHouse2WarpTileIDs - dw DojoWarpTileIDs - dw PokecenterWarpTileIDs - dw GymWarpTileIDs - dw HouseWarpTileIDs - dw ForestGateWarpTileIDs - dw MuseumWarpTileIDs - dw UndergroundWarpTileIDs - dw GateWarpTileIDs - dw ShipWarpTileIDs - dw ShipPortWarpTileIDs - dw CemeteryWarpTileIDs - dw InteriorWarpTileIDs - dw CavernWarpTileIDs - dw LobbyWarpTileIDs - dw MansionWarpTileIDs - dw LabWarpTileIDs - dw ClubWarpTileIDs - dw FacilityWarpTileIDs - dw PlateauWarpTileIDs - dw BeachHouseWarpTileIDs - -OverworldWarpTileIDs: - db $1B,$58,$FF - -ForestGateWarpTileIDs: -MuseumWarpTileIDs: -GateWarpTileIDs: - db $3B - -RedsHouse1WarpTileIDs: -RedsHouse2WarpTileIDs: - db $1A,$1C,$FF - -MartWarpTileIDs: -PokecenterWarpTileIDs: - db $5E,$FF - -ForestWarpTileIDs: - db $5A,$5C,$3A,$FF - -DojoWarpTileIDs: -GymWarpTileIDs: - db $4A,$FF - -HouseWarpTileIDs: - db $54,$5C,$32,$FF - -ShipWarpTileIDs: - db $37,$39,$1E,$4A,$FF - -InteriorWarpTileIDs: - db $15,$55,$04,$FF - -CavernWarpTileIDs: - db $18,$1A,$22,$FF - -LobbyWarpTileIDs: - db $1A,$1C,$38,$FF - -MansionWarpTileIDs: - db $1A,$1C,$53,$FF - -LabWarpTileIDs: - db $34,$FF - -FacilityWarpTileIDs: - db $43,$58,$20 - -CemeteryWarpTileIDs: - db $1B - -UndergroundWarpTileIDs: - db $13,$FF - -PlateauWarpTileIDs: - db $1B,$3B - -ShipPortWarpTileIDs: -ClubWarpTileIDs: - db $FF - -BeachHouseWarpTileIDs: - db $FF diff --git a/data/wild/good_rod.asm b/data/wild/good_rod.asm new file mode 100755 index 00000000..700a5516 --- /dev/null +++ b/data/wild/good_rod.asm @@ -0,0 +1,5 @@ +; random choice of 2 good rod encounters +GoodRodMons: + ; level, species + db 10, GOLDEEN + db 10, POLIWAG diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm new file mode 100755 index 00000000..a991e9ae --- /dev/null +++ b/data/wild/grass_water.asm @@ -0,0 +1,323 @@ +WildDataPointers: + dw NoMons ; PALLET_TOWN + dw NoMons ; VIRIDIAN_CITY + dw NoMons ; PEWTER_CITY + dw NoMons ; CERULEAN_CITY + dw NoMons ; LAVENDER_TOWN + dw NoMons ; VERMILION_CITY + dw NoMons ; CELADON_CITY + dw NoMons ; FUCHSIA_CITY + dw NoMons ; CINNABAR_ISLAND + dw NoMons ; INDIGO_PLATEAU + dw NoMons ; SAFFRON_CITY + dw NoMons ; unused + dw Route1Mons ; ROUTE_1 + dw Route2Mons ; ROUTE_2 + dw Route3Mons ; ROUTE_3 + dw Route4Mons ; ROUTE_4 + dw Route5Mons ; ROUTE_5 + dw Route6Mons ; ROUTE_6 + dw Route7Mons ; ROUTE_7 + dw Route8Mons ; ROUTE_8 + dw Route9Mons ; ROUTE_9 + dw Route10Mons ; ROUTE_10 + dw Route11Mons ; ROUTE_11 + dw Route12Mons ; ROUTE_12 + dw Route13Mons ; ROUTE_13 + dw Route14Mons ; ROUTE_14 + dw Route15Mons ; ROUTE_15 + dw Route16Mons ; ROUTE_16 + dw Route17Mons ; ROUTE_17 + dw Route18Mons ; ROUTE_18 + dw Route19Mons ; ROUTE_19 + dw Route20Mons ; ROUTE_20 + dw Route21Mons ; ROUTE_21 + dw Route22Mons ; ROUTE_22 + dw Route23Mons ; ROUTE_23 + dw Route24Mons ; ROUTE_24 + dw Route25Mons ; ROUTE_25 + dw NoMons ; REDS_HOUSE_1F + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw ForestMons ; ViridianForest + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw MoonMons1 + dw MoonMonsB1 + dw MoonMonsB2 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw TunnelMonsB1 + dw PowerPlantMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw PlateauMons1 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw TowerMons1 + dw TowerMons2 + dw TowerMons3 + dw TowerMons4 + dw TowerMons5 + dw TowerMons6 + dw TowerMons7 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw IslandMonsB1 + dw IslandMonsB2 + dw IslandMonsB3 + dw IslandMonsB4 + dw NoMons + dw NoMons + dw MansionMons1 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw IslandMons1 + dw NoMons + dw PlateauMons2 + dw NoMons + dw NoMons + dw CaveMons + dw PlateauMons3 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw MansionMons2 + dw MansionMons3 + dw MansionMonsB1 + dw ZoneMons1 + dw ZoneMons2 + dw ZoneMons3 + dw ZoneMonsCenter + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw DungeonMons2 + dw DungeonMonsB1 + dw DungeonMons1 + dw NoMons + dw NoMons + dw NoMons + dw TunnelMonsB2 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw -1 ; end + +; wild pokemon data is divided into two parts. +; first part: pokemon found in grass +; second part: pokemon found while surfing +; each part goes as follows: + ; if first byte == 0, then + ; no wild pokemon on this map + ; if first byte != 0, then + ; first byte is encounter rate + ; followed by 20 bytes: + ; level, species (ten times) + +INCLUDE "data/wild/maps/nothing.asm" +INCLUDE "data/wild/maps/Route1.asm" +INCLUDE "data/wild/maps/Route2.asm" +INCLUDE "data/wild/maps/Route22.asm" +INCLUDE "data/wild/maps/ViridianForest.asm" +INCLUDE "data/wild/maps/Route3.asm" +INCLUDE "data/wild/maps/MtMoon1F.asm" +INCLUDE "data/wild/maps/MtMoonB1F.asm" +INCLUDE "data/wild/maps/MtMoonB2F.asm" +INCLUDE "data/wild/maps/Route4.asm" +INCLUDE "data/wild/maps/Route24.asm" +INCLUDE "data/wild/maps/Route25.asm" +INCLUDE "data/wild/maps/Route9.asm" +INCLUDE "data/wild/maps/Route5.asm" +INCLUDE "data/wild/maps/Route6.asm" +INCLUDE "data/wild/maps/Route11.asm" +INCLUDE "data/wild/maps/RockTunnel1F.asm" +INCLUDE "data/wild/maps/RockTunnelB1F.asm" +INCLUDE "data/wild/maps/Route10.asm" +INCLUDE "data/wild/maps/Route12.asm" +INCLUDE "data/wild/maps/Route8.asm" +INCLUDE "data/wild/maps/Route7.asm" +INCLUDE "data/wild/maps/PokemonTower1F.asm" +INCLUDE "data/wild/maps/PokemonTower2F.asm" +INCLUDE "data/wild/maps/PokemonTower3F.asm" +INCLUDE "data/wild/maps/PokemonTower4F.asm" +INCLUDE "data/wild/maps/PokemonTower5F.asm" +INCLUDE "data/wild/maps/PokemonTower6F.asm" +INCLUDE "data/wild/maps/PokemonTower7F.asm" +INCLUDE "data/wild/maps/Route13.asm" +INCLUDE "data/wild/maps/Route14.asm" +INCLUDE "data/wild/maps/Route15.asm" +INCLUDE "data/wild/maps/Route16.asm" +INCLUDE "data/wild/maps/Route17.asm" +INCLUDE "data/wild/maps/Route18.asm" +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/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" +INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm" +INCLUDE "data/wild/maps/PokemonMansion1F.asm" +INCLUDE "data/wild/maps/PokemonMansion2F.asm" +INCLUDE "data/wild/maps/PokemonMansion3F.asm" +INCLUDE "data/wild/maps/PokemonMansionB1F.asm" +INCLUDE "data/wild/maps/Route21.asm" +INCLUDE "data/wild/maps/CeruleanCave1F.asm" +INCLUDE "data/wild/maps/CeruleanCave2F.asm" +INCLUDE "data/wild/maps/CeruleanCaveB1F.asm" +INCLUDE "data/wild/maps/PowerPlant.asm" +INCLUDE "data/wild/maps/Route23.asm" +INCLUDE "data/wild/maps/VictoryRoad2F.asm" +INCLUDE "data/wild/maps/VictoryRoad3F.asm" +INCLUDE "data/wild/maps/VictoryRoad1F.asm" +INCLUDE "data/wild/maps/DiglettsCave.asm" diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm new file mode 100644 index 00000000..24a24f60 --- /dev/null +++ b/data/wild/maps/CeruleanCave1F.asm @@ -0,0 +1,14 @@ +DungeonMons1: + db 10 ; grass encounter rate + db 50, GOLBAT + db 55, GOLBAT + db 45, GRAVELER + db 55, GLOOM + db 55, WEEPINBELL + db 52, SANDSLASH + 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 new file mode 100644 index 00000000..07b34527 --- /dev/null +++ b/data/wild/maps/CeruleanCave2F.asm @@ -0,0 +1,14 @@ +DungeonMons2: + db 15 ; grass encounter rate + 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 new file mode 100644 index 00000000..969ab18f --- /dev/null +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -0,0 +1,14 @@ +DungeonMonsB1: + db 25 ; grass encounter rate + 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 55, LICKITUNG + db 50, LICKITUNG + + db 0 ; water encounter rate diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm new file mode 100755 index 00000000..d1e73af4 --- /dev/null +++ b/data/wild/maps/DiglettsCave.asm @@ -0,0 +1,14 @@ +CaveMons: + db 20 ; grass encounter rate + db 18, DIGLETT + db 19, DIGLETT + db 17, DIGLETT + db 20, DIGLETT + db 16, DIGLETT + db 15, DIGLETT + db 21, DIGLETT + db 22, DIGLETT + db 29, DUGTRIO + db 31, DUGTRIO + + db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm new file mode 100755 index 00000000..2e426655 --- /dev/null +++ b/data/wild/maps/MtMoon1F.asm @@ -0,0 +1,14 @@ +MoonMons1: + db 10 ; grass encounter rate + db 8, ZUBAT + db 9, ZUBAT + db 10, GEODUDE + db 6, ZUBAT + db 7, ZUBAT + db 10, ZUBAT + db 10, GEODUDE + db 11, ZUBAT + 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 new file mode 100755 index 00000000..1eee34ce --- /dev/null +++ b/data/wild/maps/MtMoonB1F.asm @@ -0,0 +1,14 @@ +MoonMonsB1: + db 10 ; grass encounter rate + db 8, ZUBAT + db 9, ZUBAT + db 10, ZUBAT + db 10, GEODUDE + db 11, GEODUDE + db 11, ZUBAT + 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 new file mode 100755 index 00000000..d49ec585 --- /dev/null +++ b/data/wild/maps/MtMoonB2F.asm @@ -0,0 +1,14 @@ +MoonMonsB2: + db 10 ; grass encounter rate + db 10, ZUBAT + db 11, GEODUDE + db 13, PARAS + db 11, ZUBAT + db 11, ZUBAT + db 12, ZUBAT + 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 new file mode 100755 index 00000000..75fcadfe --- /dev/null +++ b/data/wild/maps/PokemonMansion1F.asm @@ -0,0 +1,14 @@ +MansionMons1: + db 10 ; grass encounter rate + 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 38, GROWLITHE + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm new file mode 100755 index 00000000..2143532f --- /dev/null +++ b/data/wild/maps/PokemonMansion2F.asm @@ -0,0 +1,14 @@ +MansionMons2: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..f0c77977 --- /dev/null +++ b/data/wild/maps/PokemonMansion3F.asm @@ -0,0 +1,14 @@ +MansionMons3: + db 10 ; grass encounter rate + db 40, RATTATA + db 40, RATICATE + db 32, GRIMER + db 35, GRIMER + db 43, RATTATA + db 43, RATICATE + db 38, GRIMER + db 38, GRIMER + db 38, MUK + db 41, MUK + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm new file mode 100755 index 00000000..c0ad432b --- /dev/null +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -0,0 +1,14 @@ +MansionMonsB1: + db 10 ; grass encounter rate + db 35, GRIMER + 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/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm new file mode 100755 index 00000000..95bef4a3 --- /dev/null +++ b/data/wild/maps/PokemonTower1F.asm @@ -0,0 +1,4 @@ +TowerMons1: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm new file mode 100755 index 00000000..77b7d415 --- /dev/null +++ b/data/wild/maps/PokemonTower2F.asm @@ -0,0 +1,4 @@ +TowerMons2: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm new file mode 100755 index 00000000..b608ea15 --- /dev/null +++ b/data/wild/maps/PokemonTower3F.asm @@ -0,0 +1,14 @@ +TowerMons3: + db 10 ; grass encounter rate + db 20, GASTLY + 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 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm new file mode 100755 index 00000000..425b200c --- /dev/null +++ b/data/wild/maps/PokemonTower4F.asm @@ -0,0 +1,14 @@ +TowerMons4: + db 10 ; grass encounter rate + db 20, GASTLY + 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 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm new file mode 100755 index 00000000..5a0c96e1 --- /dev/null +++ b/data/wild/maps/PokemonTower5F.asm @@ -0,0 +1,14 @@ +TowerMons5: + db 15 ; grass encounter rate + db 22, GASTLY + db 23, GASTLY + 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 new file mode 100755 index 00000000..5e9d23f4 --- /dev/null +++ b/data/wild/maps/PokemonTower6F.asm @@ -0,0 +1,14 @@ +TowerMons6: + db 15 ; grass encounter rate + db 22, GASTLY + db 23, GASTLY + db 24, GASTLY + db 25, GASTLY + db 26, GASTLY + db 21, GASTLY + db 22, CUBONE + 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 new file mode 100755 index 00000000..8a3467ff --- /dev/null +++ b/data/wild/maps/PokemonTower7F.asm @@ -0,0 +1,14 @@ +TowerMons7: + db 20 ; grass encounter rate + db 24, GASTLY + db 25, GASTLY + db 26, GASTLY + db 27, GASTLY + db 28, GASTLY + db 23, GASTLY + db 24, CUBONE + 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 new file mode 100755 index 00000000..a910420e --- /dev/null +++ b/data/wild/maps/PowerPlant.asm @@ -0,0 +1,14 @@ +PowerPlantMons: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..5c64bac4 --- /dev/null +++ b/data/wild/maps/RockTunnel1F.asm @@ -0,0 +1,14 @@ +TunnelMonsB1: + db 15 ; grass encounter rate + 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 19, MACHOP + db 21, MACHOP + + db 0 ; water encounter rate diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm new file mode 100755 index 00000000..3f034958 --- /dev/null +++ b/data/wild/maps/RockTunnelB1F.asm @@ -0,0 +1,14 @@ +TunnelMonsB2: + db 15 ; grass encounter rate + db 20, ZUBAT + db 17, 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 new file mode 100755 index 00000000..df599383 --- /dev/null +++ b/data/wild/maps/Route1.asm @@ -0,0 +1,14 @@ +Route1Mons: + db 25 ; grass encounter rate + db 3, PIDGEY + db 4, PIDGEY + db 2, RATTATA + db 3, RATTATA + db 2, PIDGEY + db 3, 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 new file mode 100755 index 00000000..b7ca364c --- /dev/null +++ b/data/wild/maps/Route10.asm @@ -0,0 +1,14 @@ +Route10Mons: + db 15 ; grass encounter rate + 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 new file mode 100755 index 00000000..eb00aa7e --- /dev/null +++ b/data/wild/maps/Route11.asm @@ -0,0 +1,14 @@ +Route11Mons: + db 15 ; grass encounter rate + 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 new file mode 100755 index 00000000..46c4106e --- /dev/null +++ b/data/wild/maps/Route12.asm @@ -0,0 +1,24 @@ +Route12Mons: + db 15 ; grass encounter rate + 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 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 new file mode 100755 index 00000000..d19e0d83 --- /dev/null +++ b/data/wild/maps/Route13.asm @@ -0,0 +1,24 @@ +Route13Mons: + 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 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 new file mode 100755 index 00000000..fe600bed --- /dev/null +++ b/data/wild/maps/Route14.asm @@ -0,0 +1,14 @@ +Route14Mons: + db 15 ; grass encounter rate + db 26, ODDISH + db 26, BELLSPROUT + 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 new file mode 100755 index 00000000..4374acfb --- /dev/null +++ b/data/wild/maps/Route15.asm @@ -0,0 +1,14 @@ +Route15Mons: + db 15 ; grass encounter rate + db 26, ODDISH + db 26, BELLSPROUT + db 24, VENONAT + db 32, 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/Route16.asm b/data/wild/maps/Route16.asm new file mode 100755 index 00000000..f858dcdb --- /dev/null +++ b/data/wild/maps/Route16.asm @@ -0,0 +1,14 @@ +Route16Mons: + db 25 ; grass encounter rate + db 22, SPEAROW + db 22, DODUO + 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 new file mode 100755 index 00000000..3f6316f3 --- /dev/null +++ b/data/wild/maps/Route17.asm @@ -0,0 +1,14 @@ +Route17Mons: + db 25 ; grass encounter rate + db 26, DODUO + 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 new file mode 100755 index 00000000..b76cef02 --- /dev/null +++ b/data/wild/maps/Route18.asm @@ -0,0 +1,14 @@ +Route18Mons: + db 25 ; grass encounter rate + db 22, SPEAROW + db 22, DODUO + 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/Route19.asm b/data/wild/maps/Route19.asm new file mode 100644 index 00000000..70b06ac8 --- /dev/null +++ b/data/wild/maps/Route19.asm @@ -0,0 +1,14 @@ +Route19Mons: + db 0 ; grass encounter rate + + db 5 ; water encounter rate + 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/Route2.asm b/data/wild/maps/Route2.asm new file mode 100755 index 00000000..40093712 --- /dev/null +++ b/data/wild/maps/Route2.asm @@ -0,0 +1,14 @@ +Route2Mons: + db 25 ; grass encounter rate + db 3, RATTATA + db 3, PIDGEY + db 4, RATTATA + db 4, NIDORAN_M + db 4, NIDORAN_F + db 5, PIDGEY + db 6, NIDORAN_M + db 6, NIDORAN_F + db 7, PIDGEY + db 7, PIDGEY + + db 0 ; water encounter rate diff --git a/data/wildPokemon/route20.asm b/data/wild/maps/Route20.asm index b955c330..b955c330 100644 --- a/data/wildPokemon/route20.asm +++ b/data/wild/maps/Route20.asm diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm new file mode 100755 index 00000000..e934e079 --- /dev/null +++ b/data/wild/maps/Route21.asm @@ -0,0 +1,24 @@ +Route21Mons: + db 25 ; grass encounter rate + 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 + 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/Route22.asm b/data/wild/maps/Route22.asm new file mode 100755 index 00000000..1b50ded0 --- /dev/null +++ b/data/wild/maps/Route22.asm @@ -0,0 +1,14 @@ +Route22Mons: + db 25 ; grass encounter rate + db 2, NIDORAN_M + db 2, NIDORAN_F + db 3, MANKEY + db 3, RATTATA + db 4, NIDORAN_M + 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 new file mode 100755 index 00000000..cc1642e8 --- /dev/null +++ b/data/wild/maps/Route23.asm @@ -0,0 +1,14 @@ +Route23Mons: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..e493dfbf --- /dev/null +++ b/data/wild/maps/Route24.asm @@ -0,0 +1,14 @@ +Route24Mons: + db 25 ; grass encounter rate + db 12, ODDISH + db 12, BELLSPROUT + db 13, PIDGEY + 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 new file mode 100755 index 00000000..2daa060c --- /dev/null +++ b/data/wild/maps/Route25.asm @@ -0,0 +1,14 @@ +Route25Mons: + db 15 ; grass encounter rate + db 12, ODDISH + db 12, BELLSPROUT + db 13, PIDGEY + 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/Route3.asm b/data/wild/maps/Route3.asm new file mode 100755 index 00000000..be7afe95 --- /dev/null +++ b/data/wild/maps/Route3.asm @@ -0,0 +1,14 @@ +Route3Mons: + db 20 ; grass encounter rate + 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 0 ; water encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm new file mode 100755 index 00000000..29f0aec4 --- /dev/null +++ b/data/wild/maps/Route4.asm @@ -0,0 +1,14 @@ +Route4Mons: + db 20 ; grass encounter rate + 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 0 ; water encounter rate diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm new file mode 100755 index 00000000..7517bcb9 --- /dev/null +++ b/data/wild/maps/Route5.asm @@ -0,0 +1,14 @@ +Route5Mons: + db 15 ; grass encounter rate + db 15, PIDGEY + db 14, RATTATA + db 7, ABRA + db 16, PIDGEY + 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 new file mode 100755 index 00000000..067d2694 --- /dev/null +++ b/data/wild/maps/Route6.asm @@ -0,0 +1,24 @@ +Route6Mons: + db 15 ; grass encounter rate + db 15, PIDGEY + db 14, RATTATA + db 7, ABRA + db 16, PIDGEY + db 16, RATTATA + db 17, PIDGEY + db 17, PIDGEOTTO + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF + + 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 new file mode 100755 index 00000000..1ebb1ce9 --- /dev/null +++ b/data/wild/maps/Route7.asm @@ -0,0 +1,14 @@ +Route7Mons: + db 15 ; grass encounter rate + db 20, PIDGEY + db 22, PIDGEY + 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 new file mode 100755 index 00000000..db07dbba --- /dev/null +++ b/data/wild/maps/Route8.asm @@ -0,0 +1,14 @@ +Route8Mons: + db 15 ; grass encounter rate + db 20, PIDGEY + 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 new file mode 100755 index 00000000..78512402 --- /dev/null +++ b/data/wild/maps/Route9.asm @@ -0,0 +1,14 @@ +Route9Mons: + db 15 ; grass encounter rate + db 16, NIDORAN_M + db 16, NIDORAN_F + db 18, RATTATA + db 18, NIDORAN_M + db 18, NIDORAN_F + db 17, SPEAROW + 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 new file mode 100755 index 00000000..125fbc6a --- /dev/null +++ b/data/wild/maps/SafariZoneCenter.asm @@ -0,0 +1,14 @@ +ZoneMonsCenter: + db 30 ; grass encounter rate + db 14, NIDORAN_M + db 36, NIDORAN_F + db 24, EXEGGCUTE + 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 new file mode 100755 index 00000000..ba0a1954 --- /dev/null +++ b/data/wild/maps/SafariZoneEast.asm @@ -0,0 +1,14 @@ +ZoneMons1: + db 30 ; grass encounter rate + 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 new file mode 100755 index 00000000..fa6dd3b4 --- /dev/null +++ b/data/wild/maps/SafariZoneNorth.asm @@ -0,0 +1,14 @@ +ZoneMons2: + db 30 ; grass encounter rate + 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 new file mode 100755 index 00000000..b1e2fe3a --- /dev/null +++ b/data/wild/maps/SafariZoneWest.asm @@ -0,0 +1,14 @@ +ZoneMons3: + db 30 ; grass encounter rate + db 29, NIDORAN_M + db 21, NIDORAN_F + db 22, EXEGGCUTE + db 21, TAUROS + db 32, NIDORINO + db 19, CUBONE + db 26, EXEGGCUTE + 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 new file mode 100755 index 00000000..e37005b2 --- /dev/null +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -0,0 +1,14 @@ +IslandMons1: + db 15 ; grass encounter rate + db 18, ZUBAT + db 25, KRABBY + db 27, KRABBY + db 27, ZUBAT + db 36, ZUBAT + db 28, SLOWPOKE + 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 new file mode 100755 index 00000000..fd9ab09a --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -0,0 +1,14 @@ +IslandMonsB1: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..53961534 --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -0,0 +1,14 @@ +IslandMonsB2: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..5435d1e6 --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -0,0 +1,24 @@ +IslandMonsB3: + db 10 ; grass encounter rate + db 27, GOLBAT + db 36, ZUBAT + db 29, KRABBY + db 27, ZUBAT + db 30, KINGLER + db 26, SEEL + db 31, KRABBY + db 30, SEEL + db 28, DEWGONG + db 32, DEWGONG + + 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 new file mode 100755 index 00000000..bfeb6821 --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -0,0 +1,24 @@ +IslandMonsB4: + db 10 ; grass encounter rate + 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 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 new file mode 100755 index 00000000..bcb16dc8 --- /dev/null +++ b/data/wild/maps/VictoryRoad1F.asm @@ -0,0 +1,14 @@ +PlateauMons1: + db 15 ; grass encounter rate + db 26, GEODUDE + 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 47, GRAVELER + + db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm new file mode 100755 index 00000000..89b736cd --- /dev/null +++ b/data/wild/maps/VictoryRoad2F.asm @@ -0,0 +1,14 @@ +PlateauMons2: + db 10 ; grass encounter rate + 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 new file mode 100755 index 00000000..aec2d097 --- /dev/null +++ b/data/wild/maps/VictoryRoad3F.asm @@ -0,0 +1,14 @@ +PlateauMons3: + db 15 ; grass encounter rate + 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 new file mode 100755 index 00000000..e7b1288f --- /dev/null +++ b/data/wild/maps/ViridianForest.asm @@ -0,0 +1,14 @@ +ForestMons: + db 25 ; grass encounter rate + db 3, CATERPIE + db 4, METAPOD + db 4, CATERPIE + db 5, CATERPIE + db 4, PIDGEY + db 6, PIDGEY + db 6, CATERPIE + db 6, METAPOD + db 8, PIDGEY + db 9, PIDGEOTTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm new file mode 100755 index 00000000..19570b50 --- /dev/null +++ b/data/wild/maps/nothing.asm @@ -0,0 +1,4 @@ +NoMons: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm new file mode 100644 index 00000000..2c56c6b9 --- /dev/null +++ b/data/wild/probabilities.asm @@ -0,0 +1,15 @@ +WildMonEncounterSlotChances: +; There are 10 slots for wild pokemon, and this is the table that defines how common each of +; those 10 slots is. A random number is generated and then the first byte of each pair in this +; table is compared against that random number. If the random number is less than or equal +; to the first byte, then that slot is chosen. The second byte is double the slot number. + db 50, $00 ; 51/256 = 19.9% chance of slot 0 + db 101, $02 ; 51/256 = 19.9% chance of slot 1 + db 140, $04 ; 39/256 = 15.2% chance of slot 2 + db 165, $06 ; 25/256 = 9.8% chance of slot 3 + db 190, $08 ; 25/256 = 9.8% chance of slot 4 + db 215, $0A ; 25/256 = 9.8% chance of slot 5 + db 228, $0C ; 13/256 = 5.1% chance of slot 6 + db 241, $0E ; 13/256 = 5.1% chance of slot 7 + db 252, $10 ; 11/256 = 4.3% chance of slot 8 + db 255, $12 ; 3/256 = 1.2% chance of slot 9 diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm new file mode 100755 index 00000000..154980cc --- /dev/null +++ b/data/wild/super_rod.asm @@ -0,0 +1,33 @@ +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 diff --git a/data/wildPokemon/ceruleancave1.asm b/data/wildPokemon/ceruleancave1.asm deleted file mode 100644 index ff7be04e..00000000 --- a/data/wildPokemon/ceruleancave1.asm +++ /dev/null @@ -1,14 +0,0 @@ -DungeonMons1: - db $0A - db 50,GOLBAT - db 55,GOLBAT - db 45,GRAVELER - db 55,GLOOM - db 55,WEEPINBELL - db 52,SANDSLASH - db 54,VENOMOTH - db 54,PARASECT - db 55,DITTO - db 60,DITTO - db $00 - diff --git a/data/wildPokemon/ceruleancave2.asm b/data/wildPokemon/ceruleancave2.asm deleted file mode 100644 index 1fd20019..00000000 --- a/data/wildPokemon/ceruleancave2.asm +++ /dev/null @@ -1,14 +0,0 @@ -DungeonMons2: - db $0F - 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 $00 - diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/wildPokemon/ceruleancaveb1.asm deleted file mode 100644 index 5848678f..00000000 --- a/data/wildPokemon/ceruleancaveb1.asm +++ /dev/null @@ -1,14 +0,0 @@ -DungeonMonsB1: - db $19 - 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 55,LICKITUNG - db 50,LICKITUNG - db $00 - diff --git a/data/wildPokemon/diglettscave.asm b/data/wildPokemon/diglettscave.asm deleted file mode 100755 index 0b8ec1c7..00000000 --- a/data/wildPokemon/diglettscave.asm +++ /dev/null @@ -1,14 +0,0 @@ -CaveMons: - db $14 - db 18,DIGLETT - db 19,DIGLETT - db 17,DIGLETT - db 20,DIGLETT - db 16,DIGLETT - db 15,DIGLETT - db 21,DIGLETT - db 22,DIGLETT - db 29,DUGTRIO - db 31,DUGTRIO - db $00 - diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm deleted file mode 100755 index 2e5a8f51..00000000 --- a/data/wildPokemon/mansion1.asm +++ /dev/null @@ -1,14 +0,0 @@ -MansionMons1: - db $0A - 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 38,GROWLITHE - db $00 - diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm deleted file mode 100755 index e830560a..00000000 --- a/data/wildPokemon/mansion2.asm +++ /dev/null @@ -1,14 +0,0 @@ -MansionMons2: - db $0A - 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 $00 - diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm deleted file mode 100755 index cc180e3b..00000000 --- a/data/wildPokemon/mansion3.asm +++ /dev/null @@ -1,14 +0,0 @@ -MansionMons3: - db $0A - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 43,RATTATA - db 43,RATICATE - db 38,GRIMER - db 38,GRIMER - db 38,MUK - db 41,MUK - db $00 - diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm deleted file mode 100755 index dcace0d8..00000000 --- a/data/wildPokemon/mansionb1.asm +++ /dev/null @@ -1,13 +0,0 @@ -MansionMonsB1: - db $0A - db 35,GRIMER - 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 $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm deleted file mode 100755 index 75f19efd..00000000 --- a/data/wildPokemon/mtmoon1.asm +++ /dev/null @@ -1,14 +0,0 @@ -MoonMons1: - db $0A - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - db $00 - diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm deleted file mode 100755 index 61c0b05c..00000000 --- a/data/wildPokemon/mtmoonb1.asm +++ /dev/null @@ -1,14 +0,0 @@ -MoonMonsB1: - db $0A - db 8,ZUBAT - db 9,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,GEODUDE - db 11,ZUBAT - db 9,PARAS - db 11,PARAS - db 10,CLEFAIRY - db 12,CLEFAIRY - db $00 - diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm deleted file mode 100755 index 27c76500..00000000 --- a/data/wildPokemon/mtmoonb2.asm +++ /dev/null @@ -1,14 +0,0 @@ -MoonMonsB2: - db $0A - db 10,ZUBAT - db 11,GEODUDE - db 13,PARAS - db 11,ZUBAT - db 11,ZUBAT - db 12,ZUBAT - db 13,ZUBAT - db 9,CLEFAIRY - db 11,CLEFAIRY - db 13,CLEFAIRY - db $00 - diff --git a/data/wildPokemon/nomons.asm b/data/wildPokemon/nomons.asm deleted file mode 100755 index 895cf2e0..00000000 --- a/data/wildPokemon/nomons.asm +++ /dev/null @@ -1,4 +0,0 @@ -NoMons: - db $00 - db $00 - diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm deleted file mode 100755 index 4911c790..00000000 --- a/data/wildPokemon/pokemontower1.asm +++ /dev/null @@ -1,4 +0,0 @@ -TowerMons1: - db $00 - db $00 - diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm deleted file mode 100755 index a849668d..00000000 --- a/data/wildPokemon/pokemontower2.asm +++ /dev/null @@ -1,4 +0,0 @@ -TowerMons2: - db $00 - db $00 - diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm deleted file mode 100755 index c071c972..00000000 --- a/data/wildPokemon/pokemontower3.asm +++ /dev/null @@ -1,14 +0,0 @@ -TowerMons3: - db $0A - db 20,GASTLY - 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 $00 - diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm deleted file mode 100755 index 35be620e..00000000 --- a/data/wildPokemon/pokemontower4.asm +++ /dev/null @@ -1,14 +0,0 @@ -TowerMons4: - db $0A - db 20,GASTLY - 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 $00 - diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm deleted file mode 100755 index 55fe2e27..00000000 --- a/data/wildPokemon/pokemontower5.asm +++ /dev/null @@ -1,14 +0,0 @@ -TowerMons5: - db $0F - db 22,GASTLY - db 23,GASTLY - 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 $00 - diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm deleted file mode 100755 index 6e914c5c..00000000 --- a/data/wildPokemon/pokemontower6.asm +++ /dev/null @@ -1,14 +0,0 @@ -TowerMons6: - db $0F - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 22,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - db $00 - diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm deleted file mode 100755 index 34ca6225..00000000 --- a/data/wildPokemon/pokemontower7.asm +++ /dev/null @@ -1,14 +0,0 @@ -TowerMons7: - db $14 - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 27,GASTLY - db 28,GASTLY - db 23,GASTLY - db 24,CUBONE - db 29,GASTLY - db 24,HAUNTER - db 29,HAUNTER - db $00 - diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm deleted file mode 100755 index 8a1667a5..00000000 --- a/data/wildPokemon/powerplant.asm +++ /dev/null @@ -1,13 +0,0 @@ -PowerPlantMons: - db $0A - 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 $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm deleted file mode 100755 index 9999490e..00000000 --- a/data/wildPokemon/rocktunnel1.asm +++ /dev/null @@ -1,14 +0,0 @@ -TunnelMonsB1: - db $0F - 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 19,MACHOP - db 21,MACHOP - db $00 - diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm deleted file mode 100755 index 41111909..00000000 --- a/data/wildPokemon/rocktunnel2.asm +++ /dev/null @@ -1,14 +0,0 @@ -TunnelMonsB2: - db $0F - db 20,ZUBAT - db 17,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 $00 - diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm deleted file mode 100755 index 4b85ba40..00000000 --- a/data/wildPokemon/route1.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route1Mons: - db $19 - db 3,PIDGEY - db 4,PIDGEY - db 2,RATTATA - db 3,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 5,PIDGEY - db 4,RATTATA - db 6,PIDGEY - db 7,PIDGEY - db $00 - diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm deleted file mode 100755 index af835c99..00000000 --- a/data/wildPokemon/route10.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route10Mons: - db $0F - 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 $00 - diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm deleted file mode 100755 index 0b1425c0..00000000 --- a/data/wildPokemon/route11.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route11Mons: - db $0F - 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 $00 - diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm deleted file mode 100755 index 6dc3d739..00000000 --- a/data/wildPokemon/route12.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route12Mons: - db $0F - 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 $03 - 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/wildPokemon/route13.asm b/data/wildPokemon/route13.asm deleted file mode 100755 index 3b6ca152..00000000 --- a/data/wildPokemon/route13.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route13Mons: - db $0F - 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 $03 - 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/wildPokemon/route14.asm b/data/wildPokemon/route14.asm deleted file mode 100755 index 9eb0e4c5..00000000 --- a/data/wildPokemon/route14.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route14Mons: - db $0F - db 26,ODDISH - db 26,BELLSPROUT - 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 $00 - diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm deleted file mode 100755 index 30d96ed2..00000000 --- a/data/wildPokemon/route15.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route15Mons: - db $0F - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 32,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - db $00 - diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm deleted file mode 100755 index eeefa9ba..00000000 --- a/data/wildPokemon/route16.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route16Mons: - db $19 - db 22,SPEAROW - db 22,DODUO - 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 $00 - diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm deleted file mode 100755 index ce72f376..00000000 --- a/data/wildPokemon/route17.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route17Mons: - db $19 - db 26,DODUO - 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 $00 - diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm deleted file mode 100755 index 62ce6c3e..00000000 --- a/data/wildPokemon/route18.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route18Mons: - db $19 - db 22,SPEAROW - db 22,DODUO - 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 $00 - diff --git a/data/wildPokemon/route19.asm b/data/wildPokemon/route19.asm deleted file mode 100644 index 77e1e3ef..00000000 --- a/data/wildPokemon/route19.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route19Mons: - 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/wildPokemon/route2.asm b/data/wildPokemon/route2.asm deleted file mode 100755 index 93f3726f..00000000 --- a/data/wildPokemon/route2.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route2Mons: - db $19 - db 3,RATTATA - db 3,PIDGEY - db 4,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,PIDGEY - db 6,NIDORAN_M - db 6,NIDORAN_F - db 7,PIDGEY - db 7,PIDGEY - db $00 - diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm deleted file mode 100755 index 11ac7e6b..00000000 --- a/data/wildPokemon/route21.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route21Mons: - db $19 - 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 $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/wildPokemon/route22.asm b/data/wildPokemon/route22.asm deleted file mode 100755 index 39f1f29c..00000000 --- a/data/wildPokemon/route22.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route22Mons: - db $19 - db 2,NIDORAN_M - db 2,NIDORAN_F - db 3,MANKEY - db 3,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,MANKEY - db 2,SPEAROW - db 4,SPEAROW - db 6,SPEAROW - db $00 - diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm deleted file mode 100755 index 43de8c2b..00000000 --- a/data/wildPokemon/route23.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route23Mons: - db $0A - 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 $00 - diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm deleted file mode 100755 index df4a3bce..00000000 --- a/data/wildPokemon/route24.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route24Mons: - db $19 - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - db $00 - diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm deleted file mode 100755 index 1546dd74..00000000 --- a/data/wildPokemon/route25.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route25Mons: - db $0F - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - db $00 - diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm deleted file mode 100755 index f867fbbf..00000000 --- a/data/wildPokemon/route3.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route3Mons: - db $14 - 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 $00 - diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm deleted file mode 100755 index b62126d8..00000000 --- a/data/wildPokemon/route4.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route4Mons: - db $14 - 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 $00 - diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm deleted file mode 100755 index 1e9703a7..00000000 --- a/data/wildPokemon/route5.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route5Mons: - db $0F - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - db $00 - diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm deleted file mode 100755 index b84e5029..00000000 --- a/data/wildPokemon/route6.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route6Mons: - db $0F - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - - db $03 - 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/wildPokemon/route7.asm b/data/wildPokemon/route7.asm deleted file mode 100755 index dad77e69..00000000 --- a/data/wildPokemon/route7.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route7Mons: - db $0F - db 20,PIDGEY - db 22,PIDGEY - 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 $00 - diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm deleted file mode 100755 index 8b47b163..00000000 --- a/data/wildPokemon/route8.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route8Mons: - db $0F - db 20,PIDGEY - 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 $00 - diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm deleted file mode 100755 index 95f5b451..00000000 --- a/data/wildPokemon/route9.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route9Mons: - db $0F - db 16,NIDORAN_M - db 16,NIDORAN_F - db 18,RATTATA - db 18,NIDORAN_M - db 18,NIDORAN_F - db 17,SPEAROW - db 18,NIDORINO - db 18,NIDORINA - db 20,RATICATE - db 19,FEAROW - db $00 - diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm deleted file mode 100755 index c8632351..00000000 --- a/data/wildPokemon/safarizone1.asm +++ /dev/null @@ -1,14 +0,0 @@ -ZoneMons1: - db $1E - 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 $00 - diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm deleted file mode 100755 index 1e4a6744..00000000 --- a/data/wildPokemon/safarizone2.asm +++ /dev/null @@ -1,14 +0,0 @@ -ZoneMons2: - db $1E - 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 $00 - diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm deleted file mode 100755 index 3424f1d7..00000000 --- a/data/wildPokemon/safarizone3.asm +++ /dev/null @@ -1,14 +0,0 @@ -ZoneMons3: - db $1E - db 29,NIDORAN_M - db 21,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINO - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 25,PINSIR - db 27,TANGELA - db $00 - diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm deleted file mode 100755 index e563fff2..00000000 --- a/data/wildPokemon/safarizonecenter.asm +++ /dev/null @@ -1,14 +0,0 @@ -ZoneMonsCenter: - db $1E - db 14,NIDORAN_M - db 36,NIDORAN_F - db 24,EXEGGCUTE - db 20,RHYHORN - db 23,NIDORINO - db 27,PARASECT - db 27,PARAS - db 32,PARASECT - db 22,TANGELA - db 7,CHANSEY - db $00 - diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm deleted file mode 100755 index f4799c12..00000000 --- a/data/wildPokemon/seafoamisland1.asm +++ /dev/null @@ -1,14 +0,0 @@ -IslandMons1: - db $0F - db 18,ZUBAT - db 25,KRABBY - db 27,KRABBY - db 27,ZUBAT - db 36,ZUBAT - db 28,SLOWPOKE - db 30,SLOWPOKE - db 9,ZUBAT - db 27,GOLBAT - db 36,GOLBAT - db $00 - diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm deleted file mode 100755 index 2f0f255e..00000000 --- a/data/wildPokemon/seafoamislandb1.asm +++ /dev/null @@ -1,14 +0,0 @@ -IslandMonsB1: - db $0A - 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 $00 - diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm deleted file mode 100755 index f3a23b07..00000000 --- a/data/wildPokemon/seafoamislandb2.asm +++ /dev/null @@ -1,14 +0,0 @@ -IslandMonsB2: - db $0A - 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 $00 - diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm deleted file mode 100755 index ddf6acd3..00000000 --- a/data/wildPokemon/seafoamislandb3.asm +++ /dev/null @@ -1,25 +0,0 @@ -IslandMonsB3: - db $0A - db 27,GOLBAT - db 36,ZUBAT - db 29,KRABBY - db 27,ZUBAT - db 30,KINGLER - db 26,SEEL - db 31,KRABBY - db 30,SEEL - db 28,DEWGONG - db 32,DEWGONG - - db $05 - 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/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm deleted file mode 100755 index dd842dda..00000000 --- a/data/wildPokemon/seafoamislandb4.asm +++ /dev/null @@ -1,25 +0,0 @@ -IslandMonsB4: - db $0A - 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 $05 - 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/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm deleted file mode 100755 index f3e029fa..00000000 --- a/data/wildPokemon/victoryroad1.asm +++ /dev/null @@ -1,14 +0,0 @@ -PlateauMons1: - db $0F - db 26,GEODUDE - 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 47,GRAVELER - db $00 - diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm deleted file mode 100755 index fcd910d2..00000000 --- a/data/wildPokemon/victoryroad2.asm +++ /dev/null @@ -1,14 +0,0 @@ -PlateauMons2: - db $0A - 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 $00 - diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm deleted file mode 100755 index ed4d773b..00000000 --- a/data/wildPokemon/victoryroad3.asm +++ /dev/null @@ -1,14 +0,0 @@ -PlateauMons3: - db $0F - 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 $00 - diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm deleted file mode 100755 index eb4889a7..00000000 --- a/data/wildPokemon/viridianforest.asm +++ /dev/null @@ -1,14 +0,0 @@ -ForestMons: - db $19 - db 3,CATERPIE - db 4,METAPOD - db 4,CATERPIE - db 5,CATERPIE - db 4,PIDGEY - db 6,PIDGEY - db 6,CATERPIE - db 6,METAPOD - db 8,PIDGEY - db 9,PIDGEOTTO - db $00 - diff --git a/data/wild_mons.asm b/data/wild_mons.asm deleted file mode 100755 index ac4a8897..00000000 --- a/data/wild_mons.asm +++ /dev/null @@ -1,323 +0,0 @@ -WildDataPointers: - dw NoMons ; PALLET_TOWN - dw NoMons ; VIRIDIAN_CITY - dw NoMons ; PEWTER_CITY - dw NoMons ; CERULEAN_CITY - dw NoMons ; LAVENDER_TOWN - dw NoMons ; VERMILION_CITY - dw NoMons ; CELADON_CITY - dw NoMons ; FUCHSIA_CITY - dw NoMons ; CINNABAR_ISLAND - dw NoMons ; INDIGO_PLATEAU - dw NoMons ; SAFFRON_CITY - dw NoMons ; unused - dw Route1Mons ; ROUTE_1 - dw Route2Mons ; ROUTE_2 - dw Route3Mons ; ROUTE_3 - dw Route4Mons ; ROUTE_4 - dw Route5Mons ; ROUTE_5 - dw Route6Mons ; ROUTE_6 - dw Route7Mons ; ROUTE_7 - dw Route8Mons ; ROUTE_8 - dw Route9Mons ; ROUTE_9 - dw Route10Mons ; ROUTE_10 - dw Route11Mons ; ROUTE_11 - dw Route12Mons ; ROUTE_12 - dw Route13Mons ; ROUTE_13 - dw Route14Mons ; ROUTE_14 - dw Route15Mons ; ROUTE_15 - dw Route16Mons ; ROUTE_16 - dw Route17Mons ; ROUTE_17 - dw Route18Mons ; ROUTE_18 - dw Route19Mons ; ROUTE_19 - dw Route20Mons ; ROUTE_20 - dw Route21Mons ; ROUTE_21 - dw Route22Mons ; ROUTE_22 - dw Route23Mons ; ROUTE_23 - dw Route24Mons ; ROUTE_24 - dw Route25Mons ; ROUTE_25 - dw NoMons ; REDS_HOUSE_1F - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw ForestMons ; ViridianForest - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MoonMons1 - dw MoonMonsB1 - dw MoonMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB1 - dw PowerPlantMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw PlateauMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TowerMons1 - dw TowerMons2 - dw TowerMons3 - dw TowerMons4 - dw TowerMons5 - dw TowerMons6 - dw TowerMons7 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMonsB1 - dw IslandMonsB2 - dw IslandMonsB3 - dw IslandMonsB4 - dw NoMons - dw NoMons - dw MansionMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMons1 - dw NoMons - dw PlateauMons2 - dw NoMons - dw NoMons - dw CaveMons - dw PlateauMons3 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MansionMons2 - dw MansionMons3 - dw MansionMonsB1 - dw ZoneMons1 - dw ZoneMons2 - dw ZoneMons3 - dw ZoneMonsCenter - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw DungeonMons2 - dw DungeonMonsB1 - dw DungeonMons1 - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw $FFFF - -; wild pokemon data is divided into two parts. -; first part: pokemon found in grass -; second part: pokemon found while surfing -; each part goes as follows: - ; if first byte == 00, then - ; no wild pokemon on this map - ; if first byte != 00, then - ; first byte is encounter rate - ; followed by 20 bytes: - ; level, species (ten times) - -INCLUDE "data/wildPokemon/nomons.asm" -INCLUDE "data/wildPokemon/route1.asm" -INCLUDE "data/wildPokemon/route2.asm" -INCLUDE "data/wildPokemon/route22.asm" -INCLUDE "data/wildPokemon/viridianforest.asm" -INCLUDE "data/wildPokemon/route3.asm" -INCLUDE "data/wildPokemon/mtmoon1.asm" -INCLUDE "data/wildPokemon/mtmoonb1.asm" -INCLUDE "data/wildPokemon/mtmoonb2.asm" -INCLUDE "data/wildPokemon/route4.asm" -INCLUDE "data/wildPokemon/route24.asm" -INCLUDE "data/wildPokemon/route25.asm" -INCLUDE "data/wildPokemon/route9.asm" -INCLUDE "data/wildPokemon/route5.asm" -INCLUDE "data/wildPokemon/route6.asm" -INCLUDE "data/wildPokemon/route11.asm" -INCLUDE "data/wildPokemon/rocktunnel1.asm" -INCLUDE "data/wildPokemon/rocktunnel2.asm" -INCLUDE "data/wildPokemon/route10.asm" -INCLUDE "data/wildPokemon/route12.asm" -INCLUDE "data/wildPokemon/route8.asm" -INCLUDE "data/wildPokemon/route7.asm" -INCLUDE "data/wildPokemon/pokemontower1.asm" -INCLUDE "data/wildPokemon/pokemontower2.asm" -INCLUDE "data/wildPokemon/pokemontower3.asm" -INCLUDE "data/wildPokemon/pokemontower4.asm" -INCLUDE "data/wildPokemon/pokemontower5.asm" -INCLUDE "data/wildPokemon/pokemontower6.asm" -INCLUDE "data/wildPokemon/pokemontower7.asm" -INCLUDE "data/wildPokemon/route13.asm" -INCLUDE "data/wildPokemon/route14.asm" -INCLUDE "data/wildPokemon/route15.asm" -INCLUDE "data/wildPokemon/route16.asm" -INCLUDE "data/wildPokemon/route17.asm" -INCLUDE "data/wildPokemon/route18.asm" -INCLUDE "data/wildPokemon/safarizonecenter.asm" -INCLUDE "data/wildPokemon/safarizone1.asm" -INCLUDE "data/wildPokemon/safarizone2.asm" -INCLUDE "data/wildPokemon/safarizone3.asm" -INCLUDE "data/wildPokemon/route19.asm" -INCLUDE "data/wildPokemon/route20.asm" -INCLUDE "data/wildPokemon/seafoamisland1.asm" -INCLUDE "data/wildPokemon/seafoamislandb1.asm" -INCLUDE "data/wildPokemon/seafoamislandb2.asm" -INCLUDE "data/wildPokemon/seafoamislandb3.asm" -INCLUDE "data/wildPokemon/seafoamislandb4.asm" -INCLUDE "data/wildPokemon/mansion1.asm" -INCLUDE "data/wildPokemon/mansion2.asm" -INCLUDE "data/wildPokemon/mansion3.asm" -INCLUDE "data/wildPokemon/mansionb1.asm" -INCLUDE "data/wildPokemon/route21.asm" -INCLUDE "data/wildPokemon/ceruleancave1.asm" -INCLUDE "data/wildPokemon/ceruleancave2.asm" -INCLUDE "data/wildPokemon/ceruleancaveb1.asm" -INCLUDE "data/wildPokemon/powerplant.asm" -INCLUDE "data/wildPokemon/route23.asm" -INCLUDE "data/wildPokemon/victoryroad2.asm" -INCLUDE "data/wildPokemon/victoryroad3.asm" -INCLUDE "data/wildPokemon/victoryroad1.asm" -INCLUDE "data/wildPokemon/diglettscave.asm" diff --git a/data/yes_no_menu_strings.asm b/data/yes_no_menu_strings.asm new file mode 100644 index 00000000..db2eeb4c --- /dev/null +++ b/data/yes_no_menu_strings.asm @@ -0,0 +1,44 @@ +two_option_menu: MACRO + db \1, \2, \3 + dw \4 +ENDM + +TwoOptionMenuStrings: +; entries correspond to *_MENU constants + ; width, height, blank line before first menu item?, text pointer + two_option_menu 4, 3, FALSE, .YesNoMenu + two_option_menu 6, 3, FALSE, .NorthWestMenu + two_option_menu 6, 3, FALSE, .SouthEastMenu + two_option_menu 6, 3, FALSE, .YesNoMenu + two_option_menu 6, 3, FALSE, .NorthEastMenu + two_option_menu 7, 3, FALSE, .TradeCancelMenu + two_option_menu 7, 4, TRUE, .HealCancelMenu + two_option_menu 4, 3, FALSE, .NoYesMenu + +.NoYesMenu: + db "NO" + next "YES@" + +.YesNoMenu: + db "YES" + next "NO@" + +.NorthWestMenu: + db "NORTH" + next "WEST@" + +.SouthEastMenu: + db "SOUTH" + next "EAST@" + +.NorthEastMenu: + db "NORTH" + next "EAST@" + +.TradeCancelMenu: + db "TRADE" + next "CANCEL@" + +.HealCancelMenu: + db "HEAL" + next "CANCEL@" |