diff options
Diffstat (limited to 'data')
57 files changed, 1054 insertions, 1054 deletions
diff --git a/data/animations.asm b/data/animations.asm index cf6dc150..8c388afd 100755 --- a/data/animations.asm +++ b/data/animations.asm @@ -1,4 +1,4 @@ -AttackAnimationPointers: ; 7a07d (1e:607d) +AttackAnimationPointers: dw PoundAnim dw KarateChopAnim dw DoubleSlapAnim @@ -209,156 +209,156 @@ AttackAnimationPointers: ; 7a07d (1e:607d) ; if first byte >= $D8 ; db special_effect_id, sound_id ; $FF terminated -ZigZagScreenAnim: ; 7a213 (1e:6213) +ZigZagScreenAnim: db SE_WAVY_SCREEN, $FF db $FF -PoundAnim: ; 7a216 (1e:6216) -StruggleAnim: ; 7a216 (1e:6216) +PoundAnim: +StruggleAnim: db $08,$00,$01 db $FF -KarateChopAnim: ; 7a21a (1e:621a) +KarateChopAnim: db $08,$01,$03 db $FF -DoubleSlapAnim: ; 7a21e (1e:621e) +DoubleSlapAnim: db $05,$02,$01 db $05,$02,$01 db $FF -CometPunchAnim: ; 7a225 (1e:6225) +CometPunchAnim: db $04,$03,$02 db $04,$03,$02 db $FF -MegaPunchAnim: ; 7a22c (1e:622c) +MegaPunchAnim: db $46,$04,$04 db $FF -PayDayAnim: ; 7a230 (1e:6230) +PayDayAnim: db $08,$00,$01 db $04,$05,$52 db $FF -FirePunchAnim: ; 7a237 (1e:6237) +FirePunchAnim: db $06,$06,$02 db $46,$FF,$11 db $FF -IcePunchAnim: ; 7a23e (1e:623e) +IcePunchAnim: db $06,$07,$02 db $10,$FF,$2F db $FF -ThunderPunchAnim: ; 7a245 (1e:6245) +ThunderPunchAnim: db $06,$08,$02 db SE_DARK_SCREEN_PALETTE, $FF db $46,$FF,$2B db SE_RESET_SCREEN_PALETTE, $FF db $FF -ScratchAnim: ; 7a250 (1e:6250) +ScratchAnim: db $06,$09,$0F db $FF -VicegripAnim: ; 7a254 (1e:6254) +VicegripAnim: db $08,$0A,$2A db $FF -GuillotineAnim: ; 7a258 (1e:6258) +GuillotineAnim: db $06,$0B,$2A db $FF -RazorWindAnim: ; 7a25c (1e:625c) +RazorWindAnim: db $04,$0C,$16 db $FF -SwordsDanceAnim: ; 7a260 (1e:6260) +SwordsDanceAnim: db $46,$0D,$18 db $46,$0D,$18 db $46,$0D,$18 db $FF -CutAnim: ; 7a26a (1e:626a) +CutAnim: db SE_DARK_SCREEN_FLASH, $0E db $04,$FF,$16 db $FF -GustAnim: ; 7a270 (1e:6270) +GustAnim: db $46,$0F,$10 db $06,$FF,$02 db $FF -WingAttackAnim: ; 7a277 (1e:6277) +WingAttackAnim: db $46,$10,$04 db $FF -WhirlwindAnim: ; 7a27b (1e:627b) +WhirlwindAnim: db $46,$11,$10 db SE_SLIDE_ENEMY_MON_OFF, $FF db $FF -FlyAnim: ; 7a281 (1e:6281) +FlyAnim: db $46,$12,$04 db SE_SHOW_MON_PIC, $FF db $FF -BindAnim: ; 7a287 (1e:6287) +BindAnim: db $04,$13,$23 db $04,$13,$23 db $FF -SlamAnim: ; 7a28e (1e:628e) +SlamAnim: db $06,$14,$02 db $FF -VineWhipAnim: ; 7a292 (1e:6292) +VineWhipAnim: db $01,$15,$16 db $08,$FF,$01 db $FF -StompAnim: ; 7a299 (1e:6299) +StompAnim: db $48,$16,$05 db $FF -DoubleKickAnim: ; 7a29d (1e:629d) +DoubleKickAnim: db $08,$17,$01 db $08,$17,$01 db $FF -MegaKickAnim: ; 7a2a4 (1e:62a4) +MegaKickAnim: db $46,$18,$04 db $FF -JumpKickAnim: ; 7a2a8 (1e:62a8) +JumpKickAnim: db $46,$19,$04 db $FF -RollingKickAnim: ; 7a2ac (1e:62ac) +RollingKickAnim: db SE_DARK_SCREEN_FLASH, $1A db $46,$FF,$04 db $FF -SandAttackAnim: ; 7a2b2 (1e:62b2) +SandAttackAnim: db $46,$1B,$28 db $FF -HeatButtAnim: ; 7a2b6 (1e:62b6) +HeatButtAnim: db $46,$1C,$05 db $FF -HornAttackAnim: ; 7a2ba (1e:62ba) +HornAttackAnim: db $06,$1D,$45 db $46,$FF,$05 db $FF -FuryAttackAnim: ; 7a2c1 (1e:62c1) +FuryAttackAnim: db $02,$1E,$46 db $02,$FF,$46 db $FF -HornDrillAnim: ; 7a2c8 (1e:62c8) +HornDrillAnim: db $42,$1F,$05 db $42,$FF,$05 db $42,$FF,$05 @@ -366,35 +366,35 @@ HornDrillAnim: ; 7a2c8 (1e:62c8) db $42,$FF,$05 db $FF -TackleAnim: ; 7a2d8 (1e:62d8) +TackleAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $FF -BodySlamAnim: ; 7a2dd (1e:62dd) +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: ; 7a2e6 (1e:62e6) +WrapAnim: db $04,$22,$23 db $04,$22,$23 db $04,$22,$23 db $FF -TakeDownAnim: ; 7a2f0 (1e:62f0) +TakeDownAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_DARK_SCREEN_FLASH, $23 db SE_RESET_MON_POSITION, $FF db $FF -ThrashAnim: ; 7a2f7 (1e:62f7) +ThrashAnim: db $46,$24,$04 db $FF -DoubleEdgeAnim: ; 7a2fb (1e:62fb) +DoubleEdgeAnim: db SE_LIGHT_SCREEN_PALETTE, $48 db $06,$FF,$2D db SE_RESET_SCREEN_PALETTE, $FF @@ -403,7 +403,7 @@ DoubleEdgeAnim: ; 7a2fb (1e:62fb) db SE_RESET_MON_POSITION, $FF db $FF -TailWhipAnim: ; 7a309 (1e:6309) +TailWhipAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -413,125 +413,125 @@ TailWhipAnim: ; 7a309 (1e:6309) db SE_RESET_MON_POSITION, $84 db $FF -PoisonStingAnim: ; 7a318 (1e:6318) +PoisonStingAnim: db $06,$27,$00 db $FF -TwineedleAnim: ; 7a31c (1e:631c) +TwineedleAnim: db $05,$28,$01 db $05,$28,$01 db $FF -PinMissileAnim: ; 7a323 (1e:6323) +PinMissileAnim: db $03,$29,$01 db $FF -LeerAnim: ; 7a327 (1e:6327) +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: ; 7a330 (1e:6330) +BiteAnim: db $08,$2B,$02 db $FF -GrowlAnim: ; 7a334 (1e:6334) +GrowlAnim: db $46,$2C,$12 db $FF -RoarAnim: ; 7a338 (1e:6338) +RoarAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$2D,$15 db $FF -SingAnim: ; 7a342 (1e:6342) +SingAnim: db $46,$2E,$12 db $50,$FF,$40 db $50,$FF,$40 db $FF -SupersonicAnim: ; 7a34c (1e:634c) +SupersonicAnim: db $06,$2F,$31 db $FF -SonicBoomAnim: ; 7a350 (1e:6350) +SonicBoomAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$0F,$10 db $46,$FF,$05 db $FF -DisableAnim: ; 7a35d (1e:635d) +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: ; 7a366 (1e:6366) +AcidAnim: db $46,$32,$13 db $46,$32,$14 db $FF -EmberAnim: ; 7a36d (1e:636d) +EmberAnim: db $46,$33,$11 db $FF -FlamethrowerAnim: ; 7a371 (1e:6371) +FlamethrowerAnim: db $46,$34,$1F db $46,$34,$0C db $46,$34,$0D db $FF -MistAnim: ; 7a37b (1e:637b) +MistAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -WaterGunAnim: ; 7a382 (1e:6382) +WaterGunAnim: db $06,$36,$2C db $FF -HydroPumpAnim: ; 7a386 (1e:6386) +HydroPumpAnim: db $06,$37,$1A db $06,$37,$1A db $FF -SurfAnim: ; 7a38d (1e:638d) +SurfAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $06,$37,$1A db $FF -IceBeamAnim: ; 7a393 (1e:6393) +IceBeamAnim: db $03,$39,$2E db $10,$FF,$2F db $FF -BlizzardAnim: ; 7a39a (1e:639a) +BlizzardAnim: db $04,$3A,$38 db $04,$37,$38 db $FF -PsyBeamAnim: ; 7a3a1 (1e:63a1) +PsyBeamAnim: db $03,$3B,$2E db SE_FLASH_SCREEN_LONG, $FF db $FF -BubbleBeamAnim: ; 7a3a7 (1e:63a7) +BubbleBeamAnim: db $12,$3C,$35 db $FF -AuroraBeamAnim: ; 7a3ab (1e:63ab) +AuroraBeamAnim: db $03,$3D,$2E db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF db $FF -HyperBeamAnim: ; 7a3b3 (1e:63b3) +HyperBeamAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_SPIRAL_BALLS_INWARD, $FF db $02,$3E,$2E @@ -541,33 +541,33 @@ HyperBeamAnim: ; 7a3b3 (1e:63b3) db SE_RESET_SCREEN_PALETTE, $FF db $FF -PeckAnim: ; 7a3c4 (1e:63c4) +PeckAnim: db $08,$3F,$01 db $FF -DrillPeckAnim: ; 7a3c8 (1e:63c8) +DrillPeckAnim: db $46,$40,$04 db $FF -SubmissionAnim: ; 7a3cc (1e:63cc) +SubmissionAnim: db SE_SLIDE_MON_OFF, $41 db $06,$FF,$01 db SE_SHOW_MON_PIC, $FF db $FF -LowKickAnim: ; 7a3d4 (1e:63d4) +LowKickAnim: db SE_SLIDE_MON_OFF, $42 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -CounterAnim: ; 7a3dc (1e:63dc) +CounterAnim: db SE_SLIDE_MON_OFF, $43 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -SeismicTossAnim: ; 7a3e4 (1e:63e4) +SeismicTossAnim: db SE_BLINK_ENEMY_MON, $FF db $41,$8B,$4E db SE_HIDE_ENEMY_MON_PIC, $FF @@ -581,20 +581,20 @@ SeismicTossAnim: ; 7a3e4 (1e:63e4) db SE_SHAKE_SCREEN, $FF db $FF -StrengthAnim: ; 7a3fe (1e:63fe) +StrengthAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $46,$06,$04 db $FF -AbsorbAnim: ; 7a406 (1e:6406) +AbsorbAnim: db SE_LIGHT_SCREEN_PALETTE, $46 db $06,$FF,$21 db $06,$FF,$22 db SE_RESET_SCREEN_PALETTE, $FF db $FF -MegaDrainAnim: ; 7a411 (1e:6411) +MegaDrainAnim: db SE_LIGHT_SCREEN_PALETTE, $47 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -603,79 +603,79 @@ MegaDrainAnim: ; 7a411 (1e:6411) db SE_RESET_SCREEN_PALETTE, $FF db $FF -LeechSeedAnim: ; 7a420 (1e:6420) +LeechSeedAnim: db $46,$48,$1B db $55,$4D,$1C db $FF -GrowthAnim: ; 7a427 (1e:6427) +GrowthAnim: db SE_LIGHT_SCREEN_PALETTE, $49 db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -RazorLeafAnim: ; 7a42e (1e:642e) +RazorLeafAnim: db SE_LEAVES_FALLING, $4A db $41,$80,$44 db $01,$0C,$16 db $FF -SolarBeamAnim: ; 7a437 (1e:6437) +SolarBeamAnim: db $06,$4B,$2E db $06,$FF,$01 db $FF -PoisonPowderAnim: ; 7a43e (1e:643e) +PoisonPowderAnim: db $06,$4C,$36 db $FF -StunSporeAnim: ; 7a442 (1e:6442) +StunSporeAnim: db $06,$4D,$36 db $FF -SleepPowderAnim: ; 7a446 (1e:6446) +SleepPowderAnim: db $06,$4E,$36 db $FF -PedalDanceAnim: ; 7a44a (1e:644a) +PedalDanceAnim: db SE_LIGHT_SCREEN_PALETTE, $4F db SE_PETALS_FALLING, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -StringShotAnim: ; 7a451 (1e:6451) +StringShotAnim: db $08,$50,$37 db $FF -DragonRageAnim: ; 7a455 (1e:6455) +DragonRageAnim: db $46,$51,$1F db $46,$FF,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -FireSpinAnim: ; 7a462 (1e:6462) +FireSpinAnim: db $46,$52,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -ThunderShockAnim: ; 7a46c (1e:646c) +ThunderShockAnim: db $42,$53,$29 db $FF -ThunderBoltAnim: ; 7a470 (1e:6470) +ThunderBoltAnim: db $41,$54,$29 db $41,$54,$29 db $FF -ThunderWaveAnim: ; 7a477 (1e:6477) +ThunderWaveAnim: db $42,$55,$29 db $02,$FF,$23 db $04,$FF,$23 db $FF -ThunderAnim: ; 7a481 (1e:6481) +ThunderAnim: db SE_DARK_SCREEN_PALETTE, $56 db SE_DARK_SCREEN_FLASH, $FF db $46,$FF,$2B @@ -684,87 +684,87 @@ ThunderAnim: ; 7a481 (1e:6481) db SE_RESET_SCREEN_PALETTE, $FF db $FF -RockThrowAnim: ; 7a490 (1e:6490) +RockThrowAnim: db $04,$57,$30 db $FF -EarthquakeAnim: ; 7a494 (1e:6494) +EarthquakeAnim: db SE_SHAKE_SCREEN, $58 db SE_SHAKE_SCREEN, $58 db $FF -FissureAnim: ; 7a499 (1e:6499) +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: ; 7a4a2 (1e:64a2) +DigAnim: db $46,$5A,$04 db SE_SLIDE_MON_UP, $FF db $FF -ToxicAnim: ; 7a4a8 (1e:64a8) +ToxicAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $46,$5B,$14 db $FF -ConfusionAnim: ; 7a4ae (1e:64ae) +ConfusionAnim: db SE_FLASH_SCREEN_LONG, $5C db $FF -PsychicAnim: ; 7a4b1 (1e:64b1) +PsychicAnim: db SE_FLASH_SCREEN_LONG, $5D db SE_WAVY_SCREEN, $FF db $FF -HypnosisAnim: ; 7a4b6 (1e:64b6) +HypnosisAnim: db SE_FLASH_SCREEN_LONG, $5E db $FF -MeditateAnim: ; 7a4b9 (1e:64b9) +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: ; 7a4c3 (1e:64c3) +AgilityAnim: db SE_LIGHT_SCREEN_PALETTE, $60 db SE_RESET_SCREEN_PALETTE, $FF db $FF -QuickAttackAnim: ; 7a4c8 (1e:64c8) +QuickAttackAnim: db SE_SLIDE_MON_OFF, $61 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -RageAnim: ; 7a4d0 (1e:64d0) +RageAnim: db $06,$62,$01 db $FF -TeleportAnim: ; 7a4d4 (1e:64d4) +TeleportAnim: db SE_SQUISH_MON_PIC, $63 db SE_SHOOT_BALLS_UPWARD, $FF db $FF -NightShadeAnim: ; 7a4d9 (1e:64d9) +NightShadeAnim: db SE_FLASH_SCREEN_LONG, $5C db SE_WAVY_SCREEN, $FF db $FF -MimicAnim: ; 7a4de (1e:64de) +MimicAnim: db $46,$65,$21 db $46,$65,$22 db $FF -ScreechAnim: ; 7a4e5 (1e:64e5) +ScreechAnim: db $46,$66,$12 db $FF -DoubleTeamAnim: ; 7a4e9 (1e:64e9) +DoubleTeamAnim: db SE_DARK_SCREEN_PALETTE, $FF db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF @@ -776,28 +776,28 @@ DoubleTeamAnim: ; 7a4e9 (1e:64e9) db $46,$6F,$33 db $FF -RecoverAnim: ; 7a4fd (1e:64fd) +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: ; 7a506 (1e:6506) +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: ; 7a510 (1e:6510) +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: ; 7a519 (1e:6519) +SmokeScreenAnim: db $46,$6B,$28 db $04,$FF,$0A db SE_DARKEN_MON_PALETTE, $FF @@ -815,13 +815,13 @@ SmokeScreenAnim: ; 7a519 (1e:6519) db SE_RESET_SCREEN_PALETTE, $FF db $FF -ConfuseRayAnim: ; 7a53a (1e:653a) +ConfuseRayAnim: db SE_DARK_SCREEN_PALETTE, $6C db $46,$FF,$3E db SE_RESET_SCREEN_PALETTE, $FF db $FF -WithdrawAnim: ; 7a542 (1e:6542) +WithdrawAnim: db SE_LIGHT_SCREEN_PALETTE, $6E db SE_SLIDE_MON_DOWN, $FF db $06,$FF,$51 @@ -829,47 +829,47 @@ WithdrawAnim: ; 7a542 (1e:6542) db SE_SHOW_MON_PIC, $FF db $FF -DefenseCurlAnim: ; 7a54e (1e:654e) +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: ; 7a558 (1e:6558) +BarrierAnim: db $46,$6F,$33 db $46,$6F,$33 db $FF -LightScreenAnim: ; 7a55f (1e:655f) +LightScreenAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$70,$33 db $46,$70,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -HazeAnim: ; 7a56a (1e:656a) +HazeAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -ReflectAnim: ; 7a571 (1e:6571) +ReflectAnim: db SE_DARK_SCREEN_PALETTE, $FF db $46,$72,$33 db $46,$72,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -FocusEnergyAnim: ; 7a57c (1e:657c) +FocusEnergyAnim: db SE_SPIRAL_BALLS_INWARD, $73 db $FF -BideAnim: ; 7a57f (1e:657f) +BideAnim: db $46,$74,$04 db $FF -MetronomeAnim: ; 7a583 (1e:6583) +MetronomeAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -879,39 +879,39 @@ MetronomeAnim: ; 7a583 (1e:6583) db SE_RESET_MON_POSITION, $84 db $FF -MirrorMoveAnim: ; 7a592 (1e:6592) +MirrorMoveAnim: db $08,$76,$01 db $FF -SelfdestructAnim: ; 7a596 (1e:6596) +SelfdestructAnim: db $43,$77,$34 db $FF -EggBombAnim: ; 7a59a (1e:659a) +EggBombAnim: db $44,$78,$41 db $44,$78,$42 db $FF -LickAnim: ; 7a5a1 (1e:65a1) +LickAnim: db $46,$7B,$14 db $FF -SmogAnim: ; 7a5a5 (1e:65a5) +SmogAnim: db SE_DARKEN_MON_PALETTE, $48 db $46,$7A,$19 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SludgeAnim: ; 7a5ad (1e:65ad) +SludgeAnim: db $46,$7B,$13 db $46,$7B,$14 db $FF -BoneClubAnim: ; 7a5b4 (1e:65b4) +BoneClubAnim: db $08,$7C,$02 db $FF -FireBlastAnim: ; 7a5b8 (1e:65b8) +FireBlastAnim: db $46,$7D,$1F db $46,$FF,$20 db $46,$FF,$20 @@ -919,47 +919,47 @@ FireBlastAnim: ; 7a5b8 (1e:65b8) db $46,$FF,$0D db $FF -WaterfallAnim: ; 7a5c8 (1e:65c8) +WaterfallAnim: db SE_SLIDE_MON_DOWN, $48 db $06,$37,$1A db $08,$FF,$02 db SE_SLIDE_MON_UP, $FF db $FF -ClampAnim: ; 7a5d3 (1e:65d3) +ClampAnim: db $08,$7F,$2A db $06,$83,$23 db $06,$83,$23 db $FF -SwiftAnim: ; 7a5dd (1e:65dd) +SwiftAnim: db $43,$80,$3F db $FF -SkullBashAnim: ; 7a5e1 (1e:65e1) +SkullBashAnim: db $46,$81,$05 db $FF -SpikeCannonAnim: ; 7a5e5 (1e:65e5) +SpikeCannonAnim: db $44,$82,$04 db $FF -ConstrictAnim: ; 7a5e9 (1e:65e9) +ConstrictAnim: db $06,$83,$23 db $06,$83,$23 db $06,$83,$23 db $FF -AmnesiaAnim: ; 7a5f3 (1e:65f3) +AmnesiaAnim: db $08,$84,$25 db $08,$84,$25 db $FF -KinesisAnim: ; 7a5fa (1e:65fa) +KinesisAnim: db $08,$85,$01 db $FF -SoftboiledAnim: ; 7a5fe (1e:65fe) +SoftboiledAnim: db SE_SLIDE_MON_HALF_OFF, $48 db $08,$86,$4C db SE_LIGHT_SCREEN_PALETTE, $FF @@ -968,34 +968,34 @@ SoftboiledAnim: ; 7a5fe (1e:65fe) db SE_SHOW_MON_PIC, $FF db $FF -HiJumpKickAnim: ; 7a6 (1e:660c) +HiJumpKickAnim: db $46,$87,$04 db $FF -GlareAnim: ; 7a610 (1e:6610) +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: ; 7a619 (1e:6619) +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: ; 7a623 (1e:6623) +PoisonGasAnim: db $46,$8A,$19 db $FF -BarrageAnim: ; 7a627 (1e:6627) +BarrageAnim: db $43,$8B,$41 db $05,$FF,$55 db $FF -LeechLifeAnim: ; 7a62e (1e:662e) +LeechLifeAnim: db $08,$8C,$02 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -1003,264 +1003,264 @@ LeechLifeAnim: ; 7a62e (1e:662e) db SE_DARK_SCREEN_FLASH, $FF db $FF -LovelyKissAnim: ; 7a63c (1e:663c) +LovelyKissAnim: db $06,$8D,$12 db $FF -SkyAttackAnim: ; 7a640 (1e:6640) +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: ; 7a64a (1e:664a) +TransformAnim: db $46,$8F,$21 db $44,$8F,$22 db $08,$FF,$47 db SE_TRANSFORM_MON, $FF db $FF -BubbleAnim: ; 7a656 (1e:6656) +BubbleAnim: db $16,$90,$35 db $FF -DizzyPunchAnim: ; 7a65a (1e:665a) +DizzyPunchAnim: db $06,$91,$17 db $06,$91,$17 db $06,$91,$17 db $06,$02,$02 db $FF -SporeAnim: ; 7a667 (1e:6667) +SporeAnim: db $06,$92,$36 db $FF -FlashAnim: ; 7a66b (1e:666b) +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: ; 7a674 (1e:6674) +PsywaveAnim: db $06,$2F,$31 db SE_WAVY_SCREEN, $5C db $FF -SplashAnim: ; 7a67a (1e:667a) +SplashAnim: db SE_BOUNCE_UP_AND_DOWN, $95 db $FF -AcidArmorAnim: ; 7a67d (1e:667d) +AcidArmorAnim: db SE_SLIDE_MON_DOWN_AND_HIDE, $96 db $FF -CrabHammerAnim: ; 7a680 (1e:6680) +CrabHammerAnim: db $46,$97,$05 db $06,$FF,$2A db $FF -ExplosionAnim: ; 7a687 (1e:6687) +ExplosionAnim: db $43,$98,$34 db $FF -FurySwipesAnim: ; 7a68b (1e:668b) +FurySwipesAnim: db $04,$99,$0F db $FF -BonemerangAnim: ; 7a68f (1e:668f) +BonemerangAnim: db $06,$9A,$02 db $FF -RestAnim: ; 7a693 (1e:6693) +RestAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -RockSlideAnim: ; 7a69a (1e:669a) +RockSlideAnim: db $04,$9C,$1D db $03,$9C,$1E db $46,$9D,$04 db $FF -HyperFangAnim: ; 7a6a4 (1e:66a4) +HyperFangAnim: db $06,$9D,$02 db $FF -SharpenAnim: ; 7a6a8 (1e:66a8) +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: ; 7a6b2 (1e:66b2) +ConversionAnim: db SE_DARK_SCREEN_FLASH, $9F db $46,$FF,$21 db $46,$FF,$22 db SE_DARK_SCREEN_FLASH, $FF db $FF -TriAttackAnim: ; 7a6bd (1e:66bd) +TriAttackAnim: db SE_DARK_SCREEN_FLASH, $A0 db $46,$FF,$4D db SE_DARK_SCREEN_FLASH, $FF db $FF -SuperFangAnim: ; 7a6c5 (1e:66c5) +SuperFangAnim: db SE_DARK_SCREEN_PALETTE, $48 db $46,$A1,$04 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SlashAnim: ; 7a6cd (1e:66cd) +SlashAnim: db $06,$A2,$0F db $FF -SubstituteAnim: ; 7a6d1 (1e:66d1) +SubstituteAnim: db SE_SLIDE_MON_OFF, $A3 db $08,$FF,$47 db SE_SUBSTITUTE_MON, $FF db $FF -BallTossAnim: ; 7a6d9 (1e:66d9) +BallTossAnim: db $03,$FF,$06 db $FF -GreatTossAnim: ; 7a6dd (1e:66dd) +GreatTossAnim: db $03,$FF,$07 db $FF -UltraTossAnim: ; 7a6e1 (1e:66e1) +UltraTossAnim: db $02,$FF,$08 db $FF -BallShakeAnim: ; 7a6e5 (1e:66e5) +BallShakeAnim: db $04,$FF,$09 db $FF -BallPoofAnim: ; 7a6e9 (1e:66e9) +BallPoofAnim: db $04,$FF,$0A db $FF -ShowPicAnim: ; 7a6ed (1e:66ed) +ShowPicAnim: db SE_SHOW_ENEMY_MON_PIC, $FF db $FF -HidePicAnim: ; 7a6f0 (1e:66f0) +HidePicAnim: db SE_HIDE_ENEMY_MON_PIC, $FF db $FF -EnemyFlashAnim: ; 7a6f3 (1e:66f3) +EnemyFlashAnim: db SE_SHOW_MON_PIC, $FF db $FF -PlayerFlashAnim: ; 7a6f6 (1e:66f6) +PlayerFlashAnim: db SE_FLASH_MON_PIC, $FF db $FF -EnemyHUDShakeAnim: ; 7a6f9 (1e:66f9) +EnemyHUDShakeAnim: db SE_SHAKE_ENEMY_HUD, $FF db $FF -TradeBallDropAnim: ; 7a6fc (1e:66fc) +TradeBallDropAnim: db $86,$FF,$48 db $FF -TradeBallAppear1Anim: ; 7a700 (1e:6700) +TradeBallAppear1Anim: db $84,$FF,$49 db $FF -TradeBallAppear2Anim: ; 7a704 (1e:6704) +TradeBallAppear2Anim: db $86,$FF,$4A db $FF -TradeBallPoofAnim: ; 7a708 (1e:6708) +TradeBallPoofAnim: db $86,$FF,$4B db $FF -XStatItemAnim: ; 7a7c0 (1e:670c) +XStatItemAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareAnim: ; 7a713 (1e:6713) +ShrinkingSquareAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -XStatItemBlackAnim: ; 7a71b (1e:671b) +XStatItemBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareBlackAnim: ; 7a722 (1e:6722) +ShrinkingSquareBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -UnusedAnim: ; 7a72a (1e:672a) +UnusedAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SHOOT_MANY_BALLS_UPWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ParalyzeAnim: ; 7a731 (1e:6731) +ParalyzeAnim: db $04,$13,$24 db $04,$13,$24 db $FF -PoisonAnim: ; 7a738 (1e:6738) +PoisonAnim: db $08,$13,$27 db $08,$13,$27 db $FF -SleepPlayerAnim: ; 7a73f (1e:673f) +SleepPlayerAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -SleepEnemyAnim: ; 7a746 (1e:6746) +SleepEnemyAnim: db $10,$9B,$3B db $10,$9B,$3B db $FF -ConfusedPlayerAnim: ; 7a74d (1e:674d) +ConfusedPlayerAnim: db $08,$84,$25 db $08,$84,$25 db $FF -ConfusedEnemyAnim: ; 7a754 (1e:6754) +ConfusedEnemyAnim: db $08,$84,$26 db $08,$84,$26 db $FF -BallBlockAnim: ; 7a75b (1e:675b) +BallBlockAnim: db $03,$FF,$0B db $FF -FaintAnim: ; 7a75f (1e:675f) +FaintAnim: db SE_SLIDE_MON_DOWN, $5A db $FF -ShakeScreenAnim: ; 7a762 (1e:6762) +ShakeScreenAnim: db SE_SHAKE_SCREEN, $FF db $FF -ThrowRockAnim: ; 7a765 (1e:6765) +ThrowRockAnim: db $03,$8B,$53 db $FF -ThrowBaitAnim: ; 7a769 (1e:6769) +ThrowBaitAnim: db $03,$8B,$54 db $FF -SubanimationPointers: ; 7a76d (1e:676d) +SubanimationPointers: dw Subanimation00 dw Subanimation01 dw Subanimation02 @@ -1348,17 +1348,17 @@ SubanimationPointers: ; 7a76d (1e:676d) dw Subanimation54 dw Subanimation55 -Subanimation04: ; 7a819 (1e:6819) +Subanimation04: db $43 db $02,$1a,$00 db $02,$10,$00 db $02,$03,$00 -Subanimation05: ; 7a823 (1e:6823) +Subanimation05: db $41 db $02,$10,$00 -Subanimation08: ; 7a827 (1e:6827) +Subanimation08: db $0b db $03,$30,$00 db $03,$44,$00 @@ -1372,7 +1372,7 @@ Subanimation08: ; 7a827 (1e:6827) db $03,$a1,$00 db $03,$34,$00 -Subanimation07: ; 7a849 (1e:6849) +Subanimation07: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1386,7 +1386,7 @@ Subanimation07: ; 7a849 (1e:6849) db $03,$a6,$00 db $03,$34,$00 -Subanimation06: ; 7a86b (1e:686b) +Subanimation06: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1400,14 +1400,14 @@ Subanimation06: ; 7a86b (1e:686b) db $03,$a9,$00 db $03,$34,$00 -Subanimation09: ; 7a88d (1e:688d) +Subanimation09: db $04 db $03,$21,$04 db $04,$21,$04 db $03,$21,$04 db $05,$21,$04 -Subanimation0a: ; 7a89a (1e:689a) +Subanimation0a: db $46 db $06,$1b,$00 db $07,$1b,$00 @@ -1416,18 +1416,18 @@ Subanimation0a: ; 7a89a (1e:689a) db $0a,$15,$00 db $0a,$15,$00 -Subanimation0b: ; 7a8ad (1e:68ad) +Subanimation0b: db $04 db $01,$2d,$00 db $03,$2f,$00 db $03,$35,$00 db $03,$4d,$00 -Subanimation55: ; 7a8ba (1e:68ba) +Subanimation55: db $41 db $01,$9d,$00 -Subanimation11: ; 7a8be (1e:68be) +Subanimation11: db $4c db $0b,$26,$00 db $0c,$26,$00 @@ -1442,7 +1442,7 @@ Subanimation11: ; 7a8be (1e:68be) db $0b,$27,$00 db $0c,$27,$00 -Subanimation2b: ; 7a8e3 (1e:68e3) +Subanimation2b: db $4b db $0d,$03,$03 db $0e,$03,$03 @@ -1456,7 +1456,7 @@ Subanimation2b: ; 7a8e3 (1e:68e3) db $11,$1b,$00 db $11,$1b,$00 -Subanimation2c: ; 7a905 (1e:6905) +Subanimation2c: db $4c db $12,$01,$00 db $12,$0f,$00 @@ -1471,7 +1471,7 @@ Subanimation2c: ; 7a905 (1e:6905) db $16,$38,$00 db $16,$38,$00 -Subanimation12: ; 7a92a (1e:692a) +Subanimation12: db $69 db $17,$30,$00 db $17,$39,$00 @@ -1483,35 +1483,35 @@ Subanimation12: ; 7a92a (1e:692a) db $17,$3f,$00 db $17,$1f,$00 -Subanimation00: ; 7a946 (1e:6946) +Subanimation00: db $41 db $01,$17,$00 -Subanimation01: ; 7a94a (1e:694a) +Subanimation01: db $42 db $01,$0f,$00 db $01,$1d,$00 -Subanimation02: ; 7a951 (1e:6951) +Subanimation02: db $43 db $01,$12,$00 db $01,$15,$00 db $01,$1c,$00 -Subanimation03: ; 7a95b (1e:695b) +Subanimation03: db $44 db $01,$0b,$00 db $01,$11,$00 db $01,$18,$00 db $01,$1d,$00 -Subanimation0c: ; 7a968 (1e:6968) +Subanimation0c: db $43 db $0c,$20,$00 db $0c,$21,$00 db $0c,$23,$00 -Subanimation0d: ; 7a972 (1e:6972) +Subanimation0d: db $46 db $0c,$20,$02 db $0c,$15,$00 @@ -1520,7 +1520,7 @@ Subanimation0d: ; 7a972 (1e:6972) db $0c,$23,$02 db $0c,$19,$00 -Subanimation0e: ; 7a985 (1e:6985) +Subanimation0e: db $49 db $0c,$20,$02 db $0c,$15,$02 @@ -1532,7 +1532,7 @@ Subanimation0e: ; 7a985 (1e:6985) db $0c,$19,$02 db $0c,$0c,$00 -Subanimation1f: ; 7a9a1 (1e:69a1) +Subanimation1f: db $85 db $0c,$30,$03 db $0c,$40,$03 @@ -1540,7 +1540,7 @@ Subanimation1f: ; 7a9a1 (1e:69a1) db $0c,$42,$03 db $0c,$21,$00 -Subanimation2e: ; 7a9b1 (1e:69b1) +Subanimation2e: db $2e db $18,$43,$02 db $75,$52,$04 @@ -1557,14 +1557,14 @@ Subanimation2e: ; 7a9b1 (1e:69b1) db $1e,$43,$02 db $75,$1b,$00 -Subanimation2f: ; 7a9dc (1e:69dc) +Subanimation2f: db $44 db $1f,$24,$00 db $20,$20,$00 db $21,$1a,$00 db $22,$15,$00 -Subanimation30: ; 7a9e9 (1e:69e9) +Subanimation30: db $52 db $23,$00,$02 db $23,$02,$02 @@ -1585,7 +1585,7 @@ Subanimation30: ; 7a9e9 (1e:69e9) db $24,$28,$00 db $24,$28,$00 -Subanimation0f: ; 7aa20 (1e:6a20) +Subanimation0f: db $4c db $26,$0e,$02 db $26,$16,$02 @@ -1600,7 +1600,7 @@ Subanimation0f: ; 7aa20 (1e:6a20) db $29,$16,$02 db $29,$1c,$00 -Subanimation16: ; 7aa45 (1e:6a45) +Subanimation16: db $4c db $2a,$05,$00 db $2b,$05,$02 @@ -1615,7 +1615,7 @@ Subanimation16: ; 7aa45 (1e:6a45) db $2c,$00,$02 db $2c,$00,$00 -Subanimation10: ; 7aa6a (1e:6a6a) +Subanimation10: db $88 db $2d,$44,$00 db $2e,$45,$00 @@ -1626,7 +1626,7 @@ Subanimation10: ; 7aa6a (1e:6a6a) db $2d,$2f,$00 db $2e,$1a,$00 -Subanimation31: ; 7aa83 (1e:6a83) +Subanimation31: db $2a db $2f,$46,$00 db $2f,$4a,$00 @@ -1639,7 +1639,7 @@ Subanimation31: ; 7aa83 (1e:6a83) db $2f,$2e,$00 db $2f,$51,$00 -Subanimation13: ; 7aaa2 (1e:6aa2) +Subanimation13: db $86 db $30,$31,$00 db $30,$32,$00 @@ -1648,7 +1648,7 @@ Subanimation13: ; 7aaa2 (1e:6aa2) db $30,$0f,$00 db $30,$10,$00 -Subanimation14: ; 7aab5 (1e:6ab5) +Subanimation14: db $49 db $30,$10,$00 db $30,$10,$03 @@ -1660,7 +1660,7 @@ Subanimation14: ; 7aab5 (1e:6ab5) db $31,$22,$04 db $31,$27,$00 -Subanimation41: ; 7aad1 (1e:6ad1) +Subanimation41: db $85 db $03,$31,$00 db $03,$32,$00 @@ -1668,32 +1668,32 @@ Subanimation41: ; 7aad1 (1e:6ad1) db $03,$0e,$00 db $03,$10,$00 -Subanimation42: ; 7aae1 (1e:6ae1) +Subanimation42: db $43 db $48,$08,$00 db $49,$08,$00 db $5a,$08,$00 -Subanimation15: ; 7aaeb (1e:6aeb) +Subanimation15: db $22 db $35,$52,$00 db $35,$53,$00 -Subanimation17: ; 7aaf2 (1e:6af2) +Subanimation17: db $44 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation18: ; 7aaff (1e:6aff) +Subanimation18: db $a4 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation40: ; 7ab0c (1e:6b0c) +Subanimation40: db $46 db $17,$54,$00 db $17,$55,$00 @@ -1702,7 +1702,7 @@ Subanimation40: ; 7ab0c (1e:6b0c) db $17,$57,$00 db $17,$13,$00 -Subanimation19: ; 7ab1f (1e:6b1f) +Subanimation19: db $8c db $38,$31,$00 db $39,$31,$00 @@ -1717,7 +1717,7 @@ Subanimation19: ; 7ab1f (1e:6b1f) db $38,$10,$00 db $39,$10,$00 -Subanimation1a: ; 7ab44 (1e:6b44) +Subanimation1a: db $50 db $3a,$08,$00 db $3b,$08,$00 @@ -1736,20 +1736,20 @@ Subanimation1a: ; 7ab44 (1e:6b44) db $3e,$0b,$00 db $3f,$0b,$00 -Subanimation1b: ; 7ab75 (1e:6b75) +Subanimation1b: db $84 db $40,$31,$00 db $40,$32,$00 db $40,$92,$00 db $40,$15,$00 -Subanimation1c: ; 7ab82 (1e:6b82) +Subanimation1c: db $43 db $41,$58,$00 db $41,$59,$00 db $41,$21,$00 -Subanimation1d: ; 7ab8c (1e:6b8c) +Subanimation1d: db $af db $24,$9a,$00 db $23,$1b,$02 @@ -1767,22 +1767,22 @@ Subanimation1d: ; 7ab8c (1e:6b8c) db $25,$62,$04 db $25,$99,$03 -Subanimation1e: ; 7abba (1e:6bba) +Subanimation1e: db $01 db $25,$75,$00 -Subanimation20: ; 7abbe (1e:6bbe) +Subanimation20: db $42 db $42,$07,$00 db $43,$07,$00 -Subanimation21: ; 7abc5 (1e:6bc5) +Subanimation21: db $43 db $44,$00,$00 db $45,$08,$00 db $46,$10,$02 -Subanimation22: ; 7abcf (1e:6bcf) +Subanimation22: db $8b db $47,$10,$00 db $47,$56,$00 @@ -1796,7 +1796,7 @@ Subanimation22: ; 7abcf (1e:6bcf) db $47,$89,$00 db $47,$b0,$00 -Subanimation2d: ; 7abf1 (1e:6bf1) +Subanimation2d: db $66 db $44,$64,$00 db $45,$65,$00 @@ -1805,15 +1805,15 @@ Subanimation2d: ; 7abf1 (1e:6bf1) db $47,$66,$00 db $47,$66,$00 -Subanimation39: ; 7ac04 (1e:6c04) +Subanimation39: db $61 db $47,$67,$00 -Subanimation4e: ; 7ac08 (1e:6c08) +Subanimation4e: db $41 db $71,$0f,$03 -Subanimation4f: ; 7ac0c (1e:6c0c) +Subanimation4f: db $47 db $71,$0f,$00 db $71,$08,$00 @@ -1823,7 +1823,7 @@ Subanimation4f: ; 7ac0c (1e:6c0c) db $73,$95,$00 db $74,$95,$00 -Subanimation50: ; 7ac22 (1e:6c22) +Subanimation50: db $48 db $74,$95,$00 db $73,$95,$00 @@ -1834,7 +1834,7 @@ Subanimation50: ; 7ac22 (1e:6c22) db $71,$0f,$00 db $71,$16,$00 -Subanimation29: ; 7ac3b (1e:6c3b) +Subanimation29: db $5d db $48,$0f,$00 db $4a,$68,$03 @@ -1866,63 +1866,63 @@ Subanimation29: ; 7ac3b (1e:6c3b) db $4d,$2a,$03 db $49,$6b,$00 -Subanimation2a: ; 7ac93 (1e:6c93) +Subanimation2a: db $44 db $4e,$2b,$00 db $4f,$2b,$00 db $50,$2b,$00 db $50,$2b,$00 -Subanimation23: ; 7aca0 (1e:6ca0) +Subanimation23: db $42 db $51,$2d,$00 db $51,$6e,$00 -Subanimation24: ; 7aca7 (1e:6ca7) +Subanimation24: db $a2 db $51,$2d,$00 db $51,$6e,$00 -Subanimation25: ; 7acae (1e:6cae) +Subanimation25: db $62 db $52,$71,$00 db $52,$72,$00 -Subanimation26: ; 7acb5 (1e:6cb5) +Subanimation26: db $02 db $52,$01,$00 db $52,$2c,$00 -Subanimation3a: ; 7acbc (1e:6cbc) +Subanimation3a: db $63 db $53,$71,$00 db $53,$7f,$00 db $53,$81,$00 -Subanimation3b: ; 7acc6 (1e:6cc6) +Subanimation3b: db $03 db $53,$01,$00 db $53,$15,$00 db $53,$2c,$00 -Subanimation27: ; 7acd0 (1e:6cd0) +Subanimation27: db $a2 db $54,$01,$00 db $54,$2c,$00 -Subanimation28: ; 7acd7 (1e:6cd7) +Subanimation28: db $23 db $55,$73,$03 db $56,$73,$03 db $57,$73,$00 -Subanimation32: ; 7ace1 (1e:6ce1) +Subanimation32: db $63 db $47,$74,$00 db $47,$43,$00 db $47,$75,$00 -Subanimation33: ; 7aceb (1e:6ceb) +Subanimation33: db $26 db $58,$76,$00 db $34,$76,$00 @@ -1931,7 +1931,7 @@ Subanimation33: ; 7aceb (1e:6ceb) db $58,$76,$00 db $34,$76,$00 -Subanimation3c: ; 7acfe (1e:6cfe) +Subanimation3c: db $67 db $59,$79,$03 db $59,$7b,$03 @@ -1941,7 +1941,7 @@ Subanimation3c: ; 7acfe (1e:6cfe) db $59,$7c,$03 db $59,$76,$00 -Subanimation3d: ; 7ad14 (1e:6d14) +Subanimation3d: db $08 db $3a,$4d,$00 db $3b,$4d,$00 @@ -1952,7 +1952,7 @@ Subanimation3d: ; 7ad14 (1e:6d14) db $3e,$4d,$00 db $3f,$4d,$00 -Subanimation34: ; 7ad2d (1e:6d2d) +Subanimation34: db $35 db $48,$7d,$00 db $49,$7d,$00 @@ -1976,14 +1976,14 @@ Subanimation34: ; 7ad2d (1e:6d2d) db $49,$82,$00 db $5a,$82,$00 -Subanimation35: ; 7ad6d (1e:6d6d) +Subanimation35: db $24 db $5b,$83,$03 db $5c,$84,$03 db $5d,$85,$03 db $5e,$09,$00 -Subanimation36: ; 7ad7a (1e:6d7a) +Subanimation36: db $48 db $5f,$2a,$00 db $5f,$00,$00 @@ -1994,7 +1994,7 @@ Subanimation36: ; 7ad7a (1e:6d7a) db $62,$2a,$00 db $62,$00,$00 -Subanimation37: ; 7ad93 (1e:6d93) +Subanimation37: db $2a db $63,$89,$00 db $64,$75,$00 @@ -2007,7 +2007,7 @@ Subanimation37: ; 7ad93 (1e:6d93) db $65,$88,$00 db $65,$1a,$00 -Subanimation38: ; 7adb2 (1e:6db2) +Subanimation38: db $50 db $66,$8a,$00 db $66,$33,$00 @@ -2026,7 +2026,7 @@ Subanimation38: ; 7adb2 (1e:6db2) db $66,$1e,$04 db $67,$29,$00 -Subanimation3e: ; 7ade3 (1e:6de3) +Subanimation3e: db $92 db $02,$31,$00 db $34,$31,$00 @@ -2047,7 +2047,7 @@ Subanimation3e: ; 7ade3 (1e:6de3) db $34,$10,$00 db $02,$10,$00 -Subanimation3f: ; 7ae1a (1e:6e1a) +Subanimation3f: db $72 db $68,$4b,$00 db $68,$8c,$00 @@ -2068,7 +2068,7 @@ Subanimation3f: ; 7ae1a (1e:6e1a) db $68,$23,$00 db $68,$1f,$00 -Subanimation44: ; 7ae51 (1e:6e51) +Subanimation44: db $2c db $69,$4b,$00 db $69,$8c,$00 @@ -2083,20 +2083,20 @@ Subanimation44: ; 7ae51 (1e:6e51) db $69,$0c,$00 db $69,$06,$00 -Subanimation43: ; 7ae76 (1e:6e76) +Subanimation43: db $a3 db $6a,$07,$00 db $6b,$0f,$00 db $6c,$17,$00 -Subanimation45: ; 7ae80 (1e:6e80) +Subanimation45: db $24 db $6d,$8b,$00 db $6d,$84,$00 db $6d,$63,$00 db $6d,$8c,$00 -Subanimation46: ; 7ae8d (1e:6e8d) +Subanimation46: db $26 db $6d,$8b,$00 db $6d,$84,$00 @@ -2105,13 +2105,13 @@ Subanimation46: ; 7ae8d (1e:6e8d) db $6d,$0a,$00 db $6d,$89,$00 -Subanimation47: ; 7aea0 (1e:6ea0) +Subanimation47: db $23 db $06,$82,$00 db $07,$82,$00 db $08,$96,$00 -Subanimation48: ; 7aeaa (1e:6eaa) +Subanimation48: db $06 db $03,$41,$04 db $03,$48,$04 @@ -2120,24 +2120,24 @@ Subanimation48: ; 7aeaa (1e:6eaa) db $05,$48,$04 db $03,$48,$03 -Subanimation49: ; 7aebd (1e:6ebd) +Subanimation49: db $04 db $04,$48,$04 db $03,$48,$04 db $05,$48,$04 db $03,$48,$03 -Subanimation4a: ; 7aeca (1e:6eca) +Subanimation4a: db $01 db $04,$84,$03 -Subanimation4b: ; 7aece (1e:6ece) +Subanimation4b: db $03 db $06,$72,$00 db $07,$72,$00 db $08,$72,$00 -Subanimation4c: ; 7aed8 (1e:6ed8) +Subanimation4c: db $68 db $6f,$30,$00 db $6e,$30,$00 @@ -2148,7 +2148,7 @@ Subanimation4c: ; 7aed8 (1e:6ed8) db $70,$30,$00 db $6e,$30,$00 -Subanimation4d: ; 7aef1 (1e:6ef1) +Subanimation4d: db $26 db $32,$4b,$00 db $33,$4f,$00 @@ -2157,7 +2157,7 @@ Subanimation4d: ; 7aef1 (1e:6ef1) db $32,$19,$00 db $33,$0d,$00 -Subanimation51: ; 7af04 (1e:6f04) +Subanimation51: db $a6 db $76,$1b,$00 db $34,$1b,$00 @@ -2166,7 +2166,7 @@ Subanimation51: ; 7af04 (1e:6f04) db $76,$1b,$00 db $34,$1b,$00 -Subanimation52: ; 7af17 (1e:6f17) +Subanimation52: db $47 db $77,$25,$00 db $77,$9b,$00 @@ -2176,7 +2176,7 @@ Subanimation52: ; 7af17 (1e:6f17) db $77,$50,$00 db $77,$8c,$00 -Subanimation53: ; 7af2d (1e:6f2d) +Subanimation53: db $0c db $78,$30,$00 db $78,$a2,$00 @@ -2191,7 +2191,7 @@ Subanimation53: ; 7af2d (1e:6f2d) db $78,$34,$00 db $01,$9e,$00 -Subanimation54: ; 7af52 (1e:6f52) +Subanimation54: db $0b db $79,$30,$00 db $79,$a2,$00 @@ -2205,7 +2205,7 @@ Subanimation54: ; 7af52 (1e:6f52) db $79,$a9,$00 db $79,$34,$00 -FrameBlockPointers: ; 7af74 (1e:6f74) +FrameBlockPointers: dw FrameBlock00 dw FrameBlock01 dw FrameBlock02 @@ -2337,7 +2337,7 @@ FrameBlockPointers: ; 7af74 (1e:6f74) ; second byte = x offset ; third byte = tile id (it's actually tile id - $31) ; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: ; 7b068 (1e:7068) +FrameBlock01: db $09 db $00,$00,$2c,$00 db $00,$08,$2d,$00 @@ -2349,7 +2349,7 @@ FrameBlock01: ; 7b068 (1e:7068) db $10,$08,$2d,$40 db $10,$10,$2c,$60 -FrameBlock02: ; 7b08d (1e:708d) +FrameBlock02: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2368,28 +2368,28 @@ FrameBlock02: ; 7b08d (1e:708d) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock03: ; 7b0ce (1e:70ce) +FrameBlock03: db $04 db $00,$00,$02,$00 db $00,$08,$02,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock04: ; 7b0df (1e:70df) +FrameBlock04: db $04 db $00,$00,$06,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock05: ; 7b0f0 (1e:70f0) +FrameBlock05: db $04 db $00,$00,$07,$20 db $00,$08,$06,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock06: ; 7b101 (1e:7101) +FrameBlock06: db $0c db $00,$08,$23,$00 db $08,$00,$32,$00 @@ -2404,7 +2404,7 @@ FrameBlock06: ; 7b101 (1e:7101) db $10,$18,$32,$60 db $18,$10,$23,$60 -FrameBlock07: ; 7b132 (1e:7132) +FrameBlock07: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2423,7 +2423,7 @@ FrameBlock07: ; 7b132 (1e:7132) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock08: ; 7b173 (1e:7173) +FrameBlock08: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2442,7 +2442,7 @@ FrameBlock08: ; 7b173 (1e:7173) db $20,$18,$21,$60 db $20,$20,$20,$60 -FrameBlock09: ; 7b1b4 (1e:71b4) +FrameBlock09: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2457,7 +2457,7 @@ FrameBlock09: ; 7b1b4 (1e:71b4) db $20,$18,$25,$60 db $20,$20,$24,$60 -FrameBlock0a: ; 7b1e5 (1e:71e5) +FrameBlock0a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2472,21 +2472,21 @@ FrameBlock0a: ; 7b1e5 (1e:71e5) db $28,$20,$25,$60 db $28,$28,$24,$60 -FrameBlock0b: ; 7b216 (1e:7216) +FrameBlock0b: db $04 db $00,$00,$05,$00 db $00,$08,$05,$20 db $08,$00,$15,$00 db $08,$08,$15,$20 -FrameBlock0c: ; 7b227 (1e:7227) +FrameBlock0c: db $04 db $00,$00,$04,$00 db $00,$08,$04,$20 db $08,$00,$14,$00 db $08,$08,$14,$20 -FrameBlock0d: ; 7b238 (1e:7238) +FrameBlock0d: db $08 db $00,$00,$0c,$00 db $00,$08,$0d,$00 @@ -2497,21 +2497,21 @@ FrameBlock0d: ; 7b238 (1e:7238) db $18,$00,$0d,$60 db $18,$08,$0c,$60 -FrameBlock0e: ; 7b259 (1e:7259) +FrameBlock0e: db $04 db $20,$00,$0c,$00 db $20,$08,$0d,$00 db $28,$00,$1c,$00 db $28,$08,$1d,$00 -FrameBlock0f: ; 7b26a (1e:726a) +FrameBlock0f: db $04 db $30,$00,$1d,$60 db $30,$08,$1c,$60 db $38,$00,$0d,$60 db $38,$08,$0c,$60 -FrameBlock10: ; 7b27b (1e:727b) +FrameBlock10: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2522,7 +2522,7 @@ FrameBlock10: ; 7b27b (1e:727b) db $08,$10,$1f,$20 db $08,$18,$1e,$20 -FrameBlock11: ; 7b29c (1e:729c) +FrameBlock11: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2533,20 +2533,20 @@ FrameBlock11: ; 7b29c (1e:729c) db $08,$20,$1f,$20 db $08,$28,$1e,$20 -FrameBlock12: ; 7b2bd (1e:72bd) +FrameBlock12: db $03 db $00,$00,$37,$00 db $08,$10,$37,$00 db $00,$20,$37,$00 -FrameBlock13: ; 7b2ca (1e:72ca) +FrameBlock13: db $04 db $00,$00,$36,$00 db $00,$08,$36,$20 db $08,$00,$36,$40 db $08,$08,$36,$60 -FrameBlock14: ; 7b2db (1e:72db) +FrameBlock14: db $08 db $00,$10,$28,$00 db $00,$18,$28,$20 @@ -2557,7 +2557,7 @@ FrameBlock14: ; 7b2db (1e:72db) db $08,$20,$36,$40 db $08,$28,$36,$60 -FrameBlock15: ; 7b2fc (1e:72fc) +FrameBlock15: db $0c db $00,$00,$28,$00 db $00,$08,$28,$20 @@ -2572,7 +2572,7 @@ FrameBlock15: ; 7b2fc (1e:72fc) db $08,$20,$38,$00 db $08,$28,$38,$20 -FrameBlock16: ; 7b32d (1e:732d) +FrameBlock16: db $08 db $00,$00,$29,$00 db $00,$08,$29,$20 @@ -2583,60 +2583,60 @@ FrameBlock16: ; 7b32d (1e:732d) db $08,$20,$39,$00 db $08,$28,$39,$20 -FrameBlock17: ; 7b34e (1e:734e) +FrameBlock17: db $04 db $00,$00,$08,$00 db $00,$08,$09,$00 db $08,$00,$18,$00 db $08,$08,$19,$00 -FrameBlock18: ; 7b35f (1e:735f) +FrameBlock18: db $01 db $18,$00,$45,$60 -FrameBlock19: ; 7b364 (1e:7364) +FrameBlock19: db $02 db $18,$08,$45,$00 db $10,$08,$46,$60 -FrameBlock1a: ; 7b36d (1e:736d) +FrameBlock1a: db $02 db $10,$10,$45,$60 db $18,$10,$46,$00 -FrameBlock1b: ; 7b376 (1e:7376) +FrameBlock1b: db $02 db $10,$18,$45,$00 db $08,$18,$46,$60 -FrameBlock1c: ; 7b37f (1e:737f) +FrameBlock1c: db $02 db $08,$20,$45,$60 db $10,$20,$46,$00 -FrameBlock1d: ; 7b388 (1e:7388) +FrameBlock1d: db $02 db $08,$28,$45,$00 db $00,$28,$46,$60 -FrameBlock1e: ; 7b391 (1e:7391) +FrameBlock1e: db $02 db $00,$30,$45,$60 db $08,$30,$46,$00 -FrameBlock75: ; 7b39a (1e:739a) +FrameBlock75: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$22,$00 db $08,$08,$43,$60 -FrameBlock1f: ; 7b3ab (1e:73ab) +FrameBlock1f: db $02 db $00,$00,$03,$00 db $00,$30,$03,$20 -FrameBlock20: ; 7b3b4 (1e:73b4) +FrameBlock20: db $06 db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2645,7 +2645,7 @@ FrameBlock20: ; 7b3b4 (1e:73b4) db $08,$00,$13,$00 db $08,$30,$13,$20 -FrameBlock21: ; 7b3cd (1e:73cd) +FrameBlock21: db $0c db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2660,7 +2660,7 @@ FrameBlock21: ; 7b3cd (1e:73cd) db $10,$00,$03,$00 db $10,$30,$03,$20 -FrameBlock22: ; 7b3fe (1e:73fe) +FrameBlock22: db $13 db $00,$00,$03,$00 db $08,$00,$13,$00 @@ -2682,19 +2682,19 @@ FrameBlock22: ; 7b3fe (1e:73fe) db $10,$30,$03,$20 db $18,$30,$13,$20 -FrameBlock23: ; 7b44b (1e:744b) +FrameBlock23: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock24: ; 7b45c (1e:745c) +FrameBlock24: db $02 db $08,$00,$0a,$00 db $08,$08,$0b,$00 -FrameBlock25: ; 7b465 (1e:7465) +FrameBlock25: db $0c db $10,$00,$0a,$00 db $10,$08,$0b,$00 @@ -2709,14 +2709,14 @@ FrameBlock25: ; 7b465 (1e:7465) db $10,$20,$1a,$00 db $10,$28,$1b,$00 -FrameBlock26: ; 7b496 (1e:7496) +FrameBlock26: db $04 db $00,$10,$44,$00 db $00,$18,$44,$20 db $08,$10,$44,$40 db $08,$18,$44,$60 -FrameBlock27: ; 7b4a7 (1e:74a7) +FrameBlock27: db $05 db $08,$08,$44,$00 db $08,$10,$44,$20 @@ -2724,7 +2724,7 @@ FrameBlock27: ; 7b4a7 (1e:74a7) db $10,$10,$44,$60 db $00,$18,$47,$00 -FrameBlock28: ; 7b4bc (1e:74bc) +FrameBlock28: db $06 db $10,$00,$44,$00 db $10,$08,$44,$20 @@ -2733,30 +2733,30 @@ FrameBlock28: ; 7b4bc (1e:74bc) db $08,$10,$47,$00 db $02,$16,$47,$00 -FrameBlock29: ; 7b4d5 (1e:74d5) +FrameBlock29: db $04 db $18,$00,$47,$00 db $12,$06,$47,$00 db $0c,$0c,$47,$00 db $06,$12,$47,$00 -FrameBlock2a: ; 7b4e6 (1e:74e6) +FrameBlock2a: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock2b: ; 7b4f7 (1e:74f7) +FrameBlock2b: db $02 db $06,$02,$47,$00 db $00,$08,$47,$00 -FrameBlock2c: ; 7b500 (1e:7500) +FrameBlock2c: db $01 db $a0,$00,$4d,$00 -FrameBlock2d: ; 7b505 (1e:7505) +FrameBlock2d: db $08 db $00,$00,$26,$00 db $00,$08,$27,$00 @@ -2767,7 +2767,7 @@ FrameBlock2d: ; 7b505 (1e:7505) db $18,$00,$38,$00 db $18,$08,$39,$00 -FrameBlock2e: ; 7b526 (1e:7526) +FrameBlock2e: db $08 db $00,$00,$27,$20 db $00,$08,$26,$20 @@ -2778,25 +2778,25 @@ FrameBlock2e: ; 7b526 (1e:7526) db $18,$00,$39,$20 db $18,$08,$38,$20 -FrameBlock2f: ; 7b547 (1e:7547) +FrameBlock2f: db $04 db $00,$00,$0c,$00 db $00,$08,$0d,$00 db $08,$00,$0c,$40 db $08,$08,$0d,$40 -FrameBlock30: ; 7b558 (1e:7558) +FrameBlock30: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock31: ; 7b569 (1e:7569) +FrameBlock31: db $01 db $00,$00,$45,$00 -FrameBlock32: ; 7b56e (1e:756e) +FrameBlock32: db $07 db $00,$00,$4d,$00 db $00,$08,$2f,$00 @@ -2806,7 +2806,7 @@ FrameBlock32: ; 7b56e (1e:756e) db $08,$10,$4e,$20 db $10,$08,$3f,$00 -FrameBlock33: ; 7b58b (1e:758b) +FrameBlock33: db $07 db $00,$08,$3f,$40 db $08,$00,$4e,$40 @@ -2816,11 +2816,11 @@ FrameBlock33: ; 7b58b (1e:758b) db $10,$08,$2f,$40 db $10,$10,$4d,$60 -FrameBlock34: ; 7b5a8 (1e:75a8) +FrameBlock34: db $01 db $a0,$00,$00,$10 -FrameBlock35: ; 7b5ad (1e:75ad) +FrameBlock35: db $06 db $00,$00,$2a,$00 db $00,$08,$2b,$00 @@ -2829,42 +2829,42 @@ FrameBlock35: ; 7b5ad (1e:75ad) db $18,$00,$2a,$40 db $18,$08,$2b,$40 -FrameBlock36: ; 7b5c6 (1e:75c6) +FrameBlock36: db $04 db $00,$00,$00,$00 db $00,$08,$01,$00 db $08,$00,$10,$00 db $08,$08,$11,$00 -FrameBlock37: ; 7b5d7 (1e:75d7) +FrameBlock37: db $04 db $00,$00,$01,$a0 db $00,$08,$00,$a0 db $08,$00,$11,$a0 db $08,$08,$10,$a0 -FrameBlock38: ; 7b5e8 (1e:75e8) +FrameBlock38: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock39: ; 7b5f9 (1e:75f9) +FrameBlock39: db $04 db $00,$00,$0b,$20 db $00,$08,$0a,$20 db $08,$00,$1b,$20 db $08,$08,$1a,$20 -FrameBlock3a: ; 7b60a (1e:760a) +FrameBlock3a: db $04 db $20,$00,$05,$00 db $20,$08,$05,$20 db $28,$00,$15,$00 db $28,$08,$15,$20 -FrameBlock3b: ; 7b61b (1e:761b) +FrameBlock3b: db $05 db $18,$00,$04,$00 db $18,$08,$04,$20 @@ -2872,7 +2872,7 @@ FrameBlock3b: ; 7b61b (1e:761b) db $20,$08,$14,$20 db $28,$04,$41,$00 -FrameBlock3c: ; 7b630 (1e:7630) +FrameBlock3c: db $06 db $10,$00,$05,$00 db $10,$08,$05,$20 @@ -2881,7 +2881,7 @@ FrameBlock3c: ; 7b630 (1e:7630) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3d: ; 7b649 (1e:7649) +FrameBlock3d: db $07 db $08,$00,$04,$00 db $08,$08,$04,$20 @@ -2891,7 +2891,7 @@ FrameBlock3d: ; 7b649 (1e:7649) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock3e: ; 7b666 (1e:7666) +FrameBlock3e: db $08 db $00,$00,$05,$00 db $00,$08,$05,$20 @@ -2902,7 +2902,7 @@ FrameBlock3e: ; 7b666 (1e:7666) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3f: ; 7b687 (1e:7687) +FrameBlock3f: db $08 db $00,$00,$04,$00 db $00,$08,$04,$20 @@ -2913,20 +2913,20 @@ FrameBlock3f: ; 7b687 (1e:7687) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock40: ; 7b6a8 (1e:76a8) +FrameBlock40: db $03 db $00,$00,$3d,$00 db $00,$08,$3d,$00 db $08,$08,$3d,$00 -FrameBlock41: ; 7b6b5 (1e:76b5) +FrameBlock41: db $04 db $00,$00,$06,$00 db $00,$08,$06,$20 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock42: ; 7b6c6 (1e:76c6) +FrameBlock42: db $0b db $00,$10,$42,$00 db $08,$00,$42,$00 @@ -2940,7 +2940,7 @@ FrameBlock42: ; 7b6c6 (1e:76c6) db $20,$00,$42,$00 db $20,$20,$42,$00 -FrameBlock43: ; 7b6f3 (1e:76f3) +FrameBlock43: db $0b db $00,$10,$41,$00 db $08,$00,$41,$00 @@ -2954,42 +2954,42 @@ FrameBlock43: ; 7b6f3 (1e:76f3) db $20,$00,$41,$00 db $20,$20,$41,$00 -FrameBlock44: ; 7b720 (1e:7720) +FrameBlock44: db $04 db $00,$00,$49,$00 db $00,$28,$49,$00 db $28,$00,$49,$00 db $28,$28,$49,$00 -FrameBlock45: ; 7b731 (1e:7731) +FrameBlock45: db $04 db $00,$00,$49,$00 db $00,$18,$49,$00 db $18,$00,$49,$00 db $18,$18,$49,$00 -FrameBlock46: ; 7b742 (1e:7742) +FrameBlock46: db $04 db $00,$00,$49,$00 db $00,$08,$49,$00 db $08,$00,$49,$00 db $08,$08,$49,$00 -FrameBlock47: ; 7b753 (1e:7753) +FrameBlock47: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -SmallBlackCircleFrameBlock: ; 7b764 (1e:7764) +SmallBlackCircleFrameBlock: db $04 db $08,$08,$33,$00 db $08,$10,$33,$20 db $10,$08,$33,$40 db $10,$10,$33,$60 -LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) +LargeBlockCircleFrameBlock: db $10 db $00,$00,$22,$00 db $00,$08,$23,$00 @@ -3008,7 +3008,7 @@ LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock71: ; 7b7b6 (1e:77b6) +FrameBlock71: db $10 db $00,$00,$22,$00 db $00,$08,$3b,$00 @@ -3027,7 +3027,7 @@ FrameBlock71: ; 7b7b6 (1e:77b6) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock72: ; 7b7f7 (1e:77f7) +FrameBlock72: db $0c db $00,$00,$32,$00 db $00,$08,$43,$00 @@ -3042,7 +3042,7 @@ FrameBlock72: ; 7b7f7 (1e:77f7) db $10,$10,$23,$60 db $10,$18,$22,$60 -FrameBlock73: ; 7b828 (1e:7828) +FrameBlock73: db $08 db $00,$00,$32,$40 db $00,$08,$43,$40 @@ -3053,42 +3053,42 @@ FrameBlock73: ; 7b828 (1e:7828) db $08,$10,$23,$60 db $08,$18,$22,$60 -FrameBlock74: ; 7b849 (1e:7849) +FrameBlock74: db $04 db $00,$00,$22,$40 db $00,$08,$23,$40 db $00,$10,$23,$60 db $00,$18,$22,$60 -FrameBlock4a: ; 7b85a (1e:785a) +FrameBlock4a: db $04 db $08,$18,$4c,$20 db $20,$08,$4b,$00 db $30,$20,$4c,$00 db $18,$30,$4b,$40 -FrameBlock4b: ; 7b86b (1e:786b) +FrameBlock4b: db $04 db $00,$18,$4c,$00 db $20,$00,$4b,$40 db $38,$20,$4c,$20 db $18,$38,$4b,$00 -FrameBlock4c: ; 7b87c (1e:787c) +FrameBlock4c: db $04 db $10,$08,$4a,$40 db $30,$10,$4a,$00 db $28,$30,$4a,$20 db $08,$28,$4a,$60 -FrameBlock4d: ; 7b88d (1e:788d) +FrameBlock4d: db $04 db $08,$00,$4a,$20 db $38,$08,$4a,$60 db $30,$38,$4a,$40 db $00,$30,$4a,$00 -FrameBlock4e: ; 7b89e (1e:789e) +FrameBlock4e: db $08 db $00,$30,$44,$00 db $00,$38,$44,$20 @@ -3099,7 +3099,7 @@ FrameBlock4e: ; 7b89e (1e:789e) db $2e,$0a,$44,$40 db $2e,$12,$44,$60 -FrameBlock4f: ; 7b8bf (1e:78bf) +FrameBlock4f: db $0c db $0e,$22,$44,$00 db $0e,$2a,$44,$20 @@ -3114,7 +3114,7 @@ FrameBlock4f: ; 7b8bf (1e:78bf) db $30,$08,$47,$00 db $2a,$0e,$47,$00 -FrameBlock50: ; 7b8f0 (1e:78f0) +FrameBlock50: db $08 db $06,$32,$47,$00 db $00,$38,$47,$00 @@ -3125,7 +3125,7 @@ FrameBlock50: ; 7b8f0 (1e:78f0) db $2a,$0e,$47,$00 db $24,$14,$47,$00 -FrameBlock51: ; 7b911 (1e:7911) +FrameBlock51: db $08 db $00,$00,$35,$20 db $08,$00,$35,$40 @@ -3136,33 +3136,33 @@ FrameBlock51: ; 7b911 (1e:7911) db $10,$40,$35,$20 db $18,$40,$35,$40 -FrameBlock52: ; 7b932 (1e:7932) +FrameBlock52: db $04 db $00,$00,$2a,$00 db $00,$08,$2b,$00 db $08,$00,$3a,$00 db $08,$08,$3b,$00 -FrameBlock53: ; 7b943 (1e:7943) +FrameBlock53: db $03 db $00,$00,$3f,$00 db $00,$08,$3f,$00 db $08,$06,$3f,$00 -FrameBlock54: ; 7b950 (1e:7950) +FrameBlock54: db $04 db $00,$00,$0e,$00 db $00,$08,$0e,$20 db $08,$00,$0f,$00 db $08,$08,$0f,$20 -FrameBlock55: ; 7b961 (1e:7961) +FrameBlock55: db $03 db $10,$00,$2c,$00 db $10,$08,$3c,$00 db $10,$10,$2d,$00 -FrameBlock56: ; 7b96e (1e:796e) +FrameBlock56: db $06 db $10,$10,$31,$00 db $10,$18,$31,$00 @@ -3171,7 +3171,7 @@ FrameBlock56: ; 7b96e (1e:796e) db $08,$20,$2d,$00 db $10,$20,$2d,$00 -FrameBlock57: ; 7b987 (1e:7987) +FrameBlock57: db $09 db $08,$20,$31,$00 db $10,$20,$31,$00 @@ -3183,7 +3183,7 @@ FrameBlock57: ; 7b987 (1e:7987) db $08,$30,$2d,$00 db $10,$30,$2d,$00 -FrameBlock58: ; 7b9ac (1e:79ac) +FrameBlock58: db $07 db $00,$00,$46,$00 db $08,$02,$47,$00 @@ -3193,11 +3193,11 @@ FrameBlock58: ; 7b9ac (1e:79ac) db $28,$05,$48,$00 db $30,$05,$48,$00 -FrameBlock59: ; 7b9c9 (1e:79c9) +FrameBlock59: db $01 db $00,$00,$42,$00 -FrameBlock5a: ; 7b9ce (1e:79ce) +FrameBlock5a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -3212,14 +3212,14 @@ FrameBlock5a: ; 7b9ce (1e:79ce) db $18,$10,$25,$60 db $18,$18,$24,$60 -FrameBlock5b: ; 7b9ff (1e:79ff) +FrameBlock5b: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -FrameBlock5c: ; 7ba10 (1e:7a10) +FrameBlock5c: db $08 db $00,$00,$49,$00 db $02,$08,$49,$00 @@ -3230,7 +3230,7 @@ FrameBlock5c: ; 7ba10 (1e:7a10) db $10,$00,$43,$40 db $10,$08,$43,$60 -FrameBlock5d: ; 7ba31 (1e:7a31) +FrameBlock5d: db $0b db $00,$00,$49,$00 db $18,$02,$49,$00 @@ -3244,7 +3244,7 @@ FrameBlock5d: ; 7ba31 (1e:7a31) db $0c,$08,$43,$40 db $0c,$10,$43,$60 -FrameBlock5e: ; 7ba5e (1e:7a5e) +FrameBlock5e: db $0f db $00,$08,$49,$00 db $08,$10,$49,$00 @@ -3262,14 +3262,14 @@ FrameBlock5e: ; 7ba5e (1e:7a5e) db $28,$08,$43,$40 db $28,$10,$43,$60 -FrameBlock5f: ; 7ba9b (1e:7a9b) +FrameBlock5f: db $04 db $00,$00,$49,$00 db $00,$10,$49,$00 db $00,$20,$49,$00 db $00,$30,$49,$00 -FrameBlock60: ; 7baac (1e:7aac) +FrameBlock60: db $08 db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3280,7 +3280,7 @@ FrameBlock60: ; 7baac (1e:7aac) db $08,$28,$49,$00 db $08,$38,$49,$00 -FrameBlock61: ; 7bacd (1e:7acd) +FrameBlock61: db $0c db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3295,7 +3295,7 @@ FrameBlock61: ; 7bacd (1e:7acd) db $10,$20,$49,$00 db $10,$30,$49,$00 -FrameBlock62: ; 7bafe (1e:7afe) +FrameBlock62: db $0f db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3314,7 +3314,7 @@ FrameBlock62: ; 7bafe (1e:7afe) db $18,$28,$49,$00 db $18,$38,$49,$00 ; unused -FrameBlock63: ; 7bb3f (1e:7b3f) +FrameBlock63: db $06 db $10,$00,$26,$00 db $10,$08,$27,$00 @@ -3323,7 +3323,7 @@ FrameBlock63: ; 7bb3f (1e:7b3f) db $00,$20,$26,$00 db $00,$28,$27,$00 -FrameBlock64: ; 7bb58 (1e:7b58) +FrameBlock64: db $06 db $18,$00,$27,$00 db $10,$08,$26,$00 @@ -3332,7 +3332,7 @@ FrameBlock64: ; 7bb58 (1e:7b58) db $08,$20,$27,$00 db $00,$28,$26,$00 -FrameBlock65: ; 7bb71 (1e:7b71) +FrameBlock65: db $06 db $00,$00,$1c,$00 db $00,$08,$1d,$00 @@ -3341,27 +3341,27 @@ FrameBlock65: ; 7bb71 (1e:7b71) db $20,$00,$1c,$00 db $20,$08,$1d,$00 -FrameBlock66: ; 7bb8a (1e:7b8a) +FrameBlock66: db $02 db $00,$00,$03,$00 db $08,$00,$13,$00 -FrameBlock67: ; 7bb93 (1e:7b93) +FrameBlock67: db $01 db $00,$00,$03,$00 -FrameBlock68: ; 7bb98 (1e:7b98) +FrameBlock68: db $04 db $00,$00,$03,$00 db $00,$08,$03,$20 db $08,$00,$13,$00 db $08,$08,$13,$20 -FrameBlock69: ; 7bba9 (1e:7ba9) +FrameBlock69: db $01 db $00,$00,$06,$00 -FrameBlock6a: ; 7bbae (1e:7bae) +FrameBlock6a: db $08 db $00,$00,$2e,$00 db $00,$30,$2e,$20 @@ -3372,7 +3372,7 @@ FrameBlock6a: ; 7bbae (1e:7bae) db $18,$00,$3e,$00 db $18,$30,$3e,$20 -FrameBlock6b: ; 7bbcf (1e:7bcf) +FrameBlock6b: db $08 db $00,$00,$2e,$00 db $00,$20,$2e,$20 @@ -3383,7 +3383,7 @@ FrameBlock6b: ; 7bbcf (1e:7bcf) db $10,$00,$3e,$00 db $10,$20,$3e,$20 -FrameBlock6c: ; 7bbf0 (1e:7bf0) +FrameBlock6c: db $08 db $00,$00,$2e,$00 db $00,$10,$2e,$20 @@ -3394,33 +3394,33 @@ FrameBlock6c: ; 7bbf0 (1e:7bf0) db $08,$00,$3e,$00 db $08,$10,$3e,$20 -FrameBlock6d: ; 7bc11 (1e:7c11) +FrameBlock6d: db $02 db $00,$00,$1e,$00 db $00,$08,$1f,$00 -FrameBlock6e: ; 7bc1a (1e:7c1a) +FrameBlock6e: db $04 db $00,$00,$48,$00 db $00,$08,$48,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock6f: ; 7bc2b (1e:7c2b) +FrameBlock6f: db $04 db $00,$00,$4a,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock70: ; 7bc3c (1e:7c3c) +FrameBlock70: db $04 db $00,$00,$07,$20 db $00,$08,$4a,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock76: ; 7bc4d (1e:7c4d) +FrameBlock76: db $07 db $00,$10,$2f,$00 db $01,$08,$2f,$00 @@ -3430,22 +3430,22 @@ FrameBlock76: ; 7bc4d (1e:7c4d) db $0a,$00,$3e,$00 db $0a,$20,$3e,$20 -FrameBlock77: ; 7bc6a (1e:7c6a) +FrameBlock77: db $04 db $00,$02,$4b,$00 db $00,$0a,$4c,$00 db $08,$00,$4c,$60 db $08,$08,$4b,$60 -FrameBlock78: ; 7bc7b (1e:7c7b) +FrameBlock78: db $01 db $00,$00,$4d,$00 -FrameBlock79: ; 7bc80 (1e:7c80) +FrameBlock79: db $01 db $00,$00,$4e,$00 -FrameBlockBaseCoords: ; 7bc85 (1e:7c85) +FrameBlockBaseCoords: db $10,$68 db $10,$70 db $10,$78 @@ -3624,5 +3624,5 @@ FrameBlockBaseCoords: ; 7bc85 (1e:7c85) db $1C,$48 db $48,$28 -FrameBlock00: ; 7bde7 (1e:7de7) +FrameBlock00: db $00,$00 diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm index f0fc922d..48c2cee6 100755 --- a/data/bike_riding_tilesets.asm +++ b/data/bike_riding_tilesets.asm @@ -1,2 +1,2 @@ -BikeRidingTilesets:: ; 09e2 (0:09e2) +BikeRidingTilesets:: db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF diff --git a/data/credit_mons.asm b/data/credit_mons.asm index 6a8bb416..23142f9f 100755 --- a/data/credit_mons.asm +++ b/data/credit_mons.asm @@ -1,4 +1,4 @@ -CreditsMons: ; 74131 (1d:4131) +CreditsMons: db VENUSAUR db ARBOK db RHYHORN diff --git a/data/credits_order.asm b/data/credits_order.asm index 5a71a26a..20b9137f 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -1,4 +1,4 @@ -CreditsOrder: ; 74243 (1d:4243) +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. diff --git a/data/cries.asm b/data/cries.asm index 7d03b831..7031536e 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -1,4 +1,4 @@ -CryData: ; 39446 (e:5446) +CryData: ;$BaseCry, $Pitch, $Length db $11, $00, $80; Rhydon db $03, $00, $80; Kangaskhan diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm index 3501f2b9..01e86714 100755 --- a/data/dungeon_tilesets.asm +++ b/data/dungeon_tilesets.asm @@ -1,2 +1,2 @@ -DungeonTilesets: ; c7b2 (3:47b2) +DungeonTilesets: db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 29a33479..a668ea3e 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,4 +1,4 @@ -EvosMovesPointerTable: ; 3b05c (e:705c) +EvosMovesPointerTable: dw Mon112_EvosMoves dw Mon115_EvosMoves dw Mon032_EvosMoves @@ -190,7 +190,7 @@ EvosMovesPointerTable: ; 3b05c (e:705c) dw Mon070_EvosMoves dw Mon071_EvosMoves -Mon112_EvosMoves: ; 3b1d8 (e:71d8) +Mon112_EvosMoves: ;RHYDON ;Evolutions db 0 @@ -203,7 +203,7 @@ Mon112_EvosMoves: ; 3b1d8 (e:71d8) db 64,TAKE_DOWN db 0 -Mon115_EvosMoves: ; 3b1e6 (e:71e6) +Mon115_EvosMoves: ;KANGASKHAN ;Evolutions db 0 @@ -215,7 +215,7 @@ Mon115_EvosMoves: ; 3b1e6 (e:71e6) db 46,DIZZY_PUNCH db 0 -Mon032_EvosMoves: ; 3b1f2 (e:71f2) +Mon032_EvosMoves: ;NIDORAN_M ;Evolutions db EV_LEVEL,16,NIDORINO @@ -229,7 +229,7 @@ Mon032_EvosMoves: ; 3b1f2 (e:71f2) db 43,DOUBLE_KICK db 0 -Mon035_EvosMoves: ; 3b203 (e:7203) +Mon035_EvosMoves: ;CLEFAIRY ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE @@ -243,7 +243,7 @@ Mon035_EvosMoves: ; 3b203 (e:7203) db 48,LIGHT_SCREEN db 0 -Mon021_EvosMoves: ; 3b215 (e:7215) +Mon021_EvosMoves: ;SPEAROW ;Evolutions db EV_LEVEL,20,FEAROW @@ -256,7 +256,7 @@ Mon021_EvosMoves: ; 3b215 (e:7215) db 36,AGILITY db 0 -Mon100_EvosMoves: ; 3b224 (e:7224) +Mon100_EvosMoves: ;VOLTORB ;Evolutions db EV_LEVEL,30,ELECTRODE @@ -269,7 +269,7 @@ Mon100_EvosMoves: ; 3b224 (e:7224) db 43,EXPLOSION db 0 -Mon034_EvosMoves: ; 3b233 (e:7233) +Mon034_EvosMoves: ;NIDOKING ;Evolutions db 0 @@ -279,7 +279,7 @@ Mon034_EvosMoves: ; 3b233 (e:7233) db 23,THRASH db 0 -Mon080_EvosMoves: ; 3b23b (e:723b) +Mon080_EvosMoves: ;SLOWBRO ;Evolutions db 0 @@ -293,7 +293,7 @@ Mon080_EvosMoves: ; 3b23b (e:723b) db 55,PSYCHIC_M db 0 -Mon002_EvosMoves: ; 3b24b (e:724b) +Mon002_EvosMoves: ;IVYSAUR ;Evolutions db EV_LEVEL,32,VENUSAUR @@ -308,7 +308,7 @@ Mon002_EvosMoves: ; 3b24b (e:724b) db 54,SOLARBEAM db 0 -Mon103_EvosMoves: ; 3b25e (e:725e) +Mon103_EvosMoves: ;EXEGGUTOR ;Evolutions db 0 @@ -316,7 +316,7 @@ Mon103_EvosMoves: ; 3b25e (e:725e) db 28,STOMP db 0 -Mon108_EvosMoves: ; 3b262 (e:7262) +Mon108_EvosMoves: ;LICKITUNG ;Evolutions db 0 @@ -328,7 +328,7 @@ Mon108_EvosMoves: ; 3b262 (e:7262) db 39,SCREECH db 0 -Mon102_EvosMoves: ; 3b26e (e:726e) +Mon102_EvosMoves: ;EXEGGCUTE ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR @@ -342,7 +342,7 @@ Mon102_EvosMoves: ; 3b26e (e:726e) db 48,SLEEP_POWDER db 0 -Mon088_EvosMoves: ; 3b280 (e:7280) +Mon088_EvosMoves: ;GRIMER ;Evolutions db EV_LEVEL,38,MUK @@ -356,7 +356,7 @@ Mon088_EvosMoves: ; 3b280 (e:7280) db 55,ACID_ARMOR db 0 -Mon094_EvosMoves: ; 3b291 (e:7291) +Mon094_EvosMoves: ;GENGAR ;Evolutions db 0 @@ -365,7 +365,7 @@ Mon094_EvosMoves: ; 3b291 (e:7291) db 38,DREAM_EATER db 0 -Mon029_EvosMoves: ; 3b297 (e:7297) +Mon029_EvosMoves: ;NIDORAN_F ;Evolutions db EV_LEVEL,16,NIDORINA @@ -379,7 +379,7 @@ Mon029_EvosMoves: ; 3b297 (e:7297) db 43,DOUBLE_KICK db 0 -Mon031_EvosMoves: ; 3b2a8 (e:72a8) +Mon031_EvosMoves: ;NIDOQUEEN ;Evolutions db 0 @@ -389,7 +389,7 @@ Mon031_EvosMoves: ; 3b2a8 (e:72a8) db 23,BODY_SLAM db 0 -Mon104_EvosMoves: ; 3b2b0 (e:72b0) +Mon104_EvosMoves: ;CUBONE ;Evolutions db EV_LEVEL,28,MAROWAK @@ -402,7 +402,7 @@ Mon104_EvosMoves: ; 3b2b0 (e:72b0) db 46,RAGE db 0 -Mon111_EvosMoves: ; 3b2bf (e:72bf) +Mon111_EvosMoves: ;RHYHORN ;Evolutions db EV_LEVEL,42,RHYDON @@ -416,7 +416,7 @@ Mon111_EvosMoves: ; 3b2bf (e:72bf) db 55,TAKE_DOWN db 0 -Mon131_EvosMoves: ; 3b2d0 (e:72d0) +Mon131_EvosMoves: ;LAPRAS ;Evolutions db 0 @@ -429,14 +429,14 @@ Mon131_EvosMoves: ; 3b2d0 (e:72d0) db 46,HYDRO_PUMP db 0 -Mon059_EvosMoves: ; 3b2de (e:72de) +Mon059_EvosMoves: ;ARCANINE ;Evolutions db 0 ;Learnset db 0 -Mon151_EvosMoves: ; 3b2e0 (e:72e0) +Mon151_EvosMoves: ;MEW ;Evolutions db 0 @@ -447,7 +447,7 @@ Mon151_EvosMoves: ; 3b2e0 (e:72e0) db 40,PSYCHIC_M db 0 -Mon130_EvosMoves: ; 3b2ea (e:72ea) +Mon130_EvosMoves: ;GYARADOS ;Evolutions db 0 @@ -459,7 +459,7 @@ Mon130_EvosMoves: ; 3b2ea (e:72ea) db 52,HYPER_BEAM db 0 -Mon090_EvosMoves: ; 3b2f6 (e:72f6) +Mon090_EvosMoves: ;SHELLDER ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER @@ -472,7 +472,7 @@ Mon090_EvosMoves: ; 3b2f6 (e:72f6) db 50,ICE_BEAM db 0 -Mon072_EvosMoves: ; 3b306 (e:7306) +Mon072_EvosMoves: ;TENTACOOL ;Evolutions db EV_LEVEL,30,TENTACRUEL @@ -488,7 +488,7 @@ Mon072_EvosMoves: ; 3b306 (e:7306) db 48,HYDRO_PUMP db 0 -Mon092_EvosMoves: ; 3b31b (e:731b) +Mon092_EvosMoves: ;GASTLY ;Evolutions db EV_LEVEL,25,HAUNTER @@ -498,7 +498,7 @@ Mon092_EvosMoves: ; 3b31b (e:731b) db 35,DREAM_EATER db 0 -Mon123_EvosMoves: ; 3b324 (e:7324) +Mon123_EvosMoves: ;SCYTHER ;Evolutions db 0 @@ -511,7 +511,7 @@ Mon123_EvosMoves: ; 3b324 (e:7324) db 42,AGILITY db 0 -Mon120_EvosMoves: ; 3b332 (e:7332) +Mon120_EvosMoves: ;STARYU ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE @@ -526,7 +526,7 @@ Mon120_EvosMoves: ; 3b332 (e:7332) db 47,HYDRO_PUMP db 0 -Mon009_EvosMoves: ; 3b346 (e:7346) +Mon009_EvosMoves: ;BLASTOISE ;Evolutions db 0 @@ -539,7 +539,7 @@ Mon009_EvosMoves: ; 3b346 (e:7346) db 52,HYDRO_PUMP db 0 -Mon127_EvosMoves: ; 3b354 (e:7354) +Mon127_EvosMoves: ;PINSIR ;Evolutions db 0 @@ -552,7 +552,7 @@ Mon127_EvosMoves: ; 3b354 (e:7354) db 54,SWORDS_DANCE db 0 -Mon114_EvosMoves: ; 3b362 (e:7362) +Mon114_EvosMoves: ;TANGELA ;Evolutions db 0 @@ -565,21 +565,21 @@ Mon114_EvosMoves: ; 3b362 (e:7362) db 49,GROWTH db 0 -Mon152_EvosMoves: ; 3b370 (e:7370) +Mon152_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon153_EvosMoves: ; 3b372 (e:7372) +Mon153_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon058_EvosMoves: ; 3b374 (e:7374) +Mon058_EvosMoves: ;GROWLITHE ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE @@ -592,7 +592,7 @@ Mon058_EvosMoves: ; 3b374 (e:7374) db 50,FLAMETHROWER db 0 -Mon095_EvosMoves: ; 3b384 (e:7384) +Mon095_EvosMoves: ;ONIX ;Evolutions db 0 @@ -604,7 +604,7 @@ Mon095_EvosMoves: ; 3b384 (e:7384) db 43,HARDEN db 0 -Mon022_EvosMoves: ; 3b390 (e:7390) +Mon022_EvosMoves: ;FEAROW ;Evolutions db 0 @@ -616,7 +616,7 @@ Mon022_EvosMoves: ; 3b390 (e:7390) db 43,AGILITY db 0 -Mon016_EvosMoves: ; 3b39c (e:739c) +Mon016_EvosMoves: ;PIDGEY ;Evolutions db EV_LEVEL,18,PIDGEOTTO @@ -630,7 +630,7 @@ Mon016_EvosMoves: ; 3b39c (e:739c) db 44,MIRROR_MOVE db 0 -Mon079_EvosMoves: ; 3b3ad (e:73ad) +Mon079_EvosMoves: ;SLOWPOKE ;Evolutions db EV_LEVEL,37,SLOWBRO @@ -644,7 +644,7 @@ Mon079_EvosMoves: ; 3b3ad (e:73ad) db 48,PSYCHIC_M db 0 -Mon064_EvosMoves: ; 3b3be (e:73be) +Mon064_EvosMoves: ;KADABRA ;Evolutions db EV_TRADE,1,ALAKAZAM @@ -658,7 +658,7 @@ Mon064_EvosMoves: ; 3b3be (e:73be) db 42,REFLECT db 0 -Mon075_EvosMoves: ; 3b3cf (e:73cf) +Mon075_EvosMoves: ;GRAVELER ;Evolutions db EV_TRADE,1,GOLEM @@ -672,7 +672,7 @@ Mon075_EvosMoves: ; 3b3cf (e:73cf) db 43,EXPLOSION db 0 -Mon113_EvosMoves: ; 3b3e0 (e:73e0) +Mon113_EvosMoves: ;CHANSEY ;Evolutions db 0 @@ -685,7 +685,7 @@ Mon113_EvosMoves: ; 3b3e0 (e:73e0) db 54,DOUBLE_EDGE db 0 -Mon067_EvosMoves: ; 3b3ee (e:73ee) +Mon067_EvosMoves: ;MACHOKE ;Evolutions db EV_TRADE,1,MACHAMP @@ -698,7 +698,7 @@ Mon067_EvosMoves: ; 3b3ee (e:73ee) db 52,SUBMISSION db 0 -Mon122_EvosMoves: ; 3b3fd (e:73fd) +Mon122_EvosMoves: ;MR_MIME ;Evolutions db 0 @@ -710,7 +710,7 @@ Mon122_EvosMoves: ; 3b3fd (e:73fd) db 47,SUBSTITUTE db 0 -Mon106_EvosMoves: ; 3b409 (e:7409) +Mon106_EvosMoves: ;HITMONLEE ;Evolutions db 0 @@ -722,7 +722,7 @@ Mon106_EvosMoves: ; 3b409 (e:7409) db 53,MEGA_KICK db 0 -Mon107_EvosMoves: ; 3b415 (e:7415) +Mon107_EvosMoves: ;HITMONCHAN ;Evolutions db 0 @@ -734,7 +734,7 @@ Mon107_EvosMoves: ; 3b415 (e:7415) db 53,COUNTER db 0 -Mon024_EvosMoves: ; 3b421 (e:7421) +Mon024_EvosMoves: ;ARBOK ;Evolutions db 0 @@ -746,7 +746,7 @@ Mon024_EvosMoves: ; 3b421 (e:7421) db 47,ACID db 0 -Mon047_EvosMoves: ; 3b42d (e:742d) +Mon047_EvosMoves: ;PARASECT ;Evolutions db 0 @@ -758,7 +758,7 @@ Mon047_EvosMoves: ; 3b42d (e:742d) db 48,GROWTH db 0 -Mon054_EvosMoves: ; 3b439 (e:7439) +Mon054_EvosMoves: ;PSYDUCK ;Evolutions db EV_LEVEL,33,GOLDUCK @@ -771,7 +771,7 @@ Mon054_EvosMoves: ; 3b439 (e:7439) db 52,HYDRO_PUMP db 0 -Mon096_EvosMoves: ; 3b448 (e:7448) +Mon096_EvosMoves: ;DROWZEE ;Evolutions db EV_LEVEL,26,HYPNO @@ -785,7 +785,7 @@ Mon096_EvosMoves: ; 3b448 (e:7448) db 37,MEDITATE db 0 -Mon076_EvosMoves: ; 3b459 (e:7459) +Mon076_EvosMoves: ;GOLEM ;Evolutions db 0 @@ -798,14 +798,14 @@ Mon076_EvosMoves: ; 3b459 (e:7459) db 43,EXPLOSION db 0 -Mon154_EvosMoves: ; 3b467 (e:7467) +Mon154_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon126_EvosMoves: ; 3b469 (e:7469) +Mon126_EvosMoves: ;MAGMAR ;Evolutions db 0 @@ -818,14 +818,14 @@ Mon126_EvosMoves: ; 3b469 (e:7469) db 55,FLAMETHROWER db 0 -Mon155_EvosMoves: ; 3b477 (e:7477) +Mon155_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon125_EvosMoves: ; 3b479 (e:7479) +Mon125_EvosMoves: ;ELECTABUZZ ;Evolutions db 0 @@ -837,7 +837,7 @@ Mon125_EvosMoves: ; 3b479 (e:7479) db 54,THUNDER db 0 -Mon082_EvosMoves: ; 3b485 (e:7485) +Mon082_EvosMoves: ;MAGNETON ;Evolutions db 0 @@ -850,7 +850,7 @@ Mon082_EvosMoves: ; 3b485 (e:7485) db 54,SCREECH db 0 -Mon109_EvosMoves: ; 3b493 (e:7493) +Mon109_EvosMoves: ;KOFFING ;Evolutions db EV_LEVEL,35,WEEZING @@ -863,14 +863,14 @@ Mon109_EvosMoves: ; 3b493 (e:7493) db 48,EXPLOSION db 0 -Mon156_EvosMoves: ; 3b4a2 (e:74a2) +Mon156_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon056_EvosMoves: ; 3b4a4 (e:74a4) +Mon056_EvosMoves: ;MANKEY ;Evolutions db EV_LEVEL,28,PRIMEAPE @@ -883,7 +883,7 @@ Mon056_EvosMoves: ; 3b4a4 (e:74a4) db 39,THRASH db 0 -Mon086_EvosMoves: ; 3b4b3 (e:74b3) +Mon086_EvosMoves: ;SEEL ;Evolutions db EV_LEVEL,34,DEWGONG @@ -896,7 +896,7 @@ Mon086_EvosMoves: ; 3b4b3 (e:74b3) db 50,ICE_BEAM db 0 -Mon050_EvosMoves: ; 3b4c2 (e:74c2) +Mon050_EvosMoves: ;DIGLETT ;Evolutions db EV_LEVEL,26,DUGTRIO @@ -909,7 +909,7 @@ Mon050_EvosMoves: ; 3b4c2 (e:74c2) db 40,EARTHQUAKE db 0 -Mon128_EvosMoves: ; 3b4d1 (e:74d1) +Mon128_EvosMoves: ;TAUROS ;Evolutions db 0 @@ -921,28 +921,28 @@ Mon128_EvosMoves: ; 3b4d1 (e:74d1) db 51,TAKE_DOWN db 0 -Mon157_EvosMoves: ; 3b4dd (e:74dd) +Mon157_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon158_EvosMoves: ; 3b4df (e:74df) +Mon158_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon159_EvosMoves: ; 3b4e1 (e:74e1) +Mon159_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon083_EvosMoves: ; 3b4e3 (e:74e3) +Mon083_EvosMoves: ;FARFETCHD ;Evolutions db 0 @@ -954,7 +954,7 @@ Mon083_EvosMoves: ; 3b4e3 (e:74e3) db 39,SLASH db 0 -Mon048_EvosMoves: ; 3b4ef (e:74ef) +Mon048_EvosMoves: ;VENONAT ;Evolutions db EV_LEVEL,31,VENOMOTH @@ -968,7 +968,7 @@ Mon048_EvosMoves: ; 3b4ef (e:74ef) db 43,PSYCHIC_M db 0 -Mon149_EvosMoves: ; 3b500 (e:7500) +Mon149_EvosMoves: ;DRAGONITE ;Evolutions db 0 @@ -980,28 +980,28 @@ Mon149_EvosMoves: ; 3b500 (e:7500) db 60,HYPER_BEAM db 0 -Mon160_EvosMoves: ; 3b50c (e:750c) +Mon160_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon161_EvosMoves: ; 3b50e (e:750e) +Mon161_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon162_EvosMoves: ; 3b510 (e:7510) +Mon162_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon084_EvosMoves: ; 3b512 (e:7512) +Mon084_EvosMoves: ;DODUO ;Evolutions db EV_LEVEL,31,DODRIO @@ -1015,7 +1015,7 @@ Mon084_EvosMoves: ; 3b512 (e:7512) db 44,AGILITY db 0 -Mon060_EvosMoves: ; 3b523 (e:7523) +Mon060_EvosMoves: ;POLIWAG ;Evolutions db EV_LEVEL,25,POLIWHIRL @@ -1029,7 +1029,7 @@ Mon060_EvosMoves: ; 3b523 (e:7523) db 45,HYDRO_PUMP db 0 -Mon124_EvosMoves: ; 3b534 (e:7534) +Mon124_EvosMoves: ;JYNX ;Evolutions db 0 @@ -1042,7 +1042,7 @@ Mon124_EvosMoves: ; 3b534 (e:7534) db 58,BLIZZARD db 0 -Mon146_EvosMoves: ; 3b542 (e:7542) +Mon146_EvosMoves: ;MOLTRES ;Evolutions db 0 @@ -1052,7 +1052,7 @@ Mon146_EvosMoves: ; 3b542 (e:7542) db 60,SKY_ATTACK db 0 -Mon144_EvosMoves: ; 3b54a (e:754a) +Mon144_EvosMoves: ;ARTICUNO ;Evolutions db 0 @@ -1062,7 +1062,7 @@ Mon144_EvosMoves: ; 3b54a (e:754a) db 60,MIST db 0 -Mon145_EvosMoves: ; 3b552 (e:7552) +Mon145_EvosMoves: ;ZAPDOS ;Evolutions db 0 @@ -1072,14 +1072,14 @@ Mon145_EvosMoves: ; 3b552 (e:7552) db 60,LIGHT_SCREEN db 0 -Mon132_EvosMoves: ; 3b55a (e:755a) +Mon132_EvosMoves: ;DITTO ;Evolutions db 0 ;Learnset db 0 -Mon052_EvosMoves: ; 3b55c (e:755c) +Mon052_EvosMoves: ;MEOWTH ;Evolutions db EV_LEVEL,28,PERSIAN @@ -1092,7 +1092,7 @@ Mon052_EvosMoves: ; 3b55c (e:755c) db 44,SLASH db 0 -Mon098_EvosMoves: ; 3b56b (e:756b) +Mon098_EvosMoves: ;KRABBY ;Evolutions db EV_LEVEL,28,KINGLER @@ -1105,28 +1105,28 @@ Mon098_EvosMoves: ; 3b56b (e:756b) db 40,HARDEN db 0 -Mon163_EvosMoves: ; 3b57a (e:757a) +Mon163_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon164_EvosMoves: ; 3b57c (e:757c) +Mon164_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon165_EvosMoves: ; 3b57e (e:757e) +Mon165_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon037_EvosMoves: ; 3b580 (e:7580) +Mon037_EvosMoves: ;VULPIX ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES @@ -1139,14 +1139,14 @@ Mon037_EvosMoves: ; 3b580 (e:7580) db 42,FIRE_SPIN db 0 -Mon038_EvosMoves: ; 3b590 (e:7590) +Mon038_EvosMoves: ;NINETALES ;Evolutions db 0 ;Learnset db 0 -Mon025_EvosMoves: ; 3b592 (e:7592) +Mon025_EvosMoves: ;PIKACHU ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU @@ -1159,28 +1159,28 @@ Mon025_EvosMoves: ; 3b592 (e:7592) db 43,THUNDER db 0 -Mon026_EvosMoves: ; 3b5a2 (e:75a2) +Mon026_EvosMoves: ;RAICHU ;Evolutions db 0 ;Learnset db 0 -Mon166_EvosMoves: ; 3b5a4 (e:75a4) +Mon166_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon167_EvosMoves: ; 3b5a6 (e:75a6) +Mon167_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon147_EvosMoves: ; 3b5a8 (e:75a8) +Mon147_EvosMoves: ;DRATINI ;Evolutions db EV_LEVEL,30,DRAGONAIR @@ -1193,7 +1193,7 @@ Mon147_EvosMoves: ; 3b5a8 (e:75a8) db 50,HYPER_BEAM db 0 -Mon148_EvosMoves: ; 3b5b7 (e:75b7) +Mon148_EvosMoves: ;DRAGONAIR ;Evolutions db EV_LEVEL,55,DRAGONITE @@ -1206,7 +1206,7 @@ Mon148_EvosMoves: ; 3b5b7 (e:75b7) db 55,HYPER_BEAM db 0 -Mon140_EvosMoves: ; 3b5c6 (e:75c6) +Mon140_EvosMoves: ;KABUTO ;Evolutions db EV_LEVEL,40,KABUTOPS @@ -1218,7 +1218,7 @@ Mon140_EvosMoves: ; 3b5c6 (e:75c6) db 49,HYDRO_PUMP db 0 -Mon141_EvosMoves: ; 3b5d3 (e:75d3) +Mon141_EvosMoves: ;KABUTOPS ;Evolutions db 0 @@ -1229,7 +1229,7 @@ Mon141_EvosMoves: ; 3b5d3 (e:75d3) db 53,HYDRO_PUMP db 0 -Mon116_EvosMoves: ; 3b5dd (e:75dd) +Mon116_EvosMoves: ;HORSEA ;Evolutions db EV_LEVEL,32,SEADRA @@ -1242,7 +1242,7 @@ Mon116_EvosMoves: ; 3b5dd (e:75dd) db 45,HYDRO_PUMP db 0 -Mon117_EvosMoves: ; 3b5ec (e:75ec) +Mon117_EvosMoves: ;SEADRA ;Evolutions db 0 @@ -1254,21 +1254,21 @@ Mon117_EvosMoves: ; 3b5ec (e:75ec) db 52,HYDRO_PUMP db 0 -Mon168_EvosMoves: ; 3b5f8 (e:75f8) +Mon168_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon169_EvosMoves: ; 3b5fa (e:75fa) +Mon169_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon027_EvosMoves: ; 3b5fc (e:75fc) +Mon027_EvosMoves: ;SANDSHREW ;Evolutions db EV_LEVEL,22,SANDSLASH @@ -1281,7 +1281,7 @@ Mon027_EvosMoves: ; 3b5fc (e:75fc) db 38,FURY_SWIPES db 0 -Mon028_EvosMoves: ; 3b60b (e:760b) +Mon028_EvosMoves: ;SANDSLASH ;Evolutions db 0 @@ -1293,7 +1293,7 @@ Mon028_EvosMoves: ; 3b60b (e:760b) db 47,FURY_SWIPES db 0 -Mon138_EvosMoves: ; 3b617 (e:7617) +Mon138_EvosMoves: ;OMANYTE ;Evolutions db EV_LEVEL,40,OMASTAR @@ -1305,7 +1305,7 @@ Mon138_EvosMoves: ; 3b617 (e:7617) db 53,HYDRO_PUMP db 0 -Mon139_EvosMoves: ; 3b624 (e:7624) +Mon139_EvosMoves: ;OMASTAR ;Evolutions db 0 @@ -1316,7 +1316,7 @@ Mon139_EvosMoves: ; 3b624 (e:7624) db 49,HYDRO_PUMP db 0 -Mon039_EvosMoves: ; 3b62e (e:762e) +Mon039_EvosMoves: ;JIGGLYPUFF ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF @@ -1331,14 +1331,14 @@ Mon039_EvosMoves: ; 3b62e (e:762e) db 39,DOUBLE_EDGE db 0 -Mon040_EvosMoves: ; 3b642 (e:7642) +Mon040_EvosMoves: ;WIGGLYTUFF ;Evolutions db 0 ;Learnset db 0 -Mon133_EvosMoves: ; 3b644 (e:7644) +Mon133_EvosMoves: ;EEVEE ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON @@ -1353,7 +1353,7 @@ Mon133_EvosEnd: db 45,TAKE_DOWN db 0 -Mon136_EvosMoves: ; 3b65a (e:765a) +Mon136_EvosMoves: ;FLAREON ;Evolutions db 0 @@ -1368,7 +1368,7 @@ Mon136_EvosMoves: ; 3b65a (e:765a) db 54,FLAMETHROWER db 0 -Mon135_EvosMoves: ; 3b66c (e:766c) +Mon135_EvosMoves: ;JOLTEON ;Evolutions db 0 @@ -1383,7 +1383,7 @@ Mon135_EvosMoves: ; 3b66c (e:766c) db 54,THUNDER db 0 -Mon134_EvosMoves: ; 3b67e (e:767e) +Mon134_EvosMoves: ;VAPOREON ;Evolutions db 0 @@ -1398,7 +1398,7 @@ Mon134_EvosMoves: ; 3b67e (e:767e) db 54,HYDRO_PUMP db 0 -Mon066_EvosMoves: ; 3b690 (e:7690) +Mon066_EvosMoves: ;MACHOP ;Evolutions db EV_LEVEL,28,MACHOKE @@ -1411,7 +1411,7 @@ Mon066_EvosMoves: ; 3b690 (e:7690) db 46,SUBMISSION db 0 -Mon041_EvosMoves: ; 3b69f (e:769f) +Mon041_EvosMoves: ;ZUBAT ;Evolutions db EV_LEVEL,22,GOLBAT @@ -1424,7 +1424,7 @@ Mon041_EvosMoves: ; 3b69f (e:769f) db 36,HAZE db 0 -Mon023_EvosMoves: ; 3b6ae (e:76ae) +Mon023_EvosMoves: ;EKANS ;Evolutions db EV_LEVEL,22,ARBOK @@ -1437,7 +1437,7 @@ Mon023_EvosMoves: ; 3b6ae (e:76ae) db 38,ACID db 0 -Mon046_EvosMoves: ; 3b6bd (e:76bd) +Mon046_EvosMoves: ;PARAS ;Evolutions db EV_LEVEL,24,PARASECT @@ -1450,7 +1450,7 @@ Mon046_EvosMoves: ; 3b6bd (e:76bd) db 41,GROWTH db 0 -Mon061_EvosMoves: ; 3b6cc (e:76cc) +Mon061_EvosMoves: ;POLIWHIRL ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH @@ -1464,7 +1464,7 @@ Mon061_EvosMoves: ; 3b6cc (e:76cc) db 49,HYDRO_PUMP db 0 -Mon062_EvosMoves: ; 3b6de (e:76de) +Mon062_EvosMoves: ;POLIWRATH ;Evolutions db 0 @@ -1473,7 +1473,7 @@ Mon062_EvosMoves: ; 3b6de (e:76de) db 19,WATER_GUN db 0 -Mon013_EvosMoves: ; 3b6e4 (e:76e4) +Mon013_EvosMoves: ;WEEDLE ;Evolutions db EV_LEVEL,7,KAKUNA @@ -1481,7 +1481,7 @@ Mon013_EvosMoves: ; 3b6e4 (e:76e4) ;Learnset db 0 -Mon014_EvosMoves: ; 3b6e9 (e:76e9) +Mon014_EvosMoves: ;KAKUNA ;Evolutions db EV_LEVEL,10,BEEDRILL @@ -1489,7 +1489,7 @@ Mon014_EvosMoves: ; 3b6e9 (e:76e9) ;Learnset db 0 -Mon015_EvosMoves: ; 3b6ee (e:76ee) +Mon015_EvosMoves: ;BEEDRILL ;Evolutions db 0 @@ -1502,14 +1502,14 @@ Mon015_EvosMoves: ; 3b6ee (e:76ee) db 35,AGILITY db 0 -Mon170_EvosMoves: ; 3b6fc (e:76fc) +Mon170_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon085_EvosMoves: ; 3b6fe (e:76fe) +Mon085_EvosMoves: ;DODRIO ;Evolutions db 0 @@ -1522,7 +1522,7 @@ Mon085_EvosMoves: ; 3b6fe (e:76fe) db 51,AGILITY db 0 -Mon057_EvosMoves: ; 3b70c (e:770c) +Mon057_EvosMoves: ;PRIMEAPE ;Evolutions db 0 @@ -1534,7 +1534,7 @@ Mon057_EvosMoves: ; 3b70c (e:770c) db 46,THRASH db 0 -Mon051_EvosMoves: ; 3b718 (e:7718) +Mon051_EvosMoves: ;DUGTRIO ;Evolutions db 0 @@ -1546,7 +1546,7 @@ Mon051_EvosMoves: ; 3b718 (e:7718) db 47,EARTHQUAKE db 0 -Mon049_EvosMoves: ; 3b724 (e:7724) +Mon049_EvosMoves: ;VENOMOTH ;Evolutions db 0 @@ -1559,7 +1559,7 @@ Mon049_EvosMoves: ; 3b724 (e:7724) db 50,PSYCHIC_M db 0 -Mon087_EvosMoves: ; 3b732 (e:7732) +Mon087_EvosMoves: ;DEWGONG ;Evolutions db 0 @@ -1571,21 +1571,21 @@ Mon087_EvosMoves: ; 3b732 (e:7732) db 56,ICE_BEAM db 0 -Mon171_EvosMoves: ; 3b73e (e:773e) +Mon171_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon172_EvosMoves: ; 3b740 (e:7740) +Mon172_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon010_EvosMoves: ; 3b742 (e:7742) +Mon010_EvosMoves: ;CATERPIE ;Evolutions db EV_LEVEL,7,METAPOD @@ -1593,7 +1593,7 @@ Mon010_EvosMoves: ; 3b742 (e:7742) ;Learnset db 0 -Mon011_EvosMoves: ; 3b747 (e:7747) +Mon011_EvosMoves: ;METAPOD ;Evolutions db EV_LEVEL,10,BUTTERFREE @@ -1601,7 +1601,7 @@ Mon011_EvosMoves: ; 3b747 (e:7747) ;Learnset db 0 -Mon012_EvosMoves: ; 3b74c (e:774c) +Mon012_EvosMoves: ;BUTTERFREE ;Evolutions db 0 @@ -1615,7 +1615,7 @@ Mon012_EvosMoves: ; 3b74c (e:774c) db 32,PSYBEAM db 0 -Mon068_EvosMoves: ; 3b75c (e:775c) +Mon068_EvosMoves: ;MACHAMP ;Evolutions db 0 @@ -1627,14 +1627,14 @@ Mon068_EvosMoves: ; 3b75c (e:775c) db 52,SUBMISSION db 0 -Mon173_EvosMoves: ; 3b768 (e:7768) +Mon173_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon055_EvosMoves: ; 3b76a (e:776a) +Mon055_EvosMoves: ;GOLDUCK ;Evolutions db 0 @@ -1646,7 +1646,7 @@ Mon055_EvosMoves: ; 3b76a (e:776a) db 59,HYDRO_PUMP db 0 -Mon097_EvosMoves: ; 3b776 (e:7776) +Mon097_EvosMoves: ;HYPNO ;Evolutions db 0 @@ -1659,7 +1659,7 @@ Mon097_EvosMoves: ; 3b776 (e:7776) db 43,MEDITATE db 0 -Mon042_EvosMoves: ; 3b784 (e:7784) +Mon042_EvosMoves: ;GOLBAT ;Evolutions db 0 @@ -1671,7 +1671,7 @@ Mon042_EvosMoves: ; 3b784 (e:7784) db 43,HAZE db 0 -Mon150_EvosMoves: ; 3b790 (e:7790) +Mon150_EvosMoves: ;MEWTWO ;Evolutions db 0 @@ -1683,7 +1683,7 @@ Mon150_EvosMoves: ; 3b790 (e:7790) db 81,AMNESIA db 0 -Mon143_EvosMoves: ; 3b79c (e:779c) +Mon143_EvosMoves: ;SNORLAX ;Evolutions db 0 @@ -1694,7 +1694,7 @@ Mon143_EvosMoves: ; 3b79c (e:779c) db 56,HYPER_BEAM db 0 -Mon129_EvosMoves: ; 3b7a6 (e:77a6) +Mon129_EvosMoves: ;MAGIKARP ;Evolutions db EV_LEVEL,20,GYARADOS @@ -1703,21 +1703,21 @@ Mon129_EvosMoves: ; 3b7a6 (e:77a6) db 15,TACKLE db 0 -Mon174_EvosMoves: ; 3b7ad (e:77ad) +Mon174_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon175_EvosMoves: ; 3b7af (e:77af) +Mon175_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon089_EvosMoves: ; 3b7b1 (e:77b1) +Mon089_EvosMoves: ;MUK ;Evolutions db 0 @@ -1730,14 +1730,14 @@ Mon089_EvosMoves: ; 3b7b1 (e:77b1) db 60,ACID_ARMOR db 0 -Mon176_EvosMoves: ; 3b7bf (e:77bf) +Mon176_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon099_EvosMoves: ; 3b7c1 (e:77c1) +Mon099_EvosMoves: ;KINGLER ;Evolutions db 0 @@ -1749,7 +1749,7 @@ Mon099_EvosMoves: ; 3b7c1 (e:77c1) db 49,HARDEN db 0 -Mon091_EvosMoves: ; 3b7cd (e:77cd) +Mon091_EvosMoves: ;CLOYSTER ;Evolutions db 0 @@ -1757,14 +1757,14 @@ Mon091_EvosMoves: ; 3b7cd (e:77cd) db 50,SPIKE_CANNON db 0 -Mon177_EvosMoves: ; 3b7d1 (e:77d1) +Mon177_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon101_EvosMoves: ; 3b7d3 (e:77d3) +Mon101_EvosMoves: ;ELECTRODE ;Evolutions db 0 @@ -1776,14 +1776,14 @@ Mon101_EvosMoves: ; 3b7d3 (e:77d3) db 50,EXPLOSION db 0 -Mon036_EvosMoves: ; 3b7df (e:77df) +Mon036_EvosMoves: ;CLEFABLE ;Evolutions db 0 ;Learnset db 0 -Mon110_EvosMoves: ; 3b7e1 (e:77e1) +Mon110_EvosMoves: ;WEEZING ;Evolutions db 0 @@ -1795,7 +1795,7 @@ Mon110_EvosMoves: ; 3b7e1 (e:77e1) db 53,EXPLOSION db 0 -Mon053_EvosMoves: ; 3b7ed (e:77ed) +Mon053_EvosMoves: ;PERSIAN ;Evolutions db 0 @@ -1807,7 +1807,7 @@ Mon053_EvosMoves: ; 3b7ed (e:77ed) db 51,SLASH db 0 -Mon105_EvosMoves: ; 3b7f9 (e:77f9) +Mon105_EvosMoves: ;MAROWAK ;Evolutions db 0 @@ -1819,14 +1819,14 @@ Mon105_EvosMoves: ; 3b7f9 (e:77f9) db 55,RAGE db 0 -Mon178_EvosMoves: ; 3b805 (e:7805) +Mon178_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon093_EvosMoves: ; 3b807 (e:7807) +Mon093_EvosMoves: ;HAUNTER ;Evolutions db EV_TRADE,1,GENGAR @@ -1836,7 +1836,7 @@ Mon093_EvosMoves: ; 3b807 (e:7807) db 38,DREAM_EATER db 0 -Mon063_EvosMoves: ; 3b810 (e:7810) +Mon063_EvosMoves: ;ABRA ;Evolutions db EV_LEVEL,16,KADABRA @@ -1844,7 +1844,7 @@ Mon063_EvosMoves: ; 3b810 (e:7810) ;Learnset db 0 -Mon065_EvosMoves: ; 3b815 (e:7815) +Mon065_EvosMoves: ;ALAKAZAM ;Evolutions db 0 @@ -1857,7 +1857,7 @@ Mon065_EvosMoves: ; 3b815 (e:7815) db 42,REFLECT db 0 -Mon017_EvosMoves: ; 3b823 (e:7823) +Mon017_EvosMoves: ;PIDGEOTTO ;Evolutions db EV_LEVEL,36,PIDGEOT @@ -1871,7 +1871,7 @@ Mon017_EvosMoves: ; 3b823 (e:7823) db 49,MIRROR_MOVE db 0 -Mon018_EvosMoves: ; 3b834 (e:7834) +Mon018_EvosMoves: ;PIDGEOT ;Evolutions db 0 @@ -1884,14 +1884,14 @@ Mon018_EvosMoves: ; 3b834 (e:7834) db 54,MIRROR_MOVE db 0 -Mon121_EvosMoves: ; 3b842 (e:7842) +Mon121_EvosMoves: ;STARMIE ;Evolutions db 0 ;Learnset db 0 -Mon001_EvosMoves: ; 3b844 (e:7844) +Mon001_EvosMoves: ;BULBASAUR ;Evolutions db EV_LEVEL,16,IVYSAUR @@ -1906,7 +1906,7 @@ Mon001_EvosMoves: ; 3b844 (e:7844) db 48,SOLARBEAM db 0 -Mon003_EvosMoves: ; 3b857 (e:7857) +Mon003_EvosMoves: ;VENUSAUR ;Evolutions db 0 @@ -1920,7 +1920,7 @@ Mon003_EvosMoves: ; 3b857 (e:7857) db 65,SOLARBEAM db 0 -Mon073_EvosMoves: ; 3b867 (e:7867) +Mon073_EvosMoves: ;TENTACRUEL ;Evolutions db 0 @@ -1935,14 +1935,14 @@ Mon073_EvosMoves: ; 3b867 (e:7867) db 50,HYDRO_PUMP db 0 -Mon179_EvosMoves: ; 3b879 (e:7879) +Mon179_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon118_EvosMoves: ; 3b87b (e:787b) +Mon118_EvosMoves: ;GOLDEEN ;Evolutions db EV_LEVEL,33,SEAKING @@ -1956,7 +1956,7 @@ Mon118_EvosMoves: ; 3b87b (e:787b) db 54,AGILITY db 0 -Mon119_EvosMoves: ; 3b88c (e:788c) +Mon119_EvosMoves: ;SEAKING ;Evolutions db 0 @@ -1969,35 +1969,35 @@ Mon119_EvosMoves: ; 3b88c (e:788c) db 54,AGILITY db 0 -Mon180_EvosMoves: ; 3b89a (e:789a) +Mon180_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon181_EvosMoves: ; 3b89c (e:789c) +Mon181_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon182_EvosMoves: ; 3b89e (e:789e) +Mon182_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon183_EvosMoves: ; 3b8a0 (e:78a0) +Mon183_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon077_EvosMoves: ; 3b8a2 (e:78a2) +Mon077_EvosMoves: ;PONYTA ;Evolutions db EV_LEVEL,40,RAPIDASH @@ -2011,7 +2011,7 @@ Mon077_EvosMoves: ; 3b8a2 (e:78a2) db 48,AGILITY db 0 -Mon078_EvosMoves: ; 3b8b3 (e:78b3) +Mon078_EvosMoves: ;RAPIDASH ;Evolutions db 0 @@ -2024,7 +2024,7 @@ Mon078_EvosMoves: ; 3b8b3 (e:78b3) db 55,AGILITY db 0 -Mon019_EvosMoves: ; 3b8c1 (e:78c1) +Mon019_EvosMoves: ;RATTATA ;Evolutions db EV_LEVEL,20,RATICATE @@ -2036,7 +2036,7 @@ Mon019_EvosMoves: ; 3b8c1 (e:78c1) db 34,SUPER_FANG db 0 -Mon020_EvosMoves: ; 3b8ce (e:78ce) +Mon020_EvosMoves: ;RATICATE ;Evolutions db 0 @@ -2047,7 +2047,7 @@ Mon020_EvosMoves: ; 3b8ce (e:78ce) db 41,SUPER_FANG db 0 -Mon033_EvosMoves: ; 3b8d8 (e:78d8) +Mon033_EvosMoves: ;NIDORINO ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING @@ -2061,7 +2061,7 @@ Mon033_EvosMoves: ; 3b8d8 (e:78d8) db 50,DOUBLE_KICK db 0 -Mon030_EvosMoves: ; 3b8ea (e:78ea) +Mon030_EvosMoves: ;NIDORINA ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN @@ -2075,7 +2075,7 @@ Mon030_EvosMoves: ; 3b8ea (e:78ea) db 50,DOUBLE_KICK db 0 -Mon074_EvosMoves: ; 3b8fc (e:78fc) +Mon074_EvosMoves: ;GEODUDE ;Evolutions db EV_LEVEL,25,GRAVELER @@ -2089,7 +2089,7 @@ Mon074_EvosMoves: ; 3b8fc (e:78fc) db 36,EXPLOSION db 0 -Mon137_EvosMoves: ; 3b90d (e:790d) +Mon137_EvosMoves: ;PORYGON ;Evolutions db 0 @@ -2100,7 +2100,7 @@ Mon137_EvosMoves: ; 3b90d (e:790d) db 42,TRI_ATTACK db 0 -Mon142_EvosMoves: ; 3b917 (e:7917) +Mon142_EvosMoves: ;AERODACTYL ;Evolutions db 0 @@ -2111,14 +2111,14 @@ Mon142_EvosMoves: ; 3b917 (e:7917) db 54,HYPER_BEAM db 0 -Mon184_EvosMoves: ; 3b921 (e:7921) +Mon184_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon081_EvosMoves: ; 3b923 (e:7923) +Mon081_EvosMoves: ;MAGNEMITE ;Evolutions db EV_LEVEL,30,MAGNETON @@ -2132,21 +2132,21 @@ Mon081_EvosMoves: ; 3b923 (e:7923) db 47,SCREECH db 0 -Mon185_EvosMoves: ; 3b934 (e:7934) +Mon185_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon186_EvosMoves: ; 3b936 (e:7936) +Mon186_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon004_EvosMoves: ; 3b938 (e:7938) +Mon004_EvosMoves: ;CHARMANDER ;Evolutions db EV_LEVEL,16,CHARMELEON @@ -2160,7 +2160,7 @@ Mon004_EvosMoves: ; 3b938 (e:7938) db 46,FIRE_SPIN db 0 -Mon007_EvosMoves: ; 3b949 (e:7949) +Mon007_EvosMoves: ;SQUIRTLE ;Evolutions db EV_LEVEL,16,WARTORTLE @@ -2174,7 +2174,7 @@ Mon007_EvosMoves: ; 3b949 (e:7949) db 42,HYDRO_PUMP db 0 -Mon005_EvosMoves: ; 3b95a (e:795a) +Mon005_EvosMoves: ;CHARMELEON ;Evolutions db EV_LEVEL,36,CHARIZARD @@ -2188,7 +2188,7 @@ Mon005_EvosMoves: ; 3b95a (e:795a) db 56,FIRE_SPIN db 0 -Mon008_EvosMoves: ; 3b96b (e:796b) +Mon008_EvosMoves: ;WARTORTLE ;Evolutions db EV_LEVEL,36,BLASTOISE @@ -2202,7 +2202,7 @@ Mon008_EvosMoves: ; 3b96b (e:796b) db 47,HYDRO_PUMP db 0 -Mon006_EvosMoves: ; 3b97c (e:797c) +Mon006_EvosMoves: ;CHARIZARD ;Evolutions db 0 @@ -2215,35 +2215,35 @@ Mon006_EvosMoves: ; 3b97c (e:797c) db 55,FIRE_SPIN db 0 -Mon187_EvosMoves: ; 3b98a (e:798a) +Mon187_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon188_EvosMoves: ; 3b98c (e:798c) +Mon188_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon189_EvosMoves: ; 3b98e (e:798e) +Mon189_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon190_EvosMoves: ; 3b990 (e:7990) +Mon190_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon043_EvosMoves: ; 3b992 (e:7992) +Mon043_EvosMoves: ;ODDISH ;Evolutions db EV_LEVEL,21,GLOOM @@ -2257,7 +2257,7 @@ Mon043_EvosMoves: ; 3b992 (e:7992) db 46,SOLARBEAM db 0 -Mon044_EvosMoves: ; 3b9a3 (e:79a3) +Mon044_EvosMoves: ;GLOOM ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME @@ -2271,7 +2271,7 @@ Mon044_EvosMoves: ; 3b9a3 (e:79a3) db 52,SOLARBEAM db 0 -Mon045_EvosMoves: ; 3b9b5 (e:79b5) +Mon045_EvosMoves: ;VILEPLUME ;Evolutions db 0 @@ -2281,7 +2281,7 @@ Mon045_EvosMoves: ; 3b9b5 (e:79b5) db 19,SLEEP_POWDER db 0 -Mon069_EvosMoves: ; 3b9bd (e:79bd) +Mon069_EvosMoves: ;BELLSPROUT ;Evolutions db EV_LEVEL,21,WEEPINBELL @@ -2296,7 +2296,7 @@ Mon069_EvosMoves: ; 3b9bd (e:79bd) db 42,SLAM db 0 -Mon070_EvosMoves: ; 3b9d0 (e:79d0) +Mon070_EvosMoves: ;WEEPINBELL ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL @@ -2311,7 +2311,7 @@ Mon070_EvosMoves: ; 3b9d0 (e:79d0) db 49,SLAM db 0 -Mon071_EvosMoves: ; 3b9e4 (e:79e4) +Mon071_EvosMoves: ;VICTREEBEL ;Evolutions db 0 diff --git a/data/facing.asm b/data/facing.asm index 6906002e..c412247a 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -1,4 +1,4 @@ -SpriteFacingAndAnimationTable: ; 4000 (1:4000) +SpriteFacingAndAnimationTable: dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0 dw SpriteFacingDownAndWalking, SpriteOAMParameters ; facing down, walk animation frame 1 dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 2 @@ -32,25 +32,25 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000) dw SpriteFacingDownAndStanding, SpriteOAMParameters dw SpriteFacingDownAndStanding, SpriteOAMParameters -SpriteFacingDownAndStanding: ; 4080 (1:4080) +SpriteFacingDownAndStanding: db $00,$01,$02,$03 -SpriteFacingDownAndWalking: ; 4084 (1:4084) +SpriteFacingDownAndWalking: db $80,$81,$82,$83 -SpriteFacingUpAndStanding: ; 4088 (1:4088) +SpriteFacingUpAndStanding: db $04,$05,$06,$07 -SpriteFacingUpAndWalking: ; 408c (1:408c) +SpriteFacingUpAndWalking: db $84,$85,$86,$87 -SpriteFacingLeftAndStanding: ; 4090 (1:4090) +SpriteFacingLeftAndStanding: db $08,$09,$0a,$0b -SpriteFacingLeftAndWalking: ; 4094 (1:4094) +SpriteFacingLeftAndWalking: db $88,$89,$8a,$8b -SpriteOAMParameters: ; 4098 (1:4098) +SpriteOAMParameters: db $00,$00, $00 ; top left db $00,$08, $00 ; top right db $08,$00, OAMFLAG_CANBEMASKED ; bottom left db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteOAMParametersFlipped: ; 40a4 (1:40a4) +SpriteOAMParametersFlipped: db $00,$08, OAMFLAG_VFLIPPED db $00,$00, OAMFLAG_VFLIPPED db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm index 66cae0a4..926db476 100755 --- a/data/force_bike_surf.asm +++ b/data/force_bike_surf.asm @@ -1,4 +1,4 @@ -ForcedBikeOrSurfMaps: ; c3e6 (3:43e6) +ForcedBikeOrSurfMaps: ; map id, y, x db ROUTE_16,$0A,$11 db ROUTE_16,$0B,$11 diff --git a/data/good_rod.asm b/data/good_rod.asm index f1785737..6c23f402 100755 --- a/data/good_rod.asm +++ b/data/good_rod.asm @@ -1,3 +1,3 @@ -GoodRodMons: ; e27f (3:627f) +GoodRodMons: db 10,GOLDEEN db 10,POLIWAG diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm index e444bf28..b7358572 100755 --- a/data/hidden_coins.asm +++ b/data/hidden_coins.asm @@ -1,4 +1,4 @@ -HiddenCoinCoords: ; 76822 (1d:6822) +HiddenCoinCoords: db GAME_CORNER,$08,$00 db GAME_CORNER,$10,$01 db GAME_CORNER,$0b,$03 diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index b2f9b3cc..96c4a07b 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -1,4 +1,4 @@ -HiddenItemCoords: ; 766b8 (1d:66b8) +HiddenItemCoords: ; map ID, then coords db VIRIDIAN_FOREST,$12,$01 db VIRIDIAN_FOREST,$2a,$10 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index d7851779..43627bfc 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -1,4 +1,4 @@ -HiddenObjectMaps: ; 46a40 (11:6a40) +HiddenObjectMaps: db REDS_HOUSE_2F db BLUES_HOUSE db OAKS_LAB @@ -86,7 +86,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40) db ROUTE_4 db $FF -HiddenObjectPointers: ; 46a96 (11:6a96) +HiddenObjectPointers: ; each of these pointers is for the corresponding map in HiddenObjectMaps dw RedsHouse2FHiddenObjects dw BluesHouseHiddenObjects @@ -175,7 +175,7 @@ HiddenObjectPointers: ; 46a96 (11:6a96) dw Route4HiddenObjects ; format: y-coord, x-coord, text id/item id, object routine -TradeCenterHiddenObjects: ; 46b40 (11:6b40) +TradeCenterHiddenObjects: db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -183,7 +183,7 @@ TradeCenterHiddenObjects: ; 46b40 (11:6b40) db BANK(CableClubLeftGameboy) dw CableClubLeftGameboy db $FF -ColosseumHiddenObjects: ; 46b4d (11:6b4d) +ColosseumHiddenObjects: db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -191,13 +191,13 @@ ColosseumHiddenObjects: ; 46b4d (11:6b4d) db BANK(CableClubLeftGameboy) dw CableClubLeftGameboy db $FF -RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) +RedsHouse2FHiddenObjects: db $01,$00,$04 dbw BANK(OpenRedsPC), OpenRedsPC db $05,$03,$d0 dbw BANK(PrintRedSNESText), PrintRedSNESText db $FF -BluesHouseHiddenObjects: ; 46b67 (11:6b67) +BluesHouseHiddenObjects: db $01,$00,$04 db BANK(PrintBookcaseText) dw PrintBookcaseText @@ -208,7 +208,7 @@ BluesHouseHiddenObjects: ; 46b67 (11:6b67) db BANK(PrintBookcaseText) dw PrintBookcaseText db $FF -OaksLabHiddenObjects: ; 46b7a (11:6b7a) +OaksLabHiddenObjects: db $00,$04,$04 db BANK(DisplayOakLabLeftPoster) dw DisplayOakLabLeftPoster @@ -222,7 +222,7 @@ OaksLabHiddenObjects: ; 46b7a (11:6b7a) db BANK(DisplayOakLabEmailText) dw DisplayOakLabEmailText db $FF -ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) +ViridianPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -230,9 +230,9 @@ ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) +ViridianMartHiddenObjects: db $FF -ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) +ViridianSchoolHiddenObjects: db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText @@ -240,27 +240,27 @@ ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText db $FF -ViridianGymHiddenObjects: ; 46bae (11:6bae) +ViridianGymHiddenObjects: db $0f,$0f,$04 dbw BANK(GymStatues),GymStatues db $0f,$12,$04 dbw BANK(GymStatues),GymStatues db $FF -Museum1FHiddenObjects: ; 46bbb (11:6bbb) +Museum1FHiddenObjects: db $03,$02,$04 dbw BANK(AerodactylFossil), AerodactylFossil db $06,$02,$04 dbw BANK(KabutopsFossil), KabutopsFossil db $FF -PewterGymHiddenObjects: ; 46bc8 (11:6bc8) +PewterGymHiddenObjects: db $0a,$03,$04 dbw BANK(GymStatues),GymStatues db $0a,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -PewterMartHiddenObjects: ; 46bd5 (11:6bd5) +PewterMartHiddenObjects: db $FF -PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) +PewterPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -268,7 +268,7 @@ PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) +CeruleanPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -276,15 +276,15 @@ CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0) +CeruleanGymHiddenObjects: db $0b,$03,$04 dbw BANK(GymStatues),GymStatues db $0b,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -CeruleanMartHiddenObjects: ; 46bfd (11:6bfd) +CeruleanMartHiddenObjects: db $FF -LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) +LavenderPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -292,7 +292,7 @@ LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) +VermilionPokecenterHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -300,7 +300,7 @@ VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -VermilionGymHiddenObjects: ; 46c18 (11:6c18) +VermilionGymHiddenObjects: db $0e,$03,$04 dbw BANK(GymStatues), GymStatues db $0e,$06,$04 @@ -338,12 +338,12 @@ VermilionGymHiddenObjects: ; 46c18 (11:6c18) db $0b,$09,$0e dbw BANK(GymTrashScript), GymTrashScript db $FF -CeladonMansion2HiddenObjects: ; 46c85 (11:6c85) +CeladonMansion2HiddenObjects: db $05,$00,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) +CeladonPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -351,13 +351,13 @@ CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeladonGymHiddenObjects: ; 46c99 (11:6c99) +CeladonGymHiddenObjects: db $0f,$03,$04 dbw BANK(GymStatues),GymStatues db $0f,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -GameCornerHiddenObjects: ; 46ca6 (11:6ca6) +GameCornerHiddenObjects: db $0f,$12,$d0 dbw BANK(StartSlotMachine), StartSlotMachine db $0e,$12,$d0 @@ -455,7 +455,7 @@ GameCornerHiddenObjects: ; 46ca6 (11:6ca6) db $0f,$0c,COIN+10 dbw BANK(HiddenCoins),HiddenCoins db $FF -CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) +CeladonHotelHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -463,7 +463,7 @@ CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) +FuchsiaPokecenterHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -471,13 +471,13 @@ FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -FuchsiaGymHiddenObjects: ; 46de1 (11:6de1) +FuchsiaGymHiddenObjects: db $0f,$03,$04 dbw BANK(GymStatues),GymStatues db $0f,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -CinnabarGymHiddenObjects: ; 46dee (11:6dee) +CinnabarGymHiddenObjects: db $0d,$11,$04 dbw BANK(GymStatues),GymStatues db $07,$0f,$01 @@ -499,7 +499,7 @@ CinnabarGymHiddenObjects: ; 46dee (11:6dee) db Bank(PrintCinnabarQuiz) dw PrintCinnabarQuiz db $FF -CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) +CinnabarPokecenterHiddenObjects: db $04,$00,$04 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -507,11 +507,11 @@ CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SaffronGymHiddenObjects: ; 46e26 (11:6e26) +SaffronGymHiddenObjects: db $0f,$09,$04 dbw BANK(GymStatues),GymStatues db $FF -MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) +MtMoonPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -519,7 +519,7 @@ MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) +RockTunnelPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -527,19 +527,19 @@ RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -ViridianForestHiddenObjects: ; 46e47 (11:6e47) +ViridianForestHiddenObjects: db $12,$01,POTION dbw BANK(HiddenItems),HiddenItems db $2a,$10,ANTIDOTE dbw BANK(HiddenItems),HiddenItems db $FF -MtMoon3HiddenObjects: ; 46e54 (11:6e54) +MtMoon3HiddenObjects: db $0c,$12,MOON_STONE dbw BANK(HiddenItems),HiddenItems db $09,$21,ETHER dbw BANK(HiddenItems),HiddenItems db $FF -IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) +IndigoPlateauHiddenObjects: db $0d,$08,$ff db BANK(PrintIndigoPlateauHQText) dw PrintIndigoPlateauHQText @@ -547,17 +547,17 @@ IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) db BANK(PrintIndigoPlateauHQText) dw PrintIndigoPlateauHQText db $FF -Route25HiddenObjects: ; 46e6e (11:6e6e) +Route25HiddenObjects: db $03,$26,ETHER dbw BANK(HiddenItems),HiddenItems db $01,$0a,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -Route9HiddenObjects: ; 46e7b (11:6e7b) +Route9HiddenObjects: db $07,$0e,ETHER dbw BANK(HiddenItems),HiddenItems db $FF -SSAnne6HiddenObjects: ; 46e82 (11:6e82) +SSAnne6HiddenObjects: db $05,$0d,$00 dbw BANK(PrintTrashText), PrintTrashText db $07,$0d,$00 @@ -565,29 +565,29 @@ SSAnne6HiddenObjects: ; 46e82 (11:6e82) db $09,$0d,GREAT_BALL dbw BANK(HiddenItems),HiddenItems db $FF -SSAnne10HiddenObjects: ; 46e95 (11:6e95) +SSAnne10HiddenObjects: db $01,$03,HYPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -Route10HiddenObjects: ; 46e9c (11:6e9c) +Route10HiddenObjects: db $11,$09,SUPER_POTION dbw BANK(HiddenItems),HiddenItems db $35,$10,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout1HiddenObjects: ; 46ea9 (11:6ea9) +RocketHideout1HiddenObjects: db $0f,$15,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout3HiddenObjects: ; 46eb0 (11:6eb0) +RocketHideout3HiddenObjects: db $11,$1b,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout4HiddenObjects: ; 46eb7 (11:6eb7) +RocketHideout4HiddenObjects: db $01,$19,SUPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) +SaffronPokecenterHiddenObjects: db $04,$00,$04 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -595,78 +595,78 @@ SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -PokemonTower5HiddenObjects: ; 46ecb (11:6ecb) +PokemonTower5HiddenObjects: db $0c,$04,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -Route13HiddenObjects: ; 46ed2 (11:6ed2) +Route13HiddenObjects: db $0e,$01,PP_UP dbw BANK(HiddenItems),HiddenItems db $0d,$10,CALCIUM dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneEntranceHiddenObjects: ; 46edf (11:6edf) +SafariZoneEntranceHiddenObjects: db $01,$0a,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneWestHiddenObjects: ; 46ee6 (11:6ee6) +SafariZoneWestHiddenObjects: db $05,$06,REVIVE dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo5FHiddenObjects: ; 46eed (11:6eed) +SilphCo5FHiddenObjects: db $03,$0c,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo9FHiddenObjects: ; 46ef4 (11:6ef4) +SilphCo9FHiddenObjects: db $0f,$02,MAX_POTION dbw BANK(HiddenItems),HiddenItems db $FF -CopycatsHouse2FHiddenObjects: ; 46efb (11:6efb) +CopycatsHouse2FHiddenObjects: db $01,$01,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon1HiddenObjects: ; 46f02 (11:6f02) +UnknownDungeon1HiddenObjects: db $0b,$0e,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon3HiddenObjects: ; 46f09 (11:6f09) +UnknownDungeon3HiddenObjects: db $03,$1b,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $FF -PowerPlantHiddenObjects: ; 46f10 (11:6f10) +PowerPlantHiddenObjects: db $10,$11,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $01,$0c,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands3HiddenObjects: ; 46f1d (11:6f1d) +SeafoamIslands3HiddenObjects: db $0f,$0f,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands5HiddenObjects: ; 46f24 (11:6f24) +SeafoamIslands5HiddenObjects: db $11,$19,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $FF -Mansion1HiddenObjects: ; 46f2b (11:6f2b) +Mansion1HiddenObjects: db $10,$08,MOON_STONE dbw BANK(HiddenItems),HiddenItems db $05,$02,$04 db BANK(Mansion1Script_Switches) dw Mansion1Script_Switches db $FF -Mansion2HiddenObjects: ; 46f38 (11:6f38) +Mansion2HiddenObjects: db $0b,$02,$04 db BANK(Mansion2Script_Switches) dw Mansion2Script_Switches db $FF -Mansion3HiddenObjects: ; 46f3f (11:6f3f) +Mansion3HiddenObjects: db $09,$01,MAX_REVIVE dbw BANK(HiddenItems),HiddenItems db $05,$0a,$04 db BANK(Mansion3Script_Switches) dw Mansion3Script_Switches db $FF -Mansion4HiddenObjects: ; 46f4c (11:6f4c) +Mansion4HiddenObjects: db $09,$01,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $03,$14,$04 @@ -676,7 +676,7 @@ Mansion4HiddenObjects: ; 46f4c (11:6f4c) db BANK(Mansion4Script_Switches) dw Mansion4Script_Switches db $FF -Route23HiddenObjects: ; 46f5f (11:6f5f) +Route23HiddenObjects: db $2c,$09,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $46,$13,ULTRA_BALL @@ -684,25 +684,25 @@ Route23HiddenObjects: ; 46f5f (11:6f5f) db $5a,$08,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -VictoryRoad2HiddenObjects: ; 46f72 (11:6f72) +VictoryRoad2HiddenObjects: db $02,$05,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $07,$1a,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $FF -Unused6FHiddenObjects: ; 46f7f (11:6f7f) +Unused6FHiddenObjects: db $0b,$0e,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -BillsHouseHiddenObjects: ; 46f86 (11:6f86) +BillsHouseHiddenObjects: db $04,$01,$04 dbw BANK(BillsHousePC), BillsHousePC db $FF -ViridianCityHiddenObjects: ; 46f8d (11:6f8d) +ViridianCityHiddenObjects: db $04,$0e,POTION dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) +SafariZoneRestHouse2HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -710,7 +710,7 @@ SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) +SafariZoneRestHouse3HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -718,7 +718,7 @@ SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) +SafariZoneRestHouse4HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -726,12 +726,12 @@ SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb) +Route15GateUpstairsHiddenObjects: db $02,$01,$04 db BANK(Route15GateLeftBinoculars) dw Route15GateLeftBinoculars db $FF -LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) +LavenderHouse1HiddenObjects: db $01,$00,$00 db BANK(PrintMagazinesText) dw PrintMagazinesText @@ -742,7 +742,7 @@ LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) db BANK(PrintMagazinesText) dw PrintMagazinesText db $FF -CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) +CeladonMansion5HiddenObjects: db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText @@ -753,7 +753,7 @@ CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) db Bank(PrintNotebookText) dw PrintNotebookText db $FF -FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) +FightingDojoHiddenObjects: db $09,$03,$04 db BANK(PrintFightingDojoText) dw PrintFightingDojoText @@ -767,12 +767,12 @@ FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) db BANK(PrintFightingDojoText3) dw PrintFightingDojoText3 db $FF -IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001) +IndigoPlateauLobbyHiddenObjects: db $07,$0f,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CinnabarLab4HiddenObjects: ; 47008 (11:7008) +CinnabarLab4HiddenObjects: db $04,$00,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -780,7 +780,7 @@ CinnabarLab4HiddenObjects: ; 47008 (11:7008) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -BikeShopHiddenObjects: ; 47015 (11:7015) +BikeShopHiddenObjects: db $00,$01,$d0 dbw BANK(PrintNewBikeText), PrintNewBikeText db $01,$02,$d0 @@ -794,20 +794,20 @@ BikeShopHiddenObjects: ; 47015 (11:7015) db $05,$01,$d0 dbw BANK(PrintNewBikeText), PrintNewBikeText db $FF -Route11HiddenObjects: ; 4703a (11:703a) +Route11HiddenObjects: db $05,$30,ESCAPE_ROPE dbw BANK(HiddenItems),HiddenItems db $FF -Route12HiddenObjects: ; 47041 (11:7041) +Route12HiddenObjects: db $3f,$02,HYPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo11FHiddenObjects: ; 47048 (11:7048) +SilphCo11FHiddenObjects: db $0c,$0a,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -Route17HiddenObjects: ; 4704f (11:704f) +Route17HiddenObjects: db $0e,$0f,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $2d,$08,FULL_RESTORE @@ -819,35 +819,35 @@ Route17HiddenObjects: ; 4704f (11:704f) db $79,$08,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -UndergroundPathNsHiddenObjects: ; 4706e (11:706e) +UndergroundPathNsHiddenObjects: db $04,$03,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $22,$04,X_SPECIAL dbw BANK(HiddenItems),HiddenItems db $FF -UndergroundPathWeHiddenObjects: ; 4707b (11:707b) +UndergroundPathWeHiddenObjects: db $02,$0c,NUGGET dbw BANK(HiddenItems),HiddenItems db $05,$15,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -CeladonCityHiddenObjects: ; 47088 (11:7088) +CeladonCityHiddenObjects: db $0f,$30,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands4HiddenObjects: ; 4708f (11:708f) +SeafoamIslands4HiddenObjects: db $10,$09,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -VermilionCityHiddenObjects: ; 47096 (11:7096) +VermilionCityHiddenObjects: db $0b,$0e,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -CeruleanCityHiddenObjects: ; 4709d (11:709d) +CeruleanCityHiddenObjects: db $08,$0f,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $FF -Route4HiddenObjects: ; 470a4 (11:70a4) +Route4HiddenObjects: db $03,$28,GREAT_BALL dbw BANK(HiddenItems),HiddenItems db $FF diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 4fe57b20..f3ea62ef 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -4,7 +4,7 @@ ; 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: ; c8f5 (3:48f5) +MapHSPointers: dw MapHS00 dw MapHS01 dw MapHS02 @@ -269,23 +269,23 @@ MapHSPointers: ; c8f5 (3:48f5) Hide equ $11 Show equ $15 -MapHSXX: ; cae7 (3:4ae7) +MapHSXX: db $FF,$FF,$FF -MapHS00: ; caea (3:4aea) +MapHS00: db PALLET_TOWN,$01,Hide -MapHS01: ; caed (3:4aed) +MapHS01: db VIRIDIAN_CITY,$05,Show db VIRIDIAN_CITY,$07,Hide -MapHS02: ; caf3 (3:4af3) +MapHS02: db PEWTER_CITY,$03,Show db PEWTER_CITY,$05,Show -MapHS03: ; caf9 (3:4af9) +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: ; cb08 (3:4b08) +MapHS0A: db SAFFRON_CITY,$01,Show db SAFFRON_CITY,$02,Show db SAFFRON_CITY,$03,Show @@ -301,34 +301,34 @@ MapHS0A: ; cb08 (3:4b08) db SAFFRON_CITY,$0D,Hide db SAFFRON_CITY,$0E,Show db SAFFRON_CITY,$0F,Hide -MapHS0D: ; cb35 (3:4b35) +MapHS0D: db ROUTE_2,$01,Show db ROUTE_2,$02,Show -MapHS0F: ; cb3b (3:4b3b) +MapHS0F: db ROUTE_4,$03,Show -MapHS14: ; cb3e (3:4b3e) +MapHS14: db ROUTE_9,$0A,Show -MapHS17: ; cb41 (3:4b41) +MapHS17: db ROUTE_12,$01,Show db ROUTE_12,$09,Show db ROUTE_12,$0A,Show -MapHS1A: ; cb4a (3:4b4a) +MapHS1A: db ROUTE_15,$0B,Show -MapHS1B: ; cb4d (3:4b4d) +MapHS1B: db ROUTE_16,$07,Show -MapHS21: ; cb50 (3:4b50) +MapHS21: db ROUTE_22,$01,Hide db ROUTE_22,$02,Hide -MapHS23: ; cb56 (3:4b56) +MapHS23: db ROUTE_24,$01,Show db ROUTE_24,$08,Show -MapHS24: ; cb5c (3:4b5c) +MapHS24: db ROUTE_25,$0A,Show -MapHS27: ; cb5f (3:4b5f) +MapHS27: db BLUES_HOUSE,$01,Show db BLUES_HOUSE,$02,Hide db BLUES_HOUSE,$03,Show -MapHS28: ; cb68 (3:4b68) +MapHS28: db OAKS_LAB,$01,Show db OAKS_LAB,$02,Show db OAKS_LAB,$03,Show @@ -337,50 +337,50 @@ MapHS28: ; cb68 (3:4b68) db OAKS_LAB,$06,Show db OAKS_LAB,$07,Show db OAKS_LAB,$08,Hide -MapHS2D: ; cb80 (3:4b80) +MapHS2D: db VIRIDIAN_GYM,$01,Show db VIRIDIAN_GYM,$0B,Show -MapHS34: ; cb86 (3:4b86) +MapHS34: db MUSEUM_1F,$05,Show -MapHSE4: ; cb89 (3:4b89) +MapHSE4: db UNKNOWN_DUNGEON_1,$01,Show db UNKNOWN_DUNGEON_1,$02,Show db UNKNOWN_DUNGEON_1,$03,Show -MapHS8F: ; cb92 (3:4b92) +MapHS8F: db POKEMONTOWER_2,$01,Show -MapHS90: ; cb95 (3:4b95) +MapHS90: db POKEMONTOWER_3,$04,Show -MapHS91: ; cb98 (3:4b98) +MapHS91: db POKEMONTOWER_4,$04,Show db POKEMONTOWER_4,$05,Show db POKEMONTOWER_4,$06,Show -MapHS92: ; cba1 (3:4ba1) +MapHS92: db POKEMONTOWER_5,$06,Show -MapHS93: ; cba4 (3:4ba4) +MapHS93: db POKEMONTOWER_6,$04,Show db POKEMONTOWER_6,$05,Show -MapHS94: ; cbaa (3:4baa) +MapHS94: db POKEMONTOWER_7,$01,Show db POKEMONTOWER_7,$02,Show db POKEMONTOWER_7,$03,Show db POKEMONTOWER_7,$04,Show -MapHS95: ; cbb6 (3:4bb6) +MapHS95: db LAVENDER_HOUSE_1,$05,Hide -MapHS84: ; cbb9 (3:4bb9) +MapHS84: db CELADON_MANSION_5,$02,Show -MapHS87: ; cbbc (3:4bbc) +MapHS87: db GAME_CORNER,$0B,Show -MapHS9B: ; cbbf (3:4bbf) +MapHS9B: db FUCHSIA_HOUSE_2,$02,Show -MapHSA5: ; cbc2 (3:4bc2) +MapHSA5: db MANSION_1,$02,Show db MANSION_1,$03,Show -MapHSB1: ; cbc8 (3:4bc8) +MapHSB1: db FIGHTING_DOJO,$06,Show db FIGHTING_DOJO,$07,Show -MapHSB5: ; cbce (3:4bce) +MapHSB5: db SILPH_CO_1F,$01,Hide -MapHS53: ; cbd1 (3:4bd1) +MapHS53: db POWER_PLANT,$01,Show db POWER_PLANT,$02,Show db POWER_PLANT,$03,Show @@ -395,84 +395,84 @@ MapHS53: ; cbd1 (3:4bd1) db POWER_PLANT,$0C,Show db POWER_PLANT,$0D,Show db POWER_PLANT,$0E,Show -MapHSC2: ; cbfb (3:4bfb) +MapHSC2: db VICTORY_ROAD_2,$06,Show db VICTORY_ROAD_2,$07,Show db VICTORY_ROAD_2,$08,Show db VICTORY_ROAD_2,$09,Show db VICTORY_ROAD_2,$0A,Show db VICTORY_ROAD_2,$0D,Show -MapHS58: ; cc0d (3:4c0d) +MapHS58: db BILLS_HOUSE,$01,Show db BILLS_HOUSE,$02,Hide db BILLS_HOUSE,$03,Hide -MapHS33: ; cc16 (3:4c16) +MapHS33: db VIRIDIAN_FOREST,$05,Show db VIRIDIAN_FOREST,$06,Show db VIRIDIAN_FOREST,$07,Show -MapHS3B: ; cc1f (3:4c1f) +MapHS3B: db MT_MOON_1,$08,Show db MT_MOON_1,$09,Show db MT_MOON_1,$0A,Show db MT_MOON_1,$0B,Show db MT_MOON_1,$0C,Show db MT_MOON_1,$0D,Show -MapHS3D: ; cc31 (3:4c31) +MapHS3D: db MT_MOON_3,$06,Show db MT_MOON_3,$07,Show db MT_MOON_3,$08,Show db MT_MOON_3,$09,Show -MapHS60: ; cc3d (3:4c3d) +MapHS60: db SS_ANNE_2,$02,Hide -MapHS66: ; cc40 (3:4c40) +MapHS66: db SS_ANNE_8,$0A,Show -MapHS67: ; cc43 (3:4c43) +MapHS67: db SS_ANNE_9,$06,Show db SS_ANNE_9,$09,Show -MapHS68: ; cc49 (3:4c49) +MapHS68: db SS_ANNE_10,$09,Show db SS_ANNE_10,$0A,Show db SS_ANNE_10,$0B,Show -MapHSC6: ; cc52 (3:4c52) +MapHSC6: db VICTORY_ROAD_3,$05,Show db VICTORY_ROAD_3,$06,Show db VICTORY_ROAD_3,$0A,Show -MapHSC7: ; cc5b (3:4c5b) +MapHSC7: db ROCKET_HIDEOUT_1,$06,Show db ROCKET_HIDEOUT_1,$07,Show -MapHSC8: ; cc61 (3:4c61) +MapHSC8: db ROCKET_HIDEOUT_2,$02,Show db ROCKET_HIDEOUT_2,$03,Show db ROCKET_HIDEOUT_2,$04,Show db ROCKET_HIDEOUT_2,$05,Show -MapHSC9: ; cc6d (3:4c6d) +MapHSC9: db ROCKET_HIDEOUT_3,$03,Show db ROCKET_HIDEOUT_3,$04,Show -MapHSCA: ; cc73 (3:4c73) +MapHSCA: db ROCKET_HIDEOUT_4,$01,Show db ROCKET_HIDEOUT_4,$05,Show db ROCKET_HIDEOUT_4,$06,Show db ROCKET_HIDEOUT_4,$07,Show db ROCKET_HIDEOUT_4,$08,Hide db ROCKET_HIDEOUT_4,$09,Hide -MapHSCF: ; cc85 (3:4c85) +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: ; cc94 (3:4c94) +MapHSD0: db SILPH_CO_3F,$02,Show db SILPH_CO_3F,$03,Show db SILPH_CO_3F,$04,Show -MapHSD1: ; cc9d (3:4c9d) +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: ; ccaf (3:4caf) +MapHSD2: db SILPH_CO_5F,$02,Show db SILPH_CO_5F,$03,Show db SILPH_CO_5F,$04,Show @@ -480,13 +480,13 @@ MapHSD2: ; ccaf (3:4caf) db SILPH_CO_5F,$06,Show db SILPH_CO_5F,$07,Show db SILPH_CO_5F,$08,Show -MapHSD3: ; ccc4 (3:4cc4) +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: ; ccd3 (3:4cd3) +MapHSD4: db SILPH_CO_7F,$05,Show db SILPH_CO_7F,$06,Show db SILPH_CO_7F,$07,Show @@ -495,81 +495,81 @@ MapHSD4: ; ccd3 (3:4cd3) db SILPH_CO_7F,$0A,Show db SILPH_CO_7F,$0B,Show db SILPH_CO_7F,$0C,Show -MapHSD5: ; cceb (3:4ceb) +MapHSD5: db SILPH_CO_8F,$02,Show db SILPH_CO_8F,$03,Show db SILPH_CO_8F,$04,Show -MapHSE9: ; ccf4 (3:4cf4) +MapHSE9: db SILPH_CO_9F,$02,Show db SILPH_CO_9F,$03,Show db SILPH_CO_9F,$04,Show -MapHSEA: ; ccfd (3:4cfd) +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: ; cd0f (3:4d0f) +MapHSEB: db SILPH_CO_11F,$03,Show db SILPH_CO_11F,$04,Show db SILPH_CO_11F,$05,Show -MapHSF4: ; cd18 (3:4d18) +MapHSF4: db $F4,$02,Show -MapHSD6: ; cd1b (3:4d1b) +MapHSD6: db MANSION_2,$02,Show -MapHSD7: ; cd1e (3:4d1e) +MapHSD7: db MANSION_3,$03,Show db MANSION_3,$04,Show -MapHSD8: ; cd24 (3:4d24) +MapHSD8: db MANSION_4,$03,Show db MANSION_4,$04,Show db MANSION_4,$05,Show db MANSION_4,$06,Show db MANSION_4,$08,Show -MapHSD9: ; cd33 (3:4d33) +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: ; cd3f (3:4d3f) +MapHSDA: db SAFARI_ZONE_NORTH,$01,Show db SAFARI_ZONE_NORTH,$02,Show -MapHSDB: ; cd45 (3:4d45) +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: ; cd51 (3:4d51) +MapHSDC: db SAFARI_ZONE_CENTER,$01,Show -MapHSE2: ; cd54 (3:4d54) +MapHSE2: db UNKNOWN_DUNGEON_2,$01,Show db UNKNOWN_DUNGEON_2,$02,Show db UNKNOWN_DUNGEON_2,$03,Show -MapHSE3: ; cd5d (3:4d5d) +MapHSE3: db UNKNOWN_DUNGEON_3,$01,Show db UNKNOWN_DUNGEON_3,$02,Show db UNKNOWN_DUNGEON_3,$03,Show -MapHS6C: ; cd66 (3:4d66) +MapHS6C: db VICTORY_ROAD_1,$03,Show db VICTORY_ROAD_1,$04,Show -MapHS78: ; cd6c (3:4d6c) +MapHS78: db CHAMPIONS_ROOM,$02,Hide -MapHSC0: ; cd6f (3:4d6f) +MapHSC0: db SEAFOAM_ISLANDS_1,$01,Show db SEAFOAM_ISLANDS_1,$02,Show -MapHS9F: ; cd75 (3:4d75) +MapHS9F: db SEAFOAM_ISLANDS_2,$01,Hide db SEAFOAM_ISLANDS_2,$02,Hide -MapHSA0: ; cd7b (3:4d7b) +MapHSA0: db SEAFOAM_ISLANDS_3,$01,Hide db SEAFOAM_ISLANDS_3,$02,Hide -MapHSA1: ; cd81 (3:4d81) +MapHSA1: db SEAFOAM_ISLANDS_4,$02,Show db SEAFOAM_ISLANDS_4,$03,Show db SEAFOAM_ISLANDS_4,$05,Hide db SEAFOAM_ISLANDS_4,$06,Hide -MapHSA2: ; cd8d (3:4d8d) +MapHSA2: db SEAFOAM_ISLANDS_5,$01,Hide db SEAFOAM_ISLANDS_5,$02,Hide db SEAFOAM_ISLANDS_5,$03,Show diff --git a/data/item_prices.asm b/data/item_prices.asm index c36e1c69..15a1bd34 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -1,4 +1,4 @@ -ItemPrices: ; 4608 (1:4608) +ItemPrices: money 0 ; MASTER_BALL money 1200 ; ULTRA_BALL money 600 ; GREAT_BALL diff --git a/data/key_items.asm b/data/key_items.asm index 9e2d16fe..afa586af 100755 --- a/data/key_items.asm +++ b/data/key_items.asm @@ -1,4 +1,4 @@ -KeyItemBitfield: ; e799 (3:6799) +KeyItemBitfield: db %11110000 db %00000001 db %11110000 diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm index 7e3a6c06..7f94cad5 100755 --- a/data/mapHeaders/celadoncity.asm +++ b/data/mapHeaders/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCity_h: ; 18000 (6:4000) +CeladonCity_h: db OVERWORLD ; tileset db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm index 5b1a1f98..792c4b32 100755 --- a/data/mapHeaders/gary.asm +++ b/data/mapHeaders/gary.asm @@ -1,4 +1,4 @@ -Gary_h: ; 75f11 (1d:5f11) +Gary_h: db GYM ;tileset db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width dw GaryBlocks, GaryTextPointers, GaryScript diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index 5ad13aea..a957314c 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -1,4 +1,4 @@ -PalletTown_h: ; 182a1 (6:42a1) +PalletTown_h: db OVERWORLD ; tileset db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm index 02dcc082..82d83042 100755 --- a/data/mapHeaders/redshouse1f.asm +++ b/data/mapHeaders/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1F_h: ; 4815c (12:415c) +RedsHouse1F_h: db REDS_HOUSE_1 ; tileset db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm index 6b72d7db..c4b0969c 100755 --- a/data/mapHeaders/redshouse2f.asm +++ b/data/mapHeaders/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2F_h: ; 5c0a4 (17:40a4) +RedsHouse2F_h: db REDS_HOUSE_2 ; tileset db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm index 0687ab28..96e7e2ca 100755 --- a/data/mapHeaders/route15gateupstairs.asm +++ b/data/mapHeaders/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairs_h: ; 4963e (12:563e) +Route15GateUpstairs_h: db GATE ; tileset db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 564f4a58..38e80842 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,4 +1,4 @@ -Route2_h: ; 54000 (15:4000) +Route2_h: db 00 ; Tileset db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm index e5e6cfa0..e12ee454 100755 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d) +UndergroundPathEntranceRoute7Copy_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 43ba02e4..231e852d 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,4 +1,4 @@ -BluesHouseObject: ; 19bce (6:5bce) +BluesHouseObject: db $0A ; border block db $2 ; warps diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4f977b2c..4d32ea3d 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1FObject: ; 481e4 (12:41e4) +RedsHouse1FObject: db $0A ; border block db $3 ; warps diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 4362ade0..c4cdcea8 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairsObject: ; 4969d (12:569d) +Route15GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 707a0e0e..04a5bf2f 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) +UndergroundPathEntranceRoute7CopyObject: db $a ; border block db $3 ; warps diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 8796a608..ab8ae1ca 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks: ; c23d (3:423d) +MapHeaderBanks: db BANK(PalletTown_h) ;PALLET_TOWN db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 746d3211..b777e4ca 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,5 +1,5 @@ ; see also MapHeaderBanks -MapHeaderPointers:: ; 01ae (0:01ae) +MapHeaderPointers:: dw PalletTown_h dw ViridianCity_h dw PewterCity_h diff --git a/data/map_songs.asm b/data/map_songs.asm index 8fee18d2..892f475e 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,4 +1,4 @@ -MapSongBanks: ; c04d (3:404d) +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 diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index 8a8aecdb..8c4d0bc0 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -1,4 +1,4 @@ -MonsterPalettes: ; 725c8 (1c:65c8) +MonsterPalettes: db PAL_MEWMON ; MISSINGNO db PAL_GREENMON ; BULBASAUR db PAL_GREENMON ; IVYSAUR diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 7e434dce..d83e7b4e 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -1,4 +1,4 @@ -MonPartyData: ; 7190d (1c:590d) +MonPartyData: dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 6f06d699..3fb2d3c6 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1,4 +1,4 @@ -PokedexEntryPointers: ; 4047e (10:447e) +PokedexEntryPointers: dw RhydonDexEntry dw KangaskhanDexEntry dw NidoranMDexEntry @@ -195,1064 +195,1064 @@ PokedexEntryPointers: ; 4047e (10:447e) ; weight in pounds ; text entry -RhydonDexEntry: ; 405fa (10:45fa) +RhydonDexEntry: db "DRILL@" db 6,3 dw 2650 TX_FAR _RhydonDexEntry db "@" -KangaskhanDexEntry: ; 40609 (10:4609) +KangaskhanDexEntry: db "PARENT@" db 7,3 dw 1760 TX_FAR _KangaskhanDexEntry db "@" -NidoranMDexEntry: ; 40619 (10:4619) +NidoranMDexEntry: db "POISON PIN@" db 1,8 dw 200 TX_FAR _NidoranMDexEntry db "@" -ClefairyDexEntry: ; 4062d (10:462d) +ClefairyDexEntry: db "FAIRY@" db 2,0 dw 170 TX_FAR _ClefairyDexEntry db "@" -SpearowDexEntry: ; 4063c (10:463c) +SpearowDexEntry: db "TINY BIRD@" db 1,0 dw 40 TX_FAR _SpearowDexEntry db "@" -VoltorbDexEntry: ; 4064f (10:464f) +VoltorbDexEntry: db "BALL@" db 1,8 dw 230 TX_FAR _VoltorbDexEntry db "@" -NidokingDexEntry: ; 4065d (10:465d) +NidokingDexEntry: db "DRILL@" db 4,7 dw 1370 TX_FAR _NidokingDexEntry db "@" -SlowbroDexEntry: ; 4066c (10:466c) +SlowbroDexEntry: db "HERMITCRAB@" db 5,3 dw 1730 TX_FAR _SlowbroDexEntry db "@" -IvysaurDexEntry: ; 40680 (10:4680) +IvysaurDexEntry: db "SEED@" db 3,3 dw 290 TX_FAR _IvysaurDexEntry db "@" -ExeggutorDexEntry: ; 4068e (10:468e) +ExeggutorDexEntry: db "COCONUT@" db 6,7 dw 2650 TX_FAR _ExeggutorDexEntry db "@" -LickitungDexEntry: ; 4069f (10:469f) +LickitungDexEntry: db "LICKING@" db 3,11 dw 1440 TX_FAR _LickitungDexEntry db "@" -ExeggcuteDexEntry: ; 406b0 (10:46b0) +ExeggcuteDexEntry: db "EGG@" db 1,4 dw 60 TX_FAR _ExeggcuteDexEntry db "@" -GrimerDexEntry: ; 406bd (10:46bd) +GrimerDexEntry: db "SLUDGE@" db 2,11 dw 660 TX_FAR _GrimerDexEntry db "@" -GengarDexEntry: ; 406cd (10:46cd) +GengarDexEntry: db "SHADOW@" db 4,11 dw 890 TX_FAR _GengarDexEntry db "@" -NidoranFDexEntry: ; 406dd (10:46dd) +NidoranFDexEntry: db "POISON PIN@" db 1,4 dw 150 TX_FAR _NidoranFDexEntry db "@" -NidoqueenDexEntry: ; 406f1 (10:46f1) +NidoqueenDexEntry: db "DRILL@" db 4,3 dw 1320 TX_FAR _NidoqueenDexEntry db "@" -CuboneDexEntry: ; 40700 (10:4700) +CuboneDexEntry: db "LONELY@" db 1,4 dw 140 TX_FAR _CuboneDexEntry db "@" -RhyhornDexEntry: ; 40710 (10:4710) +RhyhornDexEntry: db "SPIKES@" db 3,3 dw 2540 TX_FAR _RhyhornDexEntry db "@" -LaprasDexEntry: ; 40720 (10:4720) +LaprasDexEntry: db "TRANSPORT@" db 8,2 dw 4850 TX_FAR _LaprasDexEntry db "@" -ArcanineDexEntry: ; 40733 (10:4733) +ArcanineDexEntry: db "LEGENDARY@" db 6,3 dw 3420 TX_FAR _ArcanineDexEntry db "@" -MewDexEntry: ; 40746 (10:4746) +MewDexEntry: db "NEW SPECIE@" db 1,4 dw 90 TX_FAR _MewDexEntry db "@" -GyaradosDexEntry: ; 4075a (10:475a) +GyaradosDexEntry: db "ATROCIOUS@" db 21,4 dw 5180 TX_FAR _GyaradosDexEntry db "@" -ShellderDexEntry: ; 4076d (10:476d) +ShellderDexEntry: db "BIVALVE@" db 1,0 dw 90 TX_FAR _ShellderDexEntry db "@" -TentacoolDexEntry: ; 4077e (10:477e) +TentacoolDexEntry: db "JELLYFISH@" db 2,11 dw 1000 TX_FAR _TentacoolDexEntry db "@" -GastlyDexEntry: ; 40791 (10:4791) +GastlyDexEntry: db "GAS@" db 4,3 dw 2 TX_FAR _GastlyDexEntry db "@" -ScytherDexEntry: ; 4079e (10:479e) +ScytherDexEntry: db "MANTIS@" db 4,11 dw 1230 TX_FAR _ScytherDexEntry db "@" -StaryuDexEntry: ; 407ae (10:47ae) +StaryuDexEntry: db "STARSHAPE@" db 2,7 dw 760 TX_FAR _StaryuDexEntry db "@" -BlastoiseDexEntry: ; 407c1 (10:47c1) +BlastoiseDexEntry: db "SHELLFISH@" db 5,3 dw 1890 TX_FAR _BlastoiseDexEntry db "@" -PinsirDexEntry: ; 407d4 (10:47d4) +PinsirDexEntry: db "STAGBEETLE@" db 4,11 dw 1210 TX_FAR _PinsirDexEntry db "@" -TangelaDexEntry: ; 407e8 (10:47e8) +TangelaDexEntry: db "VINE@" db 3,3 dw 770 TX_FAR _TangelaDexEntry db "@" -GrowlitheDexEntry: ; 407f6 (10:47f6) +GrowlitheDexEntry: db "PUPPY@" db 2,4 dw 420 TX_FAR _GrowlitheDexEntry db "@" -OnixDexEntry: ; 40805 (10:4805) +OnixDexEntry: db "ROCK SNAKE@" db 28,10 dw 4630 TX_FAR _OnixDexEntry db "@" -FearowDexEntry: ; 40819 (10:4819) +FearowDexEntry: db "BEAK@" db 3,11 dw 840 TX_FAR _FearowDexEntry db "@" -PidgeyDexEntry: ; 40827 (10:4827) +PidgeyDexEntry: db "TINY BIRD@" db 1,0 dw 40 TX_FAR _PidgeyDexEntry db "@" -SlowpokeDexEntry: ; 4083a (10:483a) +SlowpokeDexEntry: db "DOPEY@" db 3,11 dw 790 TX_FAR _SlowpokeDexEntry db "@" -KadabraDexEntry: ; 40849 (10:4849) +KadabraDexEntry: db "PSI@" db 4,3 dw 1250 TX_FAR _KadabraDexEntry db "@" -GravelerDexEntry: ; 40856 (10:4856) +GravelerDexEntry: db "ROCK@" db 3,3 dw 2320 TX_FAR _GravelerDexEntry db "@" -ChanseyDexEntry: ; 40864 (10:4864) +ChanseyDexEntry: db "EGG@" db 3,7 dw 760 TX_FAR _ChanseyDexEntry db "@" -MachokeDexEntry: ; 40871 (10:4871) +MachokeDexEntry: db "SUPERPOWER@" db 4,11 dw 1550 TX_FAR _MachokeDexEntry db "@" -MrMimeDexEntry: ; 40885 (10:4885) +MrMimeDexEntry: db "BARRIER@" db 4,3 dw 1200 TX_FAR _MrMimeDexEntry db "@" -HitmonleeDexEntry: ; 40896 (10:4896) +HitmonleeDexEntry: db "KICKING@" db 4,11 dw 1100 TX_FAR _HitmonleeDexEntry db "@" -HitmonchanDexEntry: ; 408a7 (10:48a7) +HitmonchanDexEntry: db "PUNCHING@" db 4,7 dw 1110 TX_FAR _HitmonchanDexEntry db "@" -ArbokDexEntry: ; 408b9 (10:48b9) +ArbokDexEntry: db "COBRA@" db 11,6 dw 1430 TX_FAR _ArbokDexEntry db "@" -ParasectDexEntry: ; 408c8 (10:48c8) +ParasectDexEntry: db "MUSHROOM@" db 3,3 dw 650 TX_FAR _ParasectDexEntry db "@" -PsyduckDexEntry: ; 408da (10:48da) +PsyduckDexEntry: db "DUCK@" db 2,7 dw 430 TX_FAR _PsyduckDexEntry db "@" -DrowzeeDexEntry: ; 408e8 (10:48e8) +DrowzeeDexEntry: db "HYPNOSIS@" db 3,3 dw 710 TX_FAR _DrowzeeDexEntry db "@" -GolemDexEntry: ; 408fa (10:48fa) +GolemDexEntry: db "MEGATON@" db 4,7 dw 6620 TX_FAR _GolemDexEntry db "@" -MagmarDexEntry: ; 4090b (10:490b) +MagmarDexEntry: db "SPITFIRE@" db 4,3 dw 980 TX_FAR _MagmarDexEntry db "@" -ElectabuzzDexEntry: ; 4091d (10:491d) +ElectabuzzDexEntry: db "ELECTRIC@" db 3,7 dw 660 TX_FAR _ElectabuzzDexEntry db "@" -MagnetonDexEntry: ; 4092f (10:492f) +MagnetonDexEntry: db "MAGNET@" db 3,3 dw 1320 TX_FAR _MagnetonDexEntry db "@" -KoffingDexEntry: ; 4093f (10:493f) +KoffingDexEntry: db "POISON GAS@" db 2,0 dw 20 TX_FAR _KoffingDexEntry db "@" -MankeyDexEntry: ; 40953 (10:4953) +MankeyDexEntry: db "PIG MONKEY@" db 1,8 dw 620 TX_FAR _MankeyDexEntry db "@" -SeelDexEntry: ; 40967 (10:4967) +SeelDexEntry: db "SEA LION@" db 3,7 dw 1980 TX_FAR _SeelDexEntry db "@" -DiglettDexEntry: ; 40979 (10:4979) +DiglettDexEntry: db "MOLE@" db 0,8 dw 20 TX_FAR _DiglettDexEntry db "@" -TaurosDexEntry: ; 40987 (10:4987) +TaurosDexEntry: db "WILD BULL@" db 4,7 dw 1950 TX_FAR _TaurosDexEntry db "@" -FarfetchdDexEntry: ; 4099a (10:499a) +FarfetchdDexEntry: db "WILD DUCK@" db 2,7 dw 330 TX_FAR _FarfetchdDexEntry db "@" -VenonatDexEntry: ; 409ad (10:49ad) +VenonatDexEntry: db "INSECT@" db 3,3 dw 660 TX_FAR _VenonatDexEntry db "@" -DragoniteDexEntry: ; 409bd (10:49bd) +DragoniteDexEntry: db "DRAGON@" db 7,3 dw 4630 TX_FAR _DragoniteDexEntry db "@" -DoduoDexEntry: ; 409cd (10:49cd) +DoduoDexEntry: db "TWIN BIRD@" db 4,7 dw 860 TX_FAR _DoduoDexEntry db "@" -PoliwagDexEntry: ; 409e0 (10:49e0) +PoliwagDexEntry: db "TADPOLE@" db 2,0 dw 270 TX_FAR _PoliwagDexEntry db "@" -JynxDexEntry: ; 409f1 (10:49f1) +JynxDexEntry: db "HUMANSHAPE@" db 4,7 dw 900 TX_FAR _JynxDexEntry db "@" -MoltresDexEntry: ; 40a05 (10:4a05) +MoltresDexEntry: db "FLAME@" db 6,7 dw 1320 TX_FAR _MoltresDexEntry db "@" -ArticunoDexEntry: ; 40a14 (10:4a14) +ArticunoDexEntry: db "FREEZE@" db 5,7 dw 1220 TX_FAR _ArticunoDexEntry db "@" -ZapdosDexEntry: ; 40a24 (10:4a24) +ZapdosDexEntry: db "ELECTRIC@" db 5,3 dw 1160 TX_FAR _ZapdosDexEntry db "@" -DittoDexEntry: ; 40a36 (10:4a36) +DittoDexEntry: db "TRANSFORM@" db 1,0 dw 90 TX_FAR _DittoDexEntry db "@" -MeowthDexEntry: ; 40a49 (10:4a49) +MeowthDexEntry: db "SCRATCHCAT@" db 1,4 dw 90 TX_FAR _MeowthDexEntry db "@" -KrabbyDexEntry: ; 40a5d (10:4a5d) +KrabbyDexEntry: db "RIVER CRAB@" db 1,4 dw 140 TX_FAR _KrabbyDexEntry db "@" -VulpixDexEntry: ; 40a71 (10:4a71) +VulpixDexEntry: db "FOX@" db 2,0 dw 220 TX_FAR _VulpixDexEntry db "@" -NinetalesDexEntry: ; 40a7e (10:4a7e) +NinetalesDexEntry: db "FOX@" db 3,7 dw 440 TX_FAR _NinetalesDexEntry db "@" -PikachuDexEntry: ; 40a8b (10:4a8b) +PikachuDexEntry: db "MOUSE@" db 1,4 dw 130 TX_FAR _PikachuDexEntry db "@" -RaichuDexEntry: ; 40a9a (10:4a9a) +RaichuDexEntry: db "MOUSE@" db 2,7 dw 660 TX_FAR _RaichuDexEntry db "@" -DratiniDexEntry: ; 40aa9 (10:4aa9) +DratiniDexEntry: db "DRAGON@" db 5,11 dw 70 TX_FAR _DratiniDexEntry db "@" -DragonairDexEntry: ; 40ab9 (10:4ab9) +DragonairDexEntry: db "DRAGON@" db 13,1 dw 360 TX_FAR _DragonairDexEntry db "@" -KabutoDexEntry: ; 40ac9 (10:4ac9) +KabutoDexEntry: db "SHELLFISH@" db 1,8 dw 250 TX_FAR _KabutoDexEntry db "@" -KabutopsDexEntry: ; 40adc (10:4adc) +KabutopsDexEntry: db "SHELLFISH@" db 4,3 dw 890 TX_FAR _KabutopsDexEntry db "@" -HorseaDexEntry: ; 40aef (10:4aef) +HorseaDexEntry: db "DRAGON@" db 1,4 dw 180 TX_FAR _HorseaDexEntry db "@" -SeadraDexEntry: ; 40aff (10:4aff) +SeadraDexEntry: db "DRAGON@" db 3,11 dw 550 TX_FAR _SeadraDexEntry db "@" -SandshrewDexEntry: ; 40b0f (10:4b0f) +SandshrewDexEntry: db "MOUSE@" db 2,0 dw 260 TX_FAR _SandshrewDexEntry db "@" -SandslashDexEntry: ; 40b1e (10:4b1e) +SandslashDexEntry: db "MOUSE@" db 3,3 dw 650 TX_FAR _SandslashDexEntry db "@" -OmanyteDexEntry: ; 40b2d (10:4b2d) +OmanyteDexEntry: db "SPIRAL@" db 1,4 dw 170 TX_FAR _OmanyteDexEntry db "@" -OmastarDexEntry: ; 40b3d (10:4b3d) +OmastarDexEntry: db "SPIRAL@" db 3,3 dw 770 TX_FAR _OmastarDexEntry db "@" -JigglypuffDexEntry: ; 40b4d (10:4b4d) +JigglypuffDexEntry: db "BALLOON@" db 1,8 dw 120 TX_FAR _JigglypuffDexEntry db "@" -WigglytuffDexEntry: ; 40b5e (10:4b5e) +WigglytuffDexEntry: db "BALLOON@" db 3,3 dw 260 TX_FAR _WigglytuffDexEntry db "@" -EeveeDexEntry: ; 40b6f (10:4b6f) +EeveeDexEntry: db "EVOLUTION@" db 1,0 dw 140 TX_FAR _EeveeDexEntry db "@" -FlareonDexEntry: ; 40b82 (10:4b82) +FlareonDexEntry: db "FLAME@" db 2,11 dw 550 TX_FAR _FlareonDexEntry db "@" -JolteonDexEntry: ; 40b91 (10:4b91) +JolteonDexEntry: db "LIGHTNING@" db 2,7 dw 540 TX_FAR _JolteonDexEntry db "@" -VaporeonDexEntry: ; 40ba4 (10:4ba4) +VaporeonDexEntry: db "BUBBLE JET@" db 3,3 dw 640 TX_FAR _VaporeonDexEntry db "@" -MachopDexEntry: ; 40bb8 (10:4bb8) +MachopDexEntry: db "SUPERPOWER@" db 2,7 dw 430 TX_FAR _MachopDexEntry db "@" -ZubatDexEntry: ; 40bcc (10:4bcc) +ZubatDexEntry: db "BAT@" db 2,7 dw 170 TX_FAR _ZubatDexEntry db "@" -EkansDexEntry: ; 40bd9 (10:4bd9) +EkansDexEntry: db "SNAKE@" db 6,7 dw 150 TX_FAR _EkansDexEntry db "@" -ParasDexEntry: ; 40be8 (10:4be8) +ParasDexEntry: db "MUSHROOM@" db 1,0 dw 120 TX_FAR _ParasDexEntry db "@" -PoliwhirlDexEntry: ; 40bfa (10:4bfa) +PoliwhirlDexEntry: db "TADPOLE@" db 3,3 dw 440 TX_FAR _PoliwhirlDexEntry db "@" -PoliwrathDexEntry: ; 40c0b (10:4c0b) +PoliwrathDexEntry: db "TADPOLE@" db 4,3 dw 1190 TX_FAR _PoliwrathDexEntry db "@" -WeedleDexEntry: ; 40c1c (10:4c1c) +WeedleDexEntry: db "HAIRY BUG@" db 1,0 dw 70 TX_FAR _WeedleDexEntry db "@" -KakunaDexEntry: ; 40c2f (10:4c2f) +KakunaDexEntry: db "COCOON@" db 2,0 dw 220 TX_FAR _KakunaDexEntry db "@" -BeedrillDexEntry: ; 40c3f (10:4c3f) +BeedrillDexEntry: db "POISON BEE@" db 3,3 dw 650 TX_FAR _BeedrillDexEntry db "@" -DodrioDexEntry: ; 40c53 (10:4c53) +DodrioDexEntry: db "TRIPLEBIRD@" db 5,11 dw 1880 TX_FAR _DodrioDexEntry db "@" -PrimeapeDexEntry: ; 40c67 (10:4c67) +PrimeapeDexEntry: db "PIG MONKEY@" db 3,3 dw 710 TX_FAR _PrimeapeDexEntry db "@" -DugtrioDexEntry: ; 40c7b (10:4c7b) +DugtrioDexEntry: db "MOLE@" db 2,4 dw 730 TX_FAR _DugtrioDexEntry db "@" -VenomothDexEntry: ; 40c89 (10:4c89) +VenomothDexEntry: db "POISONMOTH@" db 4,11 dw 280 TX_FAR _VenomothDexEntry db "@" -DewgongDexEntry: ; 40c9d (10:4c9d) +DewgongDexEntry: db "SEA LION@" db 5,7 dw 2650 TX_FAR _DewgongDexEntry db "@" -CaterpieDexEntry: ; 40caf (10:4caf) +CaterpieDexEntry: db "WORM@" db 1,0 dw 60 TX_FAR _CaterpieDexEntry db "@" -MetapodDexEntry: ; 40cbd (10:4cbd) +MetapodDexEntry: db "COCOON@" db 2,4 dw 220 TX_FAR _MetapodDexEntry db "@" -ButterfreeDexEntry: ; 40ccd (10:4ccd) +ButterfreeDexEntry: db "BUTTERFLY@" db 3,7 dw 710 TX_FAR _ButterfreeDexEntry db "@" -MachampDexEntry: ; 40ce0 (10:4ce0) +MachampDexEntry: db "SUPERPOWER@" db 5,3 dw 2870 TX_FAR _MachampDexEntry db "@" -GolduckDexEntry: ; 40cf4 (10:4cf4) +GolduckDexEntry: db "DUCK@" db 5,7 dw 1690 TX_FAR _GolduckDexEntry db "@" -HypnoDexEntry: ; 40d02 (10:4d02) +HypnoDexEntry: db "HYPNOSIS@" db 5,3 dw 1670 TX_FAR _HypnoDexEntry db "@" -GolbatDexEntry: ; 40d14 (10:4d14) +GolbatDexEntry: db "BAT@" db 5,3 dw 1210 TX_FAR _GolbatDexEntry db "@" -MewtwoDexEntry: ; 40d21 (10:4d21) +MewtwoDexEntry: db "GENETIC@" db 6,7 dw 2690 TX_FAR _MewtwoDexEntry db "@" -SnorlaxDexEntry: ; 40d32 (10:4d32) +SnorlaxDexEntry: db "SLEEPING@" db 6,11 dw 10140 TX_FAR _SnorlaxDexEntry db "@" -MagikarpDexEntry: ; 40d44 (10:4d44) +MagikarpDexEntry: db "FISH@" db 2,11 dw 220 TX_FAR _MagikarpDexEntry db "@" -MukDexEntry: ; 40d52 (10:4d52) +MukDexEntry: db "SLUDGE@" db 3,11 dw 660 TX_FAR _MukDexEntry db "@" -KinglerDexEntry: ; 40d62 (10:4d62) +KinglerDexEntry: db "PINCER@" db 4,3 dw 1320 TX_FAR _KinglerDexEntry db "@" -CloysterDexEntry: ; 40d72 (10:4d72) +CloysterDexEntry: db "BIVALVE@" db 4,11 dw 2920 TX_FAR _CloysterDexEntry db "@" -ElectrodeDexEntry: ; 40d83 (10:4d83) +ElectrodeDexEntry: db "BALL@" db 3,11 dw 1470 TX_FAR _ElectrodeDexEntry db "@" -ClefableDexEntry: ; 40d91 (10:4d91) +ClefableDexEntry: db "FAIRY@" db 4,3 dw 880 TX_FAR _ClefableDexEntry db "@" -WeezingDexEntry: ; 40da0 (10:4da0) +WeezingDexEntry: db "POISON GAS@" db 3,11 dw 210 TX_FAR _WeezingDexEntry db "@" -PersianDexEntry: ; 40db4 (10:4db4) +PersianDexEntry: db "CLASSY CAT@" db 3,3 dw 710 TX_FAR _PersianDexEntry db "@" -MarowakDexEntry: ; 40dc8 (10:4dc8) +MarowakDexEntry: db "BONEKEEPER@" db 3,3 dw 990 TX_FAR _MarowakDexEntry db "@" -HaunterDexEntry: ; 40ddc (10:4ddc) +HaunterDexEntry: db "GAS@" db 5,3 dw 2 TX_FAR _HaunterDexEntry db "@" -AbraDexEntry: ; 40de9 (10:4de9) +AbraDexEntry: db "PSI@" db 2,11 dw 430 TX_FAR _AbraDexEntry db "@" -AlakazamDexEntry: ; 40df6 (10:4df6) +AlakazamDexEntry: db "PSI@" db 4,11 dw 1060 TX_FAR _AlakazamDexEntry db "@" -PidgeottoDexEntry: ; 40e03 (10:4e03) +PidgeottoDexEntry: db "BIRD@" db 3,7 dw 660 TX_FAR _PidgeottoDexEntry db "@" -PidgeotDexEntry: ; 40e11 (10:4e11) +PidgeotDexEntry: db "BIRD@" db 4,11 dw 870 TX_FAR _PidgeotDexEntry db "@" -StarmieDexEntry: ; 40e1f (10:4e1f) +StarmieDexEntry: db "MYSTERIOUS@" db 3,7 dw 1760 TX_FAR _StarmieDexEntry db "@" -BulbasaurDexEntry: ; 40e33 (10:4e33) +BulbasaurDexEntry: db "SEED@" db 2,4 dw 150 TX_FAR _BulbasaurDexEntry db "@" -VenusaurDexEntry: ; 40e41 (10:4e41) +VenusaurDexEntry: db "SEED@" db 6,7 dw 2210 TX_FAR _VenusaurDexEntry db "@" -TentacruelDexEntry: ; 40e4f (10:4e4f) +TentacruelDexEntry: db "JELLYFISH@" db 5,3 dw 1210 TX_FAR _TentacruelDexEntry db "@" -GoldeenDexEntry: ; 40e62 (10:4e62) +GoldeenDexEntry: db "GOLDFISH@" db 2,0 dw 330 TX_FAR _GoldeenDexEntry db "@" -SeakingDexEntry: ; 40e74 (10:4e74) +SeakingDexEntry: db "GOLDFISH@" db 4,3 dw 860 TX_FAR _SeakingDexEntry db "@" -PonytaDexEntry: ; 40e86 (10:4e86) +PonytaDexEntry: db "FIRE HORSE@" db 3,3 dw 660 TX_FAR _PonytaDexEntry db "@" -RapidashDexEntry: ; 40e9a (10:4e9a) +RapidashDexEntry: db "FIRE HORSE@" db 5,7 dw 2090 TX_FAR _RapidashDexEntry db "@" -RattataDexEntry: ; 40eae (10:4eae) +RattataDexEntry: db "RAT@" db 1,0 dw 80 TX_FAR _RattataDexEntry db "@" -RaticateDexEntry: ; 40ebb (10:4ebb) +RaticateDexEntry: db "RAT@" db 2,4 dw 410 TX_FAR _RaticateDexEntry db "@" -NidorinoDexEntry: ; 40ec8 (10:4ec8) +NidorinoDexEntry: db "POISON PIN@" db 2,11 dw 430 TX_FAR _NidorinoDexEntry db "@" -NidorinaDexEntry: ; 40edc (10:4edc) +NidorinaDexEntry: db "POISON PIN@" db 2,7 dw 440 TX_FAR _NidorinaDexEntry db "@" -GeodudeDexEntry: ; 40ef0 (10:4ef0) +GeodudeDexEntry: db "ROCK@" db 1,4 dw 440 TX_FAR _GeodudeDexEntry db "@" -PorygonDexEntry: ; 40efe (10:4efe) +PorygonDexEntry: db "VIRTUAL@" db 2,7 dw 800 TX_FAR _PorygonDexEntry db "@" -AerodactylDexEntry: ; 40f0f (10:4f0f) +AerodactylDexEntry: db "FOSSIL@" db 5,11 dw 1300 TX_FAR _AerodactylDexEntry db "@" -MagnemiteDexEntry: ; 40f1f (10:4f1f) +MagnemiteDexEntry: db "MAGNET@" db 1,0 dw 130 TX_FAR _MagnemiteDexEntry db "@" -CharmanderDexEntry: ; 40f2f (10:4f2f) +CharmanderDexEntry: db "LIZARD@" db 2,0 dw 190 TX_FAR _CharmanderDexEntry db "@" -SquirtleDexEntry: ; 40f3f (10:4f3f) +SquirtleDexEntry: db "TINYTURTLE@" db 1,8 dw 200 TX_FAR _SquirtleDexEntry db "@" -CharmeleonDexEntry: ; 40f53 (10:4f53) +CharmeleonDexEntry: db "FLAME@" db 3,7 dw 420 TX_FAR _CharmeleonDexEntry db "@" -WartortleDexEntry: ; 40f62 (10:4f62) +WartortleDexEntry: db "TURTLE@" db 3,3 dw 500 TX_FAR _WartortleDexEntry db "@" -CharizardDexEntry: ; 40f72 (10:4f72) +CharizardDexEntry: db "FLAME@" db 5,7 dw 2000 TX_FAR _CharizardDexEntry db "@" -OddishDexEntry: ; 40f81 (10:4f81) +OddishDexEntry: db "WEED@" db 1,8 dw 120 TX_FAR _OddishDexEntry db "@" -GloomDexEntry: ; 40f8f (10:4f8f) +GloomDexEntry: db "WEED@" db 2,7 dw 190 TX_FAR _GloomDexEntry db "@" -VileplumeDexEntry: ; 40f9d (10:4f9d) +VileplumeDexEntry: db "FLOWER@" db 3,11 dw 410 TX_FAR _VileplumeDexEntry db "@" -BellsproutDexEntry: ; 40fad (10:4fad) +BellsproutDexEntry: db "FLOWER@" db 2,4 dw 90 TX_FAR _BellsproutDexEntry db "@" -WeepinbellDexEntry: ; 40fbd (10:4fbd) +WeepinbellDexEntry: db "FLYCATCHER@" db 3,3 dw 140 TX_FAR _WeepinbellDexEntry db "@" -VictreebelDexEntry: ; 40fd1 (10:4fd1) +VictreebelDexEntry: db "FLYCATCHER@" db 5,7 dw 340 TX_FAR _VictreebelDexEntry db "@" -MissingNoDexEntry: ; 40fe5 (10:4fe5) +MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 3bd6a15b..0e293946 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -1,4 +1,4 @@ -PokedexOrder: ; 41024 (10:5024) +PokedexOrder: db DEX_RHYDON db DEX_KANGASKHAN db DEX_NIDORAN_M diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm index 1437649c..bffa4440 100755 --- a/data/prize_mon_levels.asm +++ b/data/prize_mon_levels.asm @@ -1,4 +1,4 @@ -PrizeMonLevelDictionary: ; 5298a (14:698a) +PrizeMonLevelDictionary: IF DEF(_RED) db ABRA,9 db CLEFAIRY,8 diff --git a/data/prizes.asm b/data/prizes.asm index 3d4102b6..1120c0d0 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -1,4 +1,4 @@ -PrizeDifferentMenuPtrs: ; 52843 (14:6843) +PrizeDifferentMenuPtrs: dw PrizeMenuMon1Entries dw PrizeMenuMon1Cost @@ -8,10 +8,10 @@ PrizeDifferentMenuPtrs: ; 52843 (14:6843) dw PrizeMenuTMsEntries dw PrizeMenuTMsCost -NoThanksText: ; 5284f (14:684f) +NoThanksText: db "NO THANKS@" -PrizeMenuMon1Entries: ; 52859 (14:6859) +PrizeMenuMon1Entries: db ABRA db CLEFAIRY IF DEF(_RED) @@ -22,7 +22,7 @@ IF DEF(_BLUE) ENDC db "@" -PrizeMenuMon1Cost: ; 5285d (14:685d) +PrizeMenuMon1Cost: IF DEF(_RED) coins 180 coins 500 @@ -34,7 +34,7 @@ ENDC coins 1200 db "@" -PrizeMenuMon2Entries: ; 52864 (14:6864) +PrizeMenuMon2Entries: IF DEF(_RED) db DRATINI db SCYTHER @@ -46,7 +46,7 @@ ENDC db PORYGON db "@" -PrizeMenuMon2Cost: ; 52868 (14:6868) +PrizeMenuMon2Cost: IF DEF(_RED) coins 2800 coins 5500 @@ -59,13 +59,13 @@ IF DEF(_BLUE) ENDC db "@" -PrizeMenuTMsEntries: ; 5286f (14:686f) +PrizeMenuTMsEntries: db TM_23 db TM_15 db TM_50 db "@" -PrizeMenuTMsCost: ; 52873 (14:6873) +PrizeMenuTMsCost: coins 3300 coins 5500 coins 7700 diff --git a/data/sgb_border.asm b/data/sgb_border.asm index e1da84ac..c2afc193 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,4 +1,4 @@ -BorderPalettes: ; 72788 (1c:6788) +BorderPalettes: IF DEF(_RED) INCBIN "gfx/red/sgbborder.map" ENDC @@ -53,7 +53,7 @@ ENDC ds $18 -SGBBorderGraphics: ; 72fe8 (1c:6fe8) +SGBBorderGraphics: IF DEF(_RED) INCBIN "gfx/red/sgbborder.2bpp" ENDC diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index f810db8f..cae91883 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -51,14 +51,14 @@ DATA_SND: MACRO db \3 ; length (1-11) ENDM -BlkPacket_WholeScreen: ; 7219e (1c:619e) +BlkPacket_WholeScreen: ATTR_BLK 1 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 ds 8 db $03,$00,$00,$13,$11,$00,$00 -BlkPacket_Battle: ; 721b5 (1c:61b5) +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 @@ -74,7 +74,7 @@ BlkPacket_Battle: ; 721b5 (1c:61b5) db $03,$0b,$00,$13,$07,$03 db $00 -BlkPacket_StatusScreen: ; 721fa (1c:61fa) +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 @@ -84,7 +84,7 @@ BlkPacket_StatusScreen: ; 721fa (1c:61fa) db $01,$07,$13,$11,$00,$03 db $08,$00,$13,$06,$00,$00 -BlkPacket_Pokedex: ; 72222 (1c:6222) +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 @@ -95,7 +95,7 @@ BlkPacket_Pokedex: ; 72222 (1c:6222) db $09,$08,$11,$00,$03,$09 db $01,$13,$11,$00,$00 -BlkPacket_Slots: ; 7224f (1c:624f) +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 @@ -110,7 +110,7 @@ BlkPacket_Slots: ; 7224f (1c:624f) db $03,$00,$0c,$13,$11,$00 db $00 -BlkPacket_Titlescreen: ; 7228e (1c:628e) +BlkPacket_Titlescreen: ATTR_BLK 3 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 @@ -122,7 +122,7 @@ BlkPacket_Titlescreen: ; 7228e (1c:628e) db $03,$00,$0a,$13,$11,$02 db $00 -BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) +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 @@ -134,7 +134,7 @@ BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) db $03,$00,$0e,$13,$11,$01 db $00 -BlkPacket_PartyMenu: ; 722f4 (1c:62f4) +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 @@ -156,7 +156,7 @@ BlkPacket_PartyMenu: ; 722f4 (1c:62f4) db $0c,$08,$12,$09,$00,$03 db $0c,$0a,$12,$0b,$00,$00 -BlkPacket_TrainerCard: ; 72360 (1c:6360) +BlkPacket_TrainerCard: ATTR_BLK 10 ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge @@ -182,7 +182,7 @@ BlkPacket_TrainerCard: ; 72360 (1c:6360) db $03,$0f,$0f,$10,$10,$01 db $00 -BlkPacket_GameFreakIntro: ; 723dd (1c:63dd) +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 diff --git a/data/slot_machine_wheels.asm b/data/slot_machine_wheels.asm index 8f300152..88a89822 100755 --- a/data/slot_machine_wheels.asm +++ b/data/slot_machine_wheels.asm @@ -1,4 +1,4 @@ -SlotMachineWheel1: ; 379e5 (d:79e5) +SlotMachineWheel1: dw SLOTS7 dw SLOTSMOUSE dw SLOTSFISH @@ -18,7 +18,7 @@ SlotMachineWheel1: ; 379e5 (d:79e5) dw SLOTSMOUSE dw SLOTSFISH -SlotMachineWheel2: ; 37a09 (d:7a09) +SlotMachineWheel2: dw SLOTS7 dw SLOTSFISH dw SLOTSCHERRY @@ -38,7 +38,7 @@ SlotMachineWheel2: ; 37a09 (d:7a09) dw SLOTSFISH dw SLOTSCHERRY -SlotMachineWheel3: ; 37a2d (d:7a2d) +SlotMachineWheel3: dw SLOTS7 dw SLOTSBIRD dw SLOTSFISH diff --git a/data/special_warps.asm b/data/special_warps.asm index b8baccfb..27837109 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -1,7 +1,7 @@ ; Format: (size 2 bytes) ; 00: target map ID ; 01: which dungeon warp in the source map was used -DungeonWarpList: ; 63bf (1:63bf) +DungeonWarpList: db SEAFOAM_ISLANDS_2,$01 db SEAFOAM_ISLANDS_2,$02 db SEAFOAM_ISLANDS_3,$01 @@ -16,7 +16,7 @@ DungeonWarpList: ; 63bf (1:63bf) db MANSION_2,$03 db $FF -DungeonWarpData: ; 63d8 (1:63d8) +DungeonWarpData: FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18 FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23 FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19 @@ -34,32 +34,32 @@ DungeonWarpData: ; 63d8 (1:63d8) ; db Map_id ; FLYWARP_DATA [Map Width][Y-pos][X-pos] ; db Tileset_id -FirstMapSpec: ; 6420 (1:6420) +FirstMapSpec: db REDS_HOUSE_2F FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 db REDS_HOUSE_2 -TradeCenterSpec1: ; 6428 (1:6428) +TradeCenterSpec1: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 db CLUB -TradeCenterSpec2: ; 6430 (1:6430) +TradeCenterSpec2: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 db CLUB -ColosseumSpec1: ; 6438 (1:6438) +ColosseumSpec1: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,3 db CLUB -ColosseumSpec2: ; 6440 (1:6440) +ColosseumSpec2: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,6 db CLUB -FlyWarpDataPtr: ; 6448 (1:6448) +FlyWarpDataPtr: db PALLET_TOWN, 0 dw PalletTownFlyWarp db VIRIDIAN_CITY, 0 @@ -91,29 +91,29 @@ FlyWarpDataPtr: ; 6448 (1:6448) ; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] ; Macro Format: ; FLYWARP_DATA [Map Width][Y-pos][X-pos] -PalletTownFlyWarp: ; 647c (1:647c) +PalletTownFlyWarp: FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5 -ViridianCityFlyWarp: ; 6482 (1:6482) +ViridianCityFlyWarp: FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23 -PewterCityFlyWarp: ; 6488 (1:6488) +PewterCityFlyWarp: FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13 -CeruleanCityFlyWarp: ; 648e (1:648e) +CeruleanCityFlyWarp: FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19 -LavenderTownFlyWarp: ; 6494 (1:6494) +LavenderTownFlyWarp: FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3 -VermilionCityFlyWarp: ; 649a (1:649a) +VermilionCityFlyWarp: FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11 -CeladonCityFlyWarp: ; 64a0 (1:64a0) +CeladonCityFlyWarp: FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41 -FuchsiaCityFlyWarp: ; 64a6 (1:64a6) +FuchsiaCityFlyWarp: FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19 -CinnabarIslandFlyWarp: ; 64ac (1:64ac) +CinnabarIslandFlyWarp: FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11 -IndigoPlateauFlyWarp: ; 64b2 (1:64b2) +IndigoPlateauFlyWarp: FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9 -SaffronCityFlyWarp: ; 64b8 (1:64b8) +SaffronCityFlyWarp: FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9 -Route4FlyWarp: ; 64be (1:64be) +Route4FlyWarp: FLYWARP_DATA ROUTE_4_WIDTH, 6, 11 -Route10FlyWarp: ; 64c4 (1:64c4) +Route10FlyWarp: FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm index c5e2d29e..5b0e1e00 100755 --- a/data/sprite_sets.asm +++ b/data/sprite_sets.asm @@ -1,4 +1,4 @@ -MapSpriteSets: ; 17a64 (5:7a64) +MapSpriteSets: db $01 ; PALLET_TOWN db $01 ; VIRIDIAN_CITY db $02 ; PEWTER_CITY @@ -44,7 +44,7 @@ MapSpriteSets: ; 17a64 (5:7a64) ; 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: ; 17a89 (5:7a89) +SplitMapSpriteSets: db $02,$25,$02,$01 ; $f1 db $02,$32,$02,$03 ; $f2 db $01,$39,$04,$08 ; $f3 @@ -58,7 +58,7 @@ SplitMapSpriteSets: ; 17a89 (5:7a89) db $01,$11,$05,$07 ; $fb db $01,$03,$07,$03 ; $fc -SpriteSets: ; 17ab9 (5:7ab9) +SpriteSets: ; sprite set $01 db SPRITE_BLUE db SPRITE_BUG_CATCHER @@ -189,7 +189,7 @@ SpriteSets: ; 17ab9 (5:7ab9) db SPRITE_BALL db SPRITE_OMANYTE -SpriteSheetPointerTable: ; 17b27 (5:7b27) +SpriteSheetPointerTable: ; SPRITE_RED dw RedSprite db $c0 ; byte count diff --git a/data/super_palettes.asm b/data/super_palettes.asm index c1afb003..97f1d8ec 100755 --- a/data/super_palettes.asm +++ b/data/super_palettes.asm @@ -1,5 +1,5 @@ ; palettes for overworlds, title screen, monsters -SuperPalettes: ; 72660 (1c:6660) +SuperPalettes: RGB 31,29,31 ; PAL_ROUTE RGB 21,28,11 RGB 20,26,31 diff --git a/data/super_rod.asm b/data/super_rod.asm index 2b0646fc..93ea992b 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -1,6 +1,6 @@ ; super rod data ; format: map, pointer to fishing group -SuperRodData: ; e919 (3:6919) +SuperRodData: dbw PALLET_TOWN, FishingGroup1 dbw VIRIDIAN_CITY, FishingGroup1 dbw CERULEAN_CITY, FishingGroup3 @@ -38,61 +38,61 @@ SuperRodData: ; e919 (3:6919) ; fishing groups ; number of monsters, followed by level/monster pairs -FishingGroup1: ; e97d (3:697d) +FishingGroup1: db 2 db 15,TENTACOOL db 15,POLIWAG -FishingGroup2: ; e982 (3:6982) +FishingGroup2: db 2 db 15,GOLDEEN db 15,POLIWAG -FishingGroup3: ; e987 (3:6987) +FishingGroup3: db 3 db 15,PSYDUCK db 15,GOLDEEN db 15,KRABBY -FishingGroup4: ; e98e (3:698e) +FishingGroup4: db 2 db 15,KRABBY db 15,SHELLDER -FishingGroup5: ; e993 (3:6993) +FishingGroup5: db 2 db 23,POLIWHIRL db 15,SLOWPOKE -FishingGroup6: ; e998 (3:6998) +FishingGroup6: db 4 db 15,DRATINI db 15,KRABBY db 15,PSYDUCK db 15,SLOWPOKE -FishingGroup7: ; e9a1 (3:69a1) +FishingGroup7: db 4 db 5,TENTACOOL db 15,KRABBY db 15,GOLDEEN db 15,MAGIKARP -FishingGroup8: ; e9aa (3:69aa) +FishingGroup8: db 4 db 15,STARYU db 15,HORSEA db 15,SHELLDER db 15,GOLDEEN -FishingGroup9: ; e9b3 (3:69b3) +FishingGroup9: db 4 db 23,SLOWBRO db 23,SEAKING db 23,KINGLER db 23,SEADRA -FishingGroup10: ; e9bc (3:69bc) +FishingGroup10: db 4 db 23,SEAKING db 15,KRABBY diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 84cfaffd..d8e0d9b4 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,4 +1,4 @@ -Tilesets: ; c7be (3:47be) +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 diff --git a/data/title_mons.asm b/data/title_mons.asm index abcf1bb4..c5d94301 100755 --- a/data/title_mons.asm +++ b/data/title_mons.asm @@ -1,4 +1,4 @@ -TitleMons: ; 4588 (1:4588) +TitleMons: ; mons on the title screen are randomly chosen from here IF DEF(_RED) db CHARMANDER diff --git a/data/tm_prices.asm b/data/tm_prices.asm index 89fdb8e9..ccc8be05 100755 --- a/data/tm_prices.asm +++ b/data/tm_prices.asm @@ -1,4 +1,4 @@ -TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) +TechnicalMachinePrices: ; In thousands (nybbles). dn 3, 2 ; TM_01, TM_02 dn 2, 1 ; TM_03, TM_04 diff --git a/data/tms.asm b/data/tms.asm index 23630691..23c1685e 100755 --- a/data/tms.asm +++ b/data/tms.asm @@ -1,4 +1,4 @@ -TechnicalMachines: ; 13773 (4:7773) +TechnicalMachines: db MEGA_PUNCH db RAZOR_WIND db SWORDS_DANCE diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index ee2828ca..abf584de 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -1,4 +1,4 @@ -ExternalMapEntries: ; 71313 (1c:5313) +ExternalMapEntries: EMAP $2,$B,PalletTownName EMAP $2,$8,ViridianCityName EMAP $2,$3,PewterCityName @@ -37,7 +37,7 @@ ExternalMapEntries: ; 71313 (1c:5313) EMAP $A,$1,Route24Name EMAP $B,$0,Route25Name -InternalMapEntries: ; 71382 (1c:5382) +InternalMapEntries: IMAP OAKS_LAB, $2,$B,PalletTownName IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name diff --git a/data/town_map_order.asm b/data/town_map_order.asm index 4fb4f33b..10131a31 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -1,4 +1,4 @@ -TownMapOrder: ; 70f11 (1c:4f11) +TownMapOrder: db PALLET_TOWN db ROUTE_1 db VIRIDIAN_CITY diff --git a/data/trades.asm b/data/trades.asm index e7f71233..cf0fcbfd 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,4 +1,4 @@ -TradeMons: ; 71b7b (1c:5b7b) +TradeMons: ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index a42364af..2e7b52a5 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,4 +1,4 @@ -LoneMoves: ; 39d22 (e:5d22) +LoneMoves: ; these are used for gym leaders. ; this is not automatic! you have to write the number you want to wLoneAttackNo ; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain, @@ -16,7 +16,7 @@ LoneMoves: ; 39d22 (e:5d22) db 3,FIRE_BLAST db 4,FISSURE -TeamMoves: ; 39d32 (e:5d32) +TeamMoves: ; these are used for elite four. ; this is automatic, based on trainer class. ; don't be confused by LoneMoves above, the two data structures are diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 9bc80da1..c186dd00 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -1,4 +1,4 @@ -TrainerDataPointers: ; 39d3b (e:5d3b) +TrainerDataPointers: dw YoungsterData dw BugCatcherData dw LassData diff --git a/data/trainer_types.asm b/data/trainer_types.asm index bc94015c..cc7ca605 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,11 +1,11 @@ -FemaleTrainerList:: ; 3434 (0:3434) +FemaleTrainerList:: db OPP_LASS db OPP_JR_TRAINER_F db OPP_BEAUTY db OPP_COOLTRAINER_F db $FF -EvilTrainerList:: ; 3439 (0:3439) +EvilTrainerList:: db OPP_JUGGLER_X db OPP_GAMBLER db OPP_ROCKER diff --git a/data/type_effects.asm b/data/type_effects.asm index b3207c84..1321a3d9 100755 --- a/data/type_effects.asm +++ b/data/type_effects.asm @@ -1,4 +1,4 @@ -TypeEffects: ; 3e474 (f:6474) +TypeEffects: ; format: attacking type, defending type, damage multiplier ; the multiplier is a (decimal) fixed-point number: ; 20 is ×2.0 diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm index aa725d00..6fd326cc 100755 --- a/data/warp_tile_ids.asm +++ b/data/warp_tile_ids.asm @@ -1,4 +1,4 @@ -WarpTileIDPointers: ; c4cc (3:44cc) +WarpTileIDPointers: dw OverworldWarpTileIDs dw RedsHouse1WarpTileIDs dw MartWarpTileIDs @@ -24,62 +24,62 @@ WarpTileIDPointers: ; c4cc (3:44cc) dw FacilityWarpTileIDs dw PlateauWarpTileIDs -OverworldWarpTileIDs: ; c4fc (3:44fc) +OverworldWarpTileIDs: db $1B,$58,$FF -ForestGateWarpTileIDs: ; c4ff (3:44ff) -MuseumWarpTileIDs: ; c4ff (3:44ff) -GateWarpTileIDs: ; c4ff (3:44ff) +ForestGateWarpTileIDs: +MuseumWarpTileIDs: +GateWarpTileIDs: db $3B -RedsHouse1WarpTileIDs: ; c500 (3:4500) -RedsHouse2WarpTileIDs: ; c500 (3:4500) +RedsHouse1WarpTileIDs: +RedsHouse2WarpTileIDs: db $1A,$1C,$FF -MartWarpTileIDs: ; c503 (3:4503) -PokecenterWarpTileIDs: ; c503 (3:4503) +MartWarpTileIDs: +PokecenterWarpTileIDs: db $5E,$FF -ForestWarpTileIDs: ; c505 (3:4505) +ForestWarpTileIDs: db $5A,$5C,$3A,$FF -DojoWarpTileIDs: ; c509 (3:4509) -GymWarpTileIDs: ; c509 (3:4509) +DojoWarpTileIDs: +GymWarpTileIDs: db $4A,$FF -HouseWarpTileIDs: ; c50b (3:450b) +HouseWarpTileIDs: db $54,$5C,$32,$FF -ShipWarpTileIDs: ; c50f (3:450f) +ShipWarpTileIDs: db $37,$39,$1E,$4A,$FF -InteriorWarpTileIDs: ; c514 (3:4514) +InteriorWarpTileIDs: db $15,$55,$04,$FF -CavernWarpTileIDs: ; c518 (3:4518) +CavernWarpTileIDs: db $18,$1A,$22,$FF -LobbyWarpTileIDs: ; c51c (3:451c) +LobbyWarpTileIDs: db $1A,$1C,$38,$FF -MansionWarpTileIDs: ; c520 (3:4520) +MansionWarpTileIDs: db $1A,$1C,$53,$FF -LabWarpTileIDs: ; c524 (3:4524) +LabWarpTileIDs: db $34,$FF -FacilityWarpTileIDs: ; c526 (3:4526) +FacilityWarpTileIDs: db $43,$58,$20 -CemeteryWarpTileIDs: ; c529 (3:4529) +CemeteryWarpTileIDs: db $1B -UndergroundWarpTileIDs: ; c52a (3:452a) +UndergroundWarpTileIDs: db $13,$FF -PlateauWarpTileIDs: ; c52c (3:452c) +PlateauWarpTileIDs: db $1B,$3B -ShipPortWarpTileIDs: ; c52e (3:452e) -ClubWarpTileIDs: ; c52e (3:452e) +ShipPortWarpTileIDs: +ClubWarpTileIDs: db $FF diff --git a/data/wild_mons.asm b/data/wild_mons.asm index 482405e3..a4265565 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -1,4 +1,4 @@ -WildDataPointers: ; ceeb (3:4eeb) +WildDataPointers: dw NoMons ; PALLET_TOWN dw NoMons ; VIRIDIAN_CITY dw NoMons ; PEWTER_CITY |